From da8f790cec370b7e55e31d661a1d7c95ce3597e5 Mon Sep 17 00:00:00 2001
From: pnogal <paulina.nogal@wisc.edu>
Date: Fri, 15 Feb 2019 10:14:21 -0600
Subject: [PATCH] Dsiplay grades on course item
---
.../shared/course-item/course-item.component.html | 7 +++++--
.../sidenav-menu-item/sidenav-menu-item.component.html | 1 -
.../term-container/term-container.component.scss | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
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 4b8f6aa..6606072 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
@@ -19,8 +19,8 @@
</div>
</div>
- <div *ngIf="!disabled" fxLayout="column" fxLayoutAlign="space-between end" fxFlex="20">
- <div fxLayout="row" fxLayoutAlign="end center">
+ <div fxLayout="column" fxLayoutAlign="space-between end" fxFlex="20">
+ <div *ngIf="!disabled" fxLayout="row" fxLayoutAlign="end center">
<mat-icon [matMenuTriggerFor]="courseMenu" (menuOpened)="onMenuOpen()" aria-label="Course menu" matTooltip="Course Menu" matTooltipPosition="right"
class="material-icons">more_horiz</mat-icon>
<mat-menu #courseMenu="matMenu" class="course-item-menu">
@@ -33,6 +33,9 @@
<button mat-menu-item (click)="openRemoveConfirmationDialog()">Remove</button>
</mat-menu>
</div>
+ <div *ngIf="disabled" fxLayout="row" fxLayoutAlign="end center">
+ <p>{{ course.grade }}</p>
+ </div>
<div fxLayout="row" fxLayoutAlign="end center">
<p class="course-credits">{{ course.credits ? course.credits : course.creditRange }} Cr</p>
</div>
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 2d7b351..d2db734 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
@@ -42,7 +42,6 @@
</svg>
Add Academic Year
</button>
- <button mat-button class="sidenav-link-btn"><i class="material-icons">list_alt</i> Grades</button>
</div>
</mat-expansion-panel>
</div>
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 6db9a85..7caae52 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -87,7 +87,7 @@
width: 100%;
padding: 10px;
box-sizing: border-box;
- border: solid 1px white;
+ border: solid 1.2px #f7c376;
background-color: white;
border-radius: 5px;
font-family: 'Helvetica Neue', Georgia, Helvetica, Arial, sans-serif;
--
GitLab