Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(CM): Pausing/unpausing lessons does not persist to DB #1939

Merged
merged 1 commit into from
Sep 12, 2024
Merged

fix(CM): Pausing/unpausing lessons does not persist to DB #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ssroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ class MockTeacherProjectService {
isGroupNode() {}
nodeHasWork() {}
getMaxScoreForNode() {}
getNodeById() {
return { constraints: [] };
}
getNode() {
return new Node();
}
Expand Down Expand Up @@ -121,7 +124,7 @@ function toggleLockNode() {
});
describe('when there is no teacherRemovalConstraint', () => {
it('should add constraint', () => {
const getNodeSpy = spyOn(projectService, 'getNode').and.returnValue(node1);
const getNodeSpy = spyOn(projectService, 'getNodeById').and.returnValue(node1);
expect(node1.constraints.length).toEqual(0);
lockNodeButton.click();
expect(getNodeSpy).toHaveBeenCalled();
Expand All @@ -141,7 +144,7 @@ function toggleLockNode() {
Object({ name: 'teacherRemoval', params: Object({ periodId: periodId }) })
]
});
const getNodeSpy = spyOn(projectService, 'getNode').and.returnValue(node1);
const getNodeSpy = spyOn(projectService, 'getNodeById').and.returnValue(node1);
const dataService = TestBed.inject(TeacherDataService);
const currentPeriodSpy = spyOn(dataService, 'getCurrentPeriod').and.returnValue({
periodId: periodId
Expand Down
9 changes: 6 additions & 3 deletions ...5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export class NavItemComponent implements OnInit {
}

isLocked(): boolean {
const constraints = this.projectService.getNode(this.nodeId).constraints;
const constraints = this.projectService.getNodeById(this.nodeId).constraints ?? [];
return (
(this.isShowingAllPeriods() && this.isLockedForAll(constraints)) ||
(!this.isShowingAllPeriods() &&
Expand Down Expand Up @@ -218,7 +218,7 @@ export class NavItemComponent implements OnInit {
}

protected toggleLockNode(): void {
const node = this.projectService.getNode(this.nodeId);
const node = this.projectService.getNodeById(this.nodeId);
const isLocked = this.isLocked();
if (isLocked) {
this.unlockNode(node);
Expand Down Expand Up @@ -270,7 +270,10 @@ export class NavItemComponent implements OnInit {
}
]
};
node.addConstraint(lockConstraint);
if (node.constraints == null) {
node.constraints = [];
}
node.constraints.push(lockConstraint);
}

private unlockNodeForAllPeriods(node: Node): void {
Expand Down
8 changes: 4 additions & 4 deletions src/messages.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14218,7 +14218,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>All Periods</source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts</context>
<context context-type="linenumber">371</context>
<context context-type="linenumber">374</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts</context>
Expand All @@ -14233,7 +14233,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Period: <x id="PH" equiv-text="this.currentPeriod.periodName"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts</context>
<context context-type="linenumber">372</context>
<context context-type="linenumber">375</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts</context>
Expand All @@ -14244,14 +14244,14 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
<source>Unlock for <x id="PH" equiv-text="this.getPeriodLabel()"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts</context>
<context context-type="linenumber">377</context>
<context context-type="linenumber">380</context>
</context-group>
</trans-unit>
<trans-unit id="2330813372531032088" datatype="html">
<source>Lock for <x id="PH" equiv-text="this.getPeriodLabel()"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts</context>
<context context-type="linenumber">378</context>
<context context-type="linenumber">381</context>
</context-group>
</trans-unit>
<trans-unit id="5411ee1bc7179f254f2db73cf448e995fca45f43" datatype="html">
Expand Down
Loading