From 5ae86ac93c444f7e276ae547c40441f34fe70e69 Mon Sep 17 00:00:00 2001
From: Scott Berg <saberg3@wisc.edu>
Date: Thu, 31 Jan 2019 16:05:35 -0600
Subject: [PATCH] Update loadTermsForPlan to use ActiveTermCodes instead of
ActiveTerms
---
.../degree-planner/effects/plan.effects.ts | 6 +-
src/app/degree-planner/selectors.ts | 2 +-
src/app/degree-planner/state.ts | 4 +-
.../term-container.component.ts | 56 +------------------
4 files changed, 9 insertions(+), 59 deletions(-)
diff --git a/src/app/degree-planner/effects/plan.effects.ts b/src/app/degree-planner/effects/plan.effects.ts
index c577dbc..a17defa 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, activeTermsCodes: []}))
+ map(stdin => new InitialPlanLoadResponse(stdin))
);
@Effect()
@@ -141,11 +141,11 @@ export class DegreePlanEffects {
};
});
- const activeTerms = uniqueTermCodes.filter(termCode => {
+ const activeTermCodes = uniqueTermCodes.filter(termCode => {
return termCode >= currentTerms[0].termCode;
});
- return Object.assign({}, stdin, { visibleTerms }, { activeTerms });
+ return Object.assign({}, stdin, { visibleTerms }, { activeTermCodes });
})
);
}
diff --git a/src/app/degree-planner/selectors.ts b/src/app/degree-planner/selectors.ts
index 2d9f3bb..5eea6de 100644
--- a/src/app/degree-planner/selectors.ts
+++ b/src/app/degree-planner/selectors.ts
@@ -68,7 +68,7 @@ export const getDropZones = createSelector(
(state: DegreePlannerState) => {
return [
'saved-courses',
- ...state.activeTermsCodes.map(termCode => {
+ ...state.activeTermCodes.map(termCode => {
return `term-${termCode}`;
})
];
diff --git a/src/app/degree-planner/state.ts b/src/app/degree-planner/state.ts
index 379a86d..86b2c4f 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[];
- activeTermsCodes: string[];
+ activeTermCodes: string[];
allDegreePlans: DegreePlan[];
}
@@ -16,6 +16,6 @@ export const INITIAL_DEGREE_PLANNER_STATE: DegreePlannerState = {
visibleRoadmapId: undefined,
visibleTerms: [],
savedForLaterCourses: [],
- activeTermsCodes: [],
+ activeTermCodes: [],
allDegreePlans: []
};
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 1f43692..99538b4 100644
--- a/src/app/degree-planner/term-container/term-container.component.ts
+++ b/src/app/degree-planner/term-container/term-container.component.ts
@@ -52,8 +52,6 @@ export class TermContainerComponent implements OnInit {
this.isActiveTerm$ = this.store.pipe(select(isActiveTerm(this.term.termCode)));
}
- // this.dropZones$ = this.store.pipe(select(getDropZones));
-
public openAddSidenav(): void {
this.sidenavService.open();
}
@@ -80,57 +78,9 @@ export class TermContainerComponent implements OnInit {
return;
}
- console.log(to);
- console.log(from);
- console.log(id);
+ // console.log(to);
+ // console.log(from);
+ // console.log(id);
this.store.dispatch(new ChangeCourseTermRequest({ to, from, id }));
-
- // // Get the course JSON
- // const item = event.item.data;
-
- // console.log(event);
-
- // const newTermCode = event.container.id.substr(5, 4);
-
- // if (
- // event.previousContainer.id === 'saved-courses' &&
- // event.container.id !== 'saved-courses'
- // ) {
- // // If moving from favorites to term
- // container.data.push(item);
- // previousContainer.data.splice(previousIndex, 1);
-
- // this.dataService
- // .addCourse(
- // this.degreePlannerDataSvc.getPlanId(),
- // event.item.data.subjectCode,
- // event.item.data.courseId,
- // newTermCode
- // )
- // .subscribe(data => {
- // const yearCode = newTermCode.substring(0, 3);
- // const termCode = newTermCode.substring(3);
- // });
-
- // this.dataService
- // .removeFavoriteCourse(
- // event.item.data.subjectCode,
- // event.item.data.courseId
- // )
- // .subscribe();
- // } else if (event.previousContainer.id !== event.container.id) {
- // container.data.push(item);
- // previousContainer.data.splice(previousIndex, 1);
-
- // // Tell the API this course updated
- // this.dataService
- // .updateCourseTerm(
- // this.degreePlannerDataSvc.getPlanId(),
- // event.item.data.id,
- // newTermCode
- // )
- // .subscribe();
- // }
- // Do nothing on drop to same term
}
}
--
GitLab