From 5e6cb2a83d0b5c0839711606c2b5f87db6278c90 Mon Sep 17 00:00:00 2001
From: Scott Berg <saberg3@wisc.edu>
Date: Thu, 31 Jan 2019 14:55:03 -0600
Subject: [PATCH] Update activeTerms to activeTermCodes
---
src/app/degree-planner/effects/plan.effects.ts | 4 ++--
src/app/degree-planner/selectors.ts | 3 ++-
src/app/degree-planner/state.ts | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/degree-planner/effects/plan.effects.ts b/src/app/degree-planner/effects/plan.effects.ts
index d72480f..c577dbc 100644
--- a/src/app/degree-planner/effects/plan.effects.ts
+++ b/src/app/degree-planner/effects/plan.effects.ts
@@ -59,7 +59,7 @@ export class DegreePlanEffects {
}),
// Wrap data in an Action for dispatch
- map(stdin => new InitialPlanLoadResponse(stdin))
+ map(stdin => new InitialPlanLoadResponse({...stdin, activeTermsCodes: []}))
);
@Effect()
@@ -142,7 +142,7 @@ export class DegreePlanEffects {
});
const activeTerms = uniqueTermCodes.filter(termCode => {
- return parseInt(termCode, 10) >= parseInt(currentTerms[0].termCode, 10);
+ return termCode >= currentTerms[0].termCode;
});
return Object.assign({}, stdin, { visibleTerms }, { activeTerms });
diff --git a/src/app/degree-planner/selectors.ts b/src/app/degree-planner/selectors.ts
index 8ae9f2f..2d9f3bb 100644
--- a/src/app/degree-planner/selectors.ts
+++ b/src/app/degree-planner/selectors.ts
@@ -6,6 +6,7 @@ import { GlobalState } from '@app/core/state';
import { Year } from '@app/core/models/year';
import { Note } from '@app/core/models/note';
import { Course } from '@app/core/models/course';
+import { DegreePlannerState } from './state';
export const getDegreePlannerState = ({ degreePlanner }: GlobalState) => {
return degreePlanner;
@@ -67,7 +68,7 @@ export const getDropZones = createSelector(
(state: DegreePlannerState) => {
return [
'saved-courses',
- ...state.activeTerms.map(termCode => {
+ ...state.activeTermsCodes.map(termCode => {
return `term-${termCode}`;
})
];
diff --git a/src/app/degree-planner/state.ts b/src/app/degree-planner/state.ts
index e7bbcaf..379a86d 100644
--- a/src/app/degree-planner/state.ts
+++ b/src/app/degree-planner/state.ts
@@ -8,7 +8,7 @@ export interface DegreePlannerState {
visibleRoadmapId?: number;
visibleTerms: PlannedTerm[];
savedForLaterCourses: SavedForLaterCourse[];
- activeTerms: Term[];
+ activeTermsCodes: string[];
allDegreePlans: DegreePlan[];
}
@@ -16,6 +16,6 @@ export const INITIAL_DEGREE_PLANNER_STATE: DegreePlannerState = {
visibleRoadmapId: undefined,
visibleTerms: [],
savedForLaterCourses: [],
- activeTerms: [],
+ activeTermsCodes: [],
allDegreePlans: []
};
--
GitLab