From 9f3dd806dffc65078de1e7c694122f91f355b214 Mon Sep 17 00:00:00 2001
From: Paulina Nogal <pnogal@wisc.edu>
Date: Tue, 4 Jun 2019 14:00:40 +0000
Subject: [PATCH] Roenroll 1776
---
package-lock.json | 2 +-
package.json | 2 +-
.../term-container/term-container.component.html | 2 +-
.../term-container/term-container.component.scss | 1 +
.../term-container/term-container.component.ts | 5 +++--
src/environments/environment.prod.ts | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d7ea9bd..0b52210 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "course-search-enroll-fe",
- "version": "1.0.23",
+ "version": "1.0.24",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index c1104c9..b22209a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "course-search-enroll-fe",
- "version": "1.0.23",
+ "version": "1.0.24",
"scripts": {
"ng": "ng",
"start": "ng serve --proxy-config proxy.json --open",
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 c4caaaf..a6693ba 100644
--- a/src/app/degree-planner/term-container/term-container.component.html
+++ b/src/app/degree-planner/term-container/term-container.component.html
@@ -135,7 +135,7 @@
</div>
</div>
- <p class="credit-overload-warning" *ngIf="tooManyCredits$ | async">
+ <p class="credit-overload-warning" *ngIf="((visibleCredits === 'planned') && (tooManyCredits$ | async)) || ((visibleCredits === 'enrolled') && (enrolledCredits > maxAllowedCredits))">
Warning: credit overload
</p>
diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss
index a1fecde..17085ba 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -103,6 +103,7 @@
}
.credit-overload-warning {
+ margin-bottom: 0;
margin-top: 0;
color: #ff8000;
}
diff --git a/src/app/degree-planner/term-container/term-container.component.ts b/src/app/degree-planner/term-container/term-container.component.ts
index 0935210..fb3ed32 100644
--- a/src/app/degree-planner/term-container/term-container.component.ts
+++ b/src/app/degree-planner/term-container/term-container.component.ts
@@ -79,6 +79,7 @@ export class TermContainerComponent implements OnInit, OnDestroy {
public courseNotOfferedInTerm: ReadonlyArray<Course>;
public mobileView: MediaQueryList;
public assistiveText: string;
+ public maxAllowedCredits: number;
constructor(
public dialog: MatDialog,
@@ -102,8 +103,8 @@ export class TermContainerComponent implements OnInit, OnDestroy {
map(term => {
if (this.constants.isUndergrad()) {
const credits = sumCredits(term.plannedCourses);
- const maxAllowedCredits = maximumAllowedCreditsForTerm(term.termCode);
- return credits.min >= maxAllowedCredits;
+ this.maxAllowedCredits = maximumAllowedCreditsForTerm(term.termCode);
+ return credits.min >= this.maxAllowedCredits;
} else {
return false;
}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 704b00c..0e8aff4 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.23',
+ version: '1.0.24',
apiPlannerUrl: '/api/planner/v1',
apiSearchUrl: '/api/search/v1',
apiEnrollUrl: '/api/enroll/v1',
--
GitLab