From dff6f7d08fe3f41403f6ec1011594411408a1083 Mon Sep 17 00:00:00 2001
From: Paulina Nogal <pnogal@wisc.edu>
Date: Mon, 3 Jun 2019 18:49:30 +0000
Subject: [PATCH] ROENROLL-1801 remove course incomplete status
---
package-lock.json | 2 +-
package.json | 2 +-
.../shared/course-item/course-item.component.html | 9 ---------
.../shared/course-item/course-item.component.ts | 10 +---------
.../sidenav-menu-item/sidenav-menu-item.component.html | 8 --------
src/assets/sass/general.scss | 2 --
src/environments/environment.prod.ts | 2 +-
7 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2a82972..9995727 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 93825f1..7b54df9 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 99c816b..de7440a 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 b58b8d4..85c9264 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 0cbde1b..12a5c61 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 3be8175..b7bb6f9 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 6d56324..3d43d85 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',
--
GitLab