From 03e7abf574671bc54c672fcb2cbf005041df5a1c Mon Sep 17 00:00:00 2001
From: Scott Berg <saberg3@wisc.edu>
Date: Fri, 1 Feb 2019 10:32:25 -0600
Subject: [PATCH] Disable drag on past courses and disable dropping in past
terms.
---
src/app/degree-planner/selectors.ts | 6 ++----
.../term-container/term-container.component.html | 12 +++++++++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/app/degree-planner/selectors.ts b/src/app/degree-planner/selectors.ts
index 5eea6de..2c7618e 100644
--- a/src/app/degree-planner/selectors.ts
+++ b/src/app/degree-planner/selectors.ts
@@ -75,12 +75,10 @@ export const getDropZones = createSelector(
}
);
-export const isActiveTerm = (termCode: String) => createSelector(
+export const isActiveTerm = (termCode: string) => createSelector(
getDegreePlannerState,
(state: DegreePlannerState) => {
- console.log(termCode);
- // return state.activeTerms.includes(termCode);
- return true;
+ return state.activeTermCodes.includes(termCode);
}
);
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 19ed83c..1ff4fc9 100644
--- a/src/app/degree-planner/term-container/term-container.component.html
+++ b/src/app/degree-planner/term-container/term-container.component.html
@@ -38,9 +38,15 @@
</div>
</ng-container>
- <div class="course-wrapper" [cdkDragData]="course" *ngFor="let course of term.courses" cdkDrag>
+ <div
+ class="course-wrapper"
+ cdkDrag
+ [cdkDragDisabled]="!(isActiveTerm$ | async)"
+ [cdkDragData]="course"
+ *ngFor="let course of term.courses"
+ >
<div class="course-wrapper-inner">
- <cse-course-item [course]="course"></cse-course-item>
+ <cse-course-item [course]="course" [disabled]="!(isActiveTerm$ | async)"></cse-course-item>
</div>
</div>
@@ -49,7 +55,7 @@
</div>
</div>
</div>
- <div class="add-new-wrapper">
+ <div class="add-new-wrapper" *ngIf="isActiveTerm$ | async">
<button mat-raised-button (click)="openAddSidenav()">+ Add Course</button>
</div>
</mat-card>
\ No newline at end of file
--
GitLab