From d16dca73f27ccfb531110176fcbfe3cf0981c11f Mon Sep 17 00:00:00 2001
From: "jvanboxtel@wisc.edu" <jvanboxtel@wisc.edu>
Date: Mon, 3 Jun 2019 13:48:53 -0500
Subject: [PATCH] ROENROLL-1804 & ROENROLL-1803
---
.../degree-planner-view/degree-planner-view.component.html | 4 ++--
src/app/degree-planner/services/api.service.ts | 2 +-
.../sidenav-menu-item/sidenav-menu-item.component.html | 2 +-
.../sidenav-menu-item/sidenav-menu-item.component.ts | 2 ++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/degree-planner/degree-planner-view/degree-planner-view.component.html b/src/app/degree-planner/degree-planner-view/degree-planner-view.component.html
index 2b4b7de..e01a5cf 100644
--- a/src/app/degree-planner/degree-planner-view/degree-planner-view.component.html
+++ b/src/app/degree-planner/degree-planner-view/degree-planner-view.component.html
@@ -81,7 +81,7 @@
[disabled]="degreePlan.primary">
Make primary
</button>
- <a mat-menu-item target="_blank" href="/api/degreeplanpdf?roadmapId={{ degreePlan.roadmapId }}">Create PDF</a>
+ <a mat-menu-item target="_blank" href="/api/degreeplanpdf?roadmapId={{ degreePlan.roadmapId }}&hideGrades={{ !(showGrades$ | async) }}">Create PDF</a>
<button
mat-menu-item
(click)="onDeletePlanClick(degreePlan)"
@@ -107,7 +107,7 @@
<mat-slide-toggle
color="primary"
labelPosition="before"
- [checked]="showGrades$ | async"
+ [checked]="showGrades$"
(change)="changeGradeVisibility($event)">
Show Grades
</mat-slide-toggle>
diff --git a/src/app/degree-planner/services/api.service.ts b/src/app/degree-planner/services/api.service.ts
index 5ed9a69..0d7c307 100644
--- a/src/app/degree-planner/services/api.service.ts
+++ b/src/app/degree-planner/services/api.service.ts
@@ -184,7 +184,7 @@ export class DegreePlannerApiService {
// These options control how much data we get back
page: 1,
- pageSize: 25,
+ pageSize: 100,
sortOrder: 'SCORE',
};
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 12a5c61..a32565d 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
@@ -48,7 +48,7 @@
</mat-panel-title>
</mat-expansion-panel-header>
<div>
- <a mat-button class="sidenav-link-btn" target="_blank" href="/api/degreeplanpdf?roadmapId={{ planId }}">
+ <a mat-button class="sidenav-link-btn" target="_blank" href="/api/degreeplanpdf?roadmapId={{ planId }}&hideGrades={{ !(showGrades$ | async) }}">
<i aria-hidden="true" class="material-icons" alt="create pdf">picture_as_pdf</i>
Create PDF
</a>
diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts
index 8192f27..d943616 100644
--- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts
+++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts
@@ -21,6 +21,7 @@ export class SidenavMenuItemComponent implements OnDestroy {
public yearCodes$: Observable<string[]>;
public activeRoadmapId: Subscription;
public planId: number;
+ public showGrades$: Observable<boolean>;
constructor(
private store: Store<GlobalState>,
public dialog: MatDialog,
@@ -35,6 +36,7 @@ export class SidenavMenuItemComponent implements OnDestroy {
.subscribe(planId => {
this.planId = planId;
});
+ this.showGrades$ = this.store.pipe(select(selectors.selectGradeVisibility));
}
// Unsubscribe from subs to prevent memeory leaks
public ngOnDestroy() {
--
GitLab