diff --git a/package-lock.json b/package-lock.json index 2a82972e80cfb138fff5aa783fa26eb0833cbd21..99957273b0623472402e4f7a86939b6db996dfea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "course-search-enroll-fe", - "version": "1.0.21", + "version": "1.0.22", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 93825f117e4cdca693789427882217c6defa7544..7b54df96b5d1c16a1a2646f916c534bf2325e259 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "course-search-enroll-fe", - "version": "1.0.21", + "version": "1.0.22", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.json --open", diff --git a/src/app/degree-planner/shared/course-item/course-item.component.html b/src/app/degree-planner/shared/course-item/course-item.component.html index 99c816bdb3f8ddc5c5b936b81d384093ef6b0e68..de7440a0f67a64d3769989a5bc7b52c9c8555561 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.html +++ b/src/app/degree-planner/shared/course-item/course-item.component.html @@ -35,15 +35,6 @@ matTooltipPosition="above"> report_problem </i> - <i - *ngSwitchCase="'Incomplete'" - class="material-icons incomplete-icon" - alt="Course is incomplete" - aria-label="Course is incomplete" - matTooltip="Course is incomplete" - matTooltipPosition="above"> - cancel - </i> <i *ngSwitchCase="'NotOfferedInTerm'" class="material-icons error-icon" diff --git a/src/app/degree-planner/shared/course-item/course-item.component.ts b/src/app/degree-planner/shared/course-item/course-item.component.ts index b58b8d4f5fa000e83175925ba9280ddc214e1c1a..85c92644d812b3e23f22351aecf9ab948583fcf4 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.ts +++ b/src/app/degree-planner/shared/course-item/course-item.component.ts @@ -45,7 +45,6 @@ export class CourseItemComponent implements OnInit { public status: | 'InProgress' | 'Waitlisted' - | 'Incomplete' | 'NotOfferedInTerm' | 'DoesNotExist' | 'Normal'; @@ -70,21 +69,14 @@ export class CourseItemComponent implements OnInit { ngOnInit() { const isActive = this.era === Era.Active; - const isPast = this.era === Era.Past; const isNotOffered = this.course.studentEnrollmentStatus === 'NOTOFFERED'; const doesNotExist = this.course.studentEnrollmentStatus === 'DOESNOTEXIST'; - const isIncomplete = - isPast && - this.course.grade === null && - this.course.studentEnrollmentStatus !== 'cart'; const isWaitlisted = this.course.studentEnrollmentStatus === 'Waitlisted'; const isInProgress = isActive && this.course.studentEnrollmentStatus === 'Enrolled'; - if (isIncomplete) { - this.status = 'Incomplete'; - } else if (isWaitlisted) { + if (isWaitlisted) { this.status = 'Waitlisted'; } else if (isInProgress) { this.status = 'InProgress'; diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html index 0cbde1be4ecc5bb29c6fc82939f742c4bf467ac9..12a5c612d247fdabb079dfc76815bdb744f46a6d 100644 --- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html +++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html @@ -22,14 +22,6 @@ </i> Course is waitlisted </mat-list-item> - <mat-list-item role="listitem"> - <i - class="material-icons incomplete-icon" - alt="Course is incomplete"> - cancel - </i> - Course is incomplete - </mat-list-item> <mat-list-item role="listitem"> <i class="material-icons error-icon" diff --git a/src/assets/sass/general.scss b/src/assets/sass/general.scss index 3be81751efdfcfc1c3d68856bb0ffa4a6e2fcc5e..b7bb6f9c3481ff4b2e8abfdc6c55e6e784173501 100644 --- a/src/assets/sass/general.scss +++ b/src/assets/sass/general.scss @@ -85,7 +85,6 @@ body { color: #ef6c00; } -.incomplete-icon, .not-offered-icon { color: #6e655f; } @@ -100,7 +99,6 @@ body { .in-progress-icon, .problem-icon, -.incomplete-icon, .error-icon, .help-icon, .not-offered-icon { diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 6d56324e73dc47fabc40e89c1a643aa792db1d90..3d43d853c0196d77f3c8b682ce4cfad403600390 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - version: '1.0.21', + version: '1.0.22', apiPlannerUrl: '/api/planner/v1', apiSearchUrl: '/api/search/v1', apiEnrollUrl: '/api/enroll/v1',