From 3fa8252f9bc09cbfe4b1a09f8d87fc6d7e228ac3 Mon Sep 17 00:00:00 2001
From: "jvanboxtel@wisc.edu" <jvanboxtel@wisc.edu>
Date: Tue, 26 Mar 2019 13:16:56 -0500
Subject: [PATCH] ROENROLL-1487 show tabs in past terms
---
.../term-container.component.html | 56 ++++++-------------
1 file changed, 16 insertions(+), 40 deletions(-)
diff --git a/src/app/degree-planner/term-container/term-container.component.html b/src/app/degree-planner/term-container/term-container.component.html
index c30b3bc..154b0f5 100644
--- a/src/app/degree-planner/term-container/term-container.component.html
+++ b/src/app/degree-planner/term-container/term-container.component.html
@@ -166,53 +166,29 @@
<!-- If this term is an active term -->
<ng-container *ngIf="(term$ | async).era === 'active'">
- <mat-tab-group
- (selectedTabChange)="changeVisibleCredits($event)"
- [selectedIndex]="1"
- >
- <mat-tab [label]="'In Progress (' + enrolledCourses.length + ')'"
- ><ng-container
- cdkFocusinitial
- *ngTemplateOutlet="enrolled"
- ></ng-container
- ></mat-tab>
- <mat-tab [label]="'Cart (' + plannedCourses.length + ')'"
- ><ng-container
- cdkFocusinitial
- *ngTemplateOutlet="planned"
- ></ng-container
- ></mat-tab>
+ <mat-tab-group (selectedTabChange)="changeVisibleCredits($event)" [selectedIndex]="1">
+ <mat-tab [label]="'In Progress (' + enrolledCourses.length + ')'">
+ <ng-container cdkFocusinitial *ngTemplateOutlet="enrolled"></ng-container>
+ </mat-tab>
+ <mat-tab [label]="'Cart (' + plannedCourses.length + ')'">
+ <ng-container cdkFocusinitial *ngTemplateOutlet="planned"></ng-container>
+ </mat-tab>
</mat-tab-group>
</ng-container>
<!-- If this term is a past term -->
<ng-container *ngIf="(term$ | async).era === 'past'">
- <ng-container *ngIf="plannedCourses.length > 0">
- <mat-tab-group
- (selectedTabChange)="changeVisibleCredits($event)"
- [selectedIndex]="0"
- >
- <mat-tab [label]="'Completed (' + enrolledCourses.length + ')'"
- ><ng-container
- cdkFocusinitial
- *ngTemplateOutlet="enrolled"
- ></ng-container
- ></mat-tab>
- <mat-tab [label]="'Cart (' + plannedCourses.length + ')'"
- ><ng-container
- cdkFocusinitial
- *ngTemplateOutlet="planned"
- ></ng-container
- ></mat-tab>
- </mat-tab-group>
- </ng-container>
-
- <ng-container *ngIf="plannedCourses.length === 0">
- <ng-container cdkFocusinitial *ngTemplateOutlet="enrolled"></ng-container>
- </ng-container>
+ <mat-tab-group (selectedTabChange)="changeVisibleCredits($event)" [selectedIndex]="0">
+ <mat-tab [label]="'Completed (' + enrolledCourses.length + ')'">
+ <ng-container cdkFocusinitial *ngTemplateOutlet="enrolled"></ng-container>
+ </mat-tab>
+ <mat-tab [label]="'Cart (' + plannedCourses.length + ')'">
+ <ng-container cdkFocusinitial *ngTemplateOutlet="planned"></ng-container>
+ </mat-tab>
+ </mat-tab-group>
</ng-container>
- <!-- If this term is a past term -->
+ <!-- If this term is a future term -->
<ng-container *ngIf="(term$ | async).era === 'future'">
<ng-container cdkFocusinitial *ngTemplateOutlet="planned"></ng-container>
</ng-container>
--
GitLab