From 53981782800df78fe845d87bfa3a777ae947ef6e Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 4 Dec 2024 14:59:15 -0800 Subject: [PATCH 001/127] index on component-grading: 994bbd92d0 refactor(ViewComponentRevisionsComponent): Convert to standalone (#2018) --- .../teacher/teacher-tools-routing.module.ts | 3 +- .../node-grading/node-grading.component.html | 31 ++++++++++ .../node-grading/node-grading.component.scss | 0 .../node-grading.component.spec.ts | 23 ++++++++ .../node-grading/node-grading.component.ts | 56 +++++++++++++++++++ .../node-progress-view.component.html | 3 - 6 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts diff --git a/src/app/teacher/teacher-tools-routing.module.ts b/src/app/teacher/teacher-tools-routing.module.ts index bd2909e17a0..69d8531183e 100644 --- a/src/app/teacher/teacher-tools-routing.module.ts +++ b/src/app/teacher/teacher-tools-routing.module.ts @@ -16,6 +16,7 @@ import { ExportRawDataComponent } from '../../assets/wise5/classroomMonitor/data import { ExportEventsComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-events/export-events.component'; import { ExportOneWorkgroupPerRowComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component'; import { ExportStudentWorkComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component'; +import { NodeGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component'; const routes: Routes = [ { @@ -33,7 +34,7 @@ const routes: Routes = [ { path: 'export/visits', component: ExportStepVisitsComponent }, { path: 'manage-students', component: ManageStudentsComponent }, { path: 'milestones', component: MilestonesComponent }, - { path: 'node/:nodeId', component: NodeProgressViewComponent }, + { path: 'node/:nodeId', component: NodeGradingComponent }, { path: 'notebook', component: NotebookGradingComponent }, { path: 'team', diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html new file mode 100644 index 00000000000..d6a4d33d1ed --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -0,0 +1,31 @@ +
+ {{ stepTitle }} +
+
+

+ {{ getNodeCompletion() }}% + Completion +

+ @if (hasWork) { +

+ @if (getNodeAverageScore() != null) { + {{ getNodeAverageScore() | number: '1.1' }} + } @else { + N/A + } + Mean Score +

+ } +
+ +
+
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts new file mode 100644 index 00000000000..171d68eead6 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NodeGradingComponent } from './node-grading.component'; + +describe('NodeGradingComponent', () => { + let component: NodeGradingComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [NodeGradingComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(NodeGradingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts new file mode 100644 index 00000000000..e1df3c8a07a --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -0,0 +1,56 @@ +import { Component, Input } from '@angular/core'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { ClassroomStatusService } from '../../../../services/classroomStatusService'; +import { TeacherDataService } from '../../../../services/teacherDataService'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatIconModule } from '@angular/material/icon'; +import { MatDialog } from '@angular/material/dialog'; +import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; + +@Component({ + imports: [CommonModule, FlexLayoutModule, MatIconModule], + selector: 'node-grading', + standalone: true, + styleUrl: './node-grading.component.scss', + templateUrl: './node-grading.component.html' +}) +export class NodeGradingComponent { + protected hasWork: boolean; + @Input() nodeId: string; + protected numRubrics: number; + protected stepTitle: string; + constructor( + private classroomStatusService: ClassroomStatusService, + private dataService: TeacherDataService, + private dialog: MatDialog, + private projectService: TeacherProjectService + ) {} + + ngOnInit(): void { + this.hasWork = this.projectService.nodeHasWork(this.nodeId); + this.numRubrics = this.projectService.getNode(this.nodeId).getNumRubrics(); + this.stepTitle = this.projectService.getNodePositionAndTitle(this.nodeId); + } + + protected getNodeCompletion(): number { + return this.classroomStatusService.getNodeCompletion( + this.nodeId, + this.dataService.getCurrentPeriodId() + ).completionPct; + } + + protected getNodeAverageScore(): any { + return this.classroomStatusService.getNodeAverageScore( + this.nodeId, + this.dataService.getCurrentPeriodId() + ); + } + + protected showRubric(): void { + this.dialog.open(ShowNodeInfoDialogComponent, { + data: this.nodeId, + width: '90%' + }); + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html index 8dab99ca3e5..bd26cf3213f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html @@ -23,6 +23,3 @@ -
- -
From d1e4169153a6c3f925b32a6918da26d031448880 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 4 Dec 2024 17:32:27 -0800 Subject: [PATCH 002/127] feat(NodeGrading): add SelectComponentComponent --- .../node-grading/node-grading.component.html | 4 +++ .../node-grading/node-grading.component.ts | 25 +++++++++++++++++-- .../select-component.component.html | 11 ++++++++ .../select-component.component.spec.ts | 23 +++++++++++++++++ .../select-component.component.ts | 22 ++++++++++++++++ src/messages.xlf | 14 +++++++++++ 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 8f8b5b50964..4b65411a271 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -28,4 +28,8 @@

+
+ Question: +
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 4ba8730a24d..2b13569108e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -7,17 +7,24 @@ import { FlexLayoutModule } from '@angular/flex-layout'; import { MatIconModule } from '@angular/material/icon'; import { MatDialog } from '@angular/material/dialog'; import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; +import { SelectComponentComponent } from '../select-component/select-component.component'; +import { Node } from '../../../../common/Node'; +import { Subscription } from 'rxjs'; @Component({ - imports: [CommonModule, FlexLayoutModule, MatIconModule], + imports: [CommonModule, FlexLayoutModule, MatIconModule, SelectComponentComponent], selector: 'node-grading', standalone: true, templateUrl: './node-grading.component.html' }) export class NodeGradingComponent { + protected component: any; protected hasWork: boolean; + protected node: Node; @Input() nodeId: string; protected numRubrics: number; + private subscriptions: Subscription = new Subscription(); + constructor( private classroomStatusService: ClassroomStatusService, private dataService: TeacherDataService, @@ -27,8 +34,18 @@ export class NodeGradingComponent { ngOnInit(): void { this.hasWork = this.projectService.nodeHasWork(this.nodeId); - this.numRubrics = this.projectService.getNode(this.nodeId).getNumRubrics(); + this.node = this.projectService.getNode(this.nodeId); + this.numRubrics = this.node.getNumRubrics(); this.dataService.setCurrentNodeByNodeId(this.nodeId); + this.subscriptions.add( + this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { + this.node = currentNode; + }) + ); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); } protected getNodeCompletion(): number { @@ -51,4 +68,8 @@ export class NodeGradingComponent { width: '90%' }); } + + protected showComponent(component: any): void { + this.component = component; + } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html new file mode 100644 index 00000000000..42d8c900ca0 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html @@ -0,0 +1,11 @@ + + @for (component of node.components; track component.id; let i = $index) { + + {{ i + 1 }}. {{ component.type }} + + } + + of {{ node.components.length }} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts new file mode 100644 index 00000000000..8bed1099945 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SelectComponentComponent } from './select-component.component'; + +describe('SelectComponentComponent', () => { + let component: SelectComponentComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SelectComponentComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(SelectComponentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts new file mode 100644 index 00000000000..b4fb01e6464 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts @@ -0,0 +1,22 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Node } from '../../../../common/Node'; +import { MatSelectModule } from '@angular/material/select'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { MatOptionModule } from '@angular/material/core'; + +@Component({ + imports: [CommonModule, FormsModule, MatOptionModule, MatSelectModule], + selector: 'select-component', + standalone: true, + templateUrl: './select-component.component.html' +}) +export class SelectComponentComponent { + @Input() node: Node; + protected selectedComponent: any; + @Output() componentChangedEvent: EventEmitter = new EventEmitter(); + + ngOnChanges(): void { + this.selectedComponent = this.node.components[0]; + } +} diff --git a/src/messages.xlf b/src/messages.xlf index 427d5d9ae83..ca0e92ccf68 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14262,6 +14262,20 @@ The branches will be removed but the steps will remain in the unit. 133 + + Question: + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 32 + + + + of + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html + 11 + + Visited From b8b5c70b7105fb9d64e5401e15062681a713fa10 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 9 Dec 2024 12:26:09 -0800 Subject: [PATCH 003/127] feat(NodeGrading): enhance component with teacher summary displays --- .../node-grading/node-grading.component.html | 23 ++++++++ .../node-grading.component.spec.ts | 14 +++-- .../node-grading/node-grading.component.ts | 58 ++++++++++++++++++- .../select-component.component.spec.ts | 6 +- 4 files changed, 91 insertions(+), 10 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 4b65411a271..44e9ba35056 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -32,4 +32,27 @@

Question: + @if (component?.type === 'MultipleChoice' && hasResponsesSummary) { + + } + @if (hasScoresSummary && hasScoreAnnotation) { + + } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index 171d68eead6..95b4ef3158f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -1,6 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { NodeGradingComponent } from './node-grading.component'; +import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { TeacherDataService } from '../../../../services/teacherDataService'; describe('NodeGradingComponent', () => { let component: NodeGradingComponent; @@ -8,10 +10,12 @@ describe('NodeGradingComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [NodeGradingComponent] - }) - .compileComponents(); - + imports: [ClassroomMonitorTestingModule, NodeGradingComponent] + }).compileComponents(); + const projectService = TestBed.inject(TeacherProjectService); + spyOn(projectService, 'nodeHasWork').and.returnValue(false); + const dataService = TestBed.inject(TeacherDataService); + spyOn(dataService, 'getCurrentPeriodId').and.returnValue(1); fixture = TestBed.createComponent(NodeGradingComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 2b13569108e..d88dfbce72c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -10,9 +10,20 @@ import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-mon import { SelectComponentComponent } from '../select-component/select-component.component'; import { Node } from '../../../../common/Node'; import { Subscription } from 'rxjs'; +import { ComponentServiceLookupService } from '../../../../services/componentServiceLookupService'; +import { SummaryService } from '../../../../components/summary/summaryService'; +import { AnnotationService } from '../../../../services/annotationService'; +import { isMatchingPeriods } from '../../../../common/period/period'; +import { TeacherSummaryDisplayComponent } from '../../../../directives/teacher-summary-display/teacher-summary-display.component'; @Component({ - imports: [CommonModule, FlexLayoutModule, MatIconModule, SelectComponentComponent], + imports: [ + CommonModule, + FlexLayoutModule, + MatIconModule, + SelectComponentComponent, + TeacherSummaryDisplayComponent + ], selector: 'node-grading', standalone: true, templateUrl: './node-grading.component.html' @@ -20,16 +31,25 @@ import { Subscription } from 'rxjs'; export class NodeGradingComponent { protected component: any; protected hasWork: boolean; + protected hasCorrectAnswer: boolean; + protected hasResponsesSummary: boolean; + protected hasScoresSummary: boolean; + protected hasScoreAnnotation: boolean; protected node: Node; @Input() nodeId: string; protected numRubrics: number; + protected periodId: number; + protected source: 'allPeriods' | 'period'; private subscriptions: Subscription = new Subscription(); constructor( + private annotationService: AnnotationService, private classroomStatusService: ClassroomStatusService, + private componentServiceLookupService: ComponentServiceLookupService, private dataService: TeacherDataService, private dialog: MatDialog, - private projectService: TeacherProjectService + private projectService: TeacherProjectService, + private summaryService: SummaryService ) {} ngOnInit(): void { @@ -37,6 +57,8 @@ export class NodeGradingComponent { this.node = this.projectService.getNode(this.nodeId); this.numRubrics = this.node.getNumRubrics(); this.dataService.setCurrentNodeByNodeId(this.nodeId); + this.periodId = this.dataService.getCurrentPeriodId(); + this.source = this.periodId === -1 ? 'allPeriods' : 'period'; this.subscriptions.add( this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { this.node = currentNode; @@ -71,5 +93,37 @@ export class NodeGradingComponent { protected showComponent(component: any): void { this.component = component; + this.hasCorrectAnswer = this.componentHasCorrectAnswer(component); + this.hasResponsesSummary = this.summaryService.isResponsesSummaryAvailableForComponentType( + component.type + ); + this.hasScoresSummary = this.summaryService.isScoresSummaryAvailableForComponentType( + component.type + ); + this.hasScoreAnnotation = this.componentHasScoreAnnotation( + this.nodeId, + component.id, + this.periodId + ); + } + + private componentHasCorrectAnswer(component: any): boolean { + return this.componentServiceLookupService + .getService(component.type) + .componentHasCorrectAnswer(component); + } + + private componentHasScoreAnnotation( + nodeId: string, + componentId: string, + periodId: number + ): boolean { + return this.annotationService + .getAnnotationsByNodeIdComponentId(nodeId, componentId) + .some( + (annotation) => + isMatchingPeriods(annotation.periodId, periodId) && + ['score', 'autoScore'].includes(annotation.type) + ); } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts index 8bed1099945..d94367b44d2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { SelectComponentComponent } from './select-component.component'; +import { Node } from '../../../../common/Node'; describe('SelectComponentComponent', () => { let component: SelectComponentComponent; @@ -9,11 +9,11 @@ describe('SelectComponentComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [SelectComponentComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(SelectComponentComponent); component = fixture.componentInstance; + component.node = { components: [] } as Node; fixture.detectChanges(); }); From 39fad25fad4c08aca50d6e56fc8725ed80ac399d Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 10 Dec 2024 09:27:48 -0800 Subject: [PATCH 004/127] Navigate to node/group routes when current node changes. --- src/app/teacher/teacher-tools-routing.module.ts | 1 + .../grading-step-tools.component.spec.ts | 2 ++ .../grading-step-tools.component.ts | 16 +++++++++++++++- .../node-progress-view.component.ts | 2 +- .../common/stepTools/step-tools.component.ts | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/teacher/teacher-tools-routing.module.ts b/src/app/teacher/teacher-tools-routing.module.ts index 69d8531183e..996d46f9177 100644 --- a/src/app/teacher/teacher-tools-routing.module.ts +++ b/src/app/teacher/teacher-tools-routing.module.ts @@ -34,6 +34,7 @@ const routes: Routes = [ { path: 'export/visits', component: ExportStepVisitsComponent }, { path: 'manage-students', component: ManageStudentsComponent }, { path: 'milestones', component: MilestonesComponent }, + { path: 'group/:nodeId', component: NodeProgressViewComponent }, { path: 'node/:nodeId', component: NodeGradingComponent }, { path: 'notebook', component: NotebookGradingComponent }, { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts index 899b356890c..a9206a039b5 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GradingStepToolsComponent } from './grading-step-tools.component'; import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; +import { Router } from '@angular/router'; describe('GradingStepToolsComponent', () => { let component: GradingStepToolsComponent; @@ -12,6 +13,7 @@ describe('GradingStepToolsComponent', () => { }).compileComponents(); fixture = TestBed.createComponent(GradingStepToolsComponent); + spyOn(TestBed.inject(Router), 'navigate'); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.ts index 5094d56d5a3..46da2a6d3e2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.ts @@ -14,6 +14,8 @@ import { NodeIconComponent } from '../../../vle/node-icon/node-icon.component'; import { TeacherDataService } from '../../../services/teacherDataService'; import { GradingNodeService } from '../../../services/gradingNodeService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { ConfigService } from '../../../services/configService'; +import { Router } from '@angular/router'; @Component({ encapsulation: ViewEncapsulation.None, @@ -36,14 +38,26 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; }) export class GradingStepToolsComponent extends StepToolsComponent { constructor( + private configService: ConfigService, protected dataService: TeacherDataService, protected dir: Directionality, protected nodeService: GradingNodeService, - protected projectService: TeacherProjectService + protected projectService: TeacherProjectService, + private router: Router ) { super(dataService, dir, nodeService, projectService); } + protected updateModel(): void { + super.updateModel(); + this.router.navigate([ + '/teacher/manage/unit', + this.configService.getRunId(), + this.projectService.isApplicationNode(this.nodeId) ? 'node' : 'group', + this.nodeId + ]); + } + protected calculateNodeIds(): void { this.nodeIds = Object.keys(this.projectService.idToOrder); this.nodeIds = this.nodeIds.filter((nodeId) => { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.ts index bda2f6d898a..cac31004059 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.ts @@ -57,7 +57,7 @@ export class NodeProgressViewComponent implements OnInit { this.router.navigate([ '/teacher/manage/unit', this.configService.getRunId(), - 'node', + this.isApplicationNode(this.nodeId) ? 'node' : 'group', this.nodeId ]); }) diff --git a/src/assets/wise5/common/stepTools/step-tools.component.ts b/src/assets/wise5/common/stepTools/step-tools.component.ts index 8866450e69a..635aec0cf51 100644 --- a/src/assets/wise5/common/stepTools/step-tools.component.ts +++ b/src/assets/wise5/common/stepTools/step-tools.component.ts @@ -82,7 +82,7 @@ export class StepToolsComponent { this.dataService.setCurrentNodeByNodeId(this.nodeId); } - private updateModel(): void { + protected updateModel(): void { this.nodeId = this.dataService.getCurrentNodeId(); if (this.nodeId == null) { this.prevId = null; From f9fe066f6f068ecd09da12257b74dbf2c139697e Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 10 Dec 2024 10:00:13 -0800 Subject: [PATCH 005/127] Switching components now correctly renders the summary for the new components. --- .../node-grading/node-grading.component.html | 4 +-- .../select-component.component.html | 5 +--- .../select-component.component.ts | 7 ++++- .../summary-display.component.ts | 6 +++- src/messages.xlf | 28 +++++++++---------- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 44e9ba35056..94199130801 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -29,8 +29,8 @@

- Question: + Question: +
@if (component?.type === 'MultipleChoice' && hasResponsesSummary) { + @for (component of node.components; track component.id; let i = $index) { {{ i + 1 }}. {{ component.type }} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts index b4fb01e6464..b64176f1543 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts @@ -17,6 +17,11 @@ export class SelectComponentComponent { @Output() componentChangedEvent: EventEmitter = new EventEmitter(); ngOnChanges(): void { - this.selectedComponent = this.node.components[0]; + this.selectComponent(this.node.components[0]); + } + + protected selectComponent(component: any): void { + this.selectedComponent = component; + this.componentChangedEvent.emit(component); } } diff --git a/src/assets/wise5/directives/summary-display/summary-display.component.ts b/src/assets/wise5/directives/summary-display/summary-display.component.ts index 25c08b92de7..088d8f868f9 100644 --- a/src/assets/wise5/directives/summary-display/summary-display.component.ts +++ b/src/assets/wise5/directives/summary-display/summary-display.component.ts @@ -110,7 +110,11 @@ export abstract class SummaryDisplay { } ngOnChanges(changes: SimpleChanges) { - if (!changes.doRender.firstChange) { + if (changes.doRender != null && !changes.doRender.firstChange) { + this.renderDisplay(); + } else if (changes.componentId) { + this.initializeOtherComponent(); + this.initializeCustomLabelColors(); this.renderDisplay(); } } diff --git a/src/messages.xlf b/src/messages.xlf index 494b353308e..90e1ca25773 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14273,7 +14273,7 @@ The branches will be removed but the steps will remain in the unit. of src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html - 11 + 8 @@ -19756,11 +19756,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 574 + 578 src/assets/wise5/directives/summary-display/summary-display.component.ts - 684 + 688 @@ -19771,11 +19771,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 574 + 578 src/assets/wise5/directives/summary-display/summary-display.component.ts - 688 + 692 @@ -21645,63 +21645,63 @@ If this problem continues, let your teacher know and move on to the next activit The student will see a graph of their individual data here. src/assets/wise5/directives/summary-display/summary-display.component.ts - 154 + 158 Your Response src/assets/wise5/directives/summary-display/summary-display.component.ts - 708 + 712 Your Score src/assets/wise5/directives/summary-display/summary-display.component.ts - 710 + 714 Period Responses src/assets/wise5/directives/summary-display/summary-display.component.ts - 717 + 721 Period Scores src/assets/wise5/directives/summary-display/summary-display.component.ts - 722 + 726 Class Responses src/assets/wise5/directives/summary-display/summary-display.component.ts - 731 + 735 Class Scores src/assets/wise5/directives/summary-display/summary-display.component.ts - 736 + 740 % Responded (/) src/assets/wise5/directives/summary-display/summary-display.component.ts - 747 + 751 Count src/assets/wise5/directives/summary-display/summary-display.component.ts - 864 + 868 From 9ba1137d534b810be84c31aed616e3c66c1b61bd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 10 Dec 2024 13:36:37 -0800 Subject: [PATCH 006/127] Update summary display when period selection is changed. --- .../node-grading/node-grading.component.ts | 12 +++++++++++- .../summary-display/summary-display.component.ts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index d88dfbce72c..6410dc04c2b 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -58,18 +58,28 @@ export class NodeGradingComponent { this.numRubrics = this.node.getNumRubrics(); this.dataService.setCurrentNodeByNodeId(this.nodeId); this.periodId = this.dataService.getCurrentPeriodId(); - this.source = this.periodId === -1 ? 'allPeriods' : 'period'; + this.setSource(); this.subscriptions.add( this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { this.node = currentNode; }) ); + this.subscriptions.add( + this.dataService.currentPeriodChanged$.subscribe(({ currentPeriod }) => { + this.periodId = currentPeriod.periodId; + this.setSource(); + }) + ); } ngOnDestroy(): void { this.subscriptions.unsubscribe(); } + private setSource(): void { + this.source = this.periodId === -1 ? 'allPeriods' : 'period'; + } + protected getNodeCompletion(): number { return this.classroomStatusService.getNodeCompletion( this.nodeId, diff --git a/src/assets/wise5/directives/summary-display/summary-display.component.ts b/src/assets/wise5/directives/summary-display/summary-display.component.ts index 088d8f868f9..86e6f3ac89d 100644 --- a/src/assets/wise5/directives/summary-display/summary-display.component.ts +++ b/src/assets/wise5/directives/summary-display/summary-display.component.ts @@ -112,7 +112,7 @@ export abstract class SummaryDisplay { ngOnChanges(changes: SimpleChanges) { if (changes.doRender != null && !changes.doRender.firstChange) { this.renderDisplay(); - } else if (changes.componentId) { + } else if (changes.componentId || changes.periodId) { this.initializeOtherComponent(); this.initializeCustomLabelColors(); this.renderDisplay(); From 675a289d41a549970fef4fa9046a1d4d8eac14b6 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 12 Dec 2024 14:33:29 -0800 Subject: [PATCH 007/127] refactor(NodeGradingComponent, SelectComponentComponent): update component structure to use components array instead of node --- .../node-grading/node-grading.component.html | 2 +- .../node-grading.component.spec.ts | 4 +++- .../node-grading/node-grading.component.ts | 23 ++++++++++++++----- .../select-component.component.html | 4 ++-- .../select-component.component.spec.ts | 3 +-- .../select-component.component.ts | 5 ++-- src/messages.xlf | 4 ++-- 7 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 94199130801..b724bc9e930 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -30,7 +30,7 @@

Question: - +
@if (component?.type === 'MultipleChoice' && hasResponsesSummary) { { }).compileComponents(); const projectService = TestBed.inject(TeacherProjectService); spyOn(projectService, 'nodeHasWork').and.returnValue(false); + spyOn(projectService, 'getComponents').and.returnValue([{ id: 'abc', type: 'MultipleChoice' }]); + spyOn(projectService, 'componentHasWork').and.returnValue(true); const dataService = TestBed.inject(TeacherDataService); spyOn(dataService, 'getCurrentPeriodId').and.returnValue(1); fixture = TestBed.createComponent(NodeGradingComponent); component = fixture.componentInstance; - fixture.detectChanges(); + component.ngOnChanges(); }); it('should create', () => { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 6410dc04c2b..e43532d2175 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -30,6 +30,7 @@ import { TeacherSummaryDisplayComponent } from '../../../../directives/teacher-s }) export class NodeGradingComponent { protected component: any; + protected components: any[]; protected hasWork: boolean; protected hasCorrectAnswer: boolean; protected hasResponsesSummary: boolean; @@ -53,12 +54,6 @@ export class NodeGradingComponent { ) {} ngOnInit(): void { - this.hasWork = this.projectService.nodeHasWork(this.nodeId); - this.node = this.projectService.getNode(this.nodeId); - this.numRubrics = this.node.getNumRubrics(); - this.dataService.setCurrentNodeByNodeId(this.nodeId); - this.periodId = this.dataService.getCurrentPeriodId(); - this.setSource(); this.subscriptions.add( this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { this.node = currentNode; @@ -72,6 +67,10 @@ export class NodeGradingComponent { ); } + ngOnChanges(): void { + this.setNode(); + } + ngOnDestroy(): void { this.subscriptions.unsubscribe(); } @@ -80,6 +79,18 @@ export class NodeGradingComponent { this.source = this.periodId === -1 ? 'allPeriods' : 'period'; } + private setNode(): void { + this.hasWork = this.projectService.nodeHasWork(this.nodeId); + this.node = this.projectService.getNode(this.nodeId); + this.components = this.projectService + .getComponents(this.nodeId) + .filter((component) => this.projectService.componentHasWork(component)); + this.numRubrics = this.node.getNumRubrics(); + this.dataService.setCurrentNodeByNodeId(this.nodeId); + this.periodId = this.dataService.getCurrentPeriodId(); + this.setSource(); + } + protected getNodeCompletion(): number { return this.classroomStatusService.getNodeCompletion( this.nodeId, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html index ccdc8079f7f..86beaf65d67 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html @@ -1,8 +1,8 @@ - @for (component of node.components; track component.id; let i = $index) { + @for (component of components; track component.id; let i = $index) { {{ i + 1 }}. {{ component.type }} } - of {{ node.components.length }} + of {{ components.length }} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts index d94367b44d2..7f6e965293c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SelectComponentComponent } from './select-component.component'; -import { Node } from '../../../../common/Node'; describe('SelectComponentComponent', () => { let component: SelectComponentComponent; @@ -13,7 +12,7 @@ describe('SelectComponentComponent', () => { fixture = TestBed.createComponent(SelectComponentComponent); component = fixture.componentInstance; - component.node = { components: [] } as Node; + component.components = []; fixture.detectChanges(); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts index b64176f1543..13729f0567d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts @@ -1,5 +1,4 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { Node } from '../../../../common/Node'; import { MatSelectModule } from '@angular/material/select'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -12,12 +11,12 @@ import { MatOptionModule } from '@angular/material/core'; templateUrl: './select-component.component.html' }) export class SelectComponentComponent { - @Input() node: Node; + @Input() components: any[]; protected selectedComponent: any; @Output() componentChangedEvent: EventEmitter = new EventEmitter(); ngOnChanges(): void { - this.selectComponent(this.node.components[0]); + this.selectComponent(this.components[0]); } protected selectComponent(component: any): void { diff --git a/src/messages.xlf b/src/messages.xlf index 90e1ca25773..bed626aa99f 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14269,8 +14269,8 @@ The branches will be removed but the steps will remain in the unit. 32 - - of + + of src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html 8 From d1aa2cad30393d2697651b0701eda362a4b78c3c Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 12 Dec 2024 16:40:20 -0800 Subject: [PATCH 008/127] feat(ComponentGradingView): add new component for grading components --- .../teacher/teacher-tools-routing.module.ts | 7 +- .../component-grading-view.component.html | 23 +++++ .../component-grading-view.component.scss | 0 .../component-grading-view.component.spec.ts | 22 +++++ .../component-grading-view.component.ts | 95 +++++++++++++++++++ .../node-grading/node-grading.component.html | 26 +---- .../node-grading.component.spec.ts | 4 +- .../node-grading/node-grading.component.ts | 74 ++------------- .../shared/tool-bar/tool-bar.component.ts | 2 +- 9 files changed, 160 insertions(+), 93 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts diff --git a/src/app/teacher/teacher-tools-routing.module.ts b/src/app/teacher/teacher-tools-routing.module.ts index 996d46f9177..78d66c88e02 100644 --- a/src/app/teacher/teacher-tools-routing.module.ts +++ b/src/app/teacher/teacher-tools-routing.module.ts @@ -17,6 +17,7 @@ import { ExportEventsComponent } from '../../assets/wise5/classroomMonitor/dataE import { ExportOneWorkgroupPerRowComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component'; import { ExportStudentWorkComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component'; import { NodeGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component'; +import { ComponentGradingViewComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component'; const routes: Routes = [ { @@ -35,7 +36,11 @@ const routes: Routes = [ { path: 'manage-students', component: ManageStudentsComponent }, { path: 'milestones', component: MilestonesComponent }, { path: 'group/:nodeId', component: NodeProgressViewComponent }, - { path: 'node/:nodeId', component: NodeGradingComponent }, + { + path: 'node/:nodeId', + component: NodeGradingComponent, + children: [{ path: 'component/:componentId', component: ComponentGradingViewComponent }] + }, { path: 'notebook', component: NotebookGradingComponent }, { path: 'team', diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html new file mode 100644 index 00000000000..aa48c25fe57 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -0,0 +1,23 @@ +@if (component?.type === 'MultipleChoice' && hasResponsesSummary) { + +} +@if (hasScoresSummary && hasScoreAnnotation) { + +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts new file mode 100644 index 00000000000..03d90fed427 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentGradingViewComponent } from './component-grading-view.component'; +import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; + +describe('ComponentGradingViewComponent', () => { + let component: ComponentGradingViewComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ClassroomMonitorTestingModule, ComponentGradingViewComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(ComponentGradingViewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts new file mode 100644 index 00000000000..7b876fdd5ac --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -0,0 +1,95 @@ +import { Component, Input } from '@angular/core'; +import { TeacherSummaryDisplayComponent } from '../../../directives/teacher-summary-display/teacher-summary-display.component'; +import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService'; +import { SummaryService } from '../../../components/summary/summaryService'; +import { Subscription } from 'rxjs'; +import { TeacherDataService } from '../../../services/teacherDataService'; +import { isMatchingPeriods } from '../../../common/period/period'; +import { AnnotationService } from '../../../services/annotationService'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { Node } from '../../../common/Node'; + +@Component({ + imports: [TeacherSummaryDisplayComponent], + selector: 'component-grading-view', + standalone: true, + styleUrl: './component-grading-view.component.scss', + templateUrl: './component-grading-view.component.html' +}) +export class ComponentGradingViewComponent { + protected component: any; + @Input() componentId: string; + protected hasCorrectAnswer: boolean; + protected hasResponsesSummary: boolean; + protected hasScoresSummary: boolean; + protected hasScoreAnnotation: boolean; + protected node: Node; + protected periodId: number; + protected source: 'allPeriods' | 'period'; + private subscriptions: Subscription = new Subscription(); + + constructor( + private annotationService: AnnotationService, + private componentServiceLookupService: ComponentServiceLookupService, + private dataService: TeacherDataService, + private projectService: TeacherProjectService, + private summaryService: SummaryService + ) {} + + ngOnInit(): void { + this.subscriptions.add( + this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { + this.node = this.projectService.getNode(currentNode.id); + }) + ); + this.subscriptions.add( + this.dataService.currentPeriodChanged$.subscribe(({ currentPeriod }) => { + this.periodId = currentPeriod.periodId; + this.setSource(); + }) + ); + } + + ngOnChanges(): void { + this.node = this.projectService.getNode(this.dataService.getCurrentNode().id); + this.setComponent(); + this.periodId = this.dataService.getCurrentPeriodId(); + this.setSource(); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + private setComponent(): void { + this.component = this.node.getComponent(this.componentId); + this.hasCorrectAnswer = this.componentHasCorrectAnswer(this.component); + this.hasResponsesSummary = this.summaryService.isResponsesSummaryAvailableForComponentType( + this.component.type + ); + this.hasScoresSummary = this.summaryService.isScoresSummaryAvailableForComponentType( + this.component.type + ); + this.hasScoreAnnotation = this.componentHasScoreAnnotation(this.component.id, this.periodId); + } + + private setSource(): void { + this.source = this.periodId === -1 ? 'allPeriods' : 'period'; + } + + private componentHasCorrectAnswer(component: any): boolean { + return this.componentServiceLookupService + .getService(component.type) + .componentHasCorrectAnswer(component); + } + + private componentHasScoreAnnotation(componentId: string, periodId: number): boolean { + return this.annotationService + .getAnnotationsByNodeIdComponentId(this.dataService.getCurrentNode().id, componentId) + .some( + (annotation) => + isMatchingPeriods(annotation.periodId, periodId) && + ['score', 'autoScore'].includes(annotation.type) + ); + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index b724bc9e930..47c64508bba 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -30,29 +30,7 @@

Question: - +
- @if (component?.type === 'MultipleChoice' && hasResponsesSummary) { - - } - @if (hasScoresSummary && hasScoreAnnotation) { - - } + diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index 41bcf30453a..e8ac1cacb9e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -3,6 +3,7 @@ import { NodeGradingComponent } from './node-grading.component'; import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; import { TeacherDataService } from '../../../../services/teacherDataService'; +import { provideRouter } from '@angular/router'; describe('NodeGradingComponent', () => { let component: NodeGradingComponent; @@ -10,7 +11,8 @@ describe('NodeGradingComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ClassroomMonitorTestingModule, NodeGradingComponent] + imports: [ClassroomMonitorTestingModule, NodeGradingComponent], + providers: [provideRouter([])] }).compileComponents(); const projectService = TestBed.inject(TeacherProjectService); spyOn(projectService, 'nodeHasWork').and.returnValue(false); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index e43532d2175..27dc3e594ea 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -10,47 +10,30 @@ import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-mon import { SelectComponentComponent } from '../select-component/select-component.component'; import { Node } from '../../../../common/Node'; import { Subscription } from 'rxjs'; -import { ComponentServiceLookupService } from '../../../../services/componentServiceLookupService'; -import { SummaryService } from '../../../../components/summary/summaryService'; -import { AnnotationService } from '../../../../services/annotationService'; -import { isMatchingPeriods } from '../../../../common/period/period'; -import { TeacherSummaryDisplayComponent } from '../../../../directives/teacher-summary-display/teacher-summary-display.component'; +import { ActivatedRoute, Router, RouterModule } from '@angular/router'; @Component({ - imports: [ - CommonModule, - FlexLayoutModule, - MatIconModule, - SelectComponentComponent, - TeacherSummaryDisplayComponent - ], + imports: [CommonModule, FlexLayoutModule, MatIconModule, RouterModule, SelectComponentComponent], selector: 'node-grading', standalone: true, templateUrl: './node-grading.component.html' }) export class NodeGradingComponent { - protected component: any; protected components: any[]; protected hasWork: boolean; - protected hasCorrectAnswer: boolean; - protected hasResponsesSummary: boolean; - protected hasScoresSummary: boolean; - protected hasScoreAnnotation: boolean; protected node: Node; @Input() nodeId: string; protected numRubrics: number; protected periodId: number; - protected source: 'allPeriods' | 'period'; private subscriptions: Subscription = new Subscription(); constructor( - private annotationService: AnnotationService, private classroomStatusService: ClassroomStatusService, - private componentServiceLookupService: ComponentServiceLookupService, private dataService: TeacherDataService, private dialog: MatDialog, private projectService: TeacherProjectService, - private summaryService: SummaryService + private route: ActivatedRoute, + private router: Router ) {} ngOnInit(): void { @@ -59,12 +42,6 @@ export class NodeGradingComponent { this.node = currentNode; }) ); - this.subscriptions.add( - this.dataService.currentPeriodChanged$.subscribe(({ currentPeriod }) => { - this.periodId = currentPeriod.periodId; - this.setSource(); - }) - ); } ngOnChanges(): void { @@ -75,10 +52,6 @@ export class NodeGradingComponent { this.subscriptions.unsubscribe(); } - private setSource(): void { - this.source = this.periodId === -1 ? 'allPeriods' : 'period'; - } - private setNode(): void { this.hasWork = this.projectService.nodeHasWork(this.nodeId); this.node = this.projectService.getNode(this.nodeId); @@ -88,7 +61,6 @@ export class NodeGradingComponent { this.numRubrics = this.node.getNumRubrics(); this.dataService.setCurrentNodeByNodeId(this.nodeId); this.periodId = this.dataService.getCurrentPeriodId(); - this.setSource(); } protected getNodeCompletion(): number { @@ -112,39 +84,9 @@ export class NodeGradingComponent { }); } - protected showComponent(component: any): void { - this.component = component; - this.hasCorrectAnswer = this.componentHasCorrectAnswer(component); - this.hasResponsesSummary = this.summaryService.isResponsesSummaryAvailableForComponentType( - component.type - ); - this.hasScoresSummary = this.summaryService.isScoresSummaryAvailableForComponentType( - component.type - ); - this.hasScoreAnnotation = this.componentHasScoreAnnotation( - this.nodeId, - component.id, - this.periodId - ); - } - - private componentHasCorrectAnswer(component: any): boolean { - return this.componentServiceLookupService - .getService(component.type) - .componentHasCorrectAnswer(component); - } - - private componentHasScoreAnnotation( - nodeId: string, - componentId: string, - periodId: number - ): boolean { - return this.annotationService - .getAnnotationsByNodeIdComponentId(nodeId, componentId) - .some( - (annotation) => - isMatchingPeriods(annotation.periodId, periodId) && - ['score', 'autoScore'].includes(annotation.type) - ); + protected setComponent(component: any): void { + this.router.navigate(['component', component.id], { + relativeTo: this.route + }); } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts index 0e1e33c8728..87838f6cc4d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts @@ -47,7 +47,7 @@ export class ToolBarComponent implements OnInit { }[path] ?? $localize`Grade by Step`; this.showPeriodSelect = path != 'export'; this.showTeamTools = /\/team\/(\d+)$/.test(this.router.url); - this.showStepTools = /node\/node(\d+)$/.test(this.router.url); + this.showStepTools = /node\/node(\d+)/.test(this.router.url); } protected toggleMenu() { From ecd56b14e1fcccc9cac958693e87181f710b6b6d Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 16 Dec 2024 11:38:31 -0800 Subject: [PATCH 009/127] feat(NodeGradingComponent): replace methods with properties for node average score and completion percentage --- .../node-grading/node-grading.component.html | 6 ++--- .../node-grading/node-grading.component.ts | 24 ++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 47c64508bba..9573e6a476d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -2,13 +2,13 @@

- {{ getNodeCompletion() }}% + {{ nodeCompletionPercent }}% Completion

@if (hasWork) {

- @if (getNodeAverageScore() != null) { - {{ getNodeAverageScore() | number: '1.1' }} + @if (nodeAverageScore != null) { + {{ nodeAverageScore | number: '1.1' }} } @else { N/A } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 27dc3e594ea..fe77e39c84d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -22,6 +22,8 @@ export class NodeGradingComponent { protected components: any[]; protected hasWork: boolean; protected node: Node; + protected nodeAverageScore: number; + protected nodeCompletionPercent: number; @Input() nodeId: string; protected numRubrics: number; protected periodId: number; @@ -55,6 +57,14 @@ export class NodeGradingComponent { private setNode(): void { this.hasWork = this.projectService.nodeHasWork(this.nodeId); this.node = this.projectService.getNode(this.nodeId); + this.nodeAverageScore = this.classroomStatusService.getNodeAverageScore( + this.nodeId, + this.dataService.getCurrentPeriodId() + ); + this.nodeCompletionPercent = this.classroomStatusService.getNodeCompletion( + this.nodeId, + this.dataService.getCurrentPeriodId() + ).completionPct; this.components = this.projectService .getComponents(this.nodeId) .filter((component) => this.projectService.componentHasWork(component)); @@ -63,20 +73,6 @@ export class NodeGradingComponent { this.periodId = this.dataService.getCurrentPeriodId(); } - protected getNodeCompletion(): number { - return this.classroomStatusService.getNodeCompletion( - this.nodeId, - this.dataService.getCurrentPeriodId() - ).completionPct; - } - - protected getNodeAverageScore(): any { - return this.classroomStatusService.getNodeAverageScore( - this.nodeId, - this.dataService.getCurrentPeriodId() - ); - } - protected showRubric(): void { this.dialog.open(ShowNodeInfoDialogComponent, { data: this.nodeId, From d79b647a359cd465a36224ca9968dbe7a7997c28 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 14 Feb 2025 17:03:00 -0800 Subject: [PATCH 010/127] Add ClassResponses to show student work on a specific component. Got it to work for some components like OR and MC. Had to comment out some component grading modules in ComponentGradingComponent because they cause multiple instances of TeacherDataService to be created --- src/app/app-routing.module.ts | 2 +- src/app/teacher/grading-common.module.ts | 3 + .../class-responses.component.html | 109 +++++ .../class-responses.component.spec.ts | 27 ++ .../class-responses.component.ts | 328 +++++++++++++++ .../component-grading-view.component.html | 1 + .../component-grading-view.component.scss | 0 .../component-grading-view.component.spec.ts | 10 +- .../component-grading-view.component.ts | 9 +- .../component-grading.component.ts | 30 +- .../component-workgroup-item.component.html | 58 +++ .../component-workgroup-item.component.scss | 19 + ...component-workgroup-item.component.spec.ts | 23 + .../component-workgroup-item.component.ts | 112 +++++ src/messages.xlf | 396 +++++++++++------- 15 files changed, 945 insertions(+), 182 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6d228ee9645..c3ddb6eb165 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -57,7 +57,7 @@ export class XhrInterceptor implements HttpInterceptor { } @NgModule({ - imports: [RouterModule.forRoot(routes, {}), FormsModule], + imports: [RouterModule.forRoot(routes, { paramsInheritanceStrategy: 'always' }), FormsModule], exports: [RouterModule], providers: [{ provide: HTTP_INTERCEPTORS, useClass: XhrInterceptor, multi: true }] }) diff --git a/src/app/teacher/grading-common.module.ts b/src/app/teacher/grading-common.module.ts index 5441aee41b7..5a0d80224e5 100644 --- a/src/app/teacher/grading-common.module.ts +++ b/src/app/teacher/grading-common.module.ts @@ -12,9 +12,11 @@ import { StatusIconComponent } from '../classroom-monitor/status-icon/status-ico import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress/nav-item-progress.component'; import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component'; +import { ClassResponsesComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component'; @NgModule({ imports: [ + ClassResponsesComponent, ComponentGradingComponent, ComponentStateInfoComponent, EditComponentAnnotationsComponent, @@ -30,6 +32,7 @@ import { ComponentStateInfoComponent } from '../../assets/wise5/common/component WorkgroupSelectAutocompleteComponent ], exports: [ + ClassResponsesComponent, ComponentGradingComponent, ComponentStateInfoComponent, EditComponentAnnotationsComponent, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html new file mode 100644 index 00000000000..0f53c5409b2 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html @@ -0,0 +1,109 @@ + + +
+ + + + +
+ + +
+ + + +
+ +
+ @for (workgroup of sortedWorkgroups; track workgroup.workgroupId) { + @if (isWorkgroupShown(workgroup)) { + + } + } +
+ diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts new file mode 100644 index 00000000000..2ca14615179 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts @@ -0,0 +1,27 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ClassResponsesComponent } from './class-responses.component'; +import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; +import { TeacherDataService } from '../../../services/teacherDataService'; +import { of } from 'rxjs'; +import { MockComponent } from 'ng-mocks'; +import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; + +describe('ClassResponsesComponent', () => { + let component: ClassResponsesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [MockComponent(WorkgroupSelectAutocompleteComponent)], + imports: [ClassResponsesComponent, ClassroomMonitorTestingModule] + }).compileComponents(); + spyOn(TestBed.inject(TeacherDataService), 'retrieveStudentDataForNode').and.returnValue(of({})); + fixture = TestBed.createComponent(ClassResponsesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts new file mode 100644 index 00000000000..795019ff5c1 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -0,0 +1,328 @@ +import { Component, Input, SimpleChanges } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatListModule } from '@angular/material/list'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; +import { TeacherDataService } from '../../../services/teacherDataService'; +import { Node } from '../../../common/Node'; +import { ConfigService } from '../../../services/configService'; +import { copy } from '../../../common/object/object'; +import { ClassroomStatusService } from '../../../services/classroomStatusService'; +import { AnnotationService } from '../../../services/annotationService'; +import { NotificationService } from '../../../services/notificationService'; +import { Notification } from '../../../../../app/domain/notification'; +import { CompletionStatus } from '../shared/CompletionStatus'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { ComponentWorkgroupItemComponent } from '../component-workgroup-item/component-workgroup-item.component'; +import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; + +@Component({ + selector: 'class-responses', + standalone: true, + imports: [ + CommonModule, + ComponentWorkgroupItemComponent, + FlexLayoutModule, + IntersectionObserverModule, + MatButtonModule, + MatIconModule, + MatListModule, + WorkgroupSelectAutocompleteComponent + ], + templateUrl: './class-responses.component.html' +}) +export class ClassResponsesComponent { + protected canViewStudentNames: boolean; + @Input() component: any; + protected hiddenComponents: any[] = []; + protected isExpandAll: boolean; + protected maxScore: number; + @Input() node: Node; + protected numRubrics: number; + protected sort: string; + protected sortedWorkgroups: any[] = []; + private workgroups: any[] = []; + protected workgroupsById: any = {}; + protected workgroupInViewById: any = {}; // whether the workgroup is in view or not + protected workVisibilityById: { [key: number]: boolean } = {}; + + constructor( + private annotationService: AnnotationService, + private classroomStatusService: ClassroomStatusService, + private configService: ConfigService, + private dataService: TeacherDataService, + private notificationService: NotificationService, + private projectService: TeacherProjectService + ) {} + + ngOnInit(): void { + this.retrieveStudentData(); + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes.component) { + this.collapseAll(); + } + } + + setupComponent() { + throw new Error('Method not implemented.'); + } + + protected retrieveStudentData(node: Node = this.node): void { + this.dataService.retrieveStudentDataForNode(node).subscribe(() => { + this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( + (workgroup) => + workgroup.workgroupId != null && + this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) + ); + this.canViewStudentNames = this.configService.getPermissions().canViewStudentNames; + this.setWorkgroupsById(); + this.sortWorkgroups(); + this.numRubrics = node.getNumRubrics(); + document.body.scrollTop = document.documentElement.scrollTop = 0; + }); + } + + private setWorkgroupsById(): void { + for (const workgroup of this.workgroups) { + const workgroupId = workgroup.workgroupId; + this.workgroupsById[workgroupId] = workgroup; + this.workVisibilityById[workgroupId] = false; + this.updateWorkgroup(workgroupId, true); + } + } + + /** + * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to + * hide student names because logged-in user does not have the right permissions + * @param workgroupID a workgroup ID number + * @param init Boolean whether we're in controller initialization or not + */ + protected updateWorkgroup(workgroupId: number, init = false): void { + const workgroup = this.workgroupsById[workgroupId]; + const alertNotifications = this.notificationService.getAlertNotifications({ + nodeId: this.node.id, + toWorkgroupId: workgroupId + }); + workgroup.hasAlert = alertNotifications.length > 0; + workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); + const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); + workgroup.isVisible = completionStatus.isVisible ? 1 : 0; + workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); + workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( + workgroupId, + this.node.id + ); + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); + workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; + } + + protected sortWorkgroups(): void { + this.sortedWorkgroups = []; + for (const workgroup of this.workgroups) { + this.sortedWorkgroups.push(workgroup); + } + switch (this.sort) { + case 'team': + this.sortedWorkgroups.sort(this.sortTeamAscending); + break; + case '-team': + this.sortedWorkgroups.sort(this.sortTeamDescending); + break; + case 'status': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); + break; + case '-status': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); + break; + case 'score': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); + break; + case '-score': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); + break; + } + } + + private workgroupHasNewAlert(alertNotifications: Notification[]): boolean { + for (const alert of alertNotifications) { + if (!alert.timeDismissed) { + return true; + } + } + return false; + } + + private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { + const completionStatus: CompletionStatus = { + isCompleted: false, + isVisible: false, + latestWorkTime: null, + latestAnnotationTime: null + }; + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); + if (studentStatus != null) { + const nodeStatus = studentStatus.nodeStatuses[this.node.id]; + if (nodeStatus) { + completionStatus.isVisible = nodeStatus.isVisible; + // TODO: store this info in the nodeStatus so we don't have to calculate every time? + completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); + completionStatus.latestAnnotationTime = + this.getLatestAnnotationTimeByWorkgroupId(workgroupId); + if (!this.projectService.nodeHasWork(this.node.id)) { + completionStatus.isCompleted = nodeStatus.isVisited; + } + if (completionStatus.latestWorkTime) { + completionStatus.isCompleted = nodeStatus.isCompleted; + } + } + } + return completionStatus; + } + + private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { + const componentStates = this.dataService.getComponentStatesByNodeId(this.node.id); + for (const componentState of componentStates.reverse()) { + if (componentState.workgroupId === workgroupId) { + return componentState.serverSaveTime; + } + } + return null; + } + + private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { + const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); + for (const annotation of annotations.reverse()) { + // TODO: support checking for annotations from shared teachers + if ( + annotation.toWorkgroupId === workgroupId && + annotation.fromWorkgroupId === this.configService.getWorkgroupId() + ) { + return annotation.serverSaveTime; + } + } + return null; + } + + /** + * Returns a numerical status value for a given completion status object depending on node + * completion + * Available status values are: 0 (not visited/no work; default), 1 (partially completed), + * 2 (completed) + * @param completionStatus Object + * @returns Integer status value + */ + private getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { + // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use + // more widely)? + let status = 0; + if (!completionStatus.isVisible) { + status = -1; + } else if (completionStatus.isCompleted) { + status = 2; + } else if (completionStatus.latestWorkTime !== null) { + status = 1; + } + return status; + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId ascending + */ + private sortTeamAscending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId descending + */ + private sortTeamDescending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupB.workgroupId - workgroupA.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + protected createSortAscendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupA[fieldName] - workgroupB[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + protected createSortDescendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB[fieldName] - workgroupA[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + setSort(criteria: string): void { + this.sort = criteria; + } + + isWorkgroupShown(workgroup: any): boolean { + return true; // implement actual logic + } + + onUpdateExpand({ workgroupId, value }): void { + this.workVisibilityById[workgroupId] = value; + } + + onIntersection( + workgroupId: number, + intersectionObserverEntries: IntersectionObserverEntry[] + ): void { + for (const entry of intersectionObserverEntries) { + this.workgroupInViewById[workgroupId] = entry.isIntersecting; + if (this.isExpandAll && entry.isIntersecting) { + this.workVisibilityById[workgroupId] = true; + } + } + } + + trackWorkgroup(index: number, workgroup: any): any { + return workgroup.workgroupId; + } + + protected expandAll(): void { + this.workgroups.forEach((workgroup) => { + const workgroupId = workgroup.workgroupId; + if (this.workgroupInViewById[workgroupId]) { + this.workVisibilityById[workgroupId] = true; + } + }); + this.isExpandAll = true; + } + + protected collapseAll(): void { + this.workgroups.forEach( + (workgroup) => (this.workVisibilityById[workgroup.workgroupId] = false) + ); + this.isExpandAll = false; + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index aa48c25fe57..f295af319a5 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -21,3 +21,4 @@ [doRender]="true" /> } + diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts index 03d90fed427..991455565b2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts @@ -1,6 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentGradingViewComponent } from './component-grading-view.component'; import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; +import { ActivatedRoute } from '@angular/router'; +import { of } from 'rxjs'; +import { MockComponent } from 'ng-mocks'; +import { ClassResponsesComponent } from '../class-responses/class-responses.component'; describe('ComponentGradingViewComponent', () => { let component: ComponentGradingViewComponent; @@ -8,7 +12,11 @@ describe('ComponentGradingViewComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ClassroomMonitorTestingModule, ComponentGradingViewComponent] + declarations: [MockComponent(ClassResponsesComponent)], + imports: [ClassroomMonitorTestingModule, ComponentGradingViewComponent], + providers: [ + { provide: ActivatedRoute, useValue: { parent: { params: of({ nodeId: 'node1' }) } } } + ] }).compileComponents(); fixture = TestBed.createComponent(ComponentGradingViewComponent); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index 7b876fdd5ac..df4af1ce5e9 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -8,12 +8,13 @@ import { isMatchingPeriods } from '../../../common/period/period'; import { AnnotationService } from '../../../services/annotationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { Node } from '../../../common/Node'; +import { ClassResponsesComponent } from '../class-responses/class-responses.component'; +import { ActivatedRoute } from '@angular/router'; @Component({ - imports: [TeacherSummaryDisplayComponent], + imports: [ClassResponsesComponent, TeacherSummaryDisplayComponent], selector: 'component-grading-view', standalone: true, - styleUrl: './component-grading-view.component.scss', templateUrl: './component-grading-view.component.html' }) export class ComponentGradingViewComponent { @@ -29,6 +30,7 @@ export class ComponentGradingViewComponent { private subscriptions: Subscription = new Subscription(); constructor( + private activatedRoute: ActivatedRoute, private annotationService: AnnotationService, private componentServiceLookupService: ComponentServiceLookupService, private dataService: TeacherDataService, @@ -37,6 +39,9 @@ export class ComponentGradingViewComponent { ) {} ngOnInit(): void { + this.activatedRoute.parent.params.subscribe((params) => { + this.dataService.setCurrentNodeByNodeId(params.nodeId); + }); this.subscriptions.add( this.dataService.currentNodeChanged$.subscribe(({ currentNode }) => { this.node = this.projectService.getNode(currentNode.id); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts index 5654a18f6bb..02a5f48749d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts @@ -30,23 +30,23 @@ import { DialogGuidanceGradingComponent } from '../../components/dialogGuidance/ @Component({ imports: [ - AiChatGradingModule, + //AiChatGradingModule, AnimationGradingModule, - AudioOscillatorGradingModule, - ConceptMapGradingModule, - DialogGuidanceGradingComponent, - DiscussionGradingModule, - DrawGradingModule, - EmbeddedGradingModule, - GraphGradingModule, - LabelGradingModule, + // AudioOscillatorGradingModule, + // ConceptMapGradingModule, + // DialogGuidanceGradingComponent + // DiscussionGradingModule, + // DrawGradingModule, + // EmbeddedGradingModule, + // GraphGradingModule, + // LabelGradingModule, MatchGradingModule, - MultipleChoiceGradingComponent, - OpenResponseGradingModule, - PeerChatGradingModule, - ShowGroupWorkGradingModule, - ShowMyWorkGradingModule, - TableGradingModule + MultipleChoiceGradingComponent + // OpenResponseGradingModule, + // PeerChatGradingModule, + // ShowGroupWorkGradingModule, + // ShowMyWorkGradingModule, + // TableGradingModule ], selector: 'component-grading-component', standalone: true, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html new file mode 100644 index 00000000000..29b81d085ef --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html @@ -0,0 +1,58 @@ +
+ + @if (expanded && !disabled) { + +
+
+ + +
+
+ + } +
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss new file mode 100644 index 00000000000..7e28238d934 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss @@ -0,0 +1,19 @@ +.component-workgroup-item { + .team-button { + min-height: 56px; + text-align: initial; + } + + .mdc-button__label { + text-transform: none; + width: 100%; + } + + .mdc-list-item.mdc-list-item--with-one-line { + height: auto; + } + + .mat-headline-5 { + margin: 0; + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts new file mode 100644 index 00000000000..3978ace5e2f --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentWorkgroupItemComponent } from './component-workgroup-item.component'; +import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; + +describe('ComponentWorkgroupItemComponent', () => { + let component: ComponentWorkgroupItemComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ClassroomMonitorTestingModule, ComponentWorkgroupItemComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(ComponentWorkgroupItemComponent); + component = fixture.componentInstance; + component.workgroupData = {}; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts new file mode 100644 index 00000000000..71b6ae4b20d --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts @@ -0,0 +1,112 @@ +import { CommonModule } from '@angular/common'; +import { Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core'; +import { WorkgroupInfoComponent } from '../nodeGrading/workgroupInfo/workgroup-info.component'; +import { MatListItem } from '@angular/material/list'; +import { ComponentNewWorkBadgeComponent } from '../../../../../app/classroom-monitor/component-new-work-badge/component-new-work-badge.component'; +import { WorkgroupComponentGradingComponent } from '../workgroup-component-grading/workgroup-component-grading.component'; +import { Subscription } from 'rxjs'; +import { WorkgroupNodeStatusComponent } from '../../../../../app/classroom-monitor/workgroup-node-status/workgroup-node-status.component'; +import { WorkgroupNodeScoreComponent } from '../shared/workgroupNodeScore/workgroup-node-score.component'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { copy } from '../../../common/object/object'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { AnnotationService } from '../../../services/annotationService'; + +@Component({ + imports: [ + CommonModule, + ComponentNewWorkBadgeComponent, + FlexLayoutModule, + MatListItem, + WorkgroupComponentGradingComponent, + WorkgroupInfoComponent, + WorkgroupNodeScoreComponent, + WorkgroupNodeStatusComponent + ], + selector: 'component-workgroup-item', + standalone: true, + styleUrl: './component-workgroup-item.component.scss', + templateUrl: './component-workgroup-item.component.html' +}) +export class ComponentWorkgroupItemComponent { + @Input() componentId: string; + component: any; + disabled: boolean; + @Input() expanded: boolean; + hasAlert: boolean; + hasNewAlert: boolean; + protected maxScore: number; + @Input() nodeId: string; + @Output() onUpdateExpand: EventEmitter = new EventEmitter(); + protected score: number | '-'; + @Input() showScore: boolean; + status: any; + statusClass: any; + statusText: string = ''; + subscriptions: Subscription = new Subscription(); + @Input() workgroupId: number; + @Input() workgroupData: any; + + constructor( + private annotationService: AnnotationService, + private projectService: TeacherProjectService + ) {} + + ngOnChanges(changes: SimpleChanges): void { + if (changes.workgroupData) { + const workgroupData = copy(changes.workgroupData.currentValue); + this.hasAlert = workgroupData.hasAlert; + this.hasNewAlert = workgroupData.hasNewAlert; + this.status = workgroupData.completionStatus; + this.score = workgroupData.score != null ? workgroupData.score : '-'; + } else if (changes.nodeId || changes.componentId) { + this.setComponent(); + } + this.update(); + } + + private setComponent(): void { + this.component = this.projectService.getComponent(this.nodeId, this.componentId); + this.maxScore = this.projectService.getMaxScoreForComponent(this.nodeId, this.componentId) ?? 0; + this.score = + this.annotationService.getLatestScoreAnnotation( + this.nodeId, + this.componentId, + this.workgroupId + )?.data.value ?? '-'; + } + + private update(): void { + switch (this.status) { + case -1: + this.statusClass = ' '; + this.statusText = $localize`Not Assigned`; + break; + case 2: + this.statusClass = 'success'; + this.statusText = $localize`Completed`; + break; + case 1: + this.statusClass = 'text'; + this.statusText = $localize`Partially Completed`; + break; + default: + this.statusClass = 'text-secondary'; + if (this.componentId) { + this.statusText = $localize`Not Completed`; + } else { + this.statusText = $localize`No Work`; + } + } + if (this.hasNewAlert) { + this.statusClass = 'warn'; + } + this.disabled = this.status === -1; + } + + protected toggleExpand(): void { + if (this.showScore) { + this.onUpdateExpand.emit({ workgroupId: this.workgroupId, value: !this.expanded }); + } + } +} diff --git a/src/messages.xlf b/src/messages.xlf index 43773329b6c..00e9debed9f 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10812,6 +10812,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 29 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 81 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 90 @@ -13207,6 +13211,235 @@ The branches will be removed but the steps will remain in the unit. 65 + + Expand all teams + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 14 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 82 + + + + + Expand all + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 19,21 + + + + Collapse all teams + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 24 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 92 + + + + - Collapse all + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 29,31 + + + + Sort by team + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 40 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + 47 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 114 + + + + Team + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 43 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + 83 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + 50 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 117 + + + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + 52 + + + + Sorty by completion + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 59 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 133 + + + + Status + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 62 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + 70 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 136 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 81 + + + + Sort by score + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + 78 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + 87 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html + 153 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 97 + + + + Show/hide team's work for this step + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html + 11 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html + 11 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html + 12 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html + 12 + + + + Not Assigned + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts + 83 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 138 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 105 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 92 + + + + Completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts + 87 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 142 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 110 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 97 + + + + Partially Completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts + 91 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 146 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 117 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 104 + + + + Not Completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts + 96 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 151 + + + + No Work + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts + 98 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 153 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 122 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 109 + + No feedback given for this version @@ -13764,25 +13997,6 @@ The branches will be removed but the steps will remain in the unit. 77 - - Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 83 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 50 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 117 - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 52 - - Not Completed @@ -13823,17 +14037,6 @@ The branches will be removed but the steps will remain in the unit. 29 - - Sort by team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 47 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 114 - - Sort by completion @@ -13845,36 +14048,6 @@ The branches will be removed but the steps will remain in the unit. 78 - - Status - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 70 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 136 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 81 - - - - Sort by score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 87 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 153 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 97 - - Sort by score on Step @@ -13915,21 +14088,6 @@ The branches will be removed but the steps will remain in the unit. 160 - - Show/hide team's work for this step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html - 11 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html - 12 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html - 12 - - Step @@ -13944,73 +14102,6 @@ The branches will be removed but the steps will remain in the unit. 92 - - Not Assigned - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 138 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 105 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 92 - - - - Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 142 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 110 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 97 - - - - Partially Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 146 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 117 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 104 - - - - Not Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 151 - - - - No Work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 153 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 122 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 109 - - Completion @@ -14066,13 +14157,6 @@ The branches will be removed but the steps will remain in the unit. 26 - - Expand all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 82 - - + Expand all @@ -14080,13 +14164,6 @@ The branches will be removed but the steps will remain in the unit. 87,89 - - Collapse all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 92 - - - Collapse all @@ -14101,13 +14178,6 @@ The branches will be removed but the steps will remain in the unit. 103,105 - - Sorty by completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 133 - - Question: From d15d7bc528c415ccc036a57f032b46cfa072ff7f Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 18 Feb 2025 14:53:58 -0800 Subject: [PATCH 011/127] Uncommented out all the component grading modules in ComponentGradingComponent and got the Grading Tool to work without having to instantiate multiple TeacherDataServices --- .../component-grading.component.ts | 30 +++++++++---------- .../wise5/components/aiChat/ai-chat.module.ts | 6 ++-- .../discussion/discussion-common.module.ts | 24 +++++++++++++-- .../discussion-student.module.ts | 24 +++++++++++++-- .../components/peerChat/peer-chat.module.ts | 20 +++++++++++-- .../show-work-student.module.ts | 4 +-- .../table-show-work/table-show-work.module.ts | 3 +- 7 files changed, 84 insertions(+), 27 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts index 02a5f48749d..5654a18f6bb 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts @@ -30,23 +30,23 @@ import { DialogGuidanceGradingComponent } from '../../components/dialogGuidance/ @Component({ imports: [ - //AiChatGradingModule, + AiChatGradingModule, AnimationGradingModule, - // AudioOscillatorGradingModule, - // ConceptMapGradingModule, - // DialogGuidanceGradingComponent - // DiscussionGradingModule, - // DrawGradingModule, - // EmbeddedGradingModule, - // GraphGradingModule, - // LabelGradingModule, + AudioOscillatorGradingModule, + ConceptMapGradingModule, + DialogGuidanceGradingComponent, + DiscussionGradingModule, + DrawGradingModule, + EmbeddedGradingModule, + GraphGradingModule, + LabelGradingModule, MatchGradingModule, - MultipleChoiceGradingComponent - // OpenResponseGradingModule, - // PeerChatGradingModule, - // ShowGroupWorkGradingModule, - // ShowMyWorkGradingModule, - // TableGradingModule + MultipleChoiceGradingComponent, + OpenResponseGradingModule, + PeerChatGradingModule, + ShowGroupWorkGradingModule, + ShowMyWorkGradingModule, + TableGradingModule ], selector: 'component-grading-component', standalone: true, diff --git a/src/assets/wise5/components/aiChat/ai-chat.module.ts b/src/assets/wise5/components/aiChat/ai-chat.module.ts index f78ad211248..d74b5554857 100644 --- a/src/assets/wise5/components/aiChat/ai-chat.module.ts +++ b/src/assets/wise5/components/aiChat/ai-chat.module.ts @@ -1,12 +1,14 @@ import { NgModule } from '@angular/core'; import { AiChatMessagesComponent } from './ai-chat-messages/ai-chat-messages.component'; -import { StudentTeacherCommonModule } from '../../../../app/student-teacher-common.module'; import { AiChatBotMessageComponent } from './ai-chat-bot-message/ai-chat-bot-message.component'; import { AiChatStudentMessageComponent } from './ai-chat-student-message/ai-chat-student-message.component'; +import { MatIconModule } from '@angular/material/icon'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; @NgModule({ declarations: [AiChatBotMessageComponent, AiChatStudentMessageComponent, AiChatMessagesComponent], - imports: [StudentTeacherCommonModule], + imports: [CommonModule, FlexLayoutModule, MatIconModule], exports: [AiChatBotMessageComponent, AiChatStudentMessageComponent, AiChatMessagesComponent] }) export class AiChatModule {} diff --git a/src/assets/wise5/components/discussion/discussion-common.module.ts b/src/assets/wise5/components/discussion/discussion-common.module.ts index 5350c1ab3bf..b3c04b6d974 100644 --- a/src/assets/wise5/components/discussion/discussion-common.module.ts +++ b/src/assets/wise5/components/discussion/discussion-common.module.ts @@ -1,12 +1,32 @@ import { NgModule } from '@angular/core'; -import { StudentTeacherCommonModule } from '../../../../app/student-teacher-common.module'; import { StudentComponentModule } from '../../../../app/student/student.component.module'; import { ClassResponse } from './class-response/class-response.component'; import { SaveTimeMessageComponent } from '../../common/save-time-message/save-time-message.component'; +import { MatCardModule } from '@angular/material/card'; +import { MatIconModule } from '@angular/material/icon'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDividerModule } from '@angular/material/divider'; +import { RouterModule } from '@angular/router'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { TextFieldModule } from '@angular/cdk/text-field'; @NgModule({ declarations: [ClassResponse], - imports: [SaveTimeMessageComponent, StudentComponentModule, StudentTeacherCommonModule], + imports: [ + CommonModule, + FlexLayoutModule, + MatButtonModule, + MatCardModule, + MatDividerModule, + MatIconModule, + MatTooltipModule, + RouterModule, + SaveTimeMessageComponent, + StudentComponentModule, + TextFieldModule + ], exports: [ClassResponse] }) export class DiscussionCommonModule {} diff --git a/src/assets/wise5/components/discussion/discussion-student/discussion-student.module.ts b/src/assets/wise5/components/discussion/discussion-student/discussion-student.module.ts index 06a579c4ac7..066a10f30e6 100644 --- a/src/assets/wise5/components/discussion/discussion-student/discussion-student.module.ts +++ b/src/assets/wise5/components/discussion/discussion-student/discussion-student.module.ts @@ -1,12 +1,32 @@ import { NgModule } from '@angular/core'; -import { StudentTeacherCommonModule } from '../../../../../app/student-teacher-common.module'; import { StudentComponentModule } from '../../../../../app/student/student.component.module'; import { DiscussionCommonModule } from '../discussion-common.module'; import { DiscussionStudent } from './discussion-student.component'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { ComponentHeaderComponent } from '../../../directives/component-header/component-header.component'; +import { MatCardModule } from '@angular/material/card'; +import { TextFieldModule } from '@angular/cdk/text-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; @NgModule({ declarations: [DiscussionStudent], - imports: [StudentTeacherCommonModule, DiscussionCommonModule, StudentComponentModule], + imports: [ + CommonModule, + ComponentHeaderComponent, + DiscussionCommonModule, + FlexLayoutModule, + FormsModule, + MatButtonModule, + MatCardModule, + MatFormFieldModule, + MatInputModule, + StudentComponentModule, + TextFieldModule + ], exports: [DiscussionStudent] }) export class DiscussionStudentModule {} diff --git a/src/assets/wise5/components/peerChat/peer-chat.module.ts b/src/assets/wise5/components/peerChat/peer-chat.module.ts index 8c1cd28e3d0..6a3d404d73f 100644 --- a/src/assets/wise5/components/peerChat/peer-chat.module.ts +++ b/src/assets/wise5/components/peerChat/peer-chat.module.ts @@ -7,7 +7,14 @@ import { PeerChatMessageInputComponent } from './peer-chat-message-input/peer-ch import { PeerChatMessagesComponent } from './peer-chat-messages/peer-chat-messages.component'; import { PeerChatQuestionBankComponent } from './peer-chat-question-bank/peer-chat-question-bank.component'; import { QuestionBankService } from './peer-chat-question-bank/questionBank.service'; -import { StudentTeacherCommonModule } from '../../../../app/student-teacher-common.module'; +import { MatCardModule } from '@angular/material/card'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { FormsModule } from '@angular/forms'; +import { MatInputModule } from '@angular/material/input'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; @NgModule({ declarations: [ @@ -19,7 +26,16 @@ import { StudentTeacherCommonModule } from '../../../../app/student-teacher-comm PeerChatMessagesComponent, PeerChatQuestionBankComponent ], - imports: [StudentTeacherCommonModule], + imports: [ + CommonModule, + FlexLayoutModule, + FormsModule, + MatButtonModule, + MatCardModule, + MatFormFieldModule, + MatIconModule, + MatInputModule + ], exports: [ PeerChatChatBoxComponent, PeerChatMembersComponent, diff --git a/src/assets/wise5/components/showWork/show-work-student/show-work-student.module.ts b/src/assets/wise5/components/showWork/show-work-student/show-work-student.module.ts index 9bbe8b177b5..8cb175b4f44 100644 --- a/src/assets/wise5/components/showWork/show-work-student/show-work-student.module.ts +++ b/src/assets/wise5/components/showWork/show-work-student/show-work-student.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { StudentTeacherCommonModule } from '../../../../../app/student-teacher-common.module'; import { AnimationShowWorkModule } from '../../animation/animation-show-work/animation-show-work.module'; import { AudioOscillatorShowWorkModule } from '../../audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.module'; import { ConceptMapShowWorkModule } from '../../conceptMap/concept-map-show-work/concept-map-show-work.module'; @@ -14,11 +13,12 @@ import { ShowWorkStudentComponent } from './show-work-student.component'; import { MultipleChoiceShowWorkComponent } from '../../multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component'; import { DialogGuidanceShowWorkComponent } from '../../dialogGuidance/dialog-guidance-show-work/dialog-guidance-show-work.component'; import { MatchShowWorkComponent } from '../../match/match-show-work/match-show-work.component'; +import { CommonModule } from '@angular/common'; @NgModule({ declarations: [ShowWorkStudentComponent], imports: [ - StudentTeacherCommonModule, + CommonModule, AnimationShowWorkModule, AudioOscillatorShowWorkModule, ConceptMapShowWorkModule, diff --git a/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts b/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts index 026b760f6ff..06d6fbf17e8 100644 --- a/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts +++ b/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; -import { StudentTeacherCommonModule } from '../../../../../app/student-teacher-common.module'; import { TableCommonModule } from '../table-common.module'; import { TableShowWorkComponent } from './table-show-work.component'; @NgModule({ declarations: [TableShowWorkComponent], - imports: [StudentTeacherCommonModule, TableCommonModule], + imports: [TableCommonModule], exports: [TableShowWorkComponent] }) export class TableShowWorkModule {} From a6981ca488e2f3fc297ddc15f0b2344e876256db Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 19 Feb 2025 07:53:51 -0800 Subject: [PATCH 012/127] Fix issue where the ClassResponses was not being rendered for the very first time the NodeGradingComponent was initialized --- .../nodeGrading/node-grading/node-grading.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index fe77e39c84d..1b9ee099ab6 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -44,6 +44,11 @@ export class NodeGradingComponent { this.node = currentNode; }) ); + setTimeout(() => { + // allow the current change detection cycle to complete before triggering the navigation + // to ensure url updates correctly + this.setComponent(this.node.components[0]); + }, 0); } ngOnChanges(): void { From 89242a6141701335de4ceb433a0f3f3cbb8a82a5 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 19 Feb 2025 09:10:05 -0800 Subject: [PATCH 013/127] Show component score and max score when ComponentWorkgroupItem is initialized --- .../component-workgroup-item.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts index 71b6ae4b20d..0907f950879 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts @@ -52,13 +52,16 @@ export class ComponentWorkgroupItemComponent { private projectService: TeacherProjectService ) {} + ngOnInit(): void { + this.setComponent(); + } + ngOnChanges(changes: SimpleChanges): void { if (changes.workgroupData) { const workgroupData = copy(changes.workgroupData.currentValue); this.hasAlert = workgroupData.hasAlert; this.hasNewAlert = workgroupData.hasNewAlert; this.status = workgroupData.completionStatus; - this.score = workgroupData.score != null ? workgroupData.score : '-'; } else if (changes.nodeId || changes.componentId) { this.setComponent(); } From 09df026739d97cbd49c766a9e506748a1ad0a8e8 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 19 Feb 2025 09:35:34 -0800 Subject: [PATCH 014/127] Calculate score in ClassResponsesComponent and pass down to ComponentWorkgroupItemComponent --- .../class-responses.component.html | 2 +- .../class-responses.component.ts | 12 ++++------ .../component-workgroup-item.component.html | 10 ++++----- .../component-workgroup-item.component.ts | 22 +++++-------------- src/messages.xlf | 10 ++++----- 5 files changed, 19 insertions(+), 37 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html index 0f53c5409b2..3bc45743331 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html @@ -94,8 +94,8 @@ @if (isWorkgroupShown(workgroup)) { { this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( @@ -112,10 +109,9 @@ export class ClassResponsesComponent { const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); workgroup.isVisible = completionStatus.isVisible ? 1 : 0; workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); - workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( - workgroupId, - this.node.id - ); + workgroup.score = + this.annotationService.getLatestScoreAnnotation(this.node.id, this.component.id, workgroupId) + ?.data.value ?? '-'; const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html index 29b81d085ef..ddaf76182ae 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html @@ -10,7 +10,7 @@ class="list-item__subheader-button team-button" aria-label="Show/hide team's work for this step" i18n-aria-label - [ngClass]="{ 'list-item--noclick': !showScore || disabled }" + [ngClass]="{ 'list-item--noclick': disabled }" (click)="toggleExpand()" [disabled]="disabled" fxLayoutWrap @@ -27,11 +27,9 @@
- @if (showScore) { -
- -
- } +
+ +

@if (expanded && !disabled) { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts index 0907f950879..20554f29c45 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts @@ -10,7 +10,6 @@ import { WorkgroupNodeScoreComponent } from '../shared/workgroupNodeScore/workgr import { TeacherProjectService } from '../../../services/teacherProjectService'; import { copy } from '../../../common/object/object'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { AnnotationService } from '../../../services/annotationService'; @Component({ imports: [ @@ -35,11 +34,10 @@ export class ComponentWorkgroupItemComponent { @Input() expanded: boolean; hasAlert: boolean; hasNewAlert: boolean; - protected maxScore: number; + @Input() maxScore: number; @Input() nodeId: string; @Output() onUpdateExpand: EventEmitter = new EventEmitter(); - protected score: number | '-'; - @Input() showScore: boolean; + @Input() score: number | '-'; status: any; statusClass: any; statusText: string = ''; @@ -47,10 +45,7 @@ export class ComponentWorkgroupItemComponent { @Input() workgroupId: number; @Input() workgroupData: any; - constructor( - private annotationService: AnnotationService, - private projectService: TeacherProjectService - ) {} + constructor(private projectService: TeacherProjectService) {} ngOnInit(): void { this.setComponent(); @@ -62,6 +57,7 @@ export class ComponentWorkgroupItemComponent { this.hasAlert = workgroupData.hasAlert; this.hasNewAlert = workgroupData.hasNewAlert; this.status = workgroupData.completionStatus; + this.score = workgroupData.score; } else if (changes.nodeId || changes.componentId) { this.setComponent(); } @@ -71,12 +67,6 @@ export class ComponentWorkgroupItemComponent { private setComponent(): void { this.component = this.projectService.getComponent(this.nodeId, this.componentId); this.maxScore = this.projectService.getMaxScoreForComponent(this.nodeId, this.componentId) ?? 0; - this.score = - this.annotationService.getLatestScoreAnnotation( - this.nodeId, - this.componentId, - this.workgroupId - )?.data.value ?? '-'; } private update(): void { @@ -108,8 +98,6 @@ export class ComponentWorkgroupItemComponent { } protected toggleExpand(): void { - if (this.showScore) { - this.onUpdateExpand.emit({ workgroupId: this.workgroupId, value: !this.expanded }); - } + this.onUpdateExpand.emit({ workgroupId: this.workgroupId, value: !this.expanded }); } } diff --git a/src/messages.xlf b/src/messages.xlf index 76d843e31c2..1ccb623a3dc 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13357,7 +13357,7 @@ The branches will be removed but the steps will remain in the unit. Not Assigned src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 83 + 76 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13376,7 +13376,7 @@ The branches will be removed but the steps will remain in the unit. Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 87 + 80 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13395,7 +13395,7 @@ The branches will be removed but the steps will remain in the unit. Partially Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 91 + 84 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13414,7 +13414,7 @@ The branches will be removed but the steps will remain in the unit. Not Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 96 + 89 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13425,7 +13425,7 @@ The branches will be removed but the steps will remain in the unit. No Work src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 98 + 91 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts From 9002a59f832968c77a64cef595a213b26cbeb8ed Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 19 Feb 2025 13:10:13 -0800 Subject: [PATCH 015/127] Component completion status display is now working --- .../class-responses.component.html | 5 ++- .../class-responses.component.ts | 35 ++++++++++++++----- .../component-workgroup-item.component.ts | 15 +++----- src/messages.xlf | 10 +++--- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html index 3bc45743331..4e7b5d83242 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html @@ -94,10 +94,13 @@ @if (isWorkgroupShown(workgroup)) { 0; workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); - const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); - workgroup.isVisible = completionStatus.isVisible ? 1 : 0; - workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); + const nodeCompletionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); + workgroup.isVisible = nodeCompletionStatus.isVisible ? 1 : 0; + workgroup.completionStatus = this.getWorkgroupCompletionStatus(nodeCompletionStatus); workgroup.score = this.annotationService.getLatestScoreAnnotation(this.node.id, this.component.id, workgroupId) ?.data.value ?? '-'; @@ -164,15 +166,14 @@ export class ClassResponsesComponent { const nodeStatus = studentStatus.nodeStatuses[this.node.id]; if (nodeStatus) { completionStatus.isVisible = nodeStatus.isVisible; - // TODO: store this info in the nodeStatus so we don't have to calculate every time? completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); completionStatus.latestAnnotationTime = this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.projectService.nodeHasWork(this.node.id)) { + if (!this.projectService.componentHasWork(this.component)) { completionStatus.isCompleted = nodeStatus.isVisited; } if (completionStatus.latestWorkTime) { - completionStatus.isCompleted = nodeStatus.isCompleted; + completionStatus.isCompleted = this.isCompleted(workgroupId); } } } @@ -180,7 +181,7 @@ export class ClassResponsesComponent { } private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { - const componentStates = this.dataService.getComponentStatesByNodeId(this.node.id); + const componentStates = this.dataService.getComponentStatesByComponentId(this.component.id); for (const componentState of componentStates.reverse()) { if (componentState.workgroupId === workgroupId) { return componentState.serverSaveTime; @@ -192,8 +193,8 @@ export class ClassResponsesComponent { private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); for (const annotation of annotations.reverse()) { - // TODO: support checking for annotations from shared teachers if ( + annotation.componentId === this.component.id && annotation.toWorkgroupId === workgroupId && annotation.fromWorkgroupId === this.configService.getWorkgroupId() ) { @@ -203,6 +204,24 @@ export class ClassResponsesComponent { return null; } + private isCompleted(workgroupId: number): boolean { + const service = this.componentServiceLookupService.getService(this.component.type); + const workgroupComponentStates = this.dataService.getComponentStatesByWorkgroupIdAndComponentId( + workgroupId, + this.component.id + ); + return ['OpenResponse', 'Discussion'].includes(this.component.type) + ? service.isCompletedV2(this.node, this.component, { + componentStates: workgroupComponentStates + }) + : service.isCompleted( + this.component, + workgroupComponentStates, + this.dataService.getEventsByNodeId(this.node.id), + this.node + ); + } + /** * Returns a numerical status value for a given completion status object depending on node * completion diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts index 20554f29c45..29849e9ba36 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts @@ -8,7 +8,6 @@ import { Subscription } from 'rxjs'; import { WorkgroupNodeStatusComponent } from '../../../../../app/classroom-monitor/workgroup-node-status/workgroup-node-status.component'; import { WorkgroupNodeScoreComponent } from '../shared/workgroupNodeScore/workgroup-node-score.component'; import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { copy } from '../../../common/object/object'; import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ @@ -32,13 +31,13 @@ export class ComponentWorkgroupItemComponent { component: any; disabled: boolean; @Input() expanded: boolean; - hasAlert: boolean; - hasNewAlert: boolean; + @Input() hasAlert: boolean; + @Input() hasNewAlert: boolean; @Input() maxScore: number; @Input() nodeId: string; @Output() onUpdateExpand: EventEmitter = new EventEmitter(); @Input() score: number | '-'; - status: any; + @Input() status: any; statusClass: any; statusText: string = ''; subscriptions: Subscription = new Subscription(); @@ -52,13 +51,7 @@ export class ComponentWorkgroupItemComponent { } ngOnChanges(changes: SimpleChanges): void { - if (changes.workgroupData) { - const workgroupData = copy(changes.workgroupData.currentValue); - this.hasAlert = workgroupData.hasAlert; - this.hasNewAlert = workgroupData.hasNewAlert; - this.status = workgroupData.completionStatus; - this.score = workgroupData.score; - } else if (changes.nodeId || changes.componentId) { + if (changes.nodeId || changes.componentId) { this.setComponent(); } this.update(); diff --git a/src/messages.xlf b/src/messages.xlf index 1ccb623a3dc..02ae59b02e7 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13357,7 +13357,7 @@ The branches will be removed but the steps will remain in the unit. Not Assigned src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 76 + 69 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13376,7 +13376,7 @@ The branches will be removed but the steps will remain in the unit. Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 80 + 73 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13395,7 +13395,7 @@ The branches will be removed but the steps will remain in the unit. Partially Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 84 + 77 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13414,7 +13414,7 @@ The branches will be removed but the steps will remain in the unit. Not Completed src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 89 + 82 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts @@ -13425,7 +13425,7 @@ The branches will be removed but the steps will remain in the unit. No Work src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 91 + 84 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts From 695f3f507dead0700843bcc4da183a2de9d1f093 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 20 Feb 2025 09:56:47 -0800 Subject: [PATCH 016/127] Add "Step" to completion and mean score heading text --- .../node-grading/node-grading.component.html | 4 ++-- src/messages.xlf | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 9573e6a476d..3326ab2e81f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -3,7 +3,7 @@

{{ nodeCompletionPercent }}% - Completion + Step Completion

@if (hasWork) {

@@ -12,7 +12,7 @@

} @else { N/A } - Mean Score + Step Mean Score

}
diff --git a/src/messages.xlf b/src/messages.xlf index 02ae59b02e7..e57d6abb87b 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14062,10 +14062,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 12 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 6 - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 13 @@ -14088,10 +14084,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 30 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 15 - Peer Groups @@ -14132,6 +14124,20 @@ The branches will be removed but the steps will remain in the unit. 103,105 + + Step Completion + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 6 + + + + Step Mean Score + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 15 + + Question: From 90f5ae76d3f1fd2d259d467f4e62c0cf49d97fde Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 20 Feb 2025 17:16:03 -0800 Subject: [PATCH 017/127] Get events when getting student data for node. This is used to calculate component completion. --- src/assets/wise5/services/teacherDataService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/services/teacherDataService.ts b/src/assets/wise5/services/teacherDataService.ts index 3900a360bcc..bb02e799edb 100644 --- a/src/assets/wise5/services/teacherDataService.ts +++ b/src/assets/wise5/services/teacherDataService.ts @@ -132,7 +132,7 @@ export class TeacherDataService extends DataService { .set('runId', this.configService.getRunId()) .set('getStudentWork', 'true') .set('getAnnotations', 'false') - .set('getEvents', 'false'); + .set('getEvents', 'true'); const components = node.getAllRelatedComponents(); if (components.length > 0) { params = params.set('components', compressToEncodedURIComponent(JSON.stringify(components))); From 4a5ac9b3e9fa92c102914b310bfcad1e77f5da13 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 20 Feb 2025 17:31:23 -0800 Subject: [PATCH 018/127] Fix maxScore calculation logic --- .../directives/summary-display/summary-display.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/directives/summary-display/summary-display.component.ts b/src/assets/wise5/directives/summary-display/summary-display.component.ts index 86e6f3ac89d..fd103b2082d 100644 --- a/src/assets/wise5/directives/summary-display/summary-display.component.ts +++ b/src/assets/wise5/directives/summary-display/summary-display.component.ts @@ -532,7 +532,7 @@ export abstract class SummaryDisplay { let maxScoreSoFar = this.maxScore; for (const annotation of annotations) { const score = this.getScoreFromAnnotation(annotation); - maxScoreSoFar = Math.max(this.maxScore, score); + maxScoreSoFar = Math.max(maxScoreSoFar, score); } return maxScoreSoFar; } From fe8f46bf6d2b877593286a3d6e95064b7dd5a8cd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 20 Feb 2025 17:31:39 -0800 Subject: [PATCH 019/127] Pass in nodeId correctly. --- .../component-grading-view.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index f295af319a5..59dfa872654 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -12,7 +12,7 @@ } @if (hasScoresSummary && hasScoreAnnotation) { Date: Fri, 21 Feb 2025 08:32:58 -0800 Subject: [PATCH 020/127] Add MilestoneReportButton and show if available --- .../component-grading-view.component.html | 1 + .../component-grading-view.component.spec.ts | 5 +- .../component-grading-view.component.ts | 7 ++- .../milestone-report-button.component.html | 8 +++ .../milestone-report-button.component.spec.ts | 49 +++++++++++++++++++ .../milestone-report-button.component.ts | 42 ++++++++++++++++ src/assets/wise5/services/milestoneService.ts | 11 +++++ src/messages.xlf | 4 ++ 8 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 59dfa872654..3f420e725dd 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -1,3 +1,4 @@ + @if (component?.type === 'MultipleChoice' && hasResponsesSummary) { { let component: ComponentGradingViewComponent; @@ -12,7 +13,7 @@ describe('ComponentGradingViewComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [MockComponent(ClassResponsesComponent)], + declarations: [MockComponents(ClassResponsesComponent, MilestoneReportButtonComponent)], imports: [ClassroomMonitorTestingModule, ComponentGradingViewComponent], providers: [ { provide: ActivatedRoute, useValue: { parent: { params: of({ nodeId: 'node1' }) } } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index df4af1ce5e9..ef8104c0d55 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -10,9 +10,14 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; import { Node } from '../../../common/Node'; import { ClassResponsesComponent } from '../class-responses/class-responses.component'; import { ActivatedRoute } from '@angular/router'; +import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; @Component({ - imports: [ClassResponsesComponent, TeacherSummaryDisplayComponent], + imports: [ + ClassResponsesComponent, + MilestoneReportButtonComponent, + TeacherSummaryDisplayComponent + ], selector: 'component-grading-view', standalone: true, templateUrl: './component-grading-view.component.html' diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html new file mode 100644 index 00000000000..4fd0f638147 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html @@ -0,0 +1,8 @@ +@if (report?.isReportAvailable) { + +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.spec.ts new file mode 100644 index 00000000000..2a492277b7c --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.spec.ts @@ -0,0 +1,49 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MilestoneReportButtonComponent } from './milestone-report-button.component'; +import { MockService } from 'ng-mocks'; +import { MilestoneService } from '../../../services/milestoneService'; +import { Node } from '../../../common/Node'; + +let component: MilestoneReportButtonComponent; +let fixture: ComponentFixture; +let milestoneService: MilestoneService; +describe('MilestoneReportButtonComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MilestoneReportButtonComponent], + providers: [{ provide: MilestoneService, useValue: MockService(MilestoneService) }] + }).compileComponents(); + + fixture = TestBed.createComponent(MilestoneReportButtonComponent); + component = fixture.componentInstance; + component.node = { id: 'node1' } as Node; + component.component = { id: 'abc' }; + milestoneService = TestBed.inject(MilestoneService); + fixture.detectChanges(); + }); + reportAvailable(); + reportNotAvailable(); +}); + +function reportAvailable() { + describe('report is available', () => { + it('should show button', () => { + spyOn(milestoneService, 'getMilestoneReport').and.returnValue({ + isReportAvailable: true + }); + component.ngOnChanges(); + fixture.detectChanges(); + const button = fixture.debugElement.nativeElement.querySelector('button'); + expect(button).toBeTruthy(); + }); + }); +} + +function reportNotAvailable() { + describe('report is not available', () => { + it('should hide button', () => { + const button = fixture.debugElement.nativeElement.querySelector('button'); + expect(button).toBeFalsy(); + }); + }); +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.ts new file mode 100644 index 00000000000..a7fa61f5a78 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.ts @@ -0,0 +1,42 @@ +import { CommonModule } from '@angular/common'; +import { Component, Input } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MilestoneService } from '../../../services/milestoneService'; +import { Node } from '../../../common/Node'; +import { MatDialog } from '@angular/material/dialog'; +import { MilestoneDetailsDialogComponent } from '../milestones/milestone-details-dialog/milestone-details-dialog.component'; + +@Component({ + imports: [CommonModule, FlexLayoutModule, MatButtonModule, MatIconModule], + selector: 'milestone-report-button', + standalone: true, + templateUrl: './milestone-report-button.component.html' +}) +export class MilestoneReportButtonComponent { + @Input() component: any; + @Input() node: Node; + @Input() periodId: number; + protected report: any; + + constructor( + private dialog: MatDialog, + private milestoneService: MilestoneService + ) {} + + ngOnChanges(): void { + this.setMilestoneReport(); + } + + private setMilestoneReport(): void { + this.report = this.milestoneService.getMilestoneReport(this.node.id, this.component.id); + } + + protected showReport(): void { + this.dialog.open(MilestoneDetailsDialogComponent, { + data: this.report, + panelClass: 'dialog-lg' + }); + } +} diff --git a/src/assets/wise5/services/milestoneService.ts b/src/assets/wise5/services/milestoneService.ts index e34b2957c54..153d51d414b 100644 --- a/src/assets/wise5/services/milestoneService.ts +++ b/src/assets/wise5/services/milestoneService.ts @@ -34,6 +34,17 @@ export class MilestoneService { return []; } + getMilestoneReport(nodeId: string, componentId: string): any { + const milestoneReport = this.getProjectMilestoneReports().find((report) => { + const referencedComponent = this.getReferencedComponent(report); + return ( + referencedComponent.nodeId === nodeId && referencedComponent.componentId === componentId + ); + }); + return milestoneReport ? this.getProjectMilestoneStatus(milestoneReport.id) : null; + } + + // to be deleted when NodeGradingViewComponent is removed getMilestoneReportByNodeId(nodeId: string): any { for (const milestoneReport of this.getProjectMilestoneReports()) { const referencedComponent = this.getReferencedComponent(milestoneReport); diff --git a/src/messages.xlf b/src/messages.xlf index e57d6abb87b..3be13ede1a0 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -11193,6 +11193,10 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 209 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html + 5 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 45 From f637b0a0c636f65155f53164d7b49ffdf262d3dd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 21 Feb 2025 12:34:45 -0800 Subject: [PATCH 021/127] Add PeerGroupButton and show if available --- .../component-grading-view.component.html | 1 + .../component-grading-view.component.spec.ts | 9 +++- .../component-grading-view.component.ts | 2 + .../peer-group-button.component.html | 8 ++++ .../peer-group-button.component.spec.ts | 46 +++++++++++++++++++ .../peer-group-button.component.ts | 29 ++++++++++++ src/messages.xlf | 4 ++ 7 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 3f420e725dd..736bf4ac867 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -1,4 +1,5 @@ + @if (component?.type === 'MultipleChoice' && hasResponsesSummary) { { let component: ComponentGradingViewComponent; @@ -13,7 +14,13 @@ describe('ComponentGradingViewComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [MockComponents(ClassResponsesComponent, MilestoneReportButtonComponent)], + declarations: [ + MockComponents( + ClassResponsesComponent, + MilestoneReportButtonComponent, + PeerGroupButtonComponent + ) + ], imports: [ClassroomMonitorTestingModule, ComponentGradingViewComponent], providers: [ { provide: ActivatedRoute, useValue: { parent: { params: of({ nodeId: 'node1' }) } } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index ef8104c0d55..b9f5024aed4 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -11,11 +11,13 @@ import { Node } from '../../../common/Node'; import { ClassResponsesComponent } from '../class-responses/class-responses.component'; import { ActivatedRoute } from '@angular/router'; import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; +import { PeerGroupButtonComponent } from '../peer-group-button/peer-group-button.component'; @Component({ imports: [ ClassResponsesComponent, MilestoneReportButtonComponent, + PeerGroupButtonComponent, TeacherSummaryDisplayComponent ], selector: 'component-grading-view', diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html new file mode 100644 index 00000000000..6418d17bb56 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html @@ -0,0 +1,8 @@ +@if (peerGroupingTag) { + +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.spec.ts new file mode 100644 index 00000000000..03bd074fe68 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.spec.ts @@ -0,0 +1,46 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { PeerGroupButtonComponent } from './peer-group-button.component'; +import { MockService } from 'ng-mocks'; +import { TeacherPeerGroupService } from '../../../services/teacherPeerGroupService'; + +let component: PeerGroupButtonComponent; +let fixture: ComponentFixture; +describe('PeerGroupButtonComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [PeerGroupButtonComponent], + providers: [ + { provide: TeacherPeerGroupService, useValue: MockService(TeacherPeerGroupService) } + ] + }).compileComponents(); + + fixture = TestBed.createComponent(PeerGroupButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + peerGroupAvailable(); + peerGroupNotAvailable(); +}); + +function peerGroupAvailable() { + describe('peer group is available', () => { + beforeEach(() => { + component.component = { peerGroupingTag: 'tag' }; + component.ngOnChanges(); + fixture.detectChanges(); + }); + it('should show button', () => { + const button = fixture.debugElement.nativeElement.querySelector('button'); + expect(button).toBeTruthy(); + }); + }); +} + +function peerGroupNotAvailable() { + describe('peer group is not available', () => { + it('should hide button', () => { + const button = fixture.debugElement.nativeElement.querySelector('button'); + expect(button).toBeFalsy(); + }); + }); +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.ts new file mode 100644 index 00000000000..5e9e1072021 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.ts @@ -0,0 +1,29 @@ +import { CommonModule } from '@angular/common'; +import { Component, Input } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { Node } from '../../../common/Node'; +import { TeacherPeerGroupService } from '../../../services/teacherPeerGroupService'; + +@Component({ + imports: [CommonModule, FlexLayoutModule, MatButtonModule, MatIconModule], + selector: 'peer-group-button', + standalone: true, + templateUrl: './peer-group-button.component.html' +}) +export class PeerGroupButtonComponent { + @Input() component: any; + @Input() node: Node; + protected peerGroupingTag: string; + + constructor(private peerGroupService: TeacherPeerGroupService) {} + + ngOnChanges(): void { + this.peerGroupingTag = this.component.peerGroupingTag; + } + + protected showPeerGroup(): void { + this.peerGroupService.showPeerGroupDetails(this.peerGroupingTag); + } +} diff --git a/src/messages.xlf b/src/messages.xlf index 3be13ede1a0..199baceb3d5 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14095,6 +14095,10 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 56 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html + 5 + Info + Tips () From 79f3a6191c4d919461834bf9c11f257c80f99f03 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 21 Feb 2025 16:26:23 -0800 Subject: [PATCH 022/127] Removed NodeGradingView and moved everything into MilestoneGradingView. --- .../milestone/milestoneService.spec.ts | 66 +-- src/app/teacher/classroom-monitor.module.ts | 2 - .../milestone-grading-view.component.ts | 341 ++++++++++++-- .../node-grading-view.component.html | 186 -------- .../node-grading-view.component.scss | 40 -- .../node-grading-view.component.spec.ts | 171 ------- .../node-grading-view.component.ts | 440 ------------------ src/assets/wise5/services/milestoneService.ts | 11 - src/messages.xlf | 128 +---- 9 files changed, 324 insertions(+), 1061 deletions(-) delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.scss delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.spec.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.ts diff --git a/src/app/services/milestone/milestoneService.spec.ts b/src/app/services/milestone/milestoneService.spec.ts index 380b5c44dc2..6d36d983078 100644 --- a/src/app/services/milestone/milestoneService.spec.ts +++ b/src/app/services/milestone/milestoneService.spec.ts @@ -27,8 +27,8 @@ let teacherDataService: TeacherDataService; describe('MilestoneService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [MatDialogModule, StudentTeacherCommonServicesModule], - providers: [ + imports: [MatDialogModule, StudentTeacherCommonServicesModule], + providers: [ ClassroomStatusService, CopyNodesService, MilestoneService, @@ -38,8 +38,8 @@ describe('MilestoneService', () => { TeacherWebSocketService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting() - ] -}); + ] + }); service = TestBed.inject(MilestoneService); achievementService = TestBed.inject(AchievementService); configService = TestBed.inject(ConfigService); @@ -48,7 +48,6 @@ describe('MilestoneService', () => { teacherDataService = TestBed.inject(TeacherDataService); }); getProjectMilestones(); - getMilestoneReportByNodeId(); getProjectMilestoneStatus(); insertMilestoneItems(); insertMilestoneCompletion(); @@ -85,63 +84,6 @@ function getProjectMilestones() { }); } -function getMilestoneReportByNodeId() { - describe('getMilestoneReportByNodeId()', () => { - it('should get project milestone report by node id when there is none', () => { - const achievements = { - isEnabled: true, - items: [ - { - id: 'milestone1', - type: 'milestone', - report: { - templates: [ - { - satisfyCriteria: [ - { - nodeId: 'node1', - componentId: 'component1' - } - ] - } - ] - } - } - ] - }; - spyOn(projectService, 'getAchievements').and.returnValue(achievements); - const milestoneReport = service.getMilestoneReportByNodeId('node2'); - expect(milestoneReport).toBeNull(); - }); - it('should get project milestone report by node id when there is one', () => { - const achievements = { - isEnabled: true, - items: [ - { - id: 'milestone1', - type: 'milestone', - report: { - templates: [ - { - satisfyCriteria: [ - { - nodeId: 'node1', - componentId: 'component1' - } - ] - } - ] - } - } - ] - }; - spyOn(projectService, 'getAchievements').and.returnValue(achievements); - const milestoneReport = service.getMilestoneReportByNodeId('node1'); - expect(milestoneReport).toBeDefined(); - }); - }); -} - function getProjectMilestoneStatus() { describe('getProjectMilestoneStatus()', () => { it('should get project milestone status', () => { diff --git a/src/app/teacher/classroom-monitor.module.ts b/src/app/teacher/classroom-monitor.module.ts index 3e9bead2055..cc27ee566a8 100644 --- a/src/app/teacher/classroom-monitor.module.ts +++ b/src/app/teacher/classroom-monitor.module.ts @@ -9,7 +9,6 @@ import { ComponentStudentModule } from '../../assets/wise5/components/component/ import { NotebookWorkgroupGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component'; import { PauseScreensMenuComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component'; import { StepItemComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component'; -import { NodeGradingViewComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component'; import { NotificationsMenuComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component'; import { NavItemComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component'; import { NodeProgressViewComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component'; @@ -30,7 +29,6 @@ import { GradingNodeService } from '../../assets/wise5/services/gradingNodeServi @NgModule({ declarations: [ - NodeGradingViewComponent, NodeProgressViewComponent, NotebookGradingComponent, NotebookWorkgroupGradingComponent, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index c46d7d682e4..3488596dfc7 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -1,16 +1,17 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { copy } from '../../../../common/object/object'; +import { Annotation } from '../../../../common/Annotation'; +import { Node } from '../../../../common/Node'; +import { CompletionStatus } from '../../shared/CompletionStatus'; +import { Notification } from '../../../../../../app/domain/notification'; +import { Subscription } from 'rxjs'; +import { MatDialog } from '@angular/material/dialog'; import { AnnotationService } from '../../../../services/annotationService'; import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { ConfigService } from '../../../../services/configService'; -import { MilestoneService } from '../../../../services/milestoneService'; import { NotificationService } from '../../../../services/notificationService'; import { TeacherDataService } from '../../../../services/teacherDataService'; -import { TeacherPeerGroupService } from '../../../../services/teacherPeerGroupService'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; -import { NodeGradingViewComponent } from '../../nodeGrading/node-grading-view/node-grading-view.component'; -import { Annotation } from '../../../../common/Annotation'; @Component({ selector: 'milestone-grading-view', @@ -18,15 +19,22 @@ import { Annotation } from '../../../../common/Annotation'; styleUrls: ['./milestone-grading-view.component.scss'], encapsulation: ViewEncapsulation.None }) -export class MilestoneGradingViewComponent extends NodeGradingViewComponent { - componentId: string; - firstNodeId: string; - firstNodePosition: string; - lastNodeId: string; - lastNodePosition: string; +export class MilestoneGradingViewComponent { + private componentId: string; + private firstNodeId: string; + protected firstNodePosition: string; + protected isExpandAll: boolean; + private lastNodeId: string; + protected lastNodePosition: string; @Input() milestone: any; - node: any; - nodeId: string; + private nodeId: string; + protected sort: string; + sortedWorkgroups: any[]; + private subscriptions: Subscription = new Subscription(); + private workgroupInViewById: any = {}; // whether the workgroup is in view or not + workgroups: any; + private workgroupsById: any = {}; + private workVisibilityById: any = {}; // whether student work is visible for each workgroup constructor( protected annotationService: AnnotationService, @@ -34,27 +42,12 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { protected configService: ConfigService, protected dataService: TeacherDataService, protected dialog: MatDialog, - protected milestoneService: MilestoneService, protected notificationService: NotificationService, - protected peerGroupService: TeacherPeerGroupService, protected projectService: TeacherProjectService - ) { - super( - annotationService, - classroomStatusService, - configService, - dataService, - dialog, - milestoneService, - notificationService, - peerGroupService, - projectService - ); - } + ) {} ngOnInit(): void { this.nodeId = this.milestone.nodeId; - this.node = this.projectService.getNode(this.nodeId); if (this.milestone.report.locations.length > 1) { this.firstNodeId = this.milestone.report.locations[0].nodeId; this.lastNodeId = @@ -66,8 +59,40 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { this.getNodePositions(); } + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + protected subscribeToEvents(): void { - super.subscribeToEvents(); + this.subscriptions.add( + this.notificationService.notificationChanged$.subscribe((notification) => { + if (notification.type === 'CRaterResult') { + // TODO: expand to encompass other notification types that should be shown to teacher + const workgroupId = notification.toWorkgroupId; + if (this.workgroupsById[workgroupId]) { + this.updateWorkgroup(workgroupId); + } + } + }) + ); + + this.subscriptions.add( + this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { + const workgroupId = annotation.toWorkgroupId; + if (annotation.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { + this.updateWorkgroup(workgroupId); + } + }) + ); + + this.subscriptions.add( + this.dataService.studentWorkReceived$.subscribe(({ studentWork }) => { + const workgroupId = studentWork.workgroupId; + if (studentWork.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { + this.updateWorkgroup(workgroupId); + } + }) + ); if (this.milestone.report.locations.length > 1) { this.subscriptions.add( this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { @@ -80,12 +105,114 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { } } + private workgroupHasNewAlert(alertNotifications: Notification[]): boolean { + for (const alert of alertNotifications) { + if (!alert.timeDismissed) { + return true; + } + } + return false; + } + + private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { + const completionStatus: CompletionStatus = { + isCompleted: false, + isVisible: false, + latestWorkTime: null, + latestAnnotationTime: null + }; + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); + if (studentStatus != null) { + const nodeStatus = studentStatus.nodeStatuses[this.nodeId]; + if (nodeStatus) { + completionStatus.isVisible = nodeStatus.isVisible; + // TODO: store this info in the nodeStatus so we don't have to calculate every time? + completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); + completionStatus.latestAnnotationTime = + this.getLatestAnnotationTimeByWorkgroupId(workgroupId); + if (!this.projectService.nodeHasWork(this.nodeId)) { + completionStatus.isCompleted = nodeStatus.isVisited; + } + if (completionStatus.latestWorkTime) { + completionStatus.isCompleted = nodeStatus.isCompleted; + } + } + } + return completionStatus; + } + + private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { + const componentStates = this.dataService.getComponentStatesByNodeId(this.nodeId); + for (const componentState of componentStates.reverse()) { + if (componentState.workgroupId === workgroupId) { + return componentState.serverSaveTime; + } + } + return null; + } + + private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { + const annotations = this.dataService.getAnnotationsByNodeId(this.nodeId); + for (const annotation of annotations.reverse()) { + // TODO: support checking for annotations from shared teachers + if ( + annotation.toWorkgroupId === workgroupId && + annotation.fromWorkgroupId === this.configService.getWorkgroupId() + ) { + return annotation.serverSaveTime; + } + } + return null; + } + + /** + * Returns a numerical status value for a given completion status object depending on node + * completion + * Available status values are: 0 (not visited/no work; default), 1 (partially completed), + * 2 (completed) + * @param completionStatus Object + * @returns Integer status value + */ + private getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { + // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use + // more widely)? + let status = 0; + if (!completionStatus.isVisible) { + status = -1; + } else if (completionStatus.isCompleted) { + status = 2; + } else if (completionStatus.latestWorkTime !== null) { + status = 1; + } + return status; + } + protected retrieveStudentData(): void { - const firstNode = this.projectService.getNode(this.firstNodeId); - super.retrieveStudentData(firstNode); + this.retrieveStudentDataForNode(this.projectService.getNode(this.firstNodeId)); if (this.milestone.report.locations.length > 1) { - const lastNode = this.projectService.getNode(this.lastNodeId); - super.retrieveStudentData(lastNode); + this.retrieveStudentDataForNode(this.projectService.getNode(this.lastNodeId)); + } + } + + private retrieveStudentDataForNode(node: Node): void { + this.dataService.retrieveStudentDataForNode(node).subscribe(() => { + this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( + (workgroup) => + workgroup.workgroupId != null && + this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) + ); + this.setWorkgroupsById(); + this.sortWorkgroups(); + document.body.scrollTop = document.documentElement.scrollTop = 0; + }); + } + + private setWorkgroupsById(): void { + for (const workgroup of this.workgroups) { + const workgroupId = workgroup.workgroupId; + this.workgroupsById[workgroupId] = workgroup; + this.workVisibilityById[workgroupId] = false; + this.updateWorkgroup(workgroupId, true); } } @@ -113,13 +240,22 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { return score; } - expandAll(): void { - super.expandAll(); + protected expandAll(): void { + for (const workgroup of this.workgroups) { + const workgroupId = workgroup.workgroupId; + if (this.workgroupInViewById[workgroupId]) { + this.workVisibilityById[workgroupId] = true; + } + } + this.isExpandAll = true; this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkExpandAllClicked'); } - collapseAll(): void { - super.collapseAll(); + protected collapseAll(): void { + for (const workgroup of this.workgroups) { + this.workVisibilityById[workgroup.workgroupId] = false; + } + this.isExpandAll = false; this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkCollapseAllClicked'); } @@ -133,14 +269,38 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); } - onUpdateExpand({ workgroupId, value }): void { - super.onUpdateExpand({ workgroupId: workgroupId, value: value }); + protected isWorkgroupShown(workgroup: any): boolean { + return this.dataService.isWorkgroupShown(workgroup); + } + + protected onUpdateExpand({ workgroupId, value }): void { + this.workVisibilityById[workgroupId] = value; this.saveMilestoneWorkgroupItemViewedEvent(workgroupId, value); } - updateWorkgroup(workgroupId: number, init = false): void { - super.updateWorkgroup(workgroupId, init); + /** + * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to + * hide student names because logged-in user does not have the right permissions + * @param workgroupID a workgroup ID number + * @param init Boolean whether we're in controller initialization or not + */ + protected updateWorkgroup(workgroupId: number, init = false): void { const workgroup = this.workgroupsById[workgroupId]; + const alertNotifications = this.notificationService.getAlertNotifications({ + nodeId: this.nodeId, + toWorkgroupId: workgroupId + }); + workgroup.hasAlert = alertNotifications.length > 0; + workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); + const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); + workgroup.isVisible = completionStatus.isVisible ? 1 : 0; + workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); + workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( + workgroupId, + this.nodeId + ); + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); + workgroup.nodeStatus = studentStatus.nodeStatuses[this.nodeId] || {}; workgroup.score = this.getScoreByWorkgroupId(workgroupId); if (this.milestone.report.locations.length > 1) { const firstLocation = this.milestone.report.locations[0]; @@ -179,9 +339,40 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); } + setSort(value: string): void { + if (this.sort === value) { + this.sort = `-${value}`; + } else { + this.sort = value; + } + this.dataService.nodeGradingSort = this.sort; + this.sortWorkgroups(); + } + protected sortWorkgroups(): void { - super.sortWorkgroups(); + this.sortedWorkgroups = []; + for (const workgroup of this.workgroups) { + this.sortedWorkgroups.push(workgroup); + } switch (this.sort) { + case 'team': + this.sortedWorkgroups.sort(this.sortTeamAscending); + break; + case '-team': + this.sortedWorkgroups.sort(this.sortTeamDescending); + break; + case 'status': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); + break; + case '-status': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); + break; + case 'score': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); + break; + case '-score': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); + break; case 'initialScore': this.sortedWorkgroups.sort(this.createSortAscendingFunction('initialScore')); break; @@ -196,4 +387,68 @@ export class MilestoneGradingViewComponent extends NodeGradingViewComponent { break; } } + + private createSortDescendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB[fieldName] - workgroupA[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + private createSortAscendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupA[fieldName] - workgroupB[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId ascending + */ + private sortTeamAscending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId descending + */ + private sortTeamDescending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupB.workgroupId - workgroupA.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + protected onIntersection( + workgroupId: number, + intersectionObserverEntries: IntersectionObserverEntry[] + ): void { + for (const entry of intersectionObserverEntries) { + this.workgroupInViewById[workgroupId] = entry.isIntersecting; + if (this.isExpandAll && entry.isIntersecting) { + this.workVisibilityById[workgroupId] = true; + } + } + } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html deleted file mode 100644 index c11b6d76e63..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html +++ /dev/null @@ -1,186 +0,0 @@ -
-
-
-
-

- {{ getNodeCompletion(nodeId) }}% - Completion -

-

- - {{ getNodeAverageScore() | number: '1.1' }} - - - N/A - - - - Mean Score -

-
-
- -
- - - - -
-
- - -
- - -
- - -
-
-
- - This step doesn't require any student work - -
- - -
- - - -
- -
- - - - - - -
- -
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.scss deleted file mode 100644 index 85c5f2b83e7..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.scss +++ /dev/null @@ -1,40 +0,0 @@ -.node-grading { - .content-head-label { - font-size: 50%; - } - - .user-list { - &.mat-mdc-list-base { - /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - .mat-mdc-list-item .mat-list-item-content { - padding: 0 8px; - } - - workgroup-item { - /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - .mat-mdc-list-item .mat-list-item-content { - padding: 0; - } - } - } - } - - workgroup-select-autocomplete { - width: 100%; - } - - .mat-mdc-list-base { - .mat-mdc-list-item.user-list-controls { - height: auto; - padding: 8px; - } - } - - .mdc-button__label { - width: 100%; - } - - .table--list__thead__link { - text-transform: none; - } -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.spec.ts deleted file mode 100644 index 843c2d47eef..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.spec.ts +++ /dev/null @@ -1,171 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ComponentSelectComponent } from '../../../../../../app/classroom-monitor/component-select/component-select.component'; -import { WorkgroupSelectAutocompleteComponent } from '../../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; -import { TeacherDataService } from '../../../../services/teacherDataService'; -import { TeacherProjectService } from '../../../../services/teacherProjectService'; -import { VLEProjectService } from '../../../../vle/vleProjectService'; -import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; -import { NodeGradingViewComponent } from './node-grading-view.component'; -import { ConfigService } from '../../../../services/configService'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { NodeGradingViewComponentTestHelper } from '../../nodeGrading/node-grading-view/node-grading-view.component.test.helper'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { of } from 'rxjs'; -import { ComponentTypeServiceModule } from '../../../../services/componentTypeService.module'; - -let component: NodeGradingViewComponent; -let fixture: ComponentFixture; -let testHelper: NodeGradingViewComponentTestHelper; - -describe('NodeGradingViewComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [NodeGradingViewComponent], - imports: [ - BrowserAnimationsModule, - ClassroomMonitorTestingModule, - ComponentSelectComponent, - ComponentTypeServiceModule, - WorkgroupSelectAutocompleteComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(NodeGradingViewComponent); - component = fixture.componentInstance; - spyOn(TestBed.inject(ConfigService), 'getClassmateUserInfos').and.returnValue([]); - spyOn(TestBed.inject(ConfigService), 'getPermissions').and.returnValue({ - canViewStudentNames: true, - canGradeStudentWork: true, - canAuthorProject: true - }); - spyOn(TestBed.inject(TeacherProjectService), 'getMaxScoreForNode').and.returnValue(5); - spyOn(TestBed.inject(TeacherProjectService), 'nodeHasWork').and.returnValue(true); - spyOn(TestBed.inject(VLEProjectService), 'getAchievements').and.returnValue({}); - spyOn(TestBed.inject(TeacherDataService), 'retrieveStudentDataForNode').and.returnValue(of([])); - spyOn(TestBed.inject(TeacherDataService), 'getCurrentPeriodId').and.returnValue(1); - spyOn(TestBed.inject(TeacherDataService), 'getCurrentPeriod').and.returnValue({ periodId: 1 }); - testHelper = new NodeGradingViewComponentTestHelper(); - initializeWorkgroups(component); - fixture.detectChanges(); - }); - - setSort(); -}); - -function initializeWorkgroups(component: NodeGradingViewComponent) { - component.workgroups = [ - createWorkgroupForTesting( - testHelper.statusCompleted, - testHelper.visible, - 1, - testHelper.workgroupId1 - ), - createWorkgroupForTesting( - testHelper.statusNoWork, - testHelper.visible, - 3, - testHelper.workgroupId2 - ), - createWorkgroupForTesting( - testHelper.statusPartiallyCompleted, - testHelper.visible, - 5, - testHelper.workgroupId3 - ), - createWorkgroupForTesting( - testHelper.statusCompleted, - testHelper.visible, - 3, - testHelper.workgroupId4 - ), - createWorkgroupForTesting( - testHelper.statusNoWork, - testHelper.notVisible, - null, - testHelper.workgroupId5 - ) - ]; -} - -function setSort() { - it('should sort by workgroup id ascending', () => { - component.setSort('team'); - component.setSort('team'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId1, - testHelper.workgroupId2, - testHelper.workgroupId3, - testHelper.workgroupId4, - testHelper.workgroupId5 - ]); - }); - it('should sort by workgroup id descending', () => { - component.setSort('team'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId4, - testHelper.workgroupId3, - testHelper.workgroupId2, - testHelper.workgroupId1, - testHelper.workgroupId5 - ]); - }); - it('should sort by completion status ascending', () => { - component.setSort('status'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId2, - testHelper.workgroupId3, - testHelper.workgroupId1, - testHelper.workgroupId4, - testHelper.workgroupId5 - ]); - }); - it('should sort by completion status descending', () => { - component.setSort('status'); - component.setSort('status'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId1, - testHelper.workgroupId4, - testHelper.workgroupId3, - testHelper.workgroupId2, - testHelper.workgroupId5 - ]); - }); - it('should sort by score ascending', () => { - component.setSort('score'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId1, - testHelper.workgroupId2, - testHelper.workgroupId4, - testHelper.workgroupId3, - testHelper.workgroupId5 - ]); - }); - it('should sort by score descending', () => { - component.setSort('score'); - component.setSort('score'); - testHelper.expectWorkgroupOrder(component.sortedWorkgroups, [ - testHelper.workgroupId3, - testHelper.workgroupId2, - testHelper.workgroupId4, - testHelper.workgroupId1, - testHelper.workgroupId5 - ]); - }); -} - -function createWorkgroupForTesting( - completionStatus: number, - isVisible: number, - score: number, - workgroupId: number -): any { - return { - completionStatus: completionStatus, - isVisible: isVisible, - score: score, - workgroupId: workgroupId - }; -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.ts deleted file mode 100644 index 20fa3957354..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.ts +++ /dev/null @@ -1,440 +0,0 @@ -import { Component, Input, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { Subscription, tap } from 'rxjs'; -import { Node } from '../../../../common/Node'; -import { AnnotationService } from '../../../../services/annotationService'; -import { ClassroomStatusService } from '../../../../services/classroomStatusService'; -import { ConfigService } from '../../../../services/configService'; -import { MilestoneService } from '../../../../services/milestoneService'; -import { NotificationService } from '../../../../services/notificationService'; -import { TeacherDataService } from '../../../../services/teacherDataService'; -import { TeacherPeerGroupService } from '../../../../services/teacherPeerGroupService'; -import { TeacherProjectService } from '../../../../services/teacherProjectService'; -import { Notification } from '../../../../../../app/domain/notification'; -import { CompletionStatus } from '../../shared/CompletionStatus'; -import { copy } from '../../../../common/object/object'; -import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; -import { MatDialog } from '@angular/material/dialog'; -import { MilestoneDetailsDialogComponent } from '../../milestones/milestone-details-dialog/milestone-details-dialog.component'; -import { Annotation } from '../../../../common/Annotation'; - -@Component({ - selector: 'node-grading-view', - templateUrl: './node-grading-view.component.html', - styleUrls: ['./node-grading-view.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class NodeGradingViewComponent implements OnInit { - canViewStudentNames: boolean; - hiddenComponents: any = []; - isExpandAll: boolean; - maxScore: any; - milestone: any; - milestoneReport: any; - node: Node; - nodeContent: any = null; - nodeHasWork: boolean; - @Input() nodeId: string; - numRubrics: number; - peerGroupingTags: string[]; - sort: any; - sortedWorkgroups: any[]; - subscriptions: Subscription = new Subscription(); - teacherWorkgroupId: number; - workgroupInViewById: any = {}; // whether the workgroup is in view or not - workgroups: any; - workgroupsById: any = {}; - workVisibilityById: any = {}; // whether student work is visible for each workgroup - - constructor( - protected annotationService: AnnotationService, - protected classroomStatusService: ClassroomStatusService, - protected configService: ConfigService, - protected dataService: TeacherDataService, - protected dialog: MatDialog, - protected milestoneService: MilestoneService, - protected notificationService: NotificationService, - protected peerGroupService: TeacherPeerGroupService, - protected projectService: TeacherProjectService - ) {} - - ngOnInit(): void { - this.setupNode(); - this.subscribeToEvents(); - } - - setupNode(): void { - this.maxScore = this.getMaxScore(); - this.node = this.projectService.getNode(this.nodeId); - this.nodeHasWork = this.projectService.nodeHasWork(this.nodeId); - this.sort = this.dataService.nodeGradingSort; - this.nodeContent = this.projectService.getNodeById(this.nodeId); - this.milestoneReport = this.milestoneService.getMilestoneReportByNodeId(this.nodeId); - this.peerGroupingTags = Array.from(this.peerGroupService.getPeerGroupingTags(this.node)); - this.retrieveStudentData(); - } - - ngOnDestroy(): void { - this.subscriptions.unsubscribe(); - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes.nodeId && !changes.nodeId.firstChange) { - this.nodeId = changes.nodeId.currentValue; - this.setupNode(); - } - } - - protected subscribeToEvents(): void { - this.subscriptions.add( - this.projectService.projectSaved$.subscribe(() => { - this.maxScore = this.getMaxScore(); - }) - ); - - this.subscriptions.add( - this.notificationService.notificationChanged$.subscribe((notification) => { - if (notification.type === 'CRaterResult') { - // TODO: expand to encompass other notification types that should be shown to teacher - const workgroupId = notification.toWorkgroupId; - if (this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - } - }) - ); - - this.subscriptions.add( - this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { - const workgroupId = annotation.toWorkgroupId; - if (annotation.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - }) - ); - - this.subscriptions.add( - this.dataService.studentWorkReceived$.subscribe(({ studentWork }) => { - const workgroupId = studentWork.workgroupId; - if (studentWork.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - }) - ); - - this.subscriptions.add( - this.dataService.currentPeriodChanged$.subscribe(() => { - this.milestoneReport = this.milestoneService.getMilestoneReportByNodeId(this.nodeId); - }) - ); - } - - protected retrieveStudentData(node: Node = this.node): void { - this.dataService.retrieveStudentDataForNode(node).subscribe(() => { - this.teacherWorkgroupId = this.configService.getWorkgroupId(); - this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( - (workgroup) => - workgroup.workgroupId != null && - this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) - ); - this.canViewStudentNames = this.configService.getPermissions().canViewStudentNames; - this.setWorkgroupsById(); - this.sortWorkgroups(); - this.numRubrics = node.getNumRubrics(); - document.body.scrollTop = document.documentElement.scrollTop = 0; - }); - } - - private getMaxScore(nodeId = this.nodeId): number { - return this.projectService.getMaxScoreForNode(nodeId); - } - - private setWorkgroupsById(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - this.workgroupsById[workgroupId] = workgroup; - this.workVisibilityById[workgroupId] = false; - this.updateWorkgroup(workgroupId, true); - } - } - - protected sortWorkgroups(): void { - this.sortedWorkgroups = []; - for (const workgroup of this.workgroups) { - this.sortedWorkgroups.push(workgroup); - } - switch (this.sort) { - case 'team': - this.sortedWorkgroups.sort(this.sortTeamAscending); - break; - case '-team': - this.sortedWorkgroups.sort(this.sortTeamDescending); - break; - case 'status': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); - break; - case '-status': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); - break; - case 'score': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); - break; - case '-score': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); - break; - } - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId ascending - */ - private sortTeamAscending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId descending - */ - private sortTeamDescending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupB.workgroupId - workgroupA.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - protected createSortAscendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupA[fieldName] - workgroupB[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - protected createSortDescendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB[fieldName] - workgroupA[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - /** - * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to - * hide student names because logged-in user does not have the right permissions - * @param workgroupID a workgroup ID number - * @param init Boolean whether we're in controller initialization or not - */ - protected updateWorkgroup(workgroupId: number, init = false): void { - const workgroup = this.workgroupsById[workgroupId]; - const alertNotifications = this.notificationService.getAlertNotifications({ - nodeId: this.nodeId, - toWorkgroupId: workgroupId - }); - workgroup.hasAlert = alertNotifications.length > 0; - workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); - const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); - workgroup.isVisible = completionStatus.isVisible ? 1 : 0; - workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); - workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( - workgroupId, - this.nodeId - ); - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - workgroup.nodeStatus = studentStatus.nodeStatuses[this.nodeId] || {}; - } - - private workgroupHasNewAlert(alertNotifications: Notification[]): boolean { - for (const alert of alertNotifications) { - if (!alert.timeDismissed) { - return true; - } - } - return false; - } - - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { - const completionStatus: CompletionStatus = { - isCompleted: false, - isVisible: false, - latestWorkTime: null, - latestAnnotationTime: null - }; - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - if (studentStatus != null) { - const nodeStatus = studentStatus.nodeStatuses[this.nodeId]; - if (nodeStatus) { - completionStatus.isVisible = nodeStatus.isVisible; - // TODO: store this info in the nodeStatus so we don't have to calculate every time? - completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); - completionStatus.latestAnnotationTime = - this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.projectService.nodeHasWork(this.nodeId)) { - completionStatus.isCompleted = nodeStatus.isVisited; - } - if (completionStatus.latestWorkTime) { - completionStatus.isCompleted = nodeStatus.isCompleted; - } - } - } - return completionStatus; - } - - private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { - const componentStates = this.dataService.getComponentStatesByNodeId(this.nodeId); - for (const componentState of componentStates.reverse()) { - if (componentState.workgroupId === workgroupId) { - return componentState.serverSaveTime; - } - } - return null; - } - - private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { - const annotations = this.dataService.getAnnotationsByNodeId(this.nodeId); - for (const annotation of annotations.reverse()) { - // TODO: support checking for annotations from shared teachers - if ( - annotation.toWorkgroupId === workgroupId && - annotation.fromWorkgroupId === this.configService.getWorkgroupId() - ) { - return annotation.serverSaveTime; - } - } - return null; - } - - /** - * Returns a numerical status value for a given completion status object depending on node - * completion - * Available status values are: 0 (not visited/no work; default), 1 (partially completed), - * 2 (completed) - * @param completionStatus Object - * @returns Integer status value - */ - private getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { - // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use - // more widely)? - let status = 0; - if (!completionStatus.isVisible) { - status = -1; - } else if (completionStatus.isCompleted) { - status = 2; - } else if (completionStatus.latestWorkTime !== null) { - status = 1; - } - return status; - } - - getNodeCompletion(nodeId: string): number { - return this.classroomStatusService.getNodeCompletion( - nodeId, - this.dataService.getCurrentPeriodId() - ).completionPct; - } - - getNodeAverageScore(): any { - const averageScore = this.classroomStatusService.getNodeAverageScore( - this.nodeId, - this.dataService.getCurrentPeriodId() - ); - if (averageScore === null) { - return 'N/A'; - } else { - return averageScore; - } - } - - isWorkgroupShown(workgroup: any): boolean { - return this.dataService.isWorkgroupShown(workgroup); - } - - protected showRubric(): void { - this.dialog.open(ShowNodeInfoDialogComponent, { - data: this.nodeId, - width: '90%' - }); - } - - setSort(value: string): void { - if (this.sort === value) { - this.sort = `-${value}`; - } else { - this.sort = value; - } - this.dataService.nodeGradingSort = this.sort; - this.sortWorkgroups(); - } - - expandAll(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - if (this.workgroupInViewById[workgroupId]) { - this.workVisibilityById[workgroupId] = true; - } - } - this.isExpandAll = true; - } - - collapseAll(): void { - for (const workgroup of this.workgroups) { - this.workVisibilityById[workgroup.workgroupId] = false; - } - this.isExpandAll = false; - } - - onUpdateExpand({ workgroupId, value }): void { - this.workVisibilityById[workgroupId] = value; - } - - onUpdateHiddenComponents(value: any): void { - this.hiddenComponents = copy(value); - } - - onIntersection( - workgroupId: number, - intersectionObserverEntries: IntersectionObserverEntry[] - ): void { - for (const entry of intersectionObserverEntries) { - this.workgroupInViewById[workgroupId] = entry.isIntersecting; - if (this.isExpandAll && entry.isIntersecting) { - this.workVisibilityById[workgroupId] = true; - } - } - } - - showReport(): void { - this.dialog.open(MilestoneDetailsDialogComponent, { - data: this.milestoneReport, - panelClass: 'dialog-lg' - }); - } - - showPeerGroupDetails(peerGroupingTag: string): void { - this.peerGroupService.showPeerGroupDetails(peerGroupingTag); - } - - trackWorkgroup(index: number, workgroup: any) { - return ( - `${workgroup.workgroupId}-${workgroup.completionStatus}-${workgroup.score}-` + - `${workgroup.hasAlert}-${workgroup.hasNewAlert}-${workgroup.isVisible}` - ); - } -} diff --git a/src/assets/wise5/services/milestoneService.ts b/src/assets/wise5/services/milestoneService.ts index 153d51d414b..214f08d6aa0 100644 --- a/src/assets/wise5/services/milestoneService.ts +++ b/src/assets/wise5/services/milestoneService.ts @@ -44,17 +44,6 @@ export class MilestoneService { return milestoneReport ? this.getProjectMilestoneStatus(milestoneReport.id) : null; } - // to be deleted when NodeGradingViewComponent is removed - getMilestoneReportByNodeId(nodeId: string): any { - for (const milestoneReport of this.getProjectMilestoneReports()) { - const referencedComponent = this.getReferencedComponent(milestoneReport); - if (referencedComponent.nodeId === nodeId) { - return this.getProjectMilestoneStatus(milestoneReport.id); - } - } - return null; - } - private getProjectMilestoneReports(): Milestone[] { return this.getProjectMilestones().filter((milestone) => milestone.type === 'milestoneReport'); } diff --git a/src/messages.xlf b/src/messages.xlf index 199baceb3d5..6a39219c6c0 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10820,10 +10820,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 90 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 156 - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 100 @@ -11197,10 +11193,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html 5 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 45 - Add Report Location @@ -13221,10 +13213,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html 14 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 82 - + Expand all @@ -13239,10 +13227,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html 24 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 92 - - Collapse all @@ -13261,10 +13245,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 47 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 114 - Team @@ -13280,10 +13260,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 50 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 117 - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 52 @@ -13295,10 +13271,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html 59 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 133 - Status @@ -13310,10 +13282,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 70 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 136 - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 81 @@ -13329,10 +13297,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 87 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 153 - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 97 @@ -13885,10 +13849,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 27 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 62 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 24 @@ -14060,92 +14020,34 @@ The branches will be removed but the steps will remain in the unit. 92 - - Completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 12 - + + Step Completion - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 13 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 6 N/A - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 24 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 13 - - Mean Score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 30 - - - - Peer Groups - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 56 - + + Step Mean Score - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html - 5 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 15 Info + Tips () - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 63 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 26 - - + Expand all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 87,89 - - - - - Collapse all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 97,99 - - - - This step doesn't require any student work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 103,105 - - - - Step Completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 6 - - - - Step Mean Score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 15 - - Question: @@ -14329,6 +14231,13 @@ The branches will be removed but the steps will remain in the unit. 33,35 + + Peer Groups + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html + 5 + + Groupings for @@ -15337,6 +15246,13 @@ Are you sure you want to proceed? 89 + + Completion + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 13 + + Total Score From c5daaa88ff66279f7029bca36f3f32fd4a7f386c Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 21 Feb 2025 16:49:24 -0800 Subject: [PATCH 023/127] Rewrite code using some() --- .../class-responses/class-responses.component.ts | 11 +---------- .../milestone-grading-view.component.ts | 12 +----------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index b6e32b2cc35..4df9c20282e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -107,7 +107,7 @@ export class ClassResponsesComponent { toWorkgroupId: workgroupId }); workgroup.hasAlert = alertNotifications.length > 0; - workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); + workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); const nodeCompletionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); workgroup.isVisible = nodeCompletionStatus.isVisible ? 1 : 0; workgroup.completionStatus = this.getWorkgroupCompletionStatus(nodeCompletionStatus); @@ -145,15 +145,6 @@ export class ClassResponsesComponent { } } - private workgroupHasNewAlert(alertNotifications: Notification[]): boolean { - for (const alert of alertNotifications) { - if (!alert.timeDismissed) { - return true; - } - } - return false; - } - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { const completionStatus: CompletionStatus = { isCompleted: false, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index 3488596dfc7..87456891019 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -105,15 +105,6 @@ export class MilestoneGradingViewComponent { } } - private workgroupHasNewAlert(alertNotifications: Notification[]): boolean { - for (const alert of alertNotifications) { - if (!alert.timeDismissed) { - return true; - } - } - return false; - } - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { const completionStatus: CompletionStatus = { isCompleted: false, @@ -126,7 +117,6 @@ export class MilestoneGradingViewComponent { const nodeStatus = studentStatus.nodeStatuses[this.nodeId]; if (nodeStatus) { completionStatus.isVisible = nodeStatus.isVisible; - // TODO: store this info in the nodeStatus so we don't have to calculate every time? completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); completionStatus.latestAnnotationTime = this.getLatestAnnotationTimeByWorkgroupId(workgroupId); @@ -291,7 +281,7 @@ export class MilestoneGradingViewComponent { toWorkgroupId: workgroupId }); workgroup.hasAlert = alertNotifications.length > 0; - workgroup.hasNewAlert = this.workgroupHasNewAlert(alertNotifications); + workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); workgroup.isVisible = completionStatus.isVisible ? 1 : 0; workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); From 0ac62dd0965b32fa95185321f30b75e599cf9c04 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 21 Feb 2025 16:58:56 -0800 Subject: [PATCH 024/127] Add protected modifiers. Remove unused code. Alpbahetize fields. --- .../class-responses.component.ts | 19 +++++++------------ .../milestone-grading-view.component.ts | 7 +++---- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index 4df9c20282e..f5a976e2b4d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -12,7 +12,6 @@ import { copy } from '../../../common/object/object'; import { ClassroomStatusService } from '../../../services/classroomStatusService'; import { AnnotationService } from '../../../services/annotationService'; import { NotificationService } from '../../../services/notificationService'; -import { Notification } from '../../../../../app/domain/notification'; import { CompletionStatus } from '../shared/CompletionStatus'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ComponentWorkgroupItemComponent } from '../component-workgroup-item/component-workgroup-item.component'; @@ -20,8 +19,6 @@ import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService'; @Component({ - selector: 'class-responses', - standalone: true, imports: [ CommonModule, ComponentWorkgroupItemComponent, @@ -32,6 +29,8 @@ import { ComponentServiceLookupService } from '../../../services/componentServic MatListModule, WorkgroupSelectAutocompleteComponent ], + selector: 'class-responses', + standalone: true, templateUrl: './class-responses.component.html' }) export class ClassResponsesComponent { @@ -45,8 +44,8 @@ export class ClassResponsesComponent { protected sort: string; protected sortedWorkgroups: any[] = []; private workgroups: any[] = []; - protected workgroupsById: any = {}; protected workgroupInViewById: any = {}; // whether the workgroup is in view or not + protected workgroupsById: any = {}; protected workVisibilityById: { [key: number]: boolean } = {}; constructor( @@ -287,19 +286,19 @@ export class ClassResponsesComponent { }; } - setSort(criteria: string): void { + protected setSort(criteria: string): void { this.sort = criteria; } - isWorkgroupShown(workgroup: any): boolean { + protected isWorkgroupShown(workgroup: any): boolean { return true; // implement actual logic } - onUpdateExpand({ workgroupId, value }): void { + protected onUpdateExpand({ workgroupId, value }): void { this.workVisibilityById[workgroupId] = value; } - onIntersection( + protected onIntersection( workgroupId: number, intersectionObserverEntries: IntersectionObserverEntry[] ): void { @@ -311,10 +310,6 @@ export class ClassResponsesComponent { } } - trackWorkgroup(index: number, workgroup: any): any { - return workgroup.workgroupId; - } - protected expandAll(): void { this.workgroups.forEach((workgroup) => { const workgroupId = workgroup.workgroupId; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index 87456891019..be398409971 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -3,7 +3,6 @@ import { copy } from '../../../../common/object/object'; import { Annotation } from '../../../../common/Annotation'; import { Node } from '../../../../common/Node'; import { CompletionStatus } from '../../shared/CompletionStatus'; -import { Notification } from '../../../../../../app/domain/notification'; import { Subscription } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { AnnotationService } from '../../../../services/annotationService'; @@ -14,10 +13,10 @@ import { TeacherDataService } from '../../../../services/teacherDataService'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; @Component({ + encapsulation: ViewEncapsulation.None, selector: 'milestone-grading-view', - templateUrl: './milestone-grading-view.component.html', - styleUrls: ['./milestone-grading-view.component.scss'], - encapsulation: ViewEncapsulation.None + styleUrl: './milestone-grading-view.component.scss', + templateUrl: './milestone-grading-view.component.html' }) export class MilestoneGradingViewComponent { private componentId: string; From f58150d990e905ab58e79f5be44baa0de19ce99a Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 24 Feb 2025 08:32:44 -0800 Subject: [PATCH 025/127] Add sorting on fields. Clean up template using @if --- .../class-responses.component.html | 45 ++++++++++--------- .../class-responses.component.ts | 10 ++++- src/messages.xlf | 8 ++-- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html index 4e7b5d83242..29563b398fe 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html @@ -41,13 +41,14 @@ i18n-aria-label > Team - - arrow_drop_up - + @if (sort === 'team' || sort === '-team') { + + arrow_drop_up + + }
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index f5a976e2b4d..f37dc95c503 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -287,11 +287,17 @@ export class ClassResponsesComponent { } protected setSort(criteria: string): void { - this.sort = criteria; + if (this.sort === criteria) { + this.sort = `-${criteria}`; + } else { + this.sort = criteria; + } + this.dataService.nodeGradingSort = this.sort; + this.sortWorkgroups(); } protected isWorkgroupShown(workgroup: any): boolean { - return true; // implement actual logic + return this.dataService.isWorkgroupShown(workgroup); } protected onUpdateExpand({ workgroupId, value }): void { diff --git a/src/messages.xlf b/src/messages.xlf index 6a39219c6c0..8bbcbc3b800 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10814,7 +10814,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html - 81 + 83 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html @@ -13269,14 +13269,14 @@ The branches will be removed but the steps will remain in the unit. Sorty by completion src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html - 59 + 60 Status src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html - 62 + 63 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html @@ -13291,7 +13291,7 @@ The branches will be removed but the steps will remain in the unit. Sort by score src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html - 78 + 80 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html From f9a18c8ac7156f4a8f4c925a4a5d3d3f3e6dcacb Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 08:29:49 -0800 Subject: [PATCH 026/127] Remove ComponentSelectComponent and ability to hide components using hiddenComponents since we no longer use it --- .../component-select.component.html | 23 ------- .../component-select.component.scss | 28 -------- .../component-select.component.ts | 64 ------------------- src/app/teacher/classroom-monitor.module.ts | 2 - .../class-responses.component.ts | 1 - .../workgroup-item.component.html | 2 +- .../workgroup-item.component.ts | 5 -- .../node-progress-view.component.spec.ts | 9 +-- src/messages.xlf | 37 ++--------- 9 files changed, 8 insertions(+), 163 deletions(-) delete mode 100644 src/app/classroom-monitor/component-select/component-select.component.html delete mode 100644 src/app/classroom-monitor/component-select/component-select.component.scss delete mode 100644 src/app/classroom-monitor/component-select/component-select.component.ts diff --git a/src/app/classroom-monitor/component-select/component-select.component.html b/src/app/classroom-monitor/component-select/component-select.component.html deleted file mode 100644 index 858342d923d..00000000000 --- a/src/app/classroom-monitor/component-select/component-select.component.html +++ /dev/null @@ -1,23 +0,0 @@ -@if (components.length == 1) { - -} @else if (components.length > 1) { - - - {{ getSelectedText() }} - - @for (component of components; track component.id; let i = $index) { - - {{ i + 1 }}: {{ getComponentTypeLabel(component.type) }} - - } - - - -} diff --git a/src/app/classroom-monitor/component-select/component-select.component.scss b/src/app/classroom-monitor/component-select/component-select.component.scss deleted file mode 100644 index 3c01019b1bb..00000000000 --- a/src/app/classroom-monitor/component-select/component-select.component.scss +++ /dev/null @@ -1,28 +0,0 @@ -@use '@angular/material' as mat; -@import 'style/base/typography'; - -.component-select { - .mdc-line-ripple { - &:before, &:after { - display: none; - } - } - - .mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { - padding-top: 6px; - padding-bottom: 6px; - min-height: 28px; - } - - .mat-mdc-form-field-flex { - height: 36px; - } - - .mat-mdc-select-value-text, .mat-mdc-select-placeholder { - font-size: mat.m2-font-size($wise-typography, 'caption'); - } - - .mat-mdc-form-field-subscript-wrapper { - display: none; - } -} diff --git a/src/app/classroom-monitor/component-select/component-select.component.ts b/src/app/classroom-monitor/component-select/component-select.component.ts deleted file mode 100644 index 6faa3e50e2d..00000000000 --- a/src/app/classroom-monitor/component-select/component-select.component.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { - Component, - EventEmitter, - Input, - Output, - SimpleChanges, - ViewEncapsulation -} from '@angular/core'; -import { ComponentTypeService } from '../../../assets/wise5/services/componentTypeService'; -import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonModule } from '@angular/material/button'; - -@Component({ - encapsulation: ViewEncapsulation.None, - imports: [CommonModule, FormsModule, MatButtonModule, MatFormFieldModule, MatSelectModule], - selector: 'component-select', - standalone: true, - styleUrl: 'component-select.component.scss', - templateUrl: 'component-select.component.html' -}) -export class ComponentSelectComponent { - protected components: any[]; - @Output() modelChange: EventEmitter = new EventEmitter(); - @Input() nodeId: string; - protected selectedComponents: any[]; - - constructor( - private componentTypeService: ComponentTypeService, - private projectService: TeacherProjectService - ) {} - - ngOnChanges(changes: SimpleChanges): void { - this.nodeId = changes.nodeId.currentValue; - this.components = this.projectService.getComponents(this.nodeId).filter((component) => { - return this.projectService.componentHasWork(component); - }); - this.selectedComponents = this.components.map((component) => { - return component.id; - }); - } - - protected getComponentTypeLabel(componentType: string): string { - return this.componentTypeService.getComponentTypeLabel(componentType); - } - - protected getSelectedText(): string { - return $localize`Showing ${this.selectedComponents.length}/${this.components.length} items`; - } - - protected selectedComponentsChange(): void { - const hiddenComponents = []; - for (const component of this.components) { - const id = component.id; - if (this.selectedComponents.indexOf(id) < 0) { - hiddenComponents.push(id); - } - } - this.modelChange.emit(hiddenComponents); - } -} diff --git a/src/app/teacher/classroom-monitor.module.ts b/src/app/teacher/classroom-monitor.module.ts index cc27ee566a8..567df6eee76 100644 --- a/src/app/teacher/classroom-monitor.module.ts +++ b/src/app/teacher/classroom-monitor.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { ComponentNewWorkBadgeComponent } from '../classroom-monitor/component-new-work-badge/component-new-work-badge.component'; -import { ComponentSelectComponent } from '../classroom-monitor/component-select/component-select.component'; import { PeerGroupGradingModule } from './peer-group-grading.module'; import { TeacherSummaryDisplayComponent } from '../../assets/wise5/directives/teacher-summary-display/teacher-summary-display.component'; import { HighchartsChartModule } from 'highcharts-angular'; @@ -38,7 +37,6 @@ import { GradingNodeService } from '../../assets/wise5/services/gradingNodeServi ClassroomMonitorComponent, ComponentGradingComponent, ComponentNewWorkBadgeComponent, - ComponentSelectComponent, ComponentStudentModule, DataExportModule, GradingCommonModule, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index f37dc95c503..a91ae41ddb4 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -36,7 +36,6 @@ import { ComponentServiceLookupService } from '../../../services/componentServic export class ClassResponsesComponent { protected canViewStudentNames: boolean; @Input() component: any; - protected hiddenComponents: any[] = []; protected isExpandAll: boolean; protected maxScore: number; @Input() node: Node; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html index 83ce3813a4f..64aa0210edc 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html @@ -41,7 +41,7 @@ id="component_{{ component.id }}_{{ workgroupId }}" class="component component--grading" > -
+

{{ i + 1 + '. ' + getComponentTypeLabel(component.type) }}  { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [NodeProgressViewComponent], - imports: [ - ClassroomMonitorTestingModule, - ComponentSelectComponent, - FlexLayoutModule, - MatIconModule, - MatListModule - ], + imports: [ClassroomMonitorTestingModule, FlexLayoutModule, MatIconModule, MatListModule], providers: [ { provide: MilestoneService, diff --git a/src/messages.xlf b/src/messages.xlf index 8bbcbc3b800..77c6d977868 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -1750,31 +1750,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.14 - - Assessment items to show - - src/app/classroom-monitor/component-select/component-select.component.html - 2 - - - src/app/classroom-monitor/component-select/component-select.component.html - 14 - - - - 1 assessment item - - src/app/classroom-monitor/component-select/component-select.component.html - 2,4 - - - - Showing / items - - src/app/classroom-monitor/component-select/component-select.component.ts - 51 - - / teams completed @@ -13333,7 +13308,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 105 + 100 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts @@ -13352,7 +13327,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 110 + 105 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts @@ -13371,7 +13346,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 117 + 112 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts @@ -13401,7 +13376,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 122 + 117 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts @@ -14066,7 +14041,7 @@ The branches will be removed but the steps will remain in the unit. Visited src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 112 + 107 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts @@ -14077,7 +14052,7 @@ The branches will be removed but the steps will remain in the unit. Not Visited src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 124 + 119 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts From 38e6412d15a2691a93613e4636f7e5d6e4a9de16 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 08:38:48 -0800 Subject: [PATCH 027/127] Remove unused variables --- .../class-responses/class-responses.component.html | 1 - .../class-responses/class-responses.component.ts | 5 ----- .../component-workgroup-item.component.ts | 2 +- .../milestone-grading-view.component.ts | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html index 29563b398fe..3011a0dfe1d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html @@ -99,7 +99,6 @@ [expanded]="workVisibilityById[workgroup.workgroupId]" [hasAlert]="workgroup.hasAlert" [hasNewAlert]="workgroup.hasNewAlert" - [maxScore]="maxScore" [nodeId]="node.id" [componentId]="component.id" [score]="workgroup.score" diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index a91ae41ddb4..cb255a5ade3 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -34,12 +34,9 @@ import { ComponentServiceLookupService } from '../../../services/componentServic templateUrl: './class-responses.component.html' }) export class ClassResponsesComponent { - protected canViewStudentNames: boolean; @Input() component: any; protected isExpandAll: boolean; - protected maxScore: number; @Input() node: Node; - protected numRubrics: number; protected sort: string; protected sortedWorkgroups: any[] = []; private workgroups: any[] = []; @@ -75,10 +72,8 @@ export class ClassResponsesComponent { workgroup.workgroupId != null && this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) ); - this.canViewStudentNames = this.configService.getPermissions().canViewStudentNames; this.setWorkgroupsById(); this.sortWorkgroups(); - this.numRubrics = node.getNumRubrics(); document.body.scrollTop = document.documentElement.scrollTop = 0; }); } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts index 29849e9ba36..8e0c5e0b402 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts @@ -33,7 +33,7 @@ export class ComponentWorkgroupItemComponent { @Input() expanded: boolean; @Input() hasAlert: boolean; @Input() hasNewAlert: boolean; - @Input() maxScore: number; + protected maxScore: number; @Input() nodeId: string; @Output() onUpdateExpand: EventEmitter = new EventEmitter(); @Input() score: number | '-'; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index be398409971..723b93a64d4 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -4,7 +4,6 @@ import { Annotation } from '../../../../common/Annotation'; import { Node } from '../../../../common/Node'; import { CompletionStatus } from '../../shared/CompletionStatus'; import { Subscription } from 'rxjs'; -import { MatDialog } from '@angular/material/dialog'; import { AnnotationService } from '../../../../services/annotationService'; import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { ConfigService } from '../../../../services/configService'; @@ -40,7 +39,6 @@ export class MilestoneGradingViewComponent { protected classroomStatusService: ClassroomStatusService, protected configService: ConfigService, protected dataService: TeacherDataService, - protected dialog: MatDialog, protected notificationService: NotificationService, protected projectService: TeacherProjectService ) {} From 60defd2017384564728ecab47d7a8882456674ff Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 12:14:43 -0800 Subject: [PATCH 028/127] Extract common code to AbstractClassResponsesComponent --- .../AbstractClassResponseComponent.ts | 177 +++++++++++++++++ .../class-responses.component.ts | 181 ++---------------- .../milestone-grading-view.component.ts | 179 +---------------- 3 files changed, 203 insertions(+), 334 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts new file mode 100644 index 00000000000..916e56c1d6e --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -0,0 +1,177 @@ +import { Directive } from '@angular/core'; +import { AnnotationService } from '../../services/annotationService'; +import { ClassroomStatusService } from '../../services/classroomStatusService'; +import { ConfigService } from '../../services/configService'; +import { NotificationService } from '../../services/notificationService'; +import { TeacherDataService } from '../../services/teacherDataService'; +import { TeacherProjectService } from '../../services/teacherProjectService'; +import { Node } from '../../common/Node'; +import { copy } from '../../common/object/object'; +import { CompletionStatus } from './shared/CompletionStatus'; + +@Directive() +export abstract class AbstractClassResponsesComponent { + protected isExpandAll: boolean; + protected sort: string; + sortedWorkgroups: any[] = []; + workgroups: any[] = []; + protected workgroupInViewById: any = {}; // whether the workgroup is in view or not + protected workgroupsById: any = {}; + protected workVisibilityById: { [key: number]: boolean } = {}; + + constructor( + protected annotationService: AnnotationService, + protected classroomStatusService: ClassroomStatusService, + protected configService: ConfigService, + protected dataService: TeacherDataService, + protected notificationService: NotificationService, + protected projectService: TeacherProjectService + ) {} + + protected retrieveStudentData(node: Node): void { + this.dataService.retrieveStudentDataForNode(node).subscribe(() => { + this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( + (workgroup) => + workgroup.workgroupId != null && + this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) + ); + this.setWorkgroupsById(); + this.sortWorkgroups(); + document.body.scrollTop = document.documentElement.scrollTop = 0; + }); + } + + protected setWorkgroupsById(): void { + for (const workgroup of this.workgroups) { + const workgroupId = workgroup.workgroupId; + this.workgroupsById[workgroupId] = workgroup; + this.workVisibilityById[workgroupId] = false; + this.updateWorkgroup(workgroupId, true); + } + } + + protected abstract updateWorkgroup(workgroupId: number, init: boolean): void; + + protected sortWorkgroups(): void { + this.sortedWorkgroups = []; + for (const workgroup of this.workgroups) { + this.sortedWorkgroups.push(workgroup); + } + switch (this.sort) { + case 'team': + this.sortedWorkgroups.sort(this.sortTeamAscending); + break; + case '-team': + this.sortedWorkgroups.sort(this.sortTeamDescending); + break; + case 'status': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); + break; + case '-status': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); + break; + case 'score': + this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); + break; + case '-score': + this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); + break; + } + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId ascending + */ + private sortTeamAscending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + /** + * Sort using this order hierarchy + * isVisible descending, workgroupId descending + */ + private sortTeamDescending(workgroupA: any, workgroupB: any): number { + if (workgroupA.isVisible === workgroupB.isVisible) { + return workgroupB.workgroupId - workgroupA.workgroupId; + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + } + + protected createSortAscendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupA[fieldName] - workgroupB[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + protected createSortDescendingFunction(fieldName: string): any { + return (workgroupA: any, workgroupB: any) => { + if (workgroupA.isVisible === workgroupB.isVisible) { + if (workgroupA[fieldName] === workgroupB[fieldName]) { + return workgroupA.workgroupId - workgroupB.workgroupId; + } else { + return workgroupB[fieldName] - workgroupA[fieldName]; + } + } else { + return workgroupB.isVisible - workgroupA.isVisible; + } + }; + } + + setSort(criteria: string): void { + if (this.sort === criteria) { + this.sort = `-${criteria}`; + } else { + this.sort = criteria; + } + this.dataService.nodeGradingSort = this.sort; + this.sortWorkgroups(); + } + + /** + * Returns a numerical status value for a given completion status object depending on node + * completion + * Available status values are: 0 (not visited/no work; default), 1 (partially completed), + * 2 (completed) + * @param completionStatus Object + * @returns Integer status value + */ + protected getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { + // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use + // more widely)? + let status = 0; + if (!completionStatus.isVisible) { + status = -1; + } else if (completionStatus.isCompleted) { + status = 2; + } else if (completionStatus.latestWorkTime !== null) { + status = 1; + } + return status; + } + + protected onIntersection( + workgroupId: number, + intersectionObserverEntries: IntersectionObserverEntry[] + ): void { + for (const entry of intersectionObserverEntries) { + this.workgroupInViewById[workgroupId] = entry.isIntersecting; + if (this.isExpandAll && entry.isIntersecting) { + this.workVisibilityById[workgroupId] = true; + } + } + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index cb255a5ade3..d6a475fe45a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -8,7 +8,6 @@ import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classro import { TeacherDataService } from '../../../services/teacherDataService'; import { Node } from '../../../common/Node'; import { ConfigService } from '../../../services/configService'; -import { copy } from '../../../common/object/object'; import { ClassroomStatusService } from '../../../services/classroomStatusService'; import { AnnotationService } from '../../../services/annotationService'; import { NotificationService } from '../../../services/notificationService'; @@ -17,6 +16,7 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ComponentWorkgroupItemComponent } from '../component-workgroup-item/component-workgroup-item.component'; import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService'; +import { AbstractClassResponsesComponent } from '../AbstractClassResponseComponent'; @Component({ imports: [ @@ -33,29 +33,31 @@ import { ComponentServiceLookupService } from '../../../services/componentServic standalone: true, templateUrl: './class-responses.component.html' }) -export class ClassResponsesComponent { +export class ClassResponsesComponent extends AbstractClassResponsesComponent { @Input() component: any; - protected isExpandAll: boolean; @Input() node: Node; - protected sort: string; - protected sortedWorkgroups: any[] = []; - private workgroups: any[] = []; - protected workgroupInViewById: any = {}; // whether the workgroup is in view or not - protected workgroupsById: any = {}; - protected workVisibilityById: { [key: number]: boolean } = {}; constructor( - private annotationService: AnnotationService, - private classroomStatusService: ClassroomStatusService, + protected annotationService: AnnotationService, + protected classroomStatusService: ClassroomStatusService, private componentServiceLookupService: ComponentServiceLookupService, - private configService: ConfigService, - private dataService: TeacherDataService, - private notificationService: NotificationService, - private projectService: TeacherProjectService - ) {} + protected configService: ConfigService, + protected dataService: TeacherDataService, + protected notificationService: NotificationService, + protected projectService: TeacherProjectService + ) { + super( + annotationService, + classroomStatusService, + configService, + dataService, + notificationService, + projectService + ); + } ngOnInit(): void { - this.retrieveStudentData(); + this.retrieveStudentData(this.node); } ngOnChanges(changes: SimpleChanges): void { @@ -65,28 +67,6 @@ export class ClassResponsesComponent { } } - protected retrieveStudentData(node: Node = this.node): void { - this.dataService.retrieveStudentDataForNode(node).subscribe(() => { - this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( - (workgroup) => - workgroup.workgroupId != null && - this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) - ); - this.setWorkgroupsById(); - this.sortWorkgroups(); - document.body.scrollTop = document.documentElement.scrollTop = 0; - }); - } - - private setWorkgroupsById(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - this.workgroupsById[workgroupId] = workgroup; - this.workVisibilityById[workgroupId] = false; - this.updateWorkgroup(workgroupId, true); - } - } - /** * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to * hide student names because logged-in user does not have the right permissions @@ -111,33 +91,6 @@ export class ClassResponsesComponent { workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; } - protected sortWorkgroups(): void { - this.sortedWorkgroups = []; - for (const workgroup of this.workgroups) { - this.sortedWorkgroups.push(workgroup); - } - switch (this.sort) { - case 'team': - this.sortedWorkgroups.sort(this.sortTeamAscending); - break; - case '-team': - this.sortedWorkgroups.sort(this.sortTeamDescending); - break; - case 'status': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); - break; - case '-status': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); - break; - case 'score': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); - break; - case '-score': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); - break; - } - } - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { const completionStatus: CompletionStatus = { isCompleted: false, @@ -206,90 +159,6 @@ export class ClassResponsesComponent { ); } - /** - * Returns a numerical status value for a given completion status object depending on node - * completion - * Available status values are: 0 (not visited/no work; default), 1 (partially completed), - * 2 (completed) - * @param completionStatus Object - * @returns Integer status value - */ - private getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { - // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use - // more widely)? - let status = 0; - if (!completionStatus.isVisible) { - status = -1; - } else if (completionStatus.isCompleted) { - status = 2; - } else if (completionStatus.latestWorkTime !== null) { - status = 1; - } - return status; - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId ascending - */ - private sortTeamAscending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId descending - */ - private sortTeamDescending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupB.workgroupId - workgroupA.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - protected createSortAscendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupA[fieldName] - workgroupB[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - protected createSortDescendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB[fieldName] - workgroupA[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - protected setSort(criteria: string): void { - if (this.sort === criteria) { - this.sort = `-${criteria}`; - } else { - this.sort = criteria; - } - this.dataService.nodeGradingSort = this.sort; - this.sortWorkgroups(); - } - protected isWorkgroupShown(workgroup: any): boolean { return this.dataService.isWorkgroupShown(workgroup); } @@ -298,18 +167,6 @@ export class ClassResponsesComponent { this.workVisibilityById[workgroupId] = value; } - protected onIntersection( - workgroupId: number, - intersectionObserverEntries: IntersectionObserverEntry[] - ): void { - for (const entry of intersectionObserverEntries) { - this.workgroupInViewById[workgroupId] = entry.isIntersecting; - if (this.isExpandAll && entry.isIntersecting) { - this.workVisibilityById[workgroupId] = true; - } - } - } - protected expandAll(): void { this.workgroups.forEach((workgroup) => { const workgroupId = workgroup.workgroupId; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index 723b93a64d4..c8d94356b69 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -1,15 +1,9 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { copy } from '../../../../common/object/object'; import { Annotation } from '../../../../common/Annotation'; -import { Node } from '../../../../common/Node'; import { CompletionStatus } from '../../shared/CompletionStatus'; import { Subscription } from 'rxjs'; -import { AnnotationService } from '../../../../services/annotationService'; -import { ClassroomStatusService } from '../../../../services/classroomStatusService'; -import { ConfigService } from '../../../../services/configService'; -import { NotificationService } from '../../../../services/notificationService'; -import { TeacherDataService } from '../../../../services/teacherDataService'; -import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { AbstractClassResponsesComponent } from '../../AbstractClassResponseComponent'; @Component({ encapsulation: ViewEncapsulation.None, @@ -17,31 +11,15 @@ import { TeacherProjectService } from '../../../../services/teacherProjectServic styleUrl: './milestone-grading-view.component.scss', templateUrl: './milestone-grading-view.component.html' }) -export class MilestoneGradingViewComponent { +export class MilestoneGradingViewComponent extends AbstractClassResponsesComponent { private componentId: string; private firstNodeId: string; protected firstNodePosition: string; - protected isExpandAll: boolean; private lastNodeId: string; protected lastNodePosition: string; @Input() milestone: any; private nodeId: string; - protected sort: string; - sortedWorkgroups: any[]; private subscriptions: Subscription = new Subscription(); - private workgroupInViewById: any = {}; // whether the workgroup is in view or not - workgroups: any; - private workgroupsById: any = {}; - private workVisibilityById: any = {}; // whether student work is visible for each workgroup - - constructor( - protected annotationService: AnnotationService, - protected classroomStatusService: ClassroomStatusService, - protected configService: ConfigService, - protected dataService: TeacherDataService, - protected notificationService: NotificationService, - protected projectService: TeacherProjectService - ) {} ngOnInit(): void { this.nodeId = this.milestone.nodeId; @@ -51,7 +29,10 @@ export class MilestoneGradingViewComponent { this.milestone.report.locations[this.milestone.report.locations.length - 1].nodeId; } this.componentId = this.milestone.componentId; - this.retrieveStudentData(); + this.retrieveStudentData(this.projectService.getNode(this.firstNodeId)); + if (this.milestone.report.locations.length > 1) { + this.retrieveStudentData(this.projectService.getNode(this.lastNodeId)); + } this.subscribeToEvents(); this.getNodePositions(); } @@ -152,57 +133,6 @@ export class MilestoneGradingViewComponent { return null; } - /** - * Returns a numerical status value for a given completion status object depending on node - * completion - * Available status values are: 0 (not visited/no work; default), 1 (partially completed), - * 2 (completed) - * @param completionStatus Object - * @returns Integer status value - */ - private getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { - // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use - // more widely)? - let status = 0; - if (!completionStatus.isVisible) { - status = -1; - } else if (completionStatus.isCompleted) { - status = 2; - } else if (completionStatus.latestWorkTime !== null) { - status = 1; - } - return status; - } - - protected retrieveStudentData(): void { - this.retrieveStudentDataForNode(this.projectService.getNode(this.firstNodeId)); - if (this.milestone.report.locations.length > 1) { - this.retrieveStudentDataForNode(this.projectService.getNode(this.lastNodeId)); - } - } - - private retrieveStudentDataForNode(node: Node): void { - this.dataService.retrieveStudentDataForNode(node).subscribe(() => { - this.workgroups = copy(this.configService.getClassmateUserInfos()).filter( - (workgroup) => - workgroup.workgroupId != null && - this.classroomStatusService.hasStudentStatus(workgroup.workgroupId) - ); - this.setWorkgroupsById(); - this.sortWorkgroups(); - document.body.scrollTop = document.documentElement.scrollTop = 0; - }); - } - - private setWorkgroupsById(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - this.workgroupsById[workgroupId] = workgroup; - this.workVisibilityById[workgroupId] = false; - this.updateWorkgroup(workgroupId, true); - } - } - private getNodePositions(): void { if (this.milestone.report.locations.length > 1) { this.firstNodePosition = this.projectService.getNodePositionById(this.firstNodeId); @@ -326,40 +256,9 @@ export class MilestoneGradingViewComponent { this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); } - setSort(value: string): void { - if (this.sort === value) { - this.sort = `-${value}`; - } else { - this.sort = value; - } - this.dataService.nodeGradingSort = this.sort; - this.sortWorkgroups(); - } - protected sortWorkgroups(): void { - this.sortedWorkgroups = []; - for (const workgroup of this.workgroups) { - this.sortedWorkgroups.push(workgroup); - } + super.sortWorkgroups(); switch (this.sort) { - case 'team': - this.sortedWorkgroups.sort(this.sortTeamAscending); - break; - case '-team': - this.sortedWorkgroups.sort(this.sortTeamDescending); - break; - case 'status': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); - break; - case '-status': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); - break; - case 'score': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); - break; - case '-score': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); - break; case 'initialScore': this.sortedWorkgroups.sort(this.createSortAscendingFunction('initialScore')); break; @@ -374,68 +273,4 @@ export class MilestoneGradingViewComponent { break; } } - - private createSortDescendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB[fieldName] - workgroupA[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - private createSortAscendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupA[fieldName] - workgroupB[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId ascending - */ - private sortTeamAscending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId descending - */ - private sortTeamDescending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupB.workgroupId - workgroupA.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - } - - protected onIntersection( - workgroupId: number, - intersectionObserverEntries: IntersectionObserverEntry[] - ): void { - for (const entry of intersectionObserverEntries) { - this.workgroupInViewById[workgroupId] = entry.isIntersecting; - if (this.isExpandAll && entry.isIntersecting) { - this.workVisibilityById[workgroupId] = true; - } - } - } } From a54b0d88b20974f70842820433e4c66d798b3029 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 14:59:54 -0800 Subject: [PATCH 029/127] Extract collapseAll, expandAll, isWorkgroupShown and onUpdateExpand to parent --- .../AbstractClassResponseComponent.ts | 25 +++++++++ .../class-responses.component.ts | 25 --------- .../milestone-grading-view.component.ts | 53 +++++-------------- 3 files changed, 39 insertions(+), 64 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 916e56c1d6e..8be1671cbd6 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -174,4 +174,29 @@ export abstract class AbstractClassResponsesComponent { } } } + + protected onUpdateExpand({ workgroupId, value }): void { + this.workVisibilityById[workgroupId] = value; + } + + protected isWorkgroupShown(workgroup: any): boolean { + return this.dataService.isWorkgroupShown(workgroup); + } + + protected collapseAll(): void { + this.workgroups.forEach( + (workgroup) => (this.workVisibilityById[workgroup.workgroupId] = false) + ); + this.isExpandAll = false; + } + + protected expandAll(): void { + this.workgroups.forEach((workgroup) => { + const workgroupId = workgroup.workgroupId; + if (this.workgroupInViewById[workgroupId]) { + this.workVisibilityById[workgroupId] = true; + } + }); + this.isExpandAll = true; + } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index c6261e0d21b..d36b6207fa1 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -157,29 +157,4 @@ export class ClassResponsesComponent extends AbstractClassResponsesComponent { this.node ); } - - protected isWorkgroupShown(workgroup: any): boolean { - return this.dataService.isWorkgroupShown(workgroup); - } - - protected onUpdateExpand({ workgroupId, value }): void { - this.workVisibilityById[workgroupId] = value; - } - - protected expandAll(): void { - this.workgroups.forEach((workgroup) => { - const workgroupId = workgroup.workgroupId; - if (this.workgroupInViewById[workgroupId]) { - this.workVisibilityById[workgroupId] = true; - } - }); - this.isExpandAll = true; - } - - protected collapseAll(): void { - this.workgroups.forEach( - (workgroup) => (this.workVisibilityById[workgroup.workgroupId] = false) - ); - this.isExpandAll = false; - } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index 564bbd1013e..d1c31a62072 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -159,43 +159,34 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone } protected expandAll(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - if (this.workgroupInViewById[workgroupId]) { - this.workVisibilityById[workgroupId] = true; - } - } - this.isExpandAll = true; + super.expandAll(); this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkExpandAllClicked'); } protected collapseAll(): void { - for (const workgroup of this.workgroups) { - this.workVisibilityById[workgroup.workgroupId] = false; - } - this.isExpandAll = false; + super.collapseAll(); this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkCollapseAllClicked'); } private saveMilestoneStudentWorkExpandCollapseAllEvent(event: any): void { - const context = 'ClassroomMonitor', - nodeId = null, - componentId = null, - componentType = null, - category = 'Navigation', - data = { milestoneId: this.milestone.id }; - this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); - } - - protected isWorkgroupShown(workgroup: any): boolean { - return this.dataService.isWorkgroupShown(workgroup); + this.dataService.saveEvent('ClassroomMonitor', null, null, null, 'Navigation', event, { + milestoneId: this.milestone.id + }); } protected onUpdateExpand({ workgroupId, value }): void { - this.workVisibilityById[workgroupId] = value; + super.onUpdateExpand({ workgroupId, value }); this.saveMilestoneWorkgroupItemViewedEvent(workgroupId, value); } + private saveMilestoneWorkgroupItemViewedEvent(workgroupId: number, isExpanded: boolean): void { + const event = isExpanded ? 'MilestoneStudentWorkOpened' : 'MilestoneStudentWorkClosed'; + this.dataService.saveEvent('ClassroomMonitor', null, null, null, 'Navigation', event, { + milestoneId: this.milestone.id, + workgroupId: workgroupId + }); + } + /** * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to * hide student names because logged-in user does not have the right permissions @@ -241,22 +232,6 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone return -10000; // this hack ensures that this score appears as the lowest score } - private saveMilestoneWorkgroupItemViewedEvent(workgroupId: number, isExpanded: boolean): void { - let event = ''; - if (isExpanded) { - event = 'MilestoneStudentWorkOpened'; - } else { - event = 'MilestoneStudentWorkClosed'; - } - const context = 'ClassroomMonitor', - nodeId = null, - componentId = null, - componentType = null, - category = 'Navigation', - data = { milestoneId: this.milestone.id, workgroupId: workgroupId }; - this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); - } - protected sortWorkgroups(): void { super.sortWorkgroups(); switch (this.sort) { From 9602fdb9025a9bebee5f1d37dc2374be599cb8a1 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 15:15:42 -0800 Subject: [PATCH 030/127] Add node and component in parent class. Use node.id and component.id instead of nodeId and componentId. --- .../AbstractClassResponseComponent.ts | 2 ++ .../milestone-grading-view.component.ts | 31 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 8be1671cbd6..a745b92df3c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -11,7 +11,9 @@ import { CompletionStatus } from './shared/CompletionStatus'; @Directive() export abstract class AbstractClassResponsesComponent { + protected component: any; protected isExpandAll: boolean; + protected node: Node; protected sort: string; sortedWorkgroups: any[] = []; workgroups: any[] = []; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index d1c31a62072..dd2163b5f43 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -4,6 +4,7 @@ import { Annotation } from '../../../../common/Annotation'; import { CompletionStatus } from '../../shared/CompletionStatus'; import { Subscription } from 'rxjs'; import { AbstractClassResponsesComponent } from '../../AbstractClassResponseComponent'; +import { Node } from '../../../../common/Node'; @Component({ encapsulation: ViewEncapsulation.None, @@ -13,23 +14,23 @@ import { AbstractClassResponsesComponent } from '../../AbstractClassResponseComp templateUrl: './milestone-grading-view.component.html' }) export class MilestoneGradingViewComponent extends AbstractClassResponsesComponent { - private componentId: string; + protected component: any; private firstNodeId: string; protected firstNodePosition: string; private lastNodeId: string; protected lastNodePosition: string; @Input() milestone: any; - private nodeId: string; + protected node: Node; private subscriptions: Subscription = new Subscription(); ngOnInit(): void { - this.nodeId = this.milestone.nodeId; + this.node = this.projectService.getNode(this.milestone.nodeId); + this.component = this.node.getComponent(this.milestone.componentId); if (this.milestone.report.locations.length > 1) { this.firstNodeId = this.milestone.report.locations[0].nodeId; this.lastNodeId = this.milestone.report.locations[this.milestone.report.locations.length - 1].nodeId; } - this.componentId = this.milestone.componentId; this.retrieveStudentData(this.projectService.getNode(this.firstNodeId)); if (this.milestone.report.locations.length > 1) { this.retrieveStudentData(this.projectService.getNode(this.lastNodeId)); @@ -58,7 +59,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone this.subscriptions.add( this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { const workgroupId = annotation.toWorkgroupId; - if (annotation.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { + if (annotation.nodeId === this.node.id && this.workgroupsById[workgroupId]) { this.updateWorkgroup(workgroupId); } }) @@ -67,7 +68,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone this.subscriptions.add( this.dataService.studentWorkReceived$.subscribe(({ studentWork }) => { const workgroupId = studentWork.workgroupId; - if (studentWork.nodeId === this.nodeId && this.workgroupsById[workgroupId]) { + if (studentWork.nodeId === this.node.id && this.workgroupsById[workgroupId]) { this.updateWorkgroup(workgroupId); } }) @@ -93,13 +94,13 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone }; const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); if (studentStatus != null) { - const nodeStatus = studentStatus.nodeStatuses[this.nodeId]; + const nodeStatus = studentStatus.nodeStatuses[this.node.id]; if (nodeStatus) { completionStatus.isVisible = nodeStatus.isVisible; completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); completionStatus.latestAnnotationTime = this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.projectService.nodeHasWork(this.nodeId)) { + if (!this.projectService.nodeHasWork(this.node.id)) { completionStatus.isCompleted = nodeStatus.isVisited; } if (completionStatus.latestWorkTime) { @@ -111,7 +112,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone } private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { - const componentStates = this.dataService.getComponentStatesByNodeId(this.nodeId); + const componentStates = this.dataService.getComponentStatesByNodeId(this.node.id); for (const componentState of componentStates.reverse()) { if (componentState.workgroupId === workgroupId) { return componentState.serverSaveTime; @@ -121,7 +122,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone } private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { - const annotations = this.dataService.getAnnotationsByNodeId(this.nodeId); + const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); for (const annotation of annotations.reverse()) { // TODO: support checking for annotations from shared teachers if ( @@ -143,8 +144,8 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone private getScoreByWorkgroupId( workgroupId: number, - nodeId: string = this.nodeId, - componentId: string = this.componentId + nodeId: string = this.node.id, + componentId: string = this.component.id ): number { let score = null; const latestScoreAnnotation = this.annotationService.getLatestScoreAnnotation( @@ -196,7 +197,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone protected updateWorkgroup(workgroupId: number, init = false): void { const workgroup = this.workgroupsById[workgroupId]; const alertNotifications = this.notificationService.getAlertNotifications({ - nodeId: this.nodeId, + nodeId: this.node.id, toWorkgroupId: workgroupId }); workgroup.hasAlert = alertNotifications.length > 0; @@ -206,10 +207,10 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( workgroupId, - this.nodeId + this.node.id ); const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - workgroup.nodeStatus = studentStatus.nodeStatuses[this.nodeId] || {}; + workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; workgroup.score = this.getScoreByWorkgroupId(workgroupId); if (this.milestone.report.locations.length > 1) { const firstLocation = this.milestone.report.locations[0]; From 259b6e954d6d4c9e8be17734085c71a36607aebc Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 15:22:15 -0800 Subject: [PATCH 031/127] Rewrite sortTeam* using ternary --- .../AbstractClassResponseComponent.ts | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index a745b92df3c..aa0a9a4e41a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -81,28 +81,16 @@ export abstract class AbstractClassResponsesComponent { } } - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId ascending - */ private sortTeamAscending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } + return workgroupA.isVisible === workgroupB.isVisible + ? workgroupA.workgroupId - workgroupB.workgroupId + : workgroupB.isVisible - workgroupA.isVisible; } - /** - * Sort using this order hierarchy - * isVisible descending, workgroupId descending - */ private sortTeamDescending(workgroupA: any, workgroupB: any): number { - if (workgroupA.isVisible === workgroupB.isVisible) { - return workgroupB.workgroupId - workgroupA.workgroupId; - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } + return workgroupA.isVisible === workgroupB.isVisible + ? workgroupB.workgroupId - workgroupA.workgroupId + : workgroupB.isVisible - workgroupA.isVisible; } protected createSortAscendingFunction(fieldName: string): any { From 75a44c508186e82161c2753d26303546cd58fad2 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 15:28:28 -0800 Subject: [PATCH 032/127] Move getLatestWorkTimeByWorkgroupId() to parent. --- .../AbstractClassResponseComponent.ts | 12 ++++++++++++ .../class-responses/class-responses.component.ts | 10 ++-------- .../milestone-grading-view.component.ts | 10 ++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index aa0a9a4e41a..9faa7842967 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -54,6 +54,18 @@ export abstract class AbstractClassResponsesComponent { protected abstract updateWorkgroup(workgroupId: number, init: boolean): void; + protected getLatestWorkTimeByWorkgroupId(workgroupId: number): string { + const componentStates = this.getComponentStates(); + for (const componentState of componentStates.reverse()) { + if (componentState.workgroupId === workgroupId) { + return componentState.serverSaveTime; + } + } + return null; + } + + protected abstract getComponentStates(): any[]; + protected sortWorkgroups(): void { this.sortedWorkgroups = []; for (const workgroup of this.workgroups) { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index d36b6207fa1..92d7253559e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -116,14 +116,8 @@ export class ClassResponsesComponent extends AbstractClassResponsesComponent { return completionStatus; } - private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { - const componentStates = this.dataService.getComponentStatesByComponentId(this.component.id); - for (const componentState of componentStates.reverse()) { - if (componentState.workgroupId === workgroupId) { - return componentState.serverSaveTime; - } - } - return null; + protected getComponentStates(): any[] { + return this.dataService.getComponentStatesByComponentId(this.component.id); } private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index dd2163b5f43..408e19c80c2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -111,14 +111,8 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone return completionStatus; } - private getLatestWorkTimeByWorkgroupId(workgroupId: number): string { - const componentStates = this.dataService.getComponentStatesByNodeId(this.node.id); - for (const componentState of componentStates.reverse()) { - if (componentState.workgroupId === workgroupId) { - return componentState.serverSaveTime; - } - } - return null; + protected getComponentStates(): any[] { + return this.dataService.getComponentStatesByNodeId(this.node.id); } private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { From 74bb2016a656d8e5a07e6b12cc4288608a2fd600 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 15:36:46 -0800 Subject: [PATCH 033/127] Move getLatestAnnotationTimeByWorkgroupId() to parent --- .../AbstractClassResponseComponent.ts | 17 +++++++++++++++++ .../class-responses.component.ts | 17 +++++------------ .../milestone-grading-view.component.ts | 14 -------------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 9faa7842967..ea23c7711d8 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -66,6 +66,23 @@ export abstract class AbstractClassResponsesComponent { protected abstract getComponentStates(): any[]; + protected getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { + const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); + for (const annotation of annotations.reverse()) { + if (this.isAnnotationForWorkgroup(annotation, workgroupId)) { + return annotation.serverSaveTime; + } + } + return null; + } + + protected isAnnotationForWorkgroup(annotation: any, workgroupId: number): boolean { + return ( + annotation.toWorkgroupId === workgroupId && + annotation.fromWorkgroupId === this.configService.getWorkgroupId() + ); + } + protected sortWorkgroups(): void { this.sortedWorkgroups = []; for (const workgroup of this.workgroups) { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index 92d7253559e..e16a259a472 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -120,18 +120,11 @@ export class ClassResponsesComponent extends AbstractClassResponsesComponent { return this.dataService.getComponentStatesByComponentId(this.component.id); } - private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { - const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); - for (const annotation of annotations.reverse()) { - if ( - annotation.componentId === this.component.id && - annotation.toWorkgroupId === workgroupId && - annotation.fromWorkgroupId === this.configService.getWorkgroupId() - ) { - return annotation.serverSaveTime; - } - } - return null; + protected isAnnotationForWorkgroup(annotation: any, workgroupId: number): boolean { + return ( + super.isAnnotationForWorkgroup(annotation, workgroupId) && + annotation.componentId === this.component.id + ); } private isCompleted(workgroupId: number): boolean { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index 408e19c80c2..af53c8a12bf 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -115,20 +115,6 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone return this.dataService.getComponentStatesByNodeId(this.node.id); } - private getLatestAnnotationTimeByWorkgroupId(workgroupId: number): string { - const annotations = this.dataService.getAnnotationsByNodeId(this.node.id); - for (const annotation of annotations.reverse()) { - // TODO: support checking for annotations from shared teachers - if ( - annotation.toWorkgroupId === workgroupId && - annotation.fromWorkgroupId === this.configService.getWorkgroupId() - ) { - return annotation.serverSaveTime; - } - } - return null; - } - private getNodePositions(): void { if (this.milestone.report.locations.length > 1) { this.firstNodePosition = this.projectService.getNodePositionById(this.firstNodeId); From 9f8e0d57c72890be30db2710ec373404f40e051d Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 25 Feb 2025 15:58:52 -0800 Subject: [PATCH 034/127] Move updateWorkgroup() to parent --- .../AbstractClassResponseComponent.ts | 29 +++++++++++++++-- .../class-responses.component.ts | 27 +++------------- .../milestone-grading-view.component.ts | 31 ++++++------------- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index ea23c7711d8..156ef9cfd96 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -48,11 +48,36 @@ export abstract class AbstractClassResponsesComponent { const workgroupId = workgroup.workgroupId; this.workgroupsById[workgroupId] = workgroup; this.workVisibilityById[workgroupId] = false; - this.updateWorkgroup(workgroupId, true); + this.updateWorkgroup(workgroup, true); } } - protected abstract updateWorkgroup(workgroupId: number, init: boolean): void; + /** + * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to + * hide student names because logged-in user does not have the right permissions + * @param workgroupID a workgroup ID number + * @param init Boolean whether we're in controller initialization or not + */ + protected updateWorkgroup(workgroup: any, init = false): void { + const alertNotifications = this.notificationService.getAlertNotifications({ + nodeId: this.node.id, + toWorkgroupId: workgroup.workgroupId + }); + workgroup.hasAlert = alertNotifications.length > 0; + workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); + const completionStatus = this.getCompletionStatusByWorkgroupId(workgroup.workgroupId); + workgroup.isVisible = completionStatus.isVisible ? 1 : 0; + workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId( + workgroup.workgroupId + ); + workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; + workgroup.score = this.getWorkgroupScore(workgroup.workgroupId); + } + + protected abstract getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus; + + protected abstract getWorkgroupScore(workgroupId: number): any; protected getLatestWorkTimeByWorkgroupId(workgroupId: number): string { const componentStates = this.getComponentStates(); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts index e16a259a472..621e6dac789 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts @@ -66,31 +66,14 @@ export class ClassResponsesComponent extends AbstractClassResponsesComponent { } } - /** - * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to - * hide student names because logged-in user does not have the right permissions - * @param workgroupID a workgroup ID number - * @param init Boolean whether we're in controller initialization or not - */ - protected updateWorkgroup(workgroupId: number, init = false): void { - const workgroup = this.workgroupsById[workgroupId]; - const alertNotifications = this.notificationService.getAlertNotifications({ - nodeId: this.node.id, - toWorkgroupId: workgroupId - }); - workgroup.hasAlert = alertNotifications.length > 0; - workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); - const nodeCompletionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); - workgroup.isVisible = nodeCompletionStatus.isVisible ? 1 : 0; - workgroup.completionStatus = this.getWorkgroupCompletionStatus(nodeCompletionStatus); - workgroup.score = + protected getWorkgroupScore(workgroupId: number): any { + return ( this.annotationService.getLatestScoreAnnotation(this.node.id, this.component.id, workgroupId) - ?.data.value ?? '-'; - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; + ?.data.value ?? '-' + ); } - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { + protected getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { const completionStatus: CompletionStatus = { isCompleted: false, isVisible: false, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts index af53c8a12bf..385c2cfbf3b 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts @@ -85,7 +85,7 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone } } - private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { + protected getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { const completionStatus: CompletionStatus = { isCompleted: false, isVisible: false, @@ -174,38 +174,27 @@ export class MilestoneGradingViewComponent extends AbstractClassResponsesCompone * @param workgroupID a workgroup ID number * @param init Boolean whether we're in controller initialization or not */ - protected updateWorkgroup(workgroupId: number, init = false): void { - const workgroup = this.workgroupsById[workgroupId]; - const alertNotifications = this.notificationService.getAlertNotifications({ - nodeId: this.node.id, - toWorkgroupId: workgroupId - }); - workgroup.hasAlert = alertNotifications.length > 0; - workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); - const completionStatus = this.getCompletionStatusByWorkgroupId(workgroupId); - workgroup.isVisible = completionStatus.isVisible ? 1 : 0; - workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); - workgroup.score = this.annotationService.getTotalNodeScoreForWorkgroup( - workgroupId, - this.node.id - ); - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - workgroup.nodeStatus = studentStatus.nodeStatuses[this.node.id] || {}; - workgroup.score = this.getScoreByWorkgroupId(workgroupId); + protected updateWorkgroup(workgroup: any, init = false): void { + super.updateWorkgroup(workgroup, init); + if (this.milestone.report.locations.length > 1) { const firstLocation = this.milestone.report.locations[0]; workgroup.initialScore = this.getScoreByWorkgroupId( - workgroupId, + workgroup.workgroupId, firstLocation.nodeId, firstLocation.componentId ); workgroup.changeInScore = this.getChangeInScore(workgroup.initialScore, workgroup.score); } if (!init) { - this.workgroupsById[workgroupId] = copy(workgroup); + this.workgroupsById[workgroup.workgroupId] = copy(workgroup); } } + protected getWorkgroupScore(workgroupId: number): any { + return this.getScoreByWorkgroupId(workgroupId); + } + private getChangeInScore(initialScore: number, revisedScore: number): number { if (initialScore != -1 && revisedScore != -1) { return revisedScore - initialScore; From a10e04e18c48335fed7c88a53c55a51bc0c231b2 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 09:12:40 -0800 Subject: [PATCH 035/127] Rename ClassResponses to ComponentClassResponses --- src/app/teacher/grading-common.module.ts | 6 +++--- .../component-class-responses.component.html} | 0 ...mponent-class-responses.component.spec.ts} | 12 +++++------ .../component-class-responses.component.ts} | 6 +++--- .../component-grading-view.component.html | 2 +- .../component-grading-view.component.ts | 4 ++-- src/messages.xlf | 20 +++++++++---------- 7 files changed, 25 insertions(+), 25 deletions(-) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/{class-responses/class-responses.component.html => component-class-responses/component-class-responses.component.html} (100%) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/{class-responses/class-responses.component.spec.ts => component-class-responses/component-class-responses.component.spec.ts} (68%) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/{class-responses/class-responses.component.ts => component-class-responses/component-class-responses.component.ts} (96%) diff --git a/src/app/teacher/grading-common.module.ts b/src/app/teacher/grading-common.module.ts index 5a0d80224e5..a70481c419d 100644 --- a/src/app/teacher/grading-common.module.ts +++ b/src/app/teacher/grading-common.module.ts @@ -12,11 +12,11 @@ import { StatusIconComponent } from '../classroom-monitor/status-icon/status-ico import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress/nav-item-progress.component'; import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component'; -import { ClassResponsesComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component'; +import { ComponentClassResponsesComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component'; @NgModule({ imports: [ - ClassResponsesComponent, + ComponentClassResponsesComponent, ComponentGradingComponent, ComponentStateInfoComponent, EditComponentAnnotationsComponent, @@ -32,7 +32,7 @@ import { ClassResponsesComponent } from '../../assets/wise5/classroomMonitor/cla WorkgroupSelectAutocompleteComponent ], exports: [ - ClassResponsesComponent, + ComponentClassResponsesComponent, ComponentGradingComponent, ComponentStateInfoComponent, EditComponentAnnotationsComponent, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html similarity index 100% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts similarity index 68% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts index 2ca14615179..fd5204aa3e6 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts @@ -1,22 +1,22 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ClassResponsesComponent } from './class-responses.component'; +import { ComponentClassResponsesComponent } from './component-class-responses.component'; import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; import { TeacherDataService } from '../../../services/teacherDataService'; import { of } from 'rxjs'; import { MockComponent } from 'ng-mocks'; import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; -describe('ClassResponsesComponent', () => { - let component: ClassResponsesComponent; - let fixture: ComponentFixture; +describe('ComponentClassResponsesComponent', () => { + let component: ComponentClassResponsesComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [MockComponent(WorkgroupSelectAutocompleteComponent)], - imports: [ClassResponsesComponent, ClassroomMonitorTestingModule] + imports: [ComponentClassResponsesComponent, ClassroomMonitorTestingModule] }).compileComponents(); spyOn(TestBed.inject(TeacherDataService), 'retrieveStudentDataForNode').and.returnValue(of({})); - fixture = TestBed.createComponent(ClassResponsesComponent); + fixture = TestBed.createComponent(ComponentClassResponsesComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts similarity index 96% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts index 621e6dac789..1efb0b1c4d4 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts @@ -29,10 +29,10 @@ import { AbstractClassResponsesComponent } from '../AbstractClassResponseCompone MatListModule, WorkgroupSelectAutocompleteComponent ], - selector: 'class-responses', - templateUrl: './class-responses.component.html' + selector: 'component-class-responses', + templateUrl: './component-class-responses.component.html' }) -export class ClassResponsesComponent extends AbstractClassResponsesComponent { +export class ComponentClassResponsesComponent extends AbstractClassResponsesComponent { @Input() component: any; @Input() node: Node; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 736bf4ac867..d535262b27a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -23,4 +23,4 @@ [doRender]="true" /> } - + diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index b9f5024aed4..e56c58214af 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -8,14 +8,14 @@ import { isMatchingPeriods } from '../../../common/period/period'; import { AnnotationService } from '../../../services/annotationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { Node } from '../../../common/Node'; -import { ClassResponsesComponent } from '../class-responses/class-responses.component'; +import { ComponentClassResponsesComponent } from '../component-class-responses/component-class-responses.component'; import { ActivatedRoute } from '@angular/router'; import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; import { PeerGroupButtonComponent } from '../peer-group-button/peer-group-button.component'; @Component({ imports: [ - ClassResponsesComponent, + ComponentClassResponsesComponent, MilestoneReportButtonComponent, PeerGroupButtonComponent, TeacherSummaryDisplayComponent diff --git a/src/messages.xlf b/src/messages.xlf index df8eb230331..b7a74f7aeae 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2321,7 +2321,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.29,30 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 83,85 @@ -13261,35 +13261,35 @@ The branches will be removed but the steps will remain in the unit. Expand all teams - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 14,17 + Expand all - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 20,24 Collapse all teams - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 24,27 - Collapse all - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 30,34 Sort by team - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 40,43 @@ -13300,7 +13300,7 @@ The branches will be removed but the steps will remain in the unit. Team - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 43,45 @@ -13323,14 +13323,14 @@ The branches will be removed but the steps will remain in the unit. Sorty by completion - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 60,64 Status - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 63,65 @@ -13345,7 +13345,7 @@ The branches will be removed but the steps will remain in the unit. Sort by score - src/assets/wise5/classroomMonitor/classroomMonitorComponents/class-responses/class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html 80,84 From b923b1dbb7709385f6d667775e51baf6f8abf7d6 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 10:10:52 -0800 Subject: [PATCH 036/127] Rename MilestoneGradingView to MilestoneClassResponses --- src/app/teacher/milestone/milestone.module.ts | 4 +- .../milestone-class-responses.component.html} | 0 .../milestone-class-responses.component.scss} | 0 ...lestone-class-responses.component.spec.ts} | 14 +- .../milestone-class-responses.component.ts} | 8 +- .../milestone-details.component.html | 4 +- src/messages.xlf | 160 +++++++++--------- 7 files changed, 95 insertions(+), 95 deletions(-) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/{milestone-grading-view/milestone-grading-view.component.html => milestone-class-responses/milestone-class-responses.component.html} (100%) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/{milestone-grading-view/milestone-grading-view.component.scss => milestone-class-responses/milestone-class-responses.component.scss} (100%) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/{milestone-grading-view/milestone-grading-view.component.spec.ts => milestone-class-responses/milestone-class-responses.component.spec.ts} (91%) rename src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/{milestone-grading-view/milestone-grading-view.component.ts => milestone-class-responses/milestone-class-responses.component.ts} (97%) diff --git a/src/app/teacher/milestone/milestone.module.ts b/src/app/teacher/milestone/milestone.module.ts index 47b34e74d1c..368758d65ab 100644 --- a/src/app/teacher/milestone/milestone.module.ts +++ b/src/app/teacher/milestone/milestone.module.ts @@ -3,7 +3,7 @@ import { createCustomElement } from '@angular/elements'; import { HighchartsChartModule } from 'highcharts-angular'; import { MilestoneDetailsDialogComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component'; import { MilestoneDetailsComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component'; -import { MilestoneGradingViewComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component'; +import { MilestoneClassResponsesComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component'; import { MilestoneWorkgroupItemComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component'; import { MilestonesComponent } from '../../classroom-monitor/milestones/milestones.component'; import { StudentTeacherCommonModule } from '../../student-teacher-common.module'; @@ -23,7 +23,7 @@ import { SelectPeriodComponent } from '../../../assets/wise5/classroomMonitor/cl MilestonesComponent, MilestoneDetailsComponent, MilestoneDetailsDialogComponent, - MilestoneGradingViewComponent, + MilestoneClassResponsesComponent, MilestoneReportDataComponent, MilestoneReportGraphComponent, MilestoneWorkgroupItemComponent diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html similarity index 100% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.scss similarity index 100% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.scss rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.scss diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.spec.ts similarity index 91% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.spec.ts rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.spec.ts index 92d1df2a8a2..5533d1ab953 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.spec.ts @@ -8,18 +8,18 @@ import { WorkgroupSelectAutocompleteComponent } from '../../../../../../app/clas import { ConfigService } from '../../../../services/configService'; import { TeacherDataService } from '../../../../services/teacherDataService'; import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; -import { MilestoneGradingViewComponent } from './milestone-grading-view.component'; +import { MilestoneClassResponsesComponent } from './milestone-class-responses.component'; import { NodeGradingViewComponentTestHelper } from '../../nodeGrading/node-grading-view/node-grading-view.component.test.helper'; import { of } from 'rxjs'; -let component: MilestoneGradingViewComponent; -let fixture: ComponentFixture; +let component: MilestoneClassResponsesComponent; +let fixture: ComponentFixture; let testHelper: NodeGradingViewComponentTestHelper; -describe('MilestoneGradingViewComponent', () => { +describe('MilestoneClassResponsesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [MilestoneGradingViewComponent], + declarations: [MilestoneClassResponsesComponent], imports: [ ClassroomMonitorTestingModule, FormsModule, @@ -34,7 +34,7 @@ describe('MilestoneGradingViewComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(MilestoneGradingViewComponent); + fixture = TestBed.createComponent(MilestoneClassResponsesComponent); component = fixture.componentInstance; component.milestone = { nodeId: 'node1', @@ -59,7 +59,7 @@ describe('MilestoneGradingViewComponent', () => { setSort(); }); -function initializeWorkgroups(component: MilestoneGradingViewComponent) { +function initializeWorkgroups(component: MilestoneClassResponsesComponent) { component.workgroups = [ createWorkgroupForTesting( 3, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts similarity index 97% rename from src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts rename to src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index 385c2cfbf3b..c720058336b 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -8,12 +8,12 @@ import { Node } from '../../../../common/Node'; @Component({ encapsulation: ViewEncapsulation.None, - selector: 'milestone-grading-view', + selector: 'milestone-class-responses', standalone: false, - styleUrl: './milestone-grading-view.component.scss', - templateUrl: './milestone-grading-view.component.html' + styleUrl: './milestone-class-responses.component.scss', + templateUrl: './milestone-class-responses.component.html' }) -export class MilestoneGradingViewComponent extends AbstractClassResponsesComponent { +export class MilestoneClassResponsesComponent extends AbstractClassResponsesComponent { protected component: any; private firstNodeId: string; protected firstNodePosition: string; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html index f2ae7026c55..2af8e19b21e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html @@ -60,7 +60,7 @@
- +
@@ -70,7 +70,7 @@ class="milestone-details__section mat-elevation-z1" >
Student Work
- +

diff --git a/src/messages.xlf b/src/messages.xlf index b7a74f7aeae..a6c3babe38f 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2325,7 +2325,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.83,85 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 90,92 @@ -12735,7 +12735,7 @@ The branches will be removed but the steps will remain in the unit. 44,48 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 23,27 @@ -13293,7 +13293,7 @@ The branches will be removed but the steps will remain in the unit. 40,43 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 47,50 @@ -13304,12 +13304,12 @@ The branches will be removed but the steps will remain in the unit. 43,45 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 83,86 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 50,52 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 50,52 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + 83,86 src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html @@ -13334,7 +13334,7 @@ The branches will be removed but the steps will remain in the unit. 63,65 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 70,72 @@ -13349,7 +13349,7 @@ The branches will be removed but the steps will remain in the unit. 80,84 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 87,90 @@ -13901,6 +13901,76 @@ The branches will be removed but the steps will remain in the unit. 17,21 + + Expand All + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 17,19 + + + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + 18,21 + + + + Collapse All + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 28,30 + + + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + 29,32 + + + + Sort by completion + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 67,70 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 78,81 + + + + Sort by score on Step + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 107,108 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 109,110 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 130,131 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 132,133 + + + + Sort by change in score + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 154,156 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 156,159 + + + + +/- + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 160,162 + + Milestone: @@ -13991,7 +14061,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 72,73 + 72,74 @@ -14001,76 +14071,6 @@ The branches will be removed but the steps will remain in the unit. 77,79 - - Expand All - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 17,19 - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 18,21 - - - - Collapse All - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 28,30 - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 29,32 - - - - Sort by completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 67,70 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 78,81 - - - - Sort by score on Step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 107,108 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 109,110 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 130,131 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 132,133 - - - - Sort by change in score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 154,156 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 156,159 - - - - +/- - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 160,162 - - Step From 07cd23b4be6f14cd0efc3f0050e8d3ca22fbbb4b Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 12:14:39 -0800 Subject: [PATCH 037/127] Rename isExpandAll to allWorkgroupsExpanded --- .../AbstractClassResponseComponent.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 156ef9cfd96..7c879e73d94 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -11,8 +11,8 @@ import { CompletionStatus } from './shared/CompletionStatus'; @Directive() export abstract class AbstractClassResponsesComponent { + protected allWorkgroupsExpanded: boolean; protected component: any; - protected isExpandAll: boolean; protected node: Node; protected sort: string; sortedWorkgroups: any[] = []; @@ -213,7 +213,7 @@ export abstract class AbstractClassResponsesComponent { ): void { for (const entry of intersectionObserverEntries) { this.workgroupInViewById[workgroupId] = entry.isIntersecting; - if (this.isExpandAll && entry.isIntersecting) { + if (this.allWorkgroupsExpanded && entry.isIntersecting) { this.workVisibilityById[workgroupId] = true; } } @@ -231,7 +231,7 @@ export abstract class AbstractClassResponsesComponent { this.workgroups.forEach( (workgroup) => (this.workVisibilityById[workgroup.workgroupId] = false) ); - this.isExpandAll = false; + this.allWorkgroupsExpanded = false; } protected expandAll(): void { @@ -241,6 +241,6 @@ export abstract class AbstractClassResponsesComponent { this.workVisibilityById[workgroupId] = true; } }); - this.isExpandAll = true; + this.allWorkgroupsExpanded = true; } } From 0fe9af59292b7a469964343fa3c717b0d5106db8 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 12:47:18 -0800 Subject: [PATCH 038/127] Fix issue where subroutes weren't lazily loaded in dev-serve mode --- angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular.json b/angular.json index 83ef03e8271..3193772ee0b 100644 --- a/angular.json +++ b/angular.json @@ -97,7 +97,7 @@ "baseHref": "/" }, "development": { - "optimization": false, + "optimization": true, "outputHashing": "all", "sourceMap": true, "namedChunks": true, From a7fe61737bdd8f54b53f11a306758d62e74bc3bd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 12:48:14 -0800 Subject: [PATCH 039/127] Clean up code using forEach adn ternary --- .../AbstractClassResponseComponent.ts | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 7c879e73d94..0453b0e2465 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -44,12 +44,11 @@ export abstract class AbstractClassResponsesComponent { } protected setWorkgroupsById(): void { - for (const workgroup of this.workgroups) { - const workgroupId = workgroup.workgroupId; - this.workgroupsById[workgroupId] = workgroup; - this.workVisibilityById[workgroupId] = false; + this.workgroups.forEach((workgroup) => { + this.workgroupsById[workgroup.workgroupId] = workgroup; + this.workVisibilityById[workgroup.workgroupId] = false; this.updateWorkgroup(workgroup, true); - } + }); } /** @@ -176,11 +175,7 @@ export abstract class AbstractClassResponsesComponent { } setSort(criteria: string): void { - if (this.sort === criteria) { - this.sort = `-${criteria}`; - } else { - this.sort = criteria; - } + this.sort = this.sort === criteria ? `-${criteria}` : criteria; this.dataService.nodeGradingSort = this.sort; this.sortWorkgroups(); } @@ -235,12 +230,9 @@ export abstract class AbstractClassResponsesComponent { } protected expandAll(): void { - this.workgroups.forEach((workgroup) => { - const workgroupId = workgroup.workgroupId; - if (this.workgroupInViewById[workgroupId]) { - this.workVisibilityById[workgroupId] = true; - } - }); + this.workgroups + .filter((workgroup) => this.workgroupInViewById[workgroup.workgroupId]) + .forEach((workgroup) => (this.workVisibilityById[workgroup.workgroupId] = true)); this.allWorkgroupsExpanded = true; } } From 88f4e8a2f7db7b0d859e29dac8945d11cfe6f038 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 13:12:30 -0800 Subject: [PATCH 040/127] Move getCompletionStatusByWorkgroupId() to parent --- .../AbstractClassResponseComponent.ts | 30 ++++++++++++++++++- .../component-class-responses.component.ts | 28 ++--------------- .../milestone-class-responses.component.ts | 30 ++++--------------- 3 files changed, 38 insertions(+), 50 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 0453b0e2465..5bf7f2f5a7e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -74,10 +74,38 @@ export abstract class AbstractClassResponsesComponent { workgroup.score = this.getWorkgroupScore(workgroup.workgroupId); } - protected abstract getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus; + private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { + const completionStatus: CompletionStatus = { + isCompleted: false, + isVisible: false, + latestWorkTime: null, + latestAnnotationTime: null + }; + const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); + if (studentStatus != null) { + const nodeStatus = studentStatus.nodeStatuses[this.node.id]; + if (nodeStatus) { + completionStatus.isVisible = nodeStatus.isVisible; + completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); + completionStatus.latestAnnotationTime = + this.getLatestAnnotationTimeByWorkgroupId(workgroupId); + if (!this.hasWork()) { + completionStatus.isCompleted = nodeStatus.isVisited; + } + if (completionStatus.latestWorkTime) { + completionStatus.isCompleted = this.isCompleted(workgroupId, nodeStatus); + } + } + } + return completionStatus; + } protected abstract getWorkgroupScore(workgroupId: number): any; + protected abstract hasWork(): boolean; + + protected abstract isCompleted(workgroupId: number, nodeStatus: any): boolean; + protected getLatestWorkTimeByWorkgroupId(workgroupId: number): string { const componentStates = this.getComponentStates(); for (const componentState of componentStates.reverse()) { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts index 1efb0b1c4d4..593cf24e6b9 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts @@ -73,30 +73,8 @@ export class ComponentClassResponsesComponent extends AbstractClassResponsesComp ); } - protected getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { - const completionStatus: CompletionStatus = { - isCompleted: false, - isVisible: false, - latestWorkTime: null, - latestAnnotationTime: null - }; - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - if (studentStatus != null) { - const nodeStatus = studentStatus.nodeStatuses[this.node.id]; - if (nodeStatus) { - completionStatus.isVisible = nodeStatus.isVisible; - completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); - completionStatus.latestAnnotationTime = - this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.projectService.componentHasWork(this.component)) { - completionStatus.isCompleted = nodeStatus.isVisited; - } - if (completionStatus.latestWorkTime) { - completionStatus.isCompleted = this.isCompleted(workgroupId); - } - } - } - return completionStatus; + protected hasWork(): boolean { + return this.projectService.componentHasWork(this.component); } protected getComponentStates(): any[] { @@ -110,7 +88,7 @@ export class ComponentClassResponsesComponent extends AbstractClassResponsesComp ); } - private isCompleted(workgroupId: number): boolean { + protected isCompleted(workgroupId: number, nodeStatus: any): boolean { const service = this.componentServiceLookupService.getService(this.component.type); const workgroupComponentStates = this.dataService.getComponentStatesByWorkgroupIdAndComponentId( workgroupId, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index c720058336b..8d9e105102e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -85,30 +85,12 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp } } - protected getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { - const completionStatus: CompletionStatus = { - isCompleted: false, - isVisible: false, - latestWorkTime: null, - latestAnnotationTime: null - }; - const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - if (studentStatus != null) { - const nodeStatus = studentStatus.nodeStatuses[this.node.id]; - if (nodeStatus) { - completionStatus.isVisible = nodeStatus.isVisible; - completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); - completionStatus.latestAnnotationTime = - this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.projectService.nodeHasWork(this.node.id)) { - completionStatus.isCompleted = nodeStatus.isVisited; - } - if (completionStatus.latestWorkTime) { - completionStatus.isCompleted = nodeStatus.isCompleted; - } - } - } - return completionStatus; + protected hasWork(): boolean { + return this.projectService.nodeHasWork(this.node.id); + } + + protected isCompleted(workgroupId: number, nodeStatus: any): boolean { + return nodeStatus.isCompleted; } protected getComponentStates(): any[] { From 39f24109c4cb7fe9bffc6b2ae0bc3f4f86303ca1 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 13:22:00 -0800 Subject: [PATCH 041/127] Clean up code related to saving events --- .../milestone-class-responses.component.ts | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index 8d9e105102e..bbe5ddb0e47 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -123,33 +123,30 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp protected expandAll(): void { super.expandAll(); - this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkExpandAllClicked'); + this.saveEvent('MilestoneStudentWorkExpandAllClicked', { + milestoneId: this.milestone.id + }); } protected collapseAll(): void { super.collapseAll(); - this.saveMilestoneStudentWorkExpandCollapseAllEvent('MilestoneStudentWorkCollapseAllClicked'); - } - - private saveMilestoneStudentWorkExpandCollapseAllEvent(event: any): void { - this.dataService.saveEvent('ClassroomMonitor', null, null, null, 'Navigation', event, { + this.saveEvent('MilestoneStudentWorkCollapseAllClicked', { milestoneId: this.milestone.id }); } protected onUpdateExpand({ workgroupId, value }): void { super.onUpdateExpand({ workgroupId, value }); - this.saveMilestoneWorkgroupItemViewedEvent(workgroupId, value); - } - - private saveMilestoneWorkgroupItemViewedEvent(workgroupId: number, isExpanded: boolean): void { - const event = isExpanded ? 'MilestoneStudentWorkOpened' : 'MilestoneStudentWorkClosed'; - this.dataService.saveEvent('ClassroomMonitor', null, null, null, 'Navigation', event, { + this.saveEvent(value ? 'MilestoneStudentWorkOpened' : 'MilestoneStudentWorkClosed', { milestoneId: this.milestone.id, workgroupId: workgroupId }); } + private saveEvent(event: string, data: any): void { + this.dataService.saveEvent('ClassroomMonitor', null, null, null, 'Navigation', event, data); + } + /** * Update statuses, scores, notifications, etc. for a workgroup object. Also check if we need to * hide student names because logged-in user does not have the right permissions From 3aafba7a8043475da2f787765ac297eae04eba12 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 13:26:43 -0800 Subject: [PATCH 042/127] Move getScoreByWorkgroupId() closer to caller and clean up its code --- .../milestone-class-responses.component.ts | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index bbe5ddb0e47..862ac4d2569 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -104,23 +104,6 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp } } - private getScoreByWorkgroupId( - workgroupId: number, - nodeId: string = this.node.id, - componentId: string = this.component.id - ): number { - let score = null; - const latestScoreAnnotation = this.annotationService.getLatestScoreAnnotation( - nodeId, - componentId, - workgroupId - ); - if (latestScoreAnnotation) { - score = this.annotationService.getScoreValueFromScoreAnnotation(latestScoreAnnotation); - } - return score; - } - protected expandAll(): void { super.expandAll(); this.saveEvent('MilestoneStudentWorkExpandAllClicked', { @@ -155,7 +138,6 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp */ protected updateWorkgroup(workgroup: any, init = false): void { super.updateWorkgroup(workgroup, init); - if (this.milestone.report.locations.length > 1) { const firstLocation = this.milestone.report.locations[0]; workgroup.initialScore = this.getScoreByWorkgroupId( @@ -171,7 +153,18 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp } protected getWorkgroupScore(workgroupId: number): any { - return this.getScoreByWorkgroupId(workgroupId); + return this.getScoreByWorkgroupId(workgroupId, this.node.id, this.component.id); + } + + private getScoreByWorkgroupId(workgroupId: number, nodeId: string, componentId: string): number { + const latestScoreAnnotation = this.annotationService.getLatestScoreAnnotation( + nodeId, + componentId, + workgroupId + ); + return latestScoreAnnotation + ? this.annotationService.getScoreValueFromScoreAnnotation(latestScoreAnnotation) + : null; } private getChangeInScore(initialScore: number, revisedScore: number): number { From a0cc9f4ee57a18c94fd081bf573bf327f93f24d0 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 14:28:00 -0800 Subject: [PATCH 043/127] Break up subscribeToEvents() into sub functions and use pipe(filter()) to simplify code. --- .../milestone-class-responses.component.ts | 91 +++++++++++-------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index 862ac4d2569..9ae0c55fb5e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -1,10 +1,10 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { copy } from '../../../../common/object/object'; import { Annotation } from '../../../../common/Annotation'; -import { CompletionStatus } from '../../shared/CompletionStatus'; -import { Subscription } from 'rxjs'; +import { filter, Subscription } from 'rxjs'; import { AbstractClassResponsesComponent } from '../../AbstractClassResponseComponent'; import { Node } from '../../../../common/Node'; +import { Notification } from '../../../../../../app/domain/notification'; @Component({ encapsulation: ViewEncapsulation.None, @@ -43,48 +43,59 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp this.subscriptions.unsubscribe(); } - protected subscribeToEvents(): void { - this.subscriptions.add( - this.notificationService.notificationChanged$.subscribe((notification) => { - if (notification.type === 'CRaterResult') { - // TODO: expand to encompass other notification types that should be shown to teacher - const workgroupId = notification.toWorkgroupId; - if (this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - } - }) - ); - - this.subscriptions.add( - this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { - const workgroupId = annotation.toWorkgroupId; - if (annotation.nodeId === this.node.id && this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - }) - ); - - this.subscriptions.add( - this.dataService.studentWorkReceived$.subscribe(({ studentWork }) => { - const workgroupId = studentWork.workgroupId; - if (studentWork.nodeId === this.node.id && this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - }) - ); + private subscribeToEvents(): void { + this.subscriptions.add(this.subscribeToNotifications()); + this.subscriptions.add(this.subscribeToAnnotations()); + this.subscriptions.add(this.subscribeToStudentWork()); if (this.milestone.report.locations.length > 1) { - this.subscriptions.add( - this.annotationService.annotationReceived$.subscribe((annotation: Annotation) => { - const workgroupId = annotation.toWorkgroupId; - if (annotation.nodeId === this.firstNodeId && this.workgroupsById[workgroupId]) { - this.updateWorkgroup(workgroupId); - } - }) - ); + this.subscriptions.add(this.subscribeToFirstNodeAnnotations()); } } + private subscribeToNotifications(): Subscription { + return this.notificationService.notificationChanged$ + .pipe( + filter( + (notification: Notification) => + notification.type === 'CRaterResult' && this.workgroupsById[notification.toWorkgroupId] + ) + ) + .subscribe((notification) => this.updateWorkgroup(notification.toWorkgroupId)); + } + + private subscribeToAnnotations(): Subscription { + return this.annotationService.annotationReceived$ + .pipe( + filter( + (annotation: Annotation) => + annotation.nodeId === this.node.id && this.workgroupsById[annotation.toWorkgroupId] + ) + ) + .subscribe((annotation: Annotation) => this.updateWorkgroup(annotation.toWorkgroupId)); + } + + private subscribeToStudentWork(): Subscription { + return this.dataService.studentWorkReceived$ + .pipe( + filter( + ({ studentWork }) => + studentWork.nodeId === this.node.id && this.workgroupsById[studentWork.workgroupId] + ) + ) + .subscribe(({ studentWork }) => this.updateWorkgroup(studentWork.workgroupId)); + } + + private subscribeToFirstNodeAnnotations(): Subscription { + return this.annotationService.annotationReceived$ + .pipe( + filter( + (annotation: Annotation) => + annotation.nodeId === this.firstNodeId && this.workgroupsById[annotation.toWorkgroupId] + ) + ) + .subscribe((annotation: Annotation) => this.updateWorkgroup(annotation.toWorkgroupId)); + } + protected hasWork(): boolean { return this.projectService.nodeHasWork(this.node.id); } From c824f294ad18a9f8ce66bc79a9daacc8450cbbca Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 14:44:06 -0800 Subject: [PATCH 044/127] Convert CompletionStatus into class and move StateNumber calculation into the class's method for better encapsulation. --- .../AbstractClassResponseComponent.ts | 53 +++++-------------- .../component-class-responses.component.ts | 1 - .../shared/CompletionStatus.ts | 30 ++++++++++- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 5bf7f2f5a7e..2dee90ac22f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -66,7 +66,7 @@ export abstract class AbstractClassResponsesComponent { workgroup.hasNewAlert = alertNotifications.some((alert) => !alert.timeDismissed); const completionStatus = this.getCompletionStatusByWorkgroupId(workgroup.workgroupId); workgroup.isVisible = completionStatus.isVisible ? 1 : 0; - workgroup.completionStatus = this.getWorkgroupCompletionStatus(completionStatus); + workgroup.completionStatus = completionStatus.getStateNumber(); const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId( workgroup.workgroupId ); @@ -75,26 +75,19 @@ export abstract class AbstractClassResponsesComponent { } private getCompletionStatusByWorkgroupId(workgroupId: number): CompletionStatus { - const completionStatus: CompletionStatus = { - isCompleted: false, - isVisible: false, - latestWorkTime: null, - latestAnnotationTime: null - }; + const completionStatus: CompletionStatus = new CompletionStatus(); const studentStatus = this.classroomStatusService.getStudentStatusForWorkgroupId(workgroupId); - if (studentStatus != null) { + if (studentStatus != null && studentStatus.nodeStatuses[this.node.id] != null) { const nodeStatus = studentStatus.nodeStatuses[this.node.id]; - if (nodeStatus) { - completionStatus.isVisible = nodeStatus.isVisible; - completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); - completionStatus.latestAnnotationTime = - this.getLatestAnnotationTimeByWorkgroupId(workgroupId); - if (!this.hasWork()) { - completionStatus.isCompleted = nodeStatus.isVisited; - } - if (completionStatus.latestWorkTime) { - completionStatus.isCompleted = this.isCompleted(workgroupId, nodeStatus); - } + completionStatus.isVisible = nodeStatus.isVisible; + completionStatus.latestWorkTime = this.getLatestWorkTimeByWorkgroupId(workgroupId); + completionStatus.latestAnnotationTime = + this.getLatestAnnotationTimeByWorkgroupId(workgroupId); + if (!this.hasWork()) { + completionStatus.isCompleted = nodeStatus.isVisited; + } + if (completionStatus.latestWorkTime) { + completionStatus.isCompleted = this.isCompleted(workgroupId, nodeStatus); } } return completionStatus; @@ -208,28 +201,6 @@ export abstract class AbstractClassResponsesComponent { this.sortWorkgroups(); } - /** - * Returns a numerical status value for a given completion status object depending on node - * completion - * Available status values are: 0 (not visited/no work; default), 1 (partially completed), - * 2 (completed) - * @param completionStatus Object - * @returns Integer status value - */ - protected getWorkgroupCompletionStatus(completionStatus: CompletionStatus): number { - // TODO: store this info in the nodeStatus so we don't have to calculate every time (and can use - // more widely)? - let status = 0; - if (!completionStatus.isVisible) { - status = -1; - } else if (completionStatus.isCompleted) { - status = 2; - } else if (completionStatus.latestWorkTime !== null) { - status = 1; - } - return status; - } - protected onIntersection( workgroupId: number, intersectionObserverEntries: IntersectionObserverEntry[] diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts index 593cf24e6b9..d1f81e45398 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts @@ -11,7 +11,6 @@ import { ConfigService } from '../../../services/configService'; import { ClassroomStatusService } from '../../../services/classroomStatusService'; import { AnnotationService } from '../../../services/annotationService'; import { NotificationService } from '../../../services/notificationService'; -import { CompletionStatus } from '../shared/CompletionStatus'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ComponentWorkgroupItemComponent } from '../component-workgroup-item/component-workgroup-item.component'; import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/CompletionStatus.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/CompletionStatus.ts index af358eda294..f6433f85b00 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/CompletionStatus.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/CompletionStatus.ts @@ -1,6 +1,34 @@ -export interface CompletionStatus { +export class CompletionStatus { isCompleted: boolean; isVisible: boolean; latestWorkTime: string; latestAnnotationTime: string; + + constructor() { + this.isCompleted = false; + this.isVisible = false; + this.latestWorkTime = null; + this.latestAnnotationTime = null; + } + + /** + * Returns a numerical status value for this completion status object depending on node completion + * Available status values are: + * -1 (not visible) + * 0 (not visited/no work; default) + * 1 (partially completed) + * 2 (completed) + * @returns number status value + */ + getStateNumber(): number { + let status = 0; + if (!this.isVisible) { + status = -1; + } else if (this.isCompleted) { + status = 2; + } else if (this.latestWorkTime !== null) { + status = 1; + } + return status; + } } From 35dbc1fdea295e3d7f8730c63b3e1df028023a86 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 17:06:29 -0800 Subject: [PATCH 045/127] Simplify sorting functions --- .../AbstractClassResponseComponent.ts | 49 +++++-------------- .../milestone-class-responses.component.ts | 8 +-- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index 2dee90ac22f..a183d1bb44f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -129,65 +129,38 @@ export abstract class AbstractClassResponsesComponent { } protected sortWorkgroups(): void { - this.sortedWorkgroups = []; - for (const workgroup of this.workgroups) { - this.sortedWorkgroups.push(workgroup); - } + this.sortedWorkgroups = [...this.workgroups]; switch (this.sort) { case 'team': - this.sortedWorkgroups.sort(this.sortTeamAscending); + this.sortedWorkgroups.sort(this.createSortFunction('workgroupId', true)); break; case '-team': - this.sortedWorkgroups.sort(this.sortTeamDescending); + this.sortedWorkgroups.sort(this.createSortFunction('workgroupId', false)); break; case 'status': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('completionStatus')); + this.sortedWorkgroups.sort(this.createSortFunction('completionStatus', true)); break; case '-status': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('completionStatus')); + this.sortedWorkgroups.sort(this.createSortFunction('completionStatus', false)); break; case 'score': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('score')); + this.sortedWorkgroups.sort(this.createSortFunction('score', true)); break; case '-score': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('score')); + this.sortedWorkgroups.sort(this.createSortFunction('score', false)); break; } } - private sortTeamAscending(workgroupA: any, workgroupB: any): number { - return workgroupA.isVisible === workgroupB.isVisible - ? workgroupA.workgroupId - workgroupB.workgroupId - : workgroupB.isVisible - workgroupA.isVisible; - } - - private sortTeamDescending(workgroupA: any, workgroupB: any): number { - return workgroupA.isVisible === workgroupB.isVisible - ? workgroupB.workgroupId - workgroupA.workgroupId - : workgroupB.isVisible - workgroupA.isVisible; - } - - protected createSortAscendingFunction(fieldName: string): any { - return (workgroupA: any, workgroupB: any) => { - if (workgroupA.isVisible === workgroupB.isVisible) { - if (workgroupA[fieldName] === workgroupB[fieldName]) { - return workgroupA.workgroupId - workgroupB.workgroupId; - } else { - return workgroupA[fieldName] - workgroupB[fieldName]; - } - } else { - return workgroupB.isVisible - workgroupA.isVisible; - } - }; - } - - protected createSortDescendingFunction(fieldName: string): any { + protected createSortFunction(fieldName: string, ascending: boolean): any { return (workgroupA: any, workgroupB: any) => { if (workgroupA.isVisible === workgroupB.isVisible) { if (workgroupA[fieldName] === workgroupB[fieldName]) { return workgroupA.workgroupId - workgroupB.workgroupId; } else { - return workgroupB[fieldName] - workgroupA[fieldName]; + return ascending + ? workgroupA[fieldName] - workgroupB[fieldName] + : workgroupB[fieldName] - workgroupA[fieldName]; } } else { return workgroupB.isVisible - workgroupA.isVisible; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts index 9ae0c55fb5e..eb3f6b136fd 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.ts @@ -189,16 +189,16 @@ export class MilestoneClassResponsesComponent extends AbstractClassResponsesComp super.sortWorkgroups(); switch (this.sort) { case 'initialScore': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('initialScore')); + this.sortedWorkgroups.sort(this.createSortFunction('initialScore', true)); break; case '-initialScore': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('initialScore')); + this.sortedWorkgroups.sort(this.createSortFunction('initialScore', false)); break; case 'changeInScore': - this.sortedWorkgroups.sort(this.createSortAscendingFunction('changeInScore')); + this.sortedWorkgroups.sort(this.createSortFunction('changeInScore', true)); break; case '-changeInScore': - this.sortedWorkgroups.sort(this.createSortDescendingFunction('changeInScore')); + this.sortedWorkgroups.sort(this.createSortFunction('changeInScore', false)); break; } } From 5e8ec045c2ebbd42686ae97688e00a4ac4ffa9ec Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 26 Feb 2025 18:10:14 -0800 Subject: [PATCH 046/127] Clean up sortWorkgroups() using convention. Fix issue where sorting by score was not working for null scores. --- .../AbstractClassResponseComponent.ts | 32 ++++--------------- .../component-class-responses.component.html | 12 +++---- .../component-class-responses.component.ts | 2 +- .../component-workgroup-item.component.ts | 1 + .../milestone-class-responses.component.html | 12 +++---- .../milestone-class-responses.component.ts | 18 ----------- src/messages.xlf | 12 +++---- 7 files changed, 27 insertions(+), 62 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts index a183d1bb44f..9d7cfed5ccf 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/AbstractClassResponseComponent.ts @@ -14,7 +14,7 @@ export abstract class AbstractClassResponsesComponent { protected allWorkgroupsExpanded: boolean; protected component: any; protected node: Node; - protected sort: string; + protected sort: string = 'workgroupId'; sortedWorkgroups: any[] = []; workgroups: any[] = []; protected workgroupInViewById: any = {}; // whether the workgroup is in view or not @@ -128,36 +128,19 @@ export abstract class AbstractClassResponsesComponent { ); } - protected sortWorkgroups(): void { - this.sortedWorkgroups = [...this.workgroups]; - switch (this.sort) { - case 'team': - this.sortedWorkgroups.sort(this.createSortFunction('workgroupId', true)); - break; - case '-team': - this.sortedWorkgroups.sort(this.createSortFunction('workgroupId', false)); - break; - case 'status': - this.sortedWorkgroups.sort(this.createSortFunction('completionStatus', true)); - break; - case '-status': - this.sortedWorkgroups.sort(this.createSortFunction('completionStatus', false)); - break; - case 'score': - this.sortedWorkgroups.sort(this.createSortFunction('score', true)); - break; - case '-score': - this.sortedWorkgroups.sort(this.createSortFunction('score', false)); - break; - } + private sortWorkgroups(): void { + this.sortedWorkgroups = [...this.workgroups].sort(this.createSortFunction()); } - protected createSortFunction(fieldName: string, ascending: boolean): any { + private createSortFunction(): (workgroupA: any, workgroupB: any) => number { return (workgroupA: any, workgroupB: any) => { + const ascending = this.sort[0] !== '-'; + const fieldName = this.sort.replace('-', ''); if (workgroupA.isVisible === workgroupB.isVisible) { if (workgroupA[fieldName] === workgroupB[fieldName]) { return workgroupA.workgroupId - workgroupB.workgroupId; } else { + debugger; return ascending ? workgroupA[fieldName] - workgroupB[fieldName] : workgroupB[fieldName] - workgroupA[fieldName]; @@ -170,7 +153,6 @@ export abstract class AbstractClassResponsesComponent { setSort(criteria: string): void { this.sort = this.sort === criteria ? `-${criteria}` : criteria; - this.dataService.nodeGradingSort = this.sort; this.sortWorkgroups(); } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html index 3011a0dfe1d..f66db30b4c0 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html @@ -36,15 +36,15 @@ -
-
- Question: - +
+ +
+
+ Question: + +
+ - diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 3c62d744c23..e0606302b99 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -13,16 +13,35 @@ import { Subscription } from 'rxjs'; import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { ComponentGradingViewComponent } from '../../component-grading-view/component-grading-view.component'; import { ComponentContent } from '../../../../common/ComponentContent'; +import { MatButtonModule } from '@angular/material/button'; @Component({ imports: [ CommonModule, ComponentGradingViewComponent, FlexLayoutModule, + MatButtonModule, MatIconModule, RouterModule, SelectComponentComponent ], + selector: 'node-grading', + standalone: true, + styles: [ + ` + .content-head-label { + font-size: 50%; + } + + .component-select { + padding: 6px 16px; + } + + .list-item { + display: block; + } + ` + ], templateUrl: './node-grading.component.html' }) export class NodeGradingComponent { @@ -33,6 +52,7 @@ export class NodeGradingComponent { protected node: Node; protected nodeAverageScore: number; protected nodeCompletionPercent: number; + protected nodeMaxScore: number; @Input() nodeId: string; protected numRubrics: number; private periodId: number; @@ -66,6 +86,15 @@ export class NodeGradingComponent { private setFields(): void { this.hasWork = this.projectService.nodeHasWork(this.nodeId); this.node = this.projectService.getNode(this.nodeId); + this.nodeAverageScore = this.classroomStatusService.getNodeAverageScore( + this.nodeId, + this.dataService.getCurrentPeriodId() + ); + this.nodeCompletionPercent = this.classroomStatusService.getNodeCompletion( + this.nodeId, + this.dataService.getCurrentPeriodId() + ).completionPct; + this.nodeMaxScore = this.projectService.getMaxScoreForNode(this.nodeId); this.components = this.projectService .getComponents(this.nodeId) .filter((component) => this.projectService.componentHasWork(component)); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html index 86beaf65d67..3309672c0f1 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html @@ -1,8 +1,10 @@ - - @for (component of components; track component.id; let i = $index) { - - {{ i + 1 }}. {{ component.type }} - - } - + + + @for (component of components; track component.id; let i = $index) { + + {{ i + 1 }}. {{ component.type }} + + } + + of {{ components.length }} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss new file mode 100644 index 00000000000..233ebef4f01 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss @@ -0,0 +1,24 @@ +@use '@angular/material' as mat; +@import 'style/base/typography'; + +.select-component { + .mdc-line-ripple { + &:before, &:after { + display: none; + } + } + + .mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { + padding-top: 6px; + padding-bottom: 6px; + min-height: 28px; + } + + .mat-mdc-form-field-flex { + height: 36px; + } + + .mat-mdc-select-value-text, .mat-mdc-form-field-input-control.mat-mdc-form-field-input-control { + font-size: mat.m2-font-size($wise-typography, 'caption'); + } +} \ No newline at end of file diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts index 5bcab3050c0..64fe9b71845 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts @@ -1,13 +1,16 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; import { MatSelectModule } from '@angular/material/select'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { MatOptionModule } from '@angular/material/core'; import { ComponentContent } from '../../../../common/ComponentContent'; +import { MatFormFieldModule } from '@angular/material/form-field'; @Component({ - imports: [CommonModule, FormsModule, MatOptionModule, MatSelectModule], + encapsulation: ViewEncapsulation.None, + imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], selector: 'select-component', + standalone: true, + styleUrls: ['./select-component.component.scss'], templateUrl: './select-component.component.html' }) export class SelectComponentComponent { diff --git a/src/messages.xlf b/src/messages.xlf index e3e1e5f22d5..a02adeccfd3 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2322,7 +2322,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 83,85 + 71,73 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html @@ -13262,35 +13262,35 @@ The branches will be removed but the steps will remain in the unit. Expand all teams src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 14,17 + 8,11 + Expand all src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 20,24 + 14,18 Collapse all teams src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 24,27 + 18,21 - Collapse all src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 30,34 + 24,28 Sort by team src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 40,43 + 34,38 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html @@ -13301,7 +13301,7 @@ The branches will be removed but the steps will remain in the unit. Team src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 43,44 + 37,38 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html @@ -13324,14 +13324,14 @@ The branches will be removed but the steps will remain in the unit. Sorty by completion src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 60,64 + 51,55 Status src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 63,64 + 54,55 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html @@ -13346,7 +13346,7 @@ The branches will be removed but the steps will remain in the unit. Sort by score src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 80,84 + 68,72 src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html @@ -13361,14 +13361,7 @@ The branches will be removed but the steps will remain in the unit. Component Completion src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html - 4,5 - - - - Mean Score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html - 7,9 + 6,7 @@ -14021,7 +14014,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 24,26 + 20,22 src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html @@ -14103,39 +14096,32 @@ The branches will be removed but the steps will remain in the unit. 6,9 - - N/A - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 13,15 - - - - Step Mean Score + + Mean Step Score src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 15,20 + 11,15 Info + Tips () src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 26,27 + 22,23 Question: src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 32,35 + 28,31 of src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html - 8,9 + 10,11 From b3bc8a65fed9796cd2d52d4215c8c1dc37c1cbb7 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Wed, 2 Apr 2025 22:31:21 -0700 Subject: [PATCH 072/127] Show component type labels in component select --- .../select-component/select-component.component.html | 2 +- .../select-component/select-component.component.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html index 3309672c0f1..50a3187660e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html @@ -2,7 +2,7 @@ @for (component of components; track component.id; let i = $index) { - {{ i + 1 }}. {{ component.type }} + {{ i + 1 }}. {{ getComponentTypeLabel(component.type) }} } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts index 64fe9b71845..955f0965955 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts @@ -4,6 +4,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { ComponentContent } from '../../../../common/ComponentContent'; import { MatFormFieldModule } from '@angular/material/form-field'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; @Component({ encapsulation: ViewEncapsulation.None, @@ -18,8 +19,14 @@ export class SelectComponentComponent { @Input() selectedComponent: ComponentContent; @Output() componentChangedEvent: EventEmitter = new EventEmitter(); + constructor(private componentTypeService: ComponentTypeService) {} + protected selectComponent(component: ComponentContent): void { this.selectedComponent = component; this.componentChangedEvent.emit(component); } + + protected getComponentTypeLabel(componentType: string): string { + return this.componentTypeService.getComponentTypeLabel(componentType); + } } From a9a643fec4a071677950972f0a0359c869bc7ed5 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 13 May 2025 15:00:18 -0700 Subject: [PATCH 073/127] Remove routing to specific component. Show all components in NodeGrading view. Remove SelectComponentComponent. --- .../teacher/teacher-tools-routing.module.ts | 15 +-------- .../node-grading/node-grading.component.html | 9 ++---- .../node-grading.component.spec.ts | 6 +--- .../node-grading/node-grading.component.ts | 27 +++------------- .../select-component.component.html | 10 ------ .../select-component.component.scss | 24 -------------- .../select-component.component.spec.ts | 22 ------------- .../select-component.component.ts | 32 ------------------- src/messages.xlf | 9 +----- 9 files changed, 10 insertions(+), 144 deletions(-) delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts diff --git a/src/app/teacher/teacher-tools-routing.module.ts b/src/app/teacher/teacher-tools-routing.module.ts index 49b59eb22ff..1f7761f8f85 100644 --- a/src/app/teacher/teacher-tools-routing.module.ts +++ b/src/app/teacher/teacher-tools-routing.module.ts @@ -1,4 +1,4 @@ -import { inject, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ClassroomMonitorComponent } from '../../assets/wise5/classroomMonitor/classroom-monitor.component'; import { TeacherToolsResolver } from './teacher-tools.resolver'; @@ -17,7 +17,6 @@ import { ExportEventsComponent } from '../../assets/wise5/classroomMonitor/dataE import { ExportOneWorkgroupPerRowComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component'; import { ExportStudentWorkComponent } from '../../assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component'; import { NodeGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component'; -import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService'; const routes: Routes = [ { @@ -38,18 +37,6 @@ const routes: Routes = [ { path: 'group/:nodeId', component: NodeProgressViewComponent }, { path: 'node/:nodeId', - pathMatch: 'full', - redirectTo: ({ params }) => { - const nodeId = params['nodeId']; - const projectService = inject(TeacherProjectService); - const components = projectService - .getComponents(nodeId) - .filter((component) => projectService.componentHasWork(component)); - return `node/${nodeId}/component/${components[0].id}`; - } - }, - { - path: 'node/:nodeId/component/:componentId', component: NodeGradingComponent }, { path: 'notebook', component: NotebookGradingComponent }, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index fa6759e4a44..b7297c46376 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -26,12 +26,9 @@

Question: -
- + @for (component of components; track component.id) { + + } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index 3d0c5df16e7..dc2493e6eae 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -2,13 +2,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NodeGradingComponent } from './node-grading.component'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; import { TeacherDataService } from '../../../../services/teacherDataService'; -import { provideRouter } from '@angular/router'; import { MockProviders } from 'ng-mocks'; import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { Node } from '../../../../common/Node'; import { Observable, Subject } from 'rxjs'; -import { AnnotationService } from '../../../../services/annotationService'; -import { ComponentServiceLookupService } from '../../../../services/componentServiceLookupService'; import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { WorkgroupService } from '../../../../../../app/services/workgroup.service'; @@ -44,7 +41,6 @@ describe('NodeGradingComponent', () => { imports: [NodeGradingComponent, ClassroomMonitorTestingModule], providers: [ MockProviders(ClassroomStatusService, TeacherProjectService, WorkgroupService), - provideRouter([]), { provide: TeacherDataService, useClass: MockDataService } ] }).compileComponents(); @@ -65,7 +61,6 @@ describe('NodeGradingComponent', () => { component = fixture.componentInstance; component.nodeId = 'node1'; component.ngOnInit(); - component.ngOnChanges(); }); periodChanged_RecalculateNodeCompletion(); @@ -74,6 +69,7 @@ describe('NodeGradingComponent', () => { function periodChanged_RecalculateNodeCompletion() { describe('period changed', () => { it('recalculates node completion', () => { + nodeCompletionSpy.calls.reset(); dataService.setCurrentPeriod({ periodId: 1 }); expect(nodeCompletionSpy).toHaveBeenCalledTimes(1); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index e0606302b99..8bd2637ba8e 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -7,12 +7,9 @@ import { FlexLayoutModule } from '@angular/flex-layout'; import { MatIconModule } from '@angular/material/icon'; import { MatDialog } from '@angular/material/dialog'; import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; -import { SelectComponentComponent } from '../select-component/select-component.component'; import { Node } from '../../../../common/Node'; import { Subscription } from 'rxjs'; -import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { ComponentGradingViewComponent } from '../../component-grading-view/component-grading-view.component'; -import { ComponentContent } from '../../../../common/ComponentContent'; import { MatButtonModule } from '@angular/material/button'; @Component({ @@ -21,12 +18,8 @@ import { MatButtonModule } from '@angular/material/button'; ComponentGradingViewComponent, FlexLayoutModule, MatButtonModule, - MatIconModule, - RouterModule, - SelectComponentComponent + MatIconModule ], - selector: 'node-grading', - standalone: true, styles: [ ` .content-head-label { @@ -45,8 +38,6 @@ import { MatButtonModule } from '@angular/material/button'; templateUrl: './node-grading.component.html' }) export class NodeGradingComponent { - protected component: ComponentContent; - @Input() componentId: string; protected components: any[]; protected hasWork: boolean; protected node: Node; @@ -62,12 +53,11 @@ export class NodeGradingComponent { private classroomStatusService: ClassroomStatusService, private dataService: TeacherDataService, private dialog: MatDialog, - private projectService: TeacherProjectService, - private route: ActivatedRoute, - private router: Router + private projectService: TeacherProjectService ) {} ngOnInit(): void { + this.setFields(); this.subscriptions.add( this.dataService.currentPeriodChanged$.subscribe(() => this.setPeriod()) ); @@ -78,9 +68,7 @@ export class NodeGradingComponent { } ngOnChanges(): void { - if (this.nodeId && this.componentId) { - this.setFields(); - } + this.setFields(); } private setFields(): void { @@ -98,7 +86,6 @@ export class NodeGradingComponent { this.components = this.projectService .getComponents(this.nodeId) .filter((component) => this.projectService.componentHasWork(component)); - this.component = this.node.getComponent(this.componentId); this.numRubrics = this.node.getNumRubrics(); this.setPeriod(); } @@ -129,10 +116,4 @@ export class NodeGradingComponent { width: '90%' }); } - - protected navigateToComponent(component: ComponentContent): void { - this.router.navigate(['..', component.id], { - relativeTo: this.route - }); - } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html deleted file mode 100644 index 50a3187660e..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html +++ /dev/null @@ -1,10 +0,0 @@ - - - @for (component of components; track component.id; let i = $index) { - - {{ i + 1 }}. {{ getComponentTypeLabel(component.type) }} - - } - - - of {{ components.length }} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss deleted file mode 100644 index 3efe750dd27..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -@use '@angular/material' as mat; -@use 'style/base/typography'; - -.select-component { - .mdc-line-ripple { - &:before, &:after { - display: none; - } - } - - .mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { - padding-top: 6px; - padding-bottom: 6px; - min-height: 28px; - } - - .mat-mdc-form-field-flex { - height: 36px; - } - -.mat-mdc-select-value-text, .mat-mdc-form-field-input-control.mat-mdc-form-field-input-control { - font-size: mat.m2-font-size(typography.$wise-typography, 'caption'); - } -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts deleted file mode 100644 index 7f6e965293c..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { SelectComponentComponent } from './select-component.component'; - -describe('SelectComponentComponent', () => { - let component: SelectComponentComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [SelectComponentComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(SelectComponentComponent); - component = fixture.componentInstance; - component.components = []; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts deleted file mode 100644 index 955f0965955..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; -import { MatSelectModule } from '@angular/material/select'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { ComponentContent } from '../../../../common/ComponentContent'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { ComponentTypeService } from '../../../../services/componentTypeService'; - -@Component({ - encapsulation: ViewEncapsulation.None, - imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], - selector: 'select-component', - standalone: true, - styleUrls: ['./select-component.component.scss'], - templateUrl: './select-component.component.html' -}) -export class SelectComponentComponent { - @Input() components: any[]; - @Input() selectedComponent: ComponentContent; - @Output() componentChangedEvent: EventEmitter = new EventEmitter(); - - constructor(private componentTypeService: ComponentTypeService) {} - - protected selectComponent(component: ComponentContent): void { - this.selectedComponent = component; - this.componentChangedEvent.emit(component); - } - - protected getComponentTypeLabel(componentType: string): string { - return this.componentTypeService.getComponentTypeLabel(componentType); - } -} diff --git a/src/messages.xlf b/src/messages.xlf index 74c6b198b3c..2a2f66463d9 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14255,14 +14255,7 @@ The branches will be removed but the steps will remain in the unit. Question: src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 28,31 - - - - of - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/select-component/select-component.component.html - 10,11 + 28,30 From 76bb8e24f09940d1bb074601b32b6b40d53bb6c1 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 14 May 2025 11:56:06 -0700 Subject: [PATCH 074/127] Add FilterComponentsComponent to let teacher choose only components that they want to see --- .../filter-components.component.html | 24 +++++ .../filter-components.component.spec.ts | 89 +++++++++++++++++++ .../filter-components.component.ts | 46 ++++++++++ .../node-grading/node-grading.component.html | 6 +- .../node-grading.component.spec.ts | 4 +- .../node-grading/node-grading.component.ts | 11 ++- src/messages.xlf | 27 +++++- 7 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html new file mode 100644 index 00000000000..dabc17a1b06 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html @@ -0,0 +1,24 @@ +@if (components.length == 1) { + +} @else if (components.length > 1) { + + + {{ selectedText }} + + @for (component of components; track component.id; let i = $index) { + + {{ i + 1 }}: {{ getComponentTypeLabel(component.type) }} + + } + + + +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts new file mode 100644 index 00000000000..dc571cb0550 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts @@ -0,0 +1,89 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FilterComponentsComponent } from './filter-components.component'; +import { MockProvider } from 'ng-mocks'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { ComponentContent } from '../../../../common/ComponentContent'; +import { HarnessLoader } from '@angular/cdk/testing'; +import { MatSelectHarness } from '@angular/material/select/testing'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; + +let component: FilterComponentsComponent; +let fixture: ComponentFixture; +let loader: HarnessLoader; +let select: MatSelectHarness; +describe('FilterComponentsComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [FilterComponentsComponent], + providers: [MockProvider(ComponentTypeService)] + }).compileComponents(); + + fixture = TestBed.createComponent(FilterComponentsComponent); + loader = TestbedHarnessEnvironment.loader(fixture); + component = fixture.componentInstance; + }); + onlyOneComponent(); + moreThanOneComponent(); +}); + +function onlyOneComponent() { + describe('when there is only 1 component', () => { + beforeEach(async () => { + component.components = [ + { + id: 'c1', + type: 'MultipleChoice' + } as ComponentContent + ]; + fixture.detectChanges(); + }); + it('should show button when there is only 1 component', () => { + const button = fixture.nativeElement.querySelector('button'); + expect(button).toBeTruthy(); + expect(button.innerText).toBe('1 assessment item'); + expect(button.disabled).toBe(true); + }); + }); +} + +function moreThanOneComponent() { + describe('when there is more than 1 component', () => { + beforeEach(async () => { + component.components = [ + { + id: 'c1', + type: 'MultipleChoice' + } as ComponentContent, + { + id: 'c2', + type: 'OpenResponse' + } as ComponentContent + ]; + component.ngOnChanges(); + fixture.detectChanges(); + select = await loader.getHarness(MatSelectHarness); + }); + it('should show options', async () => { + await select.open(); + const optionGroups = await select.getOptionGroups(); + expect(optionGroups.length).toBe(1); + expect(await optionGroups[0].getLabelText()).toBe('Assessment items to show'); + const options = await select.getOptions(); + expect(options.length).toBe(2); + expect(await options[0].isSelected()).toBe(true); + expect(await options[1].isSelected()).toBe(true); + }); + it('clicking on an option should emit selected components', async () => { + const spy = spyOn(component.componentsChange, 'emit').and.callThrough(); + await select.open(); + const options = await select.getOptions(); + await options[0].click(); + expect(spy).toHaveBeenCalledWith([ + { + id: 'c2', + type: 'OpenResponse' + } as ComponentContent + ]); + }); + }); +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts new file mode 100644 index 00000000000..6dcfb089225 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts @@ -0,0 +1,46 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { MatButtonModule } from '@angular/material/button'; +import { FormsModule } from '@angular/forms'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { ComponentContent } from '../../../../common/ComponentContent'; + +@Component({ + imports: [CommonModule, FormsModule, MatButtonModule, MatFormFieldModule, MatSelectModule], + selector: 'filter-components', + templateUrl: './filter-components.component.html' +}) +export class FilterComponentsComponent { + @Input() components: ComponentContent[]; + @Output() componentsChange: EventEmitter = new EventEmitter< + ComponentContent[] + >(); + protected selectedComponents: ComponentContent[]; + protected selectedText: string; + + constructor(private componentTypeService: ComponentTypeService) {} + + ngOnChanges(): void { + this.selectedComponents = this.components; + this.updateSelectedText(); + } + + private updateSelectedText(): void { + this.selectedText = $localize`Showing ${this.selectedComponents.length}/${this.components.length} items`; + } + + protected getComponentTypeLabel(componentType: string): string { + return this.componentTypeService.getComponentTypeLabel(componentType); + } + + protected compareById(component1: ComponentContent, component2: ComponentContent): boolean { + return component1?.id === component2?.id; + } + + protected updateSelectedComponents(): void { + this.updateSelectedText(); + this.componentsChange.emit(this.selectedComponents); + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index b7297c46376..8a3802d34a3 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -26,8 +26,12 @@

Question: +
- @for (component of components; track component.id) { + @for (component of visibleComponents; track component.id) { } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index dc2493e6eae..3a9c7d17585 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -2,12 +2,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NodeGradingComponent } from './node-grading.component'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; import { TeacherDataService } from '../../../../services/teacherDataService'; -import { MockProviders } from 'ng-mocks'; +import { MockComponent, MockProviders } from 'ng-mocks'; import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { Node } from '../../../../common/Node'; import { Observable, Subject } from 'rxjs'; import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { WorkgroupService } from '../../../../../../app/services/workgroup.service'; +import { FilterComponentsComponent } from '../filter-components/filter-components.component'; let classroomStatusService: ClassroomStatusService; let component: NodeGradingComponent; @@ -38,6 +39,7 @@ class MockDataService { describe('NodeGradingComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ + declarations: [MockComponent(FilterComponentsComponent)], imports: [NodeGradingComponent, ClassroomMonitorTestingModule], providers: [ MockProviders(ClassroomStatusService, TeacherProjectService, WorkgroupService), diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 8bd2637ba8e..965fbaeab11 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -11,11 +11,14 @@ import { Node } from '../../../../common/Node'; import { Subscription } from 'rxjs'; import { ComponentGradingViewComponent } from '../../component-grading-view/component-grading-view.component'; import { MatButtonModule } from '@angular/material/button'; +import { FilterComponentsComponent } from '../filter-components/filter-components.component'; +import { ComponentContent } from '../../../../common/ComponentContent'; @Component({ imports: [ CommonModule, ComponentGradingViewComponent, + FilterComponentsComponent, FlexLayoutModule, MatButtonModule, MatIconModule @@ -38,7 +41,7 @@ import { MatButtonModule } from '@angular/material/button'; templateUrl: './node-grading.component.html' }) export class NodeGradingComponent { - protected components: any[]; + protected components: ComponentContent[]; protected hasWork: boolean; protected node: Node; protected nodeAverageScore: number; @@ -48,6 +51,7 @@ export class NodeGradingComponent { protected numRubrics: number; private periodId: number; private subscriptions: Subscription = new Subscription(); + protected visibleComponents: ComponentContent[]; constructor( private classroomStatusService: ClassroomStatusService, @@ -86,6 +90,7 @@ export class NodeGradingComponent { this.components = this.projectService .getComponents(this.nodeId) .filter((component) => this.projectService.componentHasWork(component)); + this.visibleComponents = this.components; this.numRubrics = this.node.getNumRubrics(); this.setPeriod(); } @@ -110,6 +115,10 @@ export class NodeGradingComponent { ).completionPct; } + protected setVisibleComponents(visibleComponents: ComponentContent[]): void { + this.visibleComponents = visibleComponents; + } + protected showRubric(): void { this.dialog.open(ShowNodeInfoDialogComponent, { data: this.nodeId, diff --git a/src/messages.xlf b/src/messages.xlf index 2a2f66463d9..72f67ed6231 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14230,6 +14230,31 @@ The branches will be removed but the steps will remain in the unit. 92,93 + + Assessment items to show + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html + 2,5 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html + 15,16 + + + + 1 assessment item + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html + 3,6 + + + + Showing / items + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts + 31 + + Step Completion @@ -14255,7 +14280,7 @@ The branches will be removed but the steps will remain in the unit. Question: src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 28,30 + 28,31 From 39439e8f0a8f8bf066b9c7321c72d85d6199621f Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 22 May 2025 09:13:06 -0700 Subject: [PATCH 075/127] Move summary display to top of page --- .../component-grading-view.component.html | 1 - .../component-grading-view.component.ts | 2 -- .../nodeGrading/node-grading/node-grading.component.html | 5 ++++- .../nodeGrading/node-grading/node-grading.component.ts | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 5602d6be298..9660500f5a1 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -33,4 +33,3 @@ } - diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index 4671091ae29..1f0de804660 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -7,7 +7,6 @@ import { TeacherDataService } from '../../../services/teacherDataService'; import { isMatchingPeriods } from '../../../common/period/period'; import { AnnotationService } from '../../../services/annotationService'; import { Node } from '../../../common/Node'; -import { ComponentClassResponsesComponent } from '../component-class-responses/component-class-responses.component'; import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; import { PeerGroupButtonComponent } from '../peer-group-button/peer-group-button.component'; import { ComponentCompletionComponent } from '../component-completion/component-completion.component'; @@ -17,7 +16,6 @@ import { ComponentContent } from '../../../common/ComponentContent'; @Component({ imports: [ ComponentAverageScoreComponent, - ComponentClassResponsesComponent, ComponentCompletionComponent, MilestoneReportButtonComponent, PeerGroupButtonComponent, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 8a3802d34a3..f5eb97f7b11 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -24,6 +24,9 @@

+ @for (component of components; track component.id) { + + }
Question: />
@for (component of visibleComponents; track component.id) { - + } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 965fbaeab11..4e76aa1a10c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -13,10 +13,12 @@ import { ComponentGradingViewComponent } from '../../component-grading-view/comp import { MatButtonModule } from '@angular/material/button'; import { FilterComponentsComponent } from '../filter-components/filter-components.component'; import { ComponentContent } from '../../../../common/ComponentContent'; +import { ComponentClassResponsesComponent } from '../../component-class-responses/component-class-responses.component'; @Component({ imports: [ CommonModule, + ComponentClassResponsesComponent, ComponentGradingViewComponent, FilterComponentsComponent, FlexLayoutModule, From b45abd92e08863ae2c451685bb2edbbf8633abf3 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 23 May 2025 17:26:15 -0700 Subject: [PATCH 076/127] Add NodeClassResponses to show all the workgroup's work for the node and select component. --- .../node-class-responses.component.html | 98 +++++++++++ .../node-class-responses.component.scss | 12 ++ .../node-class-responses.component.spec.ts | 45 +++++ .../node-class-responses.component.ts | 127 ++++++++++++++ .../node-grading/node-grading.component.html | 7 +- .../node-grading/node-grading.component.ts | 8 +- .../node-workgroup-item.component.html | 66 +++++++ .../node-workgroup-item.component.scss | 24 +++ .../node-workgroup-item.component.spec.ts | 37 ++++ .../node-workgroup-item.component.ts | 163 ++++++++++++++++++ .../wise5/services/annotationService.ts | 13 ++ 11 files changed, 589 insertions(+), 11 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.scss create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html new file mode 100644 index 00000000000..ab80d92c8a4 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html @@ -0,0 +1,98 @@ + + +
+ + + + +
+ + +
+ + + +
+ +
+ @for (workgroup of sortedWorkgroups; track workgroup.workgroupId) { + @if (isWorkgroupShown(workgroup)) { + + } + } +
+ diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.scss new file mode 100644 index 00000000000..5f34e4a1459 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.scss @@ -0,0 +1,12 @@ +.user-list { + padding-top: 0; +} + +.table--list__thead__link { + padding: 0; +} + +.mdc-list-item.user-list-controls { + height: auto; + padding: 8px 16px; +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts new file mode 100644 index 00000000000..87959dd21b9 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts @@ -0,0 +1,45 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NodeClassResponsesComponent } from './node-class-responses.component'; +import { AnnotationService } from '../../../../services/annotationService'; +import { MockComponent, MockProvider, MockProviders } from 'ng-mocks'; +import { ClassroomStatusService } from '../../../../services/classroomStatusService'; +import { ComponentServiceLookupService } from '../../../../services/componentServiceLookupService'; +import { ConfigService } from '../../../../services/configService'; +import { TeacherDataService } from '../../../../services/teacherDataService'; +import { NotificationService } from '../../../../services/notificationService'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { of } from 'rxjs'; +import { WorkgroupSelectAutocompleteComponent } from '../../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; + +describe('NodeClassResponsesComponent', () => { + let component: NodeClassResponsesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [MockComponent(WorkgroupSelectAutocompleteComponent)], + imports: [NodeClassResponsesComponent], + providers: [ + MockProviders( + AnnotationService, + ClassroomStatusService, + ComponentServiceLookupService, + ConfigService, + TeacherDataService, + NotificationService + ), + MockProvider(TeacherProjectService, { + projectSaved$: of() + }) + ] + }).compileComponents(); + + fixture = TestBed.createComponent(NodeClassResponsesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.ts new file mode 100644 index 00000000000..90be65a0e18 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.ts @@ -0,0 +1,127 @@ +import { Component, Input } from '@angular/core'; +import { MatListModule } from '@angular/material/list'; +import { WorkgroupSelectAutocompleteComponent } from '../../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; +import { CommonModule } from '@angular/common'; +import { AbstractClassResponsesComponent } from '../../AbstractClassResponsesComponent'; +import { Node } from '../../../../common/Node'; +import { ComponentContent } from '../../../../common/ComponentContent'; +import { NodeWorkgroupItemComponent } from '../node-workgroup-item/node-workgroup-item.component'; +import { AnnotationService } from '../../../../services/annotationService'; +import { ClassroomStatusService } from '../../../../services/classroomStatusService'; +import { ComponentServiceLookupService } from '../../../../services/componentServiceLookupService'; +import { ConfigService } from '../../../../services/configService'; +import { TeacherDataService } from '../../../../services/teacherDataService'; +import { NotificationService } from '../../../../services/notificationService'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { Subscription } from 'rxjs'; + +@Component({ + imports: [ + CommonModule, + IntersectionObserverModule, + MatButtonModule, + MatIconModule, + MatListModule, + NodeWorkgroupItemComponent, + WorkgroupSelectAutocompleteComponent + ], + selector: 'node-class-responses', + styleUrl: './node-class-responses.component.scss', + templateUrl: './node-class-responses.component.html' +}) +export class NodeClassResponsesComponent extends AbstractClassResponsesComponent { + @Input() components: ComponentContent[]; + protected maxScore: number; + @Input() node: Node; + private subscriptions: Subscription = new Subscription(); + + constructor( + protected annotationService: AnnotationService, + protected classroomStatusService: ClassroomStatusService, + private componentServiceLookupService: ComponentServiceLookupService, + protected configService: ConfigService, + protected dataService: TeacherDataService, + protected notificationService: NotificationService, + protected projectService: TeacherProjectService + ) { + super( + annotationService, + classroomStatusService, + configService, + dataService, + notificationService, + projectService + ); + } + + ngOnInit(): void { + this.subscriptions.add(this.projectService.projectSaved$.subscribe(() => this.setMaxScore())); + } + + ngOnChanges(): void { + if (this.node && this.components) { + this.retrieveStudentData(this.node); + this.setMaxScore(); + } + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + private setMaxScore(): void { + this.maxScore = this.components + .map( + (component) => this.projectService.getMaxScoreForComponent(this.node.id, component.id) ?? 0 + ) + .reduce((accumulator, currentValue) => accumulator + currentValue, 0); + } + + protected setWorkgroupsById(): void { + this.workgroups.forEach((workgroup) => { + this.workgroupsById[workgroup.workgroupId] = workgroup; + this.updateWorkgroup(workgroup); + }); + } + + protected getWorkgroupScore(workgroupId: number): number { + return this.annotationService.getTotalNodeScore(workgroupId, this.node, this.components); + } + + protected hasWork(): boolean { + return this.projectService.nodeHasWork(this.node.id); + } + + protected isCompleted(workgroupId: number, nodeStatus: any): boolean { + return this.components.every((component) => this.isComponentCompleted(workgroupId, component)); + } + + private isComponentCompleted(workgroupId: number, component: ComponentContent): boolean { + const service = this.componentServiceLookupService.getService(component.type); + const workgroupComponentStates = this.dataService.getComponentStatesByWorkgroupIdAndComponentId( + workgroupId, + component.id + ); + return ['OpenResponse', 'Discussion'].includes(component.type) + ? service.isCompletedV2(this.node, component, { + componentStates: workgroupComponentStates + }) + : service.isCompleted( + component, + workgroupComponentStates, + this.dataService.getEventsByNodeId(this.node.id), + this.node + ); + } + + protected getComponentStates(): any[] { + return this.dataService + .getComponentStatesByNodeId(this.node.id) + .filter((componentState) => + this.components.some((component) => component.id === componentState.componentId) + ); + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index f5eb97f7b11..3d28705aadd 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -24,9 +24,6 @@

- @for (component of components; track component.id) { - - }
Question: (componentsChange)="setVisibleComponents($event)" />
- @for (component of visibleComponents; track component.id) { - - } + diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 4e76aa1a10c..59249c2bc55 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -9,21 +9,19 @@ import { MatDialog } from '@angular/material/dialog'; import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; import { Node } from '../../../../common/Node'; import { Subscription } from 'rxjs'; -import { ComponentGradingViewComponent } from '../../component-grading-view/component-grading-view.component'; import { MatButtonModule } from '@angular/material/button'; import { FilterComponentsComponent } from '../filter-components/filter-components.component'; import { ComponentContent } from '../../../../common/ComponentContent'; -import { ComponentClassResponsesComponent } from '../../component-class-responses/component-class-responses.component'; +import { NodeClassResponsesComponent } from '../node-class-responses/node-class-responses.component'; @Component({ imports: [ CommonModule, - ComponentClassResponsesComponent, - ComponentGradingViewComponent, FilterComponentsComponent, FlexLayoutModule, MatButtonModule, - MatIconModule + MatIconModule, + NodeClassResponsesComponent ], styles: [ ` diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html new file mode 100644 index 00000000000..29810d3cf82 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html @@ -0,0 +1,66 @@ +
+ + @if (expanded && !disabled) { + +
+ @for (component of components; track component.id; let i = $index) { + @if (componentIdToIsVisible[component.id]) { +
+
+

+ {{ i + 1 + '. ' + getComponentTypeLabel(component.type) }}  + +

+ +
+
+ } + } +
+ + } +
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.scss new file mode 100644 index 00000000000..57e36e9976f --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.scss @@ -0,0 +1,24 @@ +.grading__item-container { + height: auto; +} + +.node-workgroup-item { + .team-button { + min-height: 56px; + text-transform: none; + text-align: initial; + } + + .mdc-button__label { + text-transform: none; + width: 100%; + } + + .mdc-list-item.mdc-list-item--with-one-line { + height: auto; + } + + .mat-headline-5 { + margin: 0; + } +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts new file mode 100644 index 00000000000..8001e28b6ab --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts @@ -0,0 +1,37 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NodeWorkgroupItemComponent } from './node-workgroup-item.component'; +import { MockProvider, MockProviders } from 'ng-mocks'; +import { AnnotationService } from '../../../../services/annotationService'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { Node } from '../../../../common/Node'; +import { Annotation } from '../../../../common/Annotation'; +import { of } from 'rxjs'; + +describe('NodeWorkgroupItemComponent', () => { + let component: NodeWorkgroupItemComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [NodeWorkgroupItemComponent], + providers: [ + MockProvider(AnnotationService, { + annotationReceived$: of({} as Annotation) + }), + MockProviders(ComponentTypeService, TeacherProjectService) + ] + }).compileComponents(); + + fixture = TestBed.createComponent(NodeWorkgroupItemComponent); + component = fixture.componentInstance; + component.node = { id: 'node1' } as Node; + component.components = []; + component.workgroup = { workgroupId: 1, nodeStatus: { componentStatus: {} } }; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts new file mode 100644 index 00000000000..18cd7164287 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts @@ -0,0 +1,163 @@ +import { + Component, + EventEmitter, + Input, + Output, + SimpleChanges, + ViewEncapsulation +} from '@angular/core'; +import { calculateComponentVisibility } from '../../shared/grading-helpers/grading-helpers'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { TeacherProjectService } from '../../../../services/teacherProjectService'; +import { WorkgroupComponentGradingComponent } from '../../workgroup-component-grading/workgroup-component-grading.component'; +import { ComponentNewWorkBadgeComponent } from '../../../../../../app/classroom-monitor/component-new-work-badge/component-new-work-badge.component'; +import { WorkgroupNodeScoreComponent } from '../../shared/workgroupNodeScore/workgroup-node-score.component'; +import { WorkgroupNodeStatusComponent } from '../../../../../../app/classroom-monitor/workgroup-node-status/workgroup-node-status.component'; +import { WorkgroupInfoComponent } from '../workgroupInfo/workgroup-info.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatListModule } from '@angular/material/list'; +import { MatButtonModule } from '@angular/material/button'; +import { CommonModule } from '@angular/common'; +import { Node } from '../../../../common/Node'; +import { ComponentContent } from '../../../../common/ComponentContent'; +import { filter, Subscription } from 'rxjs'; +import { AnnotationService } from '../../../../services/annotationService'; + +@Component({ + encapsulation: ViewEncapsulation.None, + imports: [ + CommonModule, + MatButtonModule, + MatListModule, + FlexLayoutModule, + WorkgroupInfoComponent, + WorkgroupNodeStatusComponent, + WorkgroupNodeScoreComponent, + ComponentNewWorkBadgeComponent, + WorkgroupComponentGradingComponent + ], + selector: 'node-workgroup-item', + templateUrl: './node-workgroup-item.component.html', + styleUrl: './node-workgroup-item.component.scss' +}) +export class NodeWorkgroupItemComponent { + private componentIdToHasWork: { [componentId: string]: boolean } = {}; + protected componentIdToIsVisible: { [componentId: string]: boolean } = {}; + @Input() components: ComponentContent[] = []; + protected disabled: boolean; + @Input() expanded: boolean; + protected hasAlert: boolean; + protected hasNewAlert: boolean; + @Input() maxScore: number; + private nodeHasWork: boolean; + @Input() node: Node; + @Output() onUpdateExpand: EventEmitter = new EventEmitter(); + protected score: any; + private status: any; + protected statusClass: string; + protected statusText: string = ''; + private subscriptions: Subscription = new Subscription(); + @Input() workgroup: any; + + constructor( + private annotationService: AnnotationService, + private componentTypeService: ComponentTypeService, + private projectService: TeacherProjectService + ) {} + + ngOnInit(): void { + this.updateNode(); + this.updateStatus(); + this.subscribeToAnnotations(); + } + + private subscribeToAnnotations(): void { + this.subscriptions.add( + this.annotationService.annotationReceived$ + .pipe( + filter( + (annotation) => + annotation.nodeId === this.node.id && + annotation.toWorkgroupId === this.workgroup.workgroupId + ) + ) + .subscribe( + () => + (this.score = this.annotationService.getTotalNodeScore( + this.workgroup.workgroupId, + this.node, + this.components + )) + ) + ); + } + + private updateNode(): void { + this.nodeHasWork = this.projectService.nodeHasWork(this.node.id); + this.componentIdToHasWork = this.projectService.calculateComponentIdToHasWork(this.components); + this.componentIdToIsVisible = calculateComponentVisibility( + this.componentIdToHasWork, + this.workgroup.nodeStatus.componentStatuses + ); + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes.workgroup) { + const workgroup = changes.workgroup.currentValue; + this.hasAlert = workgroup.hasAlert; + this.hasNewAlert = workgroup.hasNewAlert; + this.status = workgroup.completionStatus; + this.score = workgroup.score != null ? workgroup.score : '-'; + this.workgroup = workgroup; + this.updateNode(); + this.updateStatus(); + } + if (changes.nodeId) { + this.updateNode(); + } + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + protected getComponentTypeLabel(componentType): string { + return this.componentTypeService.getComponentTypeLabel(componentType); + } + + private updateStatus(): void { + switch (this.status) { + case -1: + this.statusClass = ' '; + this.statusText = $localize`Not Assigned`; + break; + case 2: + this.statusClass = 'success'; + if (this.nodeHasWork) { + this.statusText = $localize`Completed`; + } else { + this.statusText = $localize`Visited`; + } + break; + case 1: + this.statusClass = 'text'; + this.statusText = $localize`Partially Completed`; + break; + default: + this.statusClass = 'text-secondary'; + if (this.nodeHasWork) { + this.statusText = $localize`No Work`; + } else { + this.statusText = $localize`Not Visited`; + } + } + if (this.hasNewAlert) { + this.statusClass = 'warn'; + } + this.disabled = this.status === -1; + } + + protected toggleExpand(): void { + this.onUpdateExpand.emit({ workgroupId: this.workgroup.workgroupId, value: !this.expanded }); + } +} diff --git a/src/assets/wise5/services/annotationService.ts b/src/assets/wise5/services/annotationService.ts index 8f9998c0e34..aa9b3fe024f 100644 --- a/src/assets/wise5/services/annotationService.ts +++ b/src/assets/wise5/services/annotationService.ts @@ -5,6 +5,8 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable, Subject } from 'rxjs'; import { generateRandomKey } from '../common/string/string'; import { Annotation } from '../common/Annotation'; +import { Node } from '../common/Node'; +import { ComponentContent } from '../common/ComponentContent'; @Injectable() export class AnnotationService { @@ -251,6 +253,17 @@ export class AnnotationService { return annotation.type === 'score' || annotation.type === 'autoScore'; } + getTotalNodeScore(workgroupId: number, node: Node, components: ComponentContent[]): number { + return this.getTotalScore( + this.annotations.filter( + (annotation) => + annotation.nodeId === node.id && + annotation.toWorkgroupId === workgroupId && + components.some((component) => component.id === annotation.componentId) + ) + ); + } + getTotalNodeScoreForWorkgroup(workgroupId: number, nodeId: string) { const annotationsForNodeAndWorkgroup = this.annotations.filter((annotation) => { return annotation.nodeId === nodeId && annotation.toWorkgroupId === workgroupId; From f92779d0ea1ec753d1a62e921f4e6326b4d90a02 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 27 May 2025 09:19:25 -0700 Subject: [PATCH 077/127] Add tests for the new components --- .../node-class-responses.component.spec.ts | 15 +++++++++++++-- .../node-workgroup-item.component.spec.ts | 5 ++++- .../node-workgroup-item.component.ts | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts index 87959dd21b9..579a1fde24d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.spec.ts @@ -10,10 +10,14 @@ import { NotificationService } from '../../../../services/notificationService'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; import { of } from 'rxjs'; import { WorkgroupSelectAutocompleteComponent } from '../../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; +import { MatButtonHarness } from '@angular/material/button/testing'; +import { HarnessLoader } from '@angular/cdk/testing'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; describe('NodeClassResponsesComponent', () => { let component: NodeClassResponsesComponent; let fixture: ComponentFixture; + let loader: HarnessLoader; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -35,11 +39,18 @@ describe('NodeClassResponsesComponent', () => { }).compileComponents(); fixture = TestBed.createComponent(NodeClassResponsesComponent); + loader = TestbedHarnessEnvironment.loader(fixture); component = fixture.componentInstance; + component['sortedWorkgroups'] = [ + { workgroupId: 1, name: 'Workgroup 1' }, + { workgroupId: 2, name: 'Workgroup 2' } + ]; fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); + it('clicking on the expand all button should expand all teams', async () => { + expect(component['allWorkgroupsExpanded']).toBeFalsy(); + await (await loader.getHarness(MatButtonHarness.with({ text: '+ Expand all' }))).click(); + expect(component['allWorkgroupsExpanded']).toBeTrue(); }); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts index 8001e28b6ab..48803a537b6 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.spec.ts @@ -31,7 +31,10 @@ describe('NodeWorkgroupItemComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it('should show team 1 with status', () => { expect(component).toBeTruthy(); + const textContent = fixture.nativeElement.textContent; + expect(textContent).toContain('Team 1'); + expect(textContent).toContain('Not Visited'); }); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts index 18cd7164287..41f7b6b1c3c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts @@ -37,8 +37,8 @@ import { AnnotationService } from '../../../../services/annotationService'; WorkgroupComponentGradingComponent ], selector: 'node-workgroup-item', - templateUrl: './node-workgroup-item.component.html', - styleUrl: './node-workgroup-item.component.scss' + styleUrl: './node-workgroup-item.component.scss', + templateUrl: './node-workgroup-item.component.html' }) export class NodeWorkgroupItemComponent { private componentIdToHasWork: { [componentId: string]: boolean } = {}; From ef826c5fb48cf9eacb75a7e88b019e67661bd1e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 27 May 2025 16:34:00 +0000 Subject: [PATCH 078/127] Updated messages --- src/messages.xlf | 418 +++++++++++++++++++++++------------------------ 1 file changed, 202 insertions(+), 216 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index f3703ac3b7e..3482fed0f25 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2409,14 +2409,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 29,30 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 71,73 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 90,92 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 71,73 + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 100,102 @@ -9307,10 +9307,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/teacher/select-runs-controls/select-runs-controls.component.html 23,24 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 69 - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 85,88 @@ -9319,6 +9315,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 143 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 137 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 104 @@ -11510,10 +11510,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/authoringTool/new-project-template.ts 80 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html - 5,9 - src/assets/wise5/services/notebookService.ts 45 @@ -13434,203 +13430,6 @@ The branches will be removed but the steps will remain in the unit. 64 - - Expand all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 8,11 - - - - + Expand all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 14,18 - - - - Collapse all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 18,21 - - - - - Collapse all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 24,28 - - - - Sort by team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 34,38 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html - 47,50 - - - - Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 37,38 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html - 50,52 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 83,86 - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 52,54 - - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 40 - - - - Sorty by completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 51,55 - - - - Status - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 54,55 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html - 70,72 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 81,83 - - - - Sort by score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html - 68,72 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html - 87,90 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 97,100 - - - - Component Completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html - 6,7 - - - - Show/hide team's work for this step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html - 11,14 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html - 11,13 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html - 12,14 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html - 12,14 - - - - Not Assigned - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 65 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 139 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 99 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 91 - - - - Partially Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 73 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 147 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 111 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 103 - - - - Not Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 78 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 109,113 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 152 - - - - No Work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts - 80 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts - 154 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts - 116 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts - 108 - - No feedback given for this version @@ -14106,6 +13905,40 @@ The branches will be removed but the steps will remain in the unit. 29,32 + + Sort by team + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 47,50 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 34,38 + + + + Team + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 50,52 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + 83,86 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 37,38 + + + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + 52,54 + + + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + 40 + + Sort by completion @@ -14117,6 +13950,36 @@ The branches will be removed but the steps will remain in the unit. 78,81 + + Status + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 70,72 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 54,55 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 81,83 + + + + Sort by score + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 87,90 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 68,72 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 97,100 + + Sort by score on Step @@ -14254,6 +14117,36 @@ The branches will be removed but the steps will remain in the unit. 77,79 + + Not Completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + 109,113 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 152 + + + + Show/hide team's work for this step + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html + 11,13 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html + 12,14 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html + 12,14 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html + 12,14 + + Step @@ -14265,6 +14158,63 @@ The branches will be removed but the steps will remain in the unit. 92,93 + + Not Assigned + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 139 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 132 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 99 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 91 + + + + Partially Completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 147 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 144 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 111 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 103 + + + + No Work + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + 154 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 149 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + 116 + + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + 108 + + Assessment items to show @@ -14290,6 +14240,41 @@ The branches will be removed but the steps will remain in the unit. 31 + + Expand all teams + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 8,11 + + + + + Expand all + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 14,18 + + + + Collapse all teams + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 18,21 + + + + - Collapse all + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 24,28 + + + + Sorty by completion + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 51,55 + + Step Completion @@ -14320,6 +14305,10 @@ The branches will be removed but the steps will remain in the unit. Visited + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 139 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 106 @@ -14331,6 +14320,10 @@ The branches will be removed but the steps will remain in the unit. Not Visited + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + 151 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 118 @@ -14473,13 +14466,6 @@ The branches will be removed but the steps will remain in the unit. 34,35 - - Peer Groups - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html - 5,9 - - Groupings for From 5fe932958ae82d8f3e523d7a2ffe127176db5827 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Wed, 28 May 2025 09:39:38 -0700 Subject: [PATCH 079/127] Update styles and terminology --- .../filter-components.component.html | 27 +++++++++---------- .../filter-components.component.scss | 10 +++++++ .../filter-components.component.ts | 1 + .../node-grading/node-grading.component.html | 4 +-- .../node-grading/node-grading.component.ts | 4 +++ 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.scss diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html index dabc17a1b06..723ede07dd7 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html @@ -1,9 +1,8 @@ -@if (components.length == 1) { - -} @else if (components.length > 1) { - + + @if (components.length == 1) { + + + } @else if (components.length > 1) { {{ selectedText }} - - @for (component of components; track component.id; let i = $index) { - - {{ i + 1 }}: {{ getComponentTypeLabel(component.type) }} - - } - + @for (component of components; track component.id; let i = $index) { + + {{ i + 1 }}: {{ getComponentTypeLabel(component.type) }} + + } - -} + } + diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.scss new file mode 100644 index 00000000000..409d37e82a1 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.scss @@ -0,0 +1,10 @@ +@use '@angular/material' as mat; + +.component-select { + @include mat.form-field-overrides( + ( + container-vertical-padding: 8px, + container-height: 40px + ) + ); +} \ No newline at end of file diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts index 6dcfb089225..74cea9ce3dc 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts @@ -10,6 +10,7 @@ import { ComponentContent } from '../../../../common/ComponentContent'; @Component({ imports: [CommonModule, FormsModule, MatButtonModule, MatFormFieldModule, MatSelectModule], selector: 'filter-components', + styleUrls: ['./filter-components.component.scss'], templateUrl: './filter-components.component.html' }) export class FilterComponentsComponent { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 3d28705aadd..b9f248ef0c2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -24,8 +24,8 @@

-
- Question: +
+

Class Responses

Date: Wed, 28 May 2025 09:54:59 -0700 Subject: [PATCH 080/127] Fix tests --- .../filter-components.component.spec.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts index dc571cb0550..f2b9c28cf47 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.spec.ts @@ -36,12 +36,10 @@ function onlyOneComponent() { } as ComponentContent ]; fixture.detectChanges(); + select = await loader.getHarness(MatSelectHarness); }); - it('should show button when there is only 1 component', () => { - const button = fixture.nativeElement.querySelector('button'); - expect(button).toBeTruthy(); - expect(button.innerText).toBe('1 assessment item'); - expect(button.disabled).toBe(true); + it('should be disabled', async () => { + expect(await select.isDisabled()).toBe(true); }); }); } @@ -65,9 +63,6 @@ function moreThanOneComponent() { }); it('should show options', async () => { await select.open(); - const optionGroups = await select.getOptionGroups(); - expect(optionGroups.length).toBe(1); - expect(await optionGroups[0].getLabelText()).toBe('Assessment items to show'); const options = await select.getOptions(); expect(options.length).toBe(2); expect(await options[0].isSelected()).toBe(true); From 237a8a5a6b7b38d16c8ac7bbc0b5d7ec05e6f4d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 28 May 2025 17:00:01 +0000 Subject: [PATCH 081/127] Updated messages --- src/messages.xlf | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 3482fed0f25..513303072d4 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14215,29 +14215,11 @@ The branches will be removed but the steps will remain in the unit. 108 - - Assessment items to show - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html - 2,5 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html - 15,16 - - - - 1 assessment item - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html - 3,6 - - Showing / items src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts - 31 + 32 @@ -14296,12 +14278,16 @@ The branches will be removed but the steps will remain in the unit. 22,23 - - Question: + + Class Responses src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 28,31 + + src/assets/wise5/directives/summary-display/summary-display.component.ts + 412 + Visited @@ -21533,13 +21519,6 @@ If this problem continues, let your teacher know and move on to the next activit 403 - - Class Responses - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 412 - - Class Scores From f521e40549e9ede16a6e08c684a15f560e702e8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 16 Aug 2025 21:39:31 +0000 Subject: [PATCH 082/127] Updated messages --- src/messages.xlf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 5d65856bc9e..f461f9caf0c 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -15968,11 +15968,7 @@ Are you sure you want to proceed? src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html -<<<<<<< HEAD - 23,29 -======= 23,28 ->>>>>>> develop From fab6297ac555bd74de363576f231bcfdefe3697d Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Mon, 25 Aug 2025 12:21:22 -0700 Subject: [PATCH 083/127] Fix Data Explorer fields in TableShowWork --- .../table/table-show-work/table-show-work.component.html | 8 +++----- .../table/table-show-work/table-show-work.module.ts | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/wise5/components/table/table-show-work/table-show-work.component.html b/src/assets/wise5/components/table/table-show-work/table-show-work.component.html index c8181e754c9..d3487c86010 100644 --- a/src/assets/wise5/components/table/table-show-work/table-show-work.component.html +++ b/src/assets/wise5/components/table/table-show-work/table-show-work.component.html @@ -16,7 +16,7 @@ @if (componentContent.dataExplorerGraphTypes.length > 1) { Graph Type - + @for (graphType of componentContent.dataExplorerGraphTypes; track graphType) { {{ graphType.name }} @@ -28,7 +28,7 @@
X Data - + {{ noneText }} @for (columnName of columnNames; track columnName; let i = $index) { @@ -45,9 +45,7 @@ Y Data {{ dataExplorerSeries.length > 1 ? i + 1 : '' }} {{ noneText }} diff --git a/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts b/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts index 06d6fbf17e8..03578e8fee1 100644 --- a/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts +++ b/src/assets/wise5/components/table/table-show-work/table-show-work.module.ts @@ -1,10 +1,12 @@ import { NgModule } from '@angular/core'; import { TableCommonModule } from '../table-common.module'; import { TableShowWorkComponent } from './table-show-work.component'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; @NgModule({ declarations: [TableShowWorkComponent], - imports: [TableCommonModule], + imports: [MatFormFieldModule, MatSelectModule, TableCommonModule], exports: [TableShowWorkComponent] }) export class TableShowWorkModule {} From aefa843f6ae98589724fb5c5e8e2281d6d41686e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 25 Aug 2025 19:25:42 +0000 Subject: [PATCH 084/127] Updated messages --- src/messages.xlf | 11258 +++++++++++++++------------------------------ 1 file changed, 3621 insertions(+), 7637 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index fef807d2c39..35d8647ebb0 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -1,4 +1,4 @@ - + @@ -13,8 +13,7 @@ 7,9 - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 19,21 @@ -23,8 +22,7 @@ - WISE is the product of more than 25 years of research on teaching and learning with - educational technologies + WISE is the product of more than 25 years of research on teaching and learning with educational technologies src/app/about/about.component.html 12,16 @@ -66,18 +64,14 @@ - Through our collaborations with teachers, administrators, technology designers, and - education researchers, we have refined a set of principles which guide the design of all - WISE curriculum materials and tools. + Through our collaborations with teachers, administrators, technology designers, and education researchers, we have refined a set of principles which guide the design of all WISE curriculum materials and tools. src/app/about/about.component.html 116,121 - This means that when implementing WISE units, you can be assured that what - you're using is grown from a solid foundation, advised by real teachers' - experiences, and tested in classrooms with real students. + This means that when implementing WISE units, you can be assured that what you're using is grown from a solid foundation, advised by real teachers' experiences, and tested in classrooms with real students. src/app/about/about.component.html 122,127 @@ -98,20 +92,14 @@ - As students grapple with multiple conflicting and confusing ideas, research has - shown that instruction is most effective when student views are used as a starting point - for scientific investigations. + As students grapple with multiple conflicting and confusing ideas, research has shown that instruction is most effective when student views are used as a starting point for scientific investigations. src/app/about/about.component.html 142,147 - The Knowledge - Integration (KI) - perspective emphasizes building on and strengthening science understanding by - incorporating new ideas and sorting out alternative perspectives using evidence. This - framework forms the basis of WISE curriculum design, assessments, and evaluation. + The Knowledge Integration (KI) perspective emphasizes building on and strengthening science understanding by incorporating new ideas and sorting out alternative perspectives using evidence. This framework forms the basis of WISE curriculum design, assessments, and evaluation. src/app/about/about.component.html 147,150 @@ -139,8 +127,7 @@ 13,16 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 103 @@ -155,8 +142,7 @@ 174,177 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 108 @@ -175,8 +161,7 @@ 25,28 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 113 @@ -210,10 +195,7 @@ - WISE units introduce students to complex science concepts through personally and - socially relevant topics. Each unit uses a classroom-tested pattern of instruction that - values the ideas students bring with them, helps them connect new information to their - personal experiences, and integrates their ideas into a coherent understanding of science. + WISE units introduce students to complex science concepts through personally and socially relevant topics. Each unit uses a classroom-tested pattern of instruction that values the ideas students bring with them, helps them connect new information to their personal experiences, and integrates their ideas into a coherent understanding of science. src/app/about/about.component.html 205,210 @@ -227,10 +209,7 @@ - Individual students differ in their experiences, interests, and abilities. WISE - provides a variety of tools, activity patterns, and instructional scaffolds that afford - multiple ways for expressing and assessing understanding. That way, no students' - abilities go unrecognized, and all have the chance to succeed. + Individual students differ in their experiences, interests, and abilities. WISE provides a variety of tools, activity patterns, and instructional scaffolds that afford multiple ways for expressing and assessing understanding. That way, no students' abilities go unrecognized, and all have the chance to succeed. src/app/about/about.component.html 215,220 @@ -244,14 +223,7 @@ - WISE is - free and open source! WISE subsists on - generous support from the National Science Foundation, which means it's available to - anyone with an internet connection. Driven by an active community of developers, WISE is - continually being expanded and improved. Bring science inquiry into the classroom, the - museum, the after-school, or the home-school environment! + WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html 226,230 @@ -265,10 +237,7 @@ - WISE gives more teachers and students the opportunity to do inquiry-based science. - Our units make difficult concepts accessible both for teachers to teach and students to - learn. WISE curricula help students see themselves as capable of doing science and realize - that, no matter their backgrounds, science can be a potential career. + WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html 236,241 @@ -309,98 +278,79 @@ 11,13 - - src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html + src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html 7,9 - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 208,212 - - src/app/modules/library/public-unit-type-selector/community-library-details.html + src/app/modules/library/public-unit-type-selector/community-library-details.html 17,19 - - src/app/modules/library/public-unit-type-selector/official-library-details.html + src/app/modules/library/public-unit-type-selector/official-library-details.html 19,21 - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html 57,59 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 86,88 - - src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html + src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html 31,33 - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 27,29 - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 52,54 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 41,43 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.html 7,9 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html 19,21 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html 59,61 - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 205,207 - - src/assets/wise5/directives/dialog-with-close/dialog-with-close.component.html + src/assets/wise5/directives/dialog-with-close/dialog-with-close.component.html 11,13 - - src/assets/wise5/directives/dialog-with-open-in-new-window/dialog-with-open-in-new-window.component.html + src/assets/wise5/directives/dialog-with-open-in-new-window/dialog-with-open-in-new-window.component.html 12,14 - - src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html + src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html 22,28 - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 74,76 - - src/assets/wise5/vle/studentAsset/student-assets-dialog/student-assets-dialog.component.html + src/assets/wise5/vle/studentAsset/student-assets-dialog/student-assets-dialog.component.html 6,8 @@ -411,13 +361,11 @@ 15,18 - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 40,45 - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 60,62 @@ -431,77 +379,64 @@ Add New Component - - src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html + src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html 1,3 Select the component type you want to add or - - src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html + src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html 4,5 import from another unit - - src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html + src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html 6,9 Cancel - - src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html + src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html 19,21 - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 62,66 - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 41,44 - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html 14,18 - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 22,23 - - src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html + src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 11,15 - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 39,43 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 79,80 - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 109,113 - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 22,23 @@ -509,723 +444,598 @@ 30,34 - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 48,52 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 160,163 - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html 40,43 - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 31,34 - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 58,62 - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html 28,31 - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 45,49 - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 39,43 - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 3,6 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 3,6 - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 50,54 - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 47,51 - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 81,85 - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 53,54 - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 75,76 - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 25,29 - - src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html + src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 16,20 - - src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html + src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html 14,18 - - src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html + src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 15,19 - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 55,56 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 63,67 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 36,40 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 33,37 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 21,22 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 24,25 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 22,25 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 25,28 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 98,99 - - src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html + src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 12,16 - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 32,36 Default Feedback on Submit - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 2,6 Add Default Feedback on Submit - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 7,11 - Default Feedback on Submit + Default Feedback on Submit - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 23,24 Move Up - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 38,41 - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 29,31 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 368,370 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 144,146 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 147,149 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 249,251 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 252,254 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 144,146 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 276,278 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 558,560 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 561,563 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 84,86 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 169,171 Move Down - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 49,53 - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 38,41 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 381,384 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 156,159 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 159,162 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 261,264 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 264,267 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 154,157 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 571,574 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 574,577 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 95,98 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 182,185 Delete - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.html 60,63 - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 49,51 - - src/app/authoring-tool/edit-connected-component-delete-button/edit-connected-component-delete-button.component.ts + src/app/authoring-tool/edit-connected-component-delete-button/edit-connected-component-delete-button.component.ts 15,18 - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html 40,41 - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 90,91 - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 30,33 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 188,191 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 398,400 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 432,434 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 169,171 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 172,174 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 274,276 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 277,279 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 166,168 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 303,305 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 306,308 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 123,125 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 174,176 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 145,147 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 588,590 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 604,607 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 229,231 - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 43,46 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 107,109 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 196,198 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 199,202 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 80,82 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 132,134 Are you sure you want to delete this default feedback? - - src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.ts + src/app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component.ts 63 Show Add to Notebook Button - - src/app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component.ts + src/app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component.ts 16,19 Advanced Settings - - src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html + src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html 1,5 - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 112 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 71 Close - - src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html + src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html 9,12 - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 115,120 Add Visibility Constraint - - src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html + src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html 3,7 Add Constraint - - src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html + src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html 9,13 - - src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html 3,7 - - src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html 8,12 Constraint - - src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html + src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html 19,22 Delete Constraint - - src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html + src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html 24,27 - - src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html 26,29 Do not count score on this activity towards the total score - - src/app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component.ts + src/app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component.ts 16,19 JSON - - src/app/authoring-tool/edit-component-json/edit-component-json.component.html + src/app/authoring-tool/edit-component-json/edit-component-json.component.html 2,6 Show JSON - - src/app/authoring-tool/edit-component-json/edit-component-json.component.html + src/app/authoring-tool/edit-component-json/edit-component-json.component.html 8,12 - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 18,21 - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 66,70 Close the JSON view to save the changes - - src/app/authoring-tool/edit-component-json/edit-component-json.component.html + src/app/authoring-tool/edit-component-json/edit-component-json.component.html 17,19 Edit Component JSON - - src/app/authoring-tool/edit-component-json/edit-component-json.component.html + src/app/authoring-tool/edit-component-json/edit-component-json.component.html 19,23 The JSON is invalid. Invalid JSON will not be saved. - Click "OK" to revert back to the last valid JSON. - Click "Cancel" to keep the invalid JSON open so you can fix it. +Click "OK" to revert back to the last valid JSON. +Click "Cancel" to keep the invalid JSON open so you can fix it. - - src/app/authoring-tool/edit-component-json/edit-component-json.component.ts + src/app/authoring-tool/edit-component-json/edit-component-json.component.ts 76 - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.ts + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.ts 85 Max Score - - src/app/authoring-tool/edit-component-max-score/edit-component-max-score.component.ts + src/app/authoring-tool/edit-component-max-score/edit-component-max-score.component.ts 11,15 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 152,155 Max Submit - - src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts + src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts 12,17 Prompt - - src/app/authoring-tool/edit-component-prompt/edit-component-prompt.component.ts + src/app/authoring-tool/edit-component-prompt/edit-component-prompt.component.ts 14,16 - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 50,51 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 172,173 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 265,268 Enter Prompt Here - - src/app/authoring-tool/edit-component-prompt/edit-component-prompt.component.ts + src/app/authoring-tool/edit-component-prompt/edit-component-prompt.component.ts 15,17 Rubric - - src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html + src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html 2,6 - - src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts + src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts 35 Edit Component Rubric - - src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html + src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html 8,12 Show Save Button - - src/app/authoring-tool/edit-component-save-button/edit-component-save-button.component.ts + src/app/authoring-tool/edit-component-save-button/edit-component-save-button.component.ts 15,18 Show Submit Button - - src/app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component.ts + src/app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component.ts 15,18 Tags - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 2,6 Add Tag - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 8,10 Tag Name - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 18,22 @@ -1236,754 +1046,627 @@ Are you sure you want to delete this tag? - - src/app/authoring-tool/edit-component-tags/edit-component-tags.component.ts + src/app/authoring-tool/edit-component-tags/edit-component-tags.component.ts 85 Component Width - - src/app/authoring-tool/edit-component-width/edit-component-width.component.ts + src/app/authoring-tool/edit-component-width/edit-component-width.component.ts 11,15 Type - - src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts + src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts 10,13 - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 47,48 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 514,516 - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 17,19 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 442,443 Import Work - - src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts + src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts 15,16 - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 22,23 Show Work - - src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts + src/app/authoring-tool/edit-connected-component-type-select/edit-connected-component-type-select.component.ts 16,20 - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 23,24 Connected Components - - src/app/authoring-tool/edit-connected-components-add-button/edit-connected-components-add-button.component.ts + src/app/authoring-tool/edit-connected-components-add-button/edit-connected-components-add-button.component.ts 13,17 Are you sure you want to delete this connected component? - - src/app/authoring-tool/edit-connected-components/edit-connected-components.component.ts + src/app/authoring-tool/edit-connected-components/edit-connected-components.component.ts 77 Prompt Rules - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 3,7 Add a new rule - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 7,10 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 7,10 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 7,10 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 150,153 Help - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 15,19 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 15,19 - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 88,92 - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 54,56 - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 11,13 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15,19 Drag to reorder - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 35,37 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 35,37 - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 30,32 - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 45,47 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 35,37 Expression - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 39,42 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 39,42 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 39,42 Delete rule - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 59,61 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 129,131 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 115,117 Move up - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 71,72 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 141,142 - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 68,69 - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 89,91 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 127,128 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 83,86 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 170,173 Move down - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 81,83 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 151,153 - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 77,79 - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 100,103 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 137,139 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 94,98 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 181,185 Add a new rule at the end - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html 97,100 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 167,170 Are you sure you want to delete this prompt rule? - - src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.ts + src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.ts 39 Enable Dynamic Prompt - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html + src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html 9,12 Reference Component: - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html + src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html 15,17 - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html + src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 47,49 Pre Prompt (Optional) - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html + src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html 28,30 Post Prompt (Optional) - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html + src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html 38,40 Question Bank Rules - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 3,7 Question - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 59,61 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts 74 - Question # + Question # - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 62,63 Delete question - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 75,77 - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 98,100 Add new question - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 112,114 - - add_circle + add_circle - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 118,119 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 93,94 Are you sure you want to delete this question rule? - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts 46 Are you sure you want to delete this question? - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts 62 - Question # + Question # - - src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts 75 Enable Question Bank - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html + src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 9,12 Custom Label - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html + src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 18,20 Student can select questions to use in Peer Chat - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html + src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 31,35 Max Number of Questions - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html + src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 37,40 Choose the step(s) that you want to import, then select Submit. - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 1,3 - Selected unit: + Selected unit: - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 3,4 - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 3,4 Preview Unit - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 8,12 - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 38,39 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 30,33 Preview Step - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 37,40 Back - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 56,61 - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 39,41 - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 75,80 - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 8,11 - - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html 7,10 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 7,10 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 117,121 - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 7,10 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 7,10 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 52,55 - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 9,12 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 7,10 Back - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 59,62 - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 28,31 - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 55,58 - - src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html 41,44 - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 42,45 - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 36,39 - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 78,81 - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 22,25 - - src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html + src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 13,16 - - src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html + src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html 11,14 - - src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html + src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 12,15 Submit - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html + src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html 73,77 - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 157,161 - - src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html + src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html 20,24 - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 43,47 - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 37,41 - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html 16,20 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 35,38 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 46,50 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 27,31 - - src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html + src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 20,22 - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 42,47 - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 69,74 - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 56,60 - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 50,54 - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 58,62 - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 92,96 - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 36,40 - - src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html + src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 27,31 - - src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html + src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html 25,29 - - src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html + src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 26,30 - - src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html + src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html 26,27 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 66,68 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 524,525 @@ -1994,288 +1677,214 @@ Run ID - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 7,12 Choose a unit from which to import step(s). - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 14,16 Choose a unit from which to import component(s). - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 16,19 My Units - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 19,22 - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 52,54 Library Units - - src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html + src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html 27,30 Component - - src/app/authoring-tool/select-component/select-component.component.html + src/app/authoring-tool/select-component/select-component.component.html 2,3 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 41 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 454,456 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 505,506 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 22,24 (This Component) - - src/app/authoring-tool/select-component/select-component.component.html + src/app/authoring-tool/select-component/select-component.component.html 11,16 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 515,519 - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 42,47 - - src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html + src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 42,47 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 41,46 Step - - src/app/authoring-tool/select-step/select-step.component.ts + src/app/authoring-tool/select-step/select-step.component.ts 11,12 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 48 - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 5,8 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 62,64 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 441,443 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 493,494 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 8,11 New - - src/app/classroom-monitor/component-new-work-badge/component-new-work-badge.component.ts + src/app/classroom-monitor/component-new-work-badge/component-new-work-badge.component.ts 11,15 - - src/app/classroom-monitor/step-info/step-info.component.html + src/app/classroom-monitor/step-info/step-info.component.html 20,23 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html 11,14 - - src/assets/wise5/directives/componentAnnotations/component-annotations.component.html + src/assets/wise5/directives/componentAnnotations/component-annotations.component.html 12,16 - - Assessment items to show - - - src/app/classroom-monitor/component-select/component-select.component.html - 2,5 - - - - src/app/classroom-monitor/component-select/component-select.component.html - 14,15 - - - - 1 assessment item - - - src/app/classroom-monitor/component-select/component-select.component.html - 3,6 - - - - Showing / items - - - src/app/classroom-monitor/component-select/component-select.component.ts - 49 - - - - / teams - completed + / teams completed - - src/app/classroom-monitor/milestones/milestones.component.html + src/app/classroom-monitor/milestones/milestones.component.html 38,40 ~ Report Available ~ - - src/app/classroom-monitor/milestones/milestones.component.html + src/app/classroom-monitor/milestones/milestones.component.html 42,46 - % completed (All periods) + % completed (All periods) - - src/app/classroom-monitor/nav-item-progress/nav-item-progress.component.html + src/app/classroom-monitor/nav-item-progress/nav-item-progress.component.html 5,6 - % completed (Period: ) + % completed (Period: ) - - src/app/classroom-monitor/nav-item-progress/nav-item-progress.component.html + src/app/classroom-monitor/nav-item-progress/nav-item-progress.component.html 14,15 Open in New Window - - src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html + src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html 6,8 Has new alert(s) - - src/app/classroom-monitor/step-info/step-info.component.ts + src/app/classroom-monitor/step-info/step-info.component.ts 32 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.ts 28 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 100 Has dismissed alert(s) - - src/app/classroom-monitor/step-info/step-info.component.ts + src/app/classroom-monitor/step-info/step-info.component.ts 33 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.ts 29 Step has rubrics/teaching tips - - src/app/classroom-monitor/step-info/step-info.component.ts + src/app/classroom-monitor/step-info/step-info.component.ts 36 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 103 Find a student - - src/app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component.html + src/app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component.html 5,9 @@ -2293,201 +1902,168 @@ 22 - - src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.ts + src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.ts 102 - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts 162 - - src/assets/wise5/authoringTool/peer-grouping/author-peer-grouping-dialog/author-peer-grouping-dialog.component.ts + src/assets/wise5/authoringTool/peer-grouping/author-peer-grouping-dialog/author-peer-grouping-dialog.component.ts 61 Select language - - src/app/common/project-language-chooser/project-language-chooser.component.ts + src/app/common/project-language-chooser/project-language-chooser.component.ts 21 Thank you for contacting WISE! - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 11,12 Your message has been sent. We will get back to you as soon as possible. - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 12,15 Return to WISE Home - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 15,19 Contact WISE - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 20,22 - - src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html + src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html 28,31 - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 51,54 - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 44,47 - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 92,95 - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html 30,33 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 48,51 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 53,56 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 34,37 Name - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 23,24 - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 47,49 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 77,79 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 186,187 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 421,422 Name required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 26,30 Email - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 33,34 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 10,11 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 44,45 - - src/app/register/register-teacher/register-teacher.component.html + src/app/register/register-teacher/register-teacher.component.html 6,7 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 42,43 Email required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 36,38 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 13,17 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 51,53 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 48,53 Invalid Email - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 39,42 Teacher - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 47,49 @@ -2495,8 +2071,7 @@ 19,20 - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 28,29 @@ -2507,40 +2082,35 @@ Teacher required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 56,59 Issue Type - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 64,66 Issue Type required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 73,76 Unit Name - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 80,81 Summary - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 87,88 @@ -2559,81 +2129,64 @@ Summary required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 90,94 Description - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 96,99 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 558,560 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 164,166 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 255,258 - - src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html + src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html 17,21 - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 22,26 - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 151,155 - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 185,189 Description required - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 112,116 - This site is protected by reCAPTCHA and the Google Privacy - Policy and Terms of - Service apply. - - - src/app/contact/contact-form/contact-form.component.html + This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. + + src/app/contact/contact-form/contact-form.component.html 118,121 - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 27,31 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 31,35 @@ -2641,61 +2194,50 @@ 44,48 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 137,141 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 151,155 Recaptcha failed. Please reload the page and try again! - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 126,129 Sorry, there was a problem submitting the form. Please try again. - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 130,134 - By submitting, you will be sending your unit to be reviewed. If approved, it will - be added to the Community Built library. Make sure you have filled out all appropriate - fields in the Unit Info page in the authoring tool. We will be in touch if we require any - more information. + By submitting, you will be sending your unit to be reviewed. If approved, it will be added to the Community Built library. Make sure you have filled out all appropriate fields in the Unit Info page in the authoring tool. We will be in touch if we require any more information. - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 136,141 Thank you! - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 141,145 - - src/app/student/survey/survey-completed/survey-completed.component.html + src/app/student/survey/survey-completed/survey-completed.component.html 19,23 Submit for Review - - src/app/contact/contact-form/contact-form.component.html + src/app/contact/contact-form/contact-form.component.html 155,157 @@ -2801,8 +2343,7 @@ 7,10 - - src/app/teacher/teacher-home/teacher-home.component.html + src/app/teacher/teacher-home/teacher-home.component.html 13,15 @@ -2813,8 +2354,7 @@ 12,14 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 5,8 @@ -2825,29 +2365,24 @@ 15,20 - - src/app/teacher/teacher-home/teacher-home.component.html + src/app/teacher/teacher-home/teacher-home.component.html 16,21 - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 41 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 76 - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 22,28 - Explore our curriculum library to find units and resources to use with your - classes! + Explore our curriculum library to find units and resources to use with your classes! src/app/curriculum/curriculum.component.html 21,24 @@ -2861,14 +2396,14 @@ - Public () + Public () src/app/curriculum/curriculum.component.ts 75 - My Units () + My Units () src/app/curriculum/curriculum.component.ts 79 @@ -2881,13 +2416,11 @@ 13 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 33 - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 3,5 @@ -2898,53 +2431,43 @@ 17 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 53 - - src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html + src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html 16,18 - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 10,12 - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 29,30 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 93,95 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + 90,92 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 157,159 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 71,73 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 102,104 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 70 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 396 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 132,135 @@ -2955,23 +2478,19 @@ 21 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 62 - - src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html + src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html 21,23 - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 15,17 - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 36,38 @@ -2982,23 +2501,19 @@ 25 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 32 - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 14 - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 45,47 - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 4 @@ -3136,17 +2651,14 @@ - A powerful online platform for designing, developing, and implementing science - inquiry units + A powerful online platform for designing, developing, and implementing science inquiry units src/app/features/features.component.html 12,16 - Since 1997, WISE has served a growing community of more than 20,000 teachers, - researchers, and curriculum designers, as well as over 200,000 K-12 students around the - world. + Since 1997, WISE has served a growing community of more than 20,000 teachers, researchers, and curriculum designers, as well as over 200,000 K-12 students around the world. src/app/features/features.component.html 16,20 @@ -3216,19 +2728,14 @@ - WISE engages students in the methods of real scientists and engineers. We take a - multidisciplinary approach so that students learn inquiry through activities that - emphasize essential skills in reading, writing, and multimedia literacy. Many of our units - are also project-based and feature hands-on design challenges. + WISE engages students in the methods of real scientists and engineers. We take a multidisciplinary approach so that students learn inquiry through activities that emphasize essential skills in reading, writing, and multimedia literacy. Many of our units are also project-based and feature hands-on design challenges. src/app/features/features.component.html 81,87 - With WISE inquiry units, students not only learn skills that prepare them to be - successful in STEM. They also learn skills necessary to be responsible, critical thinking - citizens. + With WISE inquiry units, students not only learn skills that prepare them to be successful in STEM. They also learn skills necessary to be responsible, critical thinking citizens. src/app/features/features.component.html 87,92 @@ -3242,27 +2749,18 @@ - WISE offers a growing collection of curriculum units that address key conceptual - difficulties students encounter in science. Units are carefully crafted to supplement - teachers' core curricular scope and sequence and are iteratively refined through - classroom-based research. + WISE offers a growing collection of curriculum units that address key conceptual difficulties students encounter in science. Units are carefully crafted to supplement teachers' core curricular scope and sequence and are iteratively refined through classroom-based research. src/app/features/features.component.html 96,102 - WISE units support the Next - Generation Science Standards (NGSS), encourage 3-dimensional - learning, and can be - adapted to address local standards. + WISE units support the Next Generation Science Standards (NGSS), encourage 3-dimensional learning, and can be adapted to address local standards. src/app/features/features.component.html 103,109 @@ -3325,19 +2823,14 @@ - WISE provides a simple user interface, cognitive hints, embedded assessments, and - online discussions, as well as tools for drawing, annotation, concept mapping, - diagramming, and graphing. + WISE provides a simple user interface, cognitive hints, embedded assessments, and online discussions, as well as tools for drawing, annotation, concept mapping, diagramming, and graphing. src/app/features/features.component.html 232,237 - Students conduct investigations using interactive simulations and models. A - notebook tool helps students collect ideas and organize evidence into research and design - reports. WISE units promote self-monitoring through collaborative reflection activities as - well as automated, personalized guidance and adaptive instruction. + Students conduct investigations using interactive simulations and models. A notebook tool helps students collect ideas and organize evidence into research and design reports. WISE units promote self-monitoring through collaborative reflection activities as well as automated, personalized guidance and adaptive instruction. src/app/features/features.component.html 237,243 @@ -3351,19 +2844,14 @@ - WISE offers an extensive suite of integrated tools that help teachers plan, monitor - progress, gain insights, provide feedback, and grade more efficiently. These tools are - continually refined through collaborations with practicing teachers who understand the - real challenges of managing modern classrooms. + WISE offers an extensive suite of integrated tools that help teachers plan, monitor progress, gain insights, provide feedback, and grade more efficiently. These tools are continually refined through collaborations with practicing teachers who understand the real challenges of managing modern classrooms. src/app/features/features.component.html 251,257 - By facilitating these necessary but time-consuming tasks, teachers are free to - focus on what makes them indispensable: providing quality instruction to individual - students. + By facilitating these necessary but time-consuming tasks, teachers are free to focus on what makes them indispensable: providing quality instruction to individual students. src/app/features/features.component.html 257,261 @@ -3433,8 +2921,7 @@ - In development: Automated insights into student NGSS understanding + suggested - classroom interventions! + In development: Automated insights into student NGSS understanding + suggested classroom interventions! src/app/features/features.component.html 339,343 @@ -3468,18 +2955,15 @@ 9,10 - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 18,19 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 45 - - src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts + src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts 22 @@ -3500,29 +2984,25 @@ Password Changed - - src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html + src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html 3,5 Your password has been successfully changed. - - src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html + src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html 4,5 Sign In - - src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html + src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.html 5,8 - - src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html + src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html 8,11 @@ -3534,152 +3014,126 @@ 45,47 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 61,63 Change Password - - src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html + src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html 4,7 - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html 4,5 - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 38,40 Create New Account - - src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html + src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.html 31,35 - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 54,58 - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 47,51 - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 95,99 - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html 33,37 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 51,55 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 56,60 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 37,41 Answer Security Question - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 4,7 Answer required - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.html 21,25 - Incorrect answer, please try again. If you can't remember the answer to your - security question, please ask your teacher to change your password or contact us for - assistance. + Incorrect answer, please try again. If you can't remember the answer to your security question, please ask your teacher to change your password or contact us for assistance. - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.ts + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.ts 101 Recaptcha failed. Please reload the page and try again. - - src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.ts + src/app/forgot/student/forgot-student-password-security/forgot-student-password-security.component.ts 104 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts 116 Forgot Student Password - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 4,6 Forgot Student Username - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 8,12 - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 4,6 Username - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 13,16 - - src/app/forgot/student/forgot-student/forgot-student.component.html + src/app/forgot/student/forgot-student/forgot-student.component.html 8,11 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 15,18 - - src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html + src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html 8,11 @@ -3687,482 +3141,398 @@ 18,21 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 23,24 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 44,45 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 23,24 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 18,21 Username required - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.html + src/app/forgot/student/forgot-student-password/forgot-student-password.component.html 23,27 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 25,29 - We could not find that username. Please make sure you are typing it correctly and - try again. If you have forgotten your username, please use the forgot username option - below. + We could not find that username. Please make sure you are typing it correctly and try again. If you have forgotten your username, please use the forgot username option below. - - src/app/forgot/student/forgot-student-password/forgot-student-password.component.ts + src/app/forgot/student/forgot-student-password/forgot-student-password.component.ts 103 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts 106 First Name - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 22,25 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 7,10 - - src/app/register/register-student/register-student.component.html + src/app/register/register-student/register-student.component.html 6,7 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 7,10 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 5,6 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 5,6 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 50 First Name required - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 32,37 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 17,19 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 17,19 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 8,13 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 8,13 Last Name - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 38,39 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 29,30 - - src/app/register/register-student/register-student.component.html + src/app/register/register-student/register-student.component.html 12,13 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 29,30 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 14,15 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 14,15 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 55 Last Name required - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 41,46 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 32,34 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 32,34 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 17,22 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 17,22 Birthday (Month) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 47,49 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 59,61 Month required - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 56,61 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 68,73 Birthday (Day) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 62,64 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 74,76 Day required - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 71,75 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 83,87 Search - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.html + src/app/forgot/student/forgot-student-username/forgot-student-username.component.html 85,89 - - src/app/modules/shared/search-bar/search-bar.component.ts + src/app/modules/shared/search-bar/search-bar.component.ts 36 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 12,14 - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 15,16 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 63,66 01 (Jan) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 51 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 35 02 (Feb) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 52 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 36 03 (Mar) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 53 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 37 04 (Apr) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 54 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 38 05 (May) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 55 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 39 06 (Jun) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 56 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 40 07 (Jul) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 57 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 41 08 (Aug) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 58 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 42 09 (Sep) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 59 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 43 10 (Oct) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 60 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 44 11 (Nov) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 61 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 45 12 (Dec) - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 62 - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 46 - We did not find any usernames that match the information you provided. Please make - sure you entered your information correctly. If you can't find your account, ask a - teacher for help or contact us for assistance. + We did not find any usernames that match the information you provided. Please make sure you entered your information correctly. If you can't find your account, ask a teacher for help or contact us for assistance. - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 125 - We found a username that matches. Select it to log in. If this username is not - yours, ask a teacher for help or contact us for assistance. + We found a username that matches. Select it to log in. If this username is not yours, ask a teacher for help or contact us for assistance. - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 128 - We found multiple usernames that match. If one of these is yours, select it to log - in. If you can't find your account, ask a teacher for help or contact us for - assistance. + We found multiple usernames that match. If one of these is yours, select it to log in. If you can't find your account, ask a teacher for help or contact us for assistance. - - src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts + src/app/forgot/student/forgot-student-username/forgot-student-username.component.ts 131 Student Forgot Username or Password - - src/app/forgot/student/forgot-student/forgot-student.component.html + src/app/forgot/student/forgot-student/forgot-student.component.html 1,2 Look up username - - src/app/forgot/student/forgot-student/forgot-student.component.html + src/app/forgot/student/forgot-student/forgot-student.component.html 10,13 - - src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html + src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html 10,13 Password - - src/app/forgot/student/forgot-student/forgot-student.component.html + src/app/forgot/student/forgot-student/forgot-student.component.html 18,21 - - src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html + src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html 18,21 @@ -4170,8 +3540,7 @@ 31,34 - - src/app/register/register-user-form/register-user-form.component.ts + src/app/register/register-user-form/register-user-form.component.ts 10 @@ -4179,8 +3548,7 @@ 14,16 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 51,52 @@ -4191,198 +3559,161 @@ Reset password - - src/app/forgot/student/forgot-student/forgot-student.component.html + src/app/forgot/student/forgot-student/forgot-student.component.html 20,24 - - src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html + src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html 20,24 Teacher Forgot Password - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.html 23,28 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 41,46 - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 4,7 - The verification code has expired. Verification codes are valid for 10 minutes. - Please go back to the Teacher Forgot Password page to generate a new one. + The verification code has expired. Verification codes are valid for 10 minutes. Please go back to the Teacher Forgot Password page to generate a new one. - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts 146 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts 86 The verification code is invalid. Please try again. - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts 150 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts 91 - You have submitted an invalid verification code too many times. For security - reasons, we will lock the ability to change your password for 10 minutes. After 10 - minutes, please go back to the Teacher Forgot Password page to generate a new verification - code. + You have submitted an invalid verification code too many times. For security reasons, we will lock the ability to change your password for 10 minutes. After 10 minutes, please go back to the Teacher Forgot Password page to generate a new verification code. - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts 154 - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts 93 Passwords do not match, please try again. - - src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts + src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts 158 Enter Verification Code - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 4,6 - We have sent a verification code to your email. Please check your email and enter - the verification code below. + We have sent a verification code to your email. Please check your email and enter the verification code below. - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 6,10 Verification Code - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 11,14 Verification Code required - - src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html + src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.html 21,25 Forgot Teacher Username - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.html 9,14 - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.html 4,7 - You have submitted an invalid verification code too many times. For security - reasons, we will lock the ability to change your password for 10 minutes. After 10 - minutes, you can try again. + You have submitted an invalid verification code too many times. For security reasons, we will lock the ability to change your password for 10 minutes. After 10 minutes, you can try again. - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts 110 - The server has encountered an error and was unable to send you an email. Please try - again. If the error continues to occur, please contact us. + The server has encountered an error and was unable to send you an email. Please try again. If the error continues to occur, please contact us. - - src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts + src/app/forgot/teacher/forgot-teacher-password/forgot-teacher-password.component.ts 113 Email Sent - - src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html + src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html 3,5 - Your username has been sent to your email. Once you have received your username, - you can use the button below to sign in. + Your username has been sent to your email. Once you have received your username, you can use the button below to sign in. - - src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html + src/app/forgot/teacher/forgot-teacher-username-complete/forgot-teacher-username-complete.component.html 5,8 - We did not find a WISE account associated with that email. Please make sure you have - typed your email address correctly. + We did not find a WISE account associated with that email. Please make sure you have typed your email address correctly. - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.ts + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.ts 90 - The server has encountered an error and was unable to send an email to you. Please - try again. If the error continues to occur, please contact us. + The server has encountered an error and was unable to send an email to you. Please try again. If the error continues to occur, please contact us. - - src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.ts + src/app/forgot/teacher/forgot-teacher-username/forgot-teacher-username.component.ts 94 Teacher Forgot Username or Password - - src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html + src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.html 1,2 Getting Started - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 3,6 @@ -4401,71 +3732,49 @@ Creating an Account - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 6,8 - All users must create their own account. Teachers must create a teacher account and - students must create a student account. Users can create an account by going to the WISE - Home Page and clicking on the - Register link at the upper right - of the screen. - - - src/app/help/faq/getting-started/getting-started.component.html + All users must create their own account. Teachers must create a teacher account and students must create a student account. Users can create an account by going to the WISE Home Page and clicking on the Register link at the upper right of the screen. + + src/app/help/faq/getting-started/getting-started.component.html 8,14 Here are instructions on how to create a teacher account. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 14,16 - Go to the WISE - Home Page. + Go to the WISE Home Page. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 16,17 - Click the - Register link at the upper right - of the screen. + Click the Register link at the upper right of the screen. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 18,20 - Click on - Teacher. + Click on Teacher. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 21,22 Choose to sign up with your email or with your Google Account. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 22,25 @@ -4480,8 +3789,7 @@ Fill out the form and submit it. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 23,25 @@ -4494,13 +3802,9 @@ - If you created an account using your email, you will be given a username that you - will need to remember. Your username will be your first name and your last name with no - space inbetween. There may be a number added at the end of your username if someone has - the same name as you. + If you created an account using your email, you will be given a username that you will need to remember. Your username will be your first name and your last name with no space inbetween. There may be a number added at the end of your username if someone has the same name as you. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 25,31 @@ -4515,33 +3819,28 @@ Using a WISE Unit - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 31,33 - To use a WISE unit with your class, you must first choose a unit to use and then - set up a "Run" of that unit. + To use a WISE unit with your class, you must first choose a unit to use and then set up a "Run" of that unit. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 33,36 Here are instructions on how to set up a Run. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 36,39 Sign in to WISE with your teacher account. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 38,40 @@ -4552,8 +3851,7 @@ Click the "Unit Library" tab. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 39,40 @@ -4568,8 +3866,7 @@ Find a project that you would like to use with your class. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 40,41 @@ -4580,8 +3877,7 @@ Click on the project to open the information for the project. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 41,43 @@ -4592,8 +3888,7 @@ Click the "Use With Class" button. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 42,44 @@ -4604,8 +3899,7 @@ Choose the periods you will use the project in. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 43,45 @@ -4614,11 +3908,9 @@ - Choose the number of students per team. Choosing 1-3 will allow students to work - together in a team. + Choose the number of students per team. Choosing 1-3 will allow students to work together in a team. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 45,49 @@ -4627,11 +3919,9 @@ - Choose the start date. Students will not be able to use the project until this - date. + Choose the start date. Students will not be able to use the project until this date. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 49,52 @@ -4642,8 +3932,7 @@ Click "Create Run". - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 51,52 @@ -4654,8 +3943,7 @@ The run will be created and added to your Teacher Home. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 52,54 @@ -4664,12 +3952,9 @@ - Copy the "Access Code" for the new run and write it down somewhere like - on the white board. Students will need to use this access code to work on the run you - created. + Copy the "Access Code" for the new run and write it down somewhere like on the white board. Students will need to use this access code to work on the run you created. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 54,61 @@ -4680,8 +3965,7 @@ Teacher FAQ - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 67,70 @@ -4696,8 +3980,7 @@ Questions from teachers. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 69,72 @@ -4712,8 +3995,7 @@ Student FAQ - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 77,80 @@ -4728,8 +4010,7 @@ Questions from students. - - src/app/help/faq/getting-started/getting-started.component.html + src/app/help/faq/getting-started/getting-started.component.html 79,83 @@ -4813,9 +4094,7 @@ - Go to the - Register page. + Go to the Register page. src/app/help/faq/student-faq/student-faq.component.html 19,20 @@ -4826,9 +4105,7 @@ - Click on - Student. + Click on Student. src/app/help/faq/student-faq/student-faq.component.html 20,21 @@ -4842,8 +4119,7 @@ - Go to the forgot username page and follow the instructions to retrieve your - username. + Go to the forgot username page and follow the instructions to retrieve your username. src/app/help/faq/student-faq/student-faq.component.html 32,35 @@ -4871,8 +4147,7 @@ - In order to start working on a project you must obtain an Access Code from your - teacher. Once you have an Access Code, follow the directions below. + In order to start working on a project you must obtain an Access Code from your teacher. Once you have an Access Code, follow the directions below. src/app/help/faq/student-faq/student-faq.component.html 41,45 @@ -4886,10 +4161,7 @@ - Click on the "Add Unit" button at the top right of the Student - Home Page. + Click on the "Add Unit" button at the top right of the Student Home Page. src/app/help/faq/student-faq/student-faq.component.html 47,50 @@ -4956,12 +4228,9 @@ - You can try clearing - your browser cache and - then reloading the WISE web site. + You can try clearing your browser cache and then reloading the WISE web site. src/app/help/faq/student-faq/student-faq.component.html 65,70 @@ -4994,8 +4263,7 @@ - If you do not remember your username or password click the Lost Username or - Password link and follow the instructions. + If you do not remember your username or password click the Lost Username or Password link and follow the instructions. src/app/help/faq/student-faq/student-faq.component.html 76,80 @@ -5024,8 +4292,7 @@ - Click on your account icon at the top right of the page. This should open a drop - down with options. + Click on your account icon at the top right of the page. This should open a drop down with options. src/app/help/faq/student-faq/student-faq.component.html 85,90 @@ -5036,9 +4303,7 @@ - Click the "Edit - Profile" option. + Click the "Edit Profile" option. src/app/help/faq/student-faq/student-faq.component.html 89,92 @@ -5071,8 +4336,7 @@ - Note 1: If your language is not listed as an option, or you'd like to help us - improve the translation, please contact us and we'll help you get started! + Note 1: If your language is not listed as an option, or you'd like to help us improve the translation, please contact us and we'll help you get started! src/app/help/faq/student-faq/student-faq.component.html 95,99 @@ -5083,10 +4347,7 @@ - Note 2: Changing the language will change the language of the website but will not - change the language of the projects. Projects must be independently translated which means - that if you want to use a project in another language, you must translate it yourself or - find a version of the project that has been translated by someone else. + Note 2: Changing the language will change the language of the website but will not change the language of the projects. Projects must be independently translated which means that if you want to use a project in another language, you must translate it yourself or find a version of the project that has been translated by someone else. src/app/help/faq/student-faq/student-faq.component.html 99,105 @@ -5108,12 +4369,7 @@ - The Contact - WISE form will send an email to - the WISE technology group. You can find a link to the form at the bottom of the home page. - Be sure to include as much information as you can about the problem. We will respond as - quickly as we can. + The Contact WISE form will send an email to the WISE technology group. You can find a link to the form at the bottom of the home page. Be sure to include as much information as you can about the problem. We will respond as quickly as we can. src/app/help/faq/student-faq/student-faq.component.html 108,111 @@ -5200,28 +4456,21 @@ - WISE makes student registration simple and intuitive -- direct your students to the - register page by having them go to the WISE home page and clicking the - "Register" link at the upper right. They should be able to register in 10 - minutes or less. However, you can also opt to pre-register all of your students and - provide them with a copy of their username/password on their first day in the project run. + WISE makes student registration simple and intuitive -- direct your students to the register page by having them go to the WISE home page and clicking the "Register" link at the upper right. They should be able to register in 10 minutes or less. However, you can also opt to pre-register all of your students and provide them with a copy of their username/password on their first day in the project run. src/app/help/faq/teacher-faq/teacher-faq.component.html 67,75 - Once a student has created a WISE account they should never need to create another - one. + Once a student has created a WISE account they should never need to create another one. src/app/help/faq/teacher-faq/teacher-faq.component.html 75,78 - Some teachers that pre-register prefer to give all students the same initial - password, to decrease problems with students signing in. This is ok, but for security - purposes, we advise that you have the students change their passwords once they log in. + Some teachers that pre-register prefer to give all students the same initial password, to decrease problems with students signing in. This is ok, but for security purposes, we advise that you have the students change their passwords once they log in. src/app/help/faq/teacher-faq/teacher-faq.component.html 78,83 @@ -5235,26 +4484,21 @@ - First, we recommend always having students WRITE DOWN their username/password when - they first register. + First, we recommend always having students WRITE DOWN their username/password when they first register. src/app/help/faq/teacher-faq/teacher-faq.component.html 86,90 - Second, encourage the students to solve the problem themselves. Tell them to go to - the WISE home page, click the Lost username/password link, and click the Student button. - If the student can answer their security question (created at registration) they can - change their password. + Second, encourage the students to solve the problem themselves. Tell them to go to the WISE home page, click the Lost username/password link, and click the Student button. If the student can answer their security question (created at registration) they can change their password. src/app/help/faq/teacher-faq/teacher-faq.component.html 90,95 - Third, if the student can't solve the problem directly, you can change their - password for them using the instructions below. + Third, if the student can't solve the problem directly, you can change their password for them using the instructions below. src/app/help/faq/teacher-faq/teacher-faq.component.html 95,99 @@ -5394,8 +4638,7 @@ - Alternatively, you can change the password for ALL students in the current period - (the new password will be applied to all the students in the period). + Alternatively, you can change the password for ALL students in the current period (the new password will be applied to all the students in the period). src/app/help/faq/teacher-faq/teacher-faq.component.html 108,112 @@ -5409,16 +4652,14 @@ - Drag-and-drop student names to move them from one team to another. Make sure to - save your changes before leaving this window. + Drag-and-drop student names to move them from one team to another. Make sure to save your changes before leaving this window. src/app/help/faq/teacher-faq/teacher-faq.component.html 120,124 - If you want to move students into a brand new team, click New Team, then drag 1 or - more students into the new team. Save your changes. + If you want to move students into a brand new team, click New Team, then drag 1 or more students into the new team. Save your changes. src/app/help/faq/teacher-faq/teacher-faq.component.html 124,128 @@ -5432,8 +4673,7 @@ - If you move Student A into an established team, student A loses all of their current - work and inherits the current work of the established team. + If you move Student A into an established team, student A loses all of their current work and inherits the current work of the established team. src/app/help/faq/teacher-faq/teacher-faq.component.html 130,135 @@ -5447,8 +4687,7 @@ - If you move Student A into a newly created (blank) team, student A will lose all of - their work. + If you move Student A into a newly created (blank) team, student A will lose all of their work. src/app/help/faq/teacher-faq/teacher-faq.component.html 137,142 @@ -5476,8 +4715,7 @@ - A popup will show up that will allow you to choose a different period for the - student. + A popup will show up that will allow you to choose a different period for the student. src/app/help/faq/teacher-faq/teacher-faq.component.html 152,155 @@ -5504,28 +4742,23 @@ 157,159 - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 5,8 - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 4,7 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 5,9 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 5,9 - - src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts + src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts 13,16 @@ -5537,8 +4770,7 @@ - I do not remember my teacher access code that students need to create their account - for my new students. + I do not remember my teacher access code that students need to create their account for my new students. src/app/help/faq/teacher-faq/teacher-faq.component.html 164,168 @@ -5559,8 +4791,7 @@ - You need to set up your project run anytime before the students can start working - on the project. They will need the Access Code for the run in order to start working. + You need to set up your project run anytime before the students can start working on the project. They will need the Access Code for the run in order to start working. src/app/help/faq/teacher-faq/teacher-faq.component.html 177,181 @@ -5574,8 +4805,7 @@ - Project durations vary from about 3 days to 10 days. Some projects may display an - estimation of the number of hours it will take for students to complete the project. + Project durations vary from about 3 days to 10 days. Some projects may display an estimation of the number of hours it will take for students to complete the project. src/app/help/faq/teacher-faq/teacher-faq.component.html 184,188 @@ -5589,11 +4819,7 @@ - It is not recommended to shorten a project. Each project has been carefully - designed to lead the student through an inquiry process and cutting it short will result - in a less satisfactory educational student experience. Nevertheless, if you are under a - time constraint and knowledgeable of the project topic, you could customize the project - and shorten it to your specific needs. + It is not recommended to shorten a project. Each project has been carefully designed to lead the student through an inquiry process and cutting it short will result in a less satisfactory educational student experience. Nevertheless, if you are under a time constraint and knowledgeable of the project topic, you could customize the project and shorten it to your specific needs. src/app/help/faq/teacher-faq/teacher-faq.component.html 191,198 @@ -5628,8 +4854,7 @@ - Note: Some projects may not have much information because it is dependent on the - author to provide the lesson plan and standards. + Note: Some projects may not have much information because it is dependent on the author to provide the lesson plan and standards. src/app/help/faq/teacher-faq/teacher-faq.component.html 206,210 @@ -5643,11 +4868,7 @@ - In general students will benefit from some pre-teaching of the topic covered in the - project. It is really up to the teacher to decide where it best fits to support student - learning. Many teachers use a WISE project as a capstone activity while others integrate - it into their curriculum at a midpoint. Some teachers elect to use WISE projects an - introductory activity for a unit, or as a summation activity for a unit. + In general students will benefit from some pre-teaching of the topic covered in the project. It is really up to the teacher to decide where it best fits to support student learning. Many teachers use a WISE project as a capstone activity while others integrate it into their curriculum at a midpoint. Some teachers elect to use WISE projects an introductory activity for a unit, or as a summation activity for a unit. src/app/help/faq/teacher-faq/teacher-faq.component.html 213,220 @@ -5704,8 +4925,7 @@ - Find the period you want to delete and click the "Delete" button next to - it. + Find the period you want to delete and click the "Delete" button next to it. src/app/help/faq/teacher-faq/teacher-faq.component.html 235,236 @@ -5719,17 +4939,14 @@ - What if I run out of computer lab time but some of my students are not finished - with the project? + What if I run out of computer lab time but some of my students are not finished with the project? src/app/help/faq/teacher-faq/teacher-faq.component.html 239,244 - WISE is a web-based learning environments, so students can sign in from a computer - at school or at home. This means that students can complete the project from any home or - community based computer, per the teacher's discretion. + WISE is a web-based learning environments, so students can sign in from a computer at school or at home. This means that students can complete the project from any home or community based computer, per the teacher's discretion. src/app/help/faq/teacher-faq/teacher-faq.component.html 244,250 @@ -5750,9 +4967,7 @@ - On the left sidebar you can choose to look at the work by step by clicking - "Grade By Step" or you can choose to look at the work by student by clicking - "Grade By Student". + On the left sidebar you can choose to look at the work by step by clicking "Grade By Step" or you can choose to look at the work by student by clicking "Grade By Student". src/app/help/faq/teacher-faq/teacher-faq.component.html 258,261 @@ -5808,10 +5023,7 @@ - The following link will give you a sample rubric for grading a step in the Mitosis - and Cell Processes project. The rubric is based on our TELS Center research on how - students integrate their knowledge of complex science concepts. We hope that it can give - you a start in developing your own rubrics for the notes and steps you plan to grade. + The following link will give you a sample rubric for grading a step in the Mitosis and Cell Processes project. The rubric is based on our TELS Center research on how students integrate their knowledge of complex science concepts. We hope that it can give you a start in developing your own rubrics for the notes and steps you plan to grade. src/app/help/faq/teacher-faq/teacher-faq.component.html 273,280 @@ -5832,9 +5044,7 @@ - Many teachers find it advantageous to grade the first step or two at the end of the - first day of the project run. At the beginning of class the next day they share with the - whole class some sample responses and have the class critique the work. + Many teachers find it advantageous to grade the first step or two at the end of the first day of the project run. At the beginning of class the next day they share with the whole class some sample responses and have the class critique the work. src/app/help/faq/teacher-faq/teacher-faq.component.html 290,295 @@ -5848,11 +5058,7 @@ - We recommend that you go through the project and select a few steps that you think - best demonstrate the students' understanding of the complex concepts covered in the - module and grade those steps. Then tell your students they must complete all questions but - should concentrate their efforts on the key steps. We recognize that critically grading - each step is very time consuming and unpractical. + We recommend that you go through the project and select a few steps that you think best demonstrate the students' understanding of the complex concepts covered in the module and grade those steps. Then tell your students they must complete all questions but should concentrate their efforts on the key steps. We recognize that critically grading each step is very time consuming and unpractical. src/app/help/faq/teacher-faq/teacher-faq.component.html 298,305 @@ -5866,10 +5072,7 @@ - The Real Time Classroom Monitor allows teachers to view student progress in real - time. Teachers will be able to see what step a student is on, how much time the student - has spent on that step, and how much of the project the student has completed. All of this - information will be updated immediately in real time as students work on the project. + The Real Time Classroom Monitor allows teachers to view student progress in real time. Teachers will be able to see what step a student is on, how much time the student has spent on that step, and how much of the project the student has completed. All of this information will be updated immediately in real time as students work on the project. src/app/help/faq/teacher-faq/teacher-faq.component.html 310,316 @@ -5897,8 +5100,7 @@ - Yes you can! This can be useful if you need to grab their attention in order to - have a class discussion or to make an announcement. + Yes you can! This can be useful if you need to grab their attention in order to have a class discussion or to make an announcement. src/app/help/faq/teacher-faq/teacher-faq.component.html 323,328 @@ -5912,8 +5114,7 @@ - We strongly recommend one computer for every two students. Research shows that - students benefit from working together as a team of two. + We strongly recommend one computer for every two students. Research shows that students benefit from working together as a team of two. src/app/help/faq/teacher-faq/teacher-faq.component.html 343,348 @@ -5929,8 +5130,7 @@ What's New? - - src/app/home/discourse-latest-news/discourse-latest-news.component.html + src/app/home/discourse-latest-news/discourse-latest-news.component.html 7,10 @@ -5941,8 +5141,7 @@ More news - - src/app/home/discourse-latest-news/discourse-latest-news.component.html + src/app/home/discourse-latest-news/discourse-latest-news.component.html 24,27 @@ -6039,8 +5238,7 @@ 9,12 - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 22,23 @@ -6106,9 +5304,7 @@ - Free, standards-aligned, and research-based inquiry curricula that address NGSS 3D proficiency + Free, standards-aligned, and research-based inquiry curricula that address NGSS 3D proficiency src/app/home/home.component.ts 61 @@ -6122,8 +5318,7 @@ - Interactive scientific models plus hands-on activities, personalized guidance, and - rich embedded assessments + Interactive scientific models plus hands-on activities, personalized guidance, and rich embedded assessments src/app/home/home.component.ts 76 @@ -6137,8 +5332,7 @@ - Robust teacher grading and management tools supporting individualized and customized - learning + Robust teacher grading and management tools supporting individualized and customized learning src/app/home/home.component.ts 92 @@ -6152,8 +5346,7 @@ - Backend returned code , body was: + Backend returned code , body was: src/app/http-error.interceptor.ts 22 @@ -6181,8 +5374,7 @@ - There was an error saving data. Please log in again. You may need to re-do your - recent work. We apologize for the inconvenience. + There was an error saving data. Please log in again. You may need to re-do your recent work. We apologize for the inconvenience. src/app/login/login-home/login-home.component.html 12,17 @@ -6195,13 +5387,11 @@ 55,61 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 146,150 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 160,164 @@ -6212,18 +5402,15 @@ 86,90 - - src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html + src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 16,20 - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 26,30 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 24,28 @@ -6234,18 +5421,15 @@ 99,103 - - src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html 16,20 - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 38,43 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 36,41 @@ -6257,9 +5441,7 @@ - New to WISE? Join for free! + New to WISE? Join for free! src/app/login/login-home/login-home.component.html 109,110 @@ -6276,23 +5458,19 @@ 12,17 - - src/app/student/survey/survey-completed/survey-completed.component.html + src/app/student/survey/survey-completed/survey-completed.component.html 12,16 - - src/app/student/survey/workgroup-limit-reached/workgroup-limit-reached.component.html + src/app/student/survey/workgroup-limit-reached/workgroup-limit-reached.component.html 12,16 - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 4,7 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 4,7 @@ -6307,23 +5485,19 @@ 46,51 - - src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html + src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 6,7 - - src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html 6,7 - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 164,169 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 178,183 @@ -6334,13 +5508,11 @@ 7,8 - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 11,16 - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 121,123 @@ -6355,8 +5527,7 @@ 8,9 - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 21,22 @@ -6372,24 +5543,14 @@ - Powered by TELS - Research and WISE - Open Source Technology. Help us - translate WISE! + Powered by TELS Research and WISE Open Source Technology. Help us translate WISE! src/app/modules/footer/footer.component.html 54,59 - This material is based upon work supported by the National Science Foundation. Any - opinions, findings, and conclusions or recommendations expressed in this material are - those of the author(s) and do not necessarily reflect the views of the National Science - Foundation. + This material is based upon work supported by the National Science Foundation. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation. src/app/modules/footer/footer.component.html 60,66 @@ -6431,11 +5592,7 @@ - ©1996-, UC - Berkeley | Web-based Inquiry - Science Environment + ©1996-, UC Berkeley | Web-based Inquiry Science Environment src/app/modules/footer/footer.component.html 134,136 @@ -6444,68 +5601,58 @@ Account Menu - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 1,3 Account avatar - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 13,15 - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 15,17 Switch back to original user - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 21,25 Student Home - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 33,37 - - src/app/student/student-home/student-home.component.html + src/app/student/student-home/student-home.component.html 6,10 Teacher Home - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 44,48 - - src/app/teacher/teacher-home/teacher-home.component.html + src/app/teacher/teacher-home/teacher-home.component.html 7,9 Edit Profile - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 55,59 - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 66,70 @@ -6520,45 +5667,39 @@ Researcher Tools - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 72,76 Admin Tools - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 78,83 Sign Out - - src/app/modules/header/header-account-menu/header-account-menu.component.html + src/app/modules/header/header-account-menu/header-account-menu.component.html 94,98 - Welcome ! + Welcome ! - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 3,4 - - src/app/teacher/teacher-home/teacher-home.component.html + src/app/teacher/teacher-home/teacher-home.component.html 9,10 Research - - src/app/modules/header/header-links/header-links.component.html + src/app/modules/header/header-links/header-links.component.html 23,26 @@ -6567,13 +5708,9 @@ - - Register or Sign In + Register or Sign In - - src/app/modules/header/header-signin/header-signin.component.html + src/app/modules/header/header-signin/header-signin.component.html 2,4 @@ -6594,418 +5731,328 @@ Copy Unit - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html 1,4 - (Unit ID: ) + (Unit ID: ) - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html 5,7 - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 4,6 - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 7,8 - Copying creates a duplicate that will appear in “My Units”. You will be the owner - and can edit the content and share the new unit with other WISE users. + Copying creates a duplicate that will appear in “My Units”. You will be the owner and can edit the content and share the new unit with other WISE users. - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html 8,13 Copy - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.html 25,28 - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 11,14 - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 19,22 - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 38,40 - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 105,107 - There was an error trying to copy the project. Please refresh the page and try - again. + There was an error trying to copy the project. Please refresh the page and try again. - - src/app/modules/library/copy-project-dialog/copy-project-dialog.component.ts + src/app/modules/library/copy-project-dialog/copy-project-dialog.component.ts 62 - Discuss () + Discuss () - - src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html + src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html 6,8 - Explore suggested curricula for the given grade levels. Check out our full - library to explore in more depth. + Explore suggested curricula for the given grade levels. Check out our full library to explore in more depth. - - src/app/modules/library/home-page-project-library/home-page-project-library.component.html + src/app/modules/library/home-page-project-library/home-page-project-library.component.html 8,11 Filters - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 27,29 Clear all - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 29,34 Type filter explanation - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 54,58 Discipline - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 67,69 Grade Level - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 85,87 Standards Addressed - - src/app/modules/library/library-filters/library-filters.component.html + src/app/modules/library/library-filters/library-filters.component.html 104,106 WISE Platform - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 48 Other Platform - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 49 NGSS - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 114 - - src/app/modules/library/library-project-details/library-project-details.component.ts + src/app/modules/library/library-project-details/library-project-details.component.ts 53 Common Core - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 115 - - src/app/modules/library/library-project-details/library-project-details.component.ts + src/app/modules/library/library-project-details/library-project-details.component.ts 51 Learning For Justice - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 116 - - src/app/modules/library/library-project-details/library-project-details.component.ts + src/app/modules/library/library-project-details/library-project-details.component.ts 52 - "Type" indicates the platform on which a unit runs. "WISE - Platform" units are created - using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers - can review and grade - work on the WISE platform. "Other" units are created using different platforms. - Resources for these units - are linked in the unit details. - - - src/app/modules/library/library-filters/library-filters.component.ts + "Type" indicates the platform on which a unit runs. "WISE Platform" units are created + using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers can review and grade + work on the WISE platform. "Other" units are created using different platforms. Resources for these units + are linked in the unit details. + + src/app/modules/library/library-filters/library-filters.component.ts 185,188 Unit Type - - src/app/modules/library/library-filters/library-filters.component.ts + src/app/modules/library/library-filters/library-filters.component.ts 192 - - src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html + src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html 1,2 - : + : - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 4,5 Grade level: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 28,31 - Duration: + Duration: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 42,43 - Unit ID: + Unit ID: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 47,48 - This unit is from an old version of WISE that is no longer supported. Please find an - alternate unit to use in the future or contact us for upgrade options. + This unit is from an old version of WISE that is no longer supported. Please find an alternate unit to use in the future or contact us for upgrade options. - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 68,71 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 89,92 Legacy Unit - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 71,75 - - src/app/modules/library/library-project/library-project.component.html + src/app/modules/library/library-project/library-project.component.html 37,39 - Note: This unit was created outside of the WISE platform. Teaching resources are - linked below. + Note: This unit was created outside of the WISE platform. Teaching resources are linked below. - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 77,81 Resources: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 83,85 Discipline: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 96,98 Features: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 108,109 Standards Addressed: - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 121,123 - This - unit is a copy of (used under CC - BY-SA). - - - src/app/modules/library/library-project-details/library-project-details.component.html + This unit is a copy of (used under CC BY-SA). + + src/app/modules/library/library-project-details/library-project-details.component.html 164,166 - This - unit is a copy of by (used under CC - BY-SA). - - - src/app/modules/library/library-project-details/library-project-details.component.html + This unit is a copy of by (used under CC BY-SA). + + src/app/modules/library/library-project-details/library-project-details.component.html 170,173 - This - unit is licensed under CC - BY-SA. - - - src/app/modules/library/library-project-details/library-project-details.component.html + This unit is licensed under CC BY-SA. + + src/app/modules/library/library-project-details/library-project-details.component.html 181,183 - This - unit is licensed under CC - BY-SA by . - - - src/app/modules/library/library-project-details/library-project-details.component.html + This unit is licensed under CC BY-SA by . + + src/app/modules/library/library-project-details/library-project-details.component.html 186,188 View License - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 193,197 More - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 201,207 Use with Class - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 217,222 - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 1,3 Preview - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 225,227 @@ -7013,131 +6060,108 @@ 16,19 - - src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html + src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html 20,23 - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 29,31 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 40,43 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 60,62 - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 44,47 - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 73,75 Unit Resources - - src/app/modules/library/library-project-details/library-project-details.component.html + src/app/modules/library/library-project-details/library-project-details.component.html 227,232 - License pertains to original content created by the author(s). Authors are - responsible for the usage and attribution of any third-party content linked to or included - in this work. + License pertains to original content created by the author(s). Authors are responsible for the usage and attribution of any third-party content linked to or included in this work. - - src/app/modules/library/library-project-details/library-project-details.component.ts + src/app/modules/library/library-project-details/library-project-details.component.ts 45 - Parent ID: + Parent ID: - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 7,8 Edit - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 15,19 - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html 30,31 - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 10,13 - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 10,13 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 140,143 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 7,12 Share - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 20,24 Publish - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 25,28 - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 4,8 Restore - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 32,35 - - src/app/notebook/notebook-report/notebook-report.component.html + src/app/notebook/notebook-report/notebook-report.component.html 51,52 - - src/app/teacher/archive-projects-button/archive-projects-button.component.html + src/app/teacher/archive-projects-button/archive-projects-button.component.html 17,20 @@ -7148,13 +6172,11 @@ Archive - - src/app/modules/library/library-project-menu/library-project-menu.component.html + src/app/modules/library/library-project-menu/library-project-menu.component.html 37,43 - - src/app/teacher/archive-projects-button/archive-projects-button.component.html + src/app/teacher/archive-projects-button/archive-projects-button.component.html 6,9 @@ -7165,40 +6187,35 @@ Show project details - - src/app/modules/library/library-project/library-project.component.html + src/app/modules/library/library-project/library-project.component.html 10,12 Select unit - - src/app/modules/library/library-project/library-project.component.html + src/app/modules/library/library-project/library-project.component.html 18,21 - (ID: ) + (ID: ) - - src/app/modules/library/library-project/library-project.component.html + src/app/modules/library/library-project/library-project.component.html 32,33 - Shared by + Shared by - - src/app/modules/library/library-project/library-project.component.html + src/app/modules/library/library-project/library-project.component.html 44,46 Unit Details - - src/app/modules/library/library-project/library-project.component.ts + src/app/modules/library/library-project/library-project.component.ts 107 @@ -7224,15 +6241,14 @@ - 0 of + 0 of src/app/modules/library/libraryPaginatorIntl.ts 12 - - of + - of src/app/modules/library/libraryPaginatorIntl.ts 17 @@ -7241,356 +6257,289 @@ unit(s) - - src/app/modules/library/official-library/official-library.component.html + src/app/modules/library/official-library/official-library.component.html 15,18 Active - - src/app/modules/library/personal-library/personal-library.component.html + src/app/modules/library/personal-library/personal-library.component.html 8,9 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 20,21 Archived - - src/app/modules/library/personal-library/personal-library.component.html + src/app/modules/library/personal-library/personal-library.component.html 9,13 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 21,26 - - selected + selected - - src/app/modules/library/personal-library/personal-library.component.html + src/app/modules/library/personal-library/personal-library.component.html 23,24 No units found. - - src/app/modules/library/personal-library/personal-library.component.html + src/app/modules/library/personal-library/personal-library.component.html 56,60 - - src/app/modules/library/public-library/public-library.component.html + src/app/modules/library/public-library/public-library.component.html 20,24 Select all units - - src/app/modules/library/personal-library/personal-library.component.ts + src/app/modules/library/personal-library/personal-library.component.ts 51 Community Built - - src/app/modules/library/public-unit-type-selector/community-library-details.html + src/app/modules/library/public-unit-type-selector/community-library-details.html 1,5 - - src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html + src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html 12,14 - "Community Built" units are designed and contributed by WISE community - members. Want to publicly share your custom unit? Select the Publish option in the unit - details pop-up. Or open your unit in the Authoring Tool, go to Unit Info, and tap Publish! + "Community Built" units are designed and contributed by WISE community members. Want to publicly share your custom unit? Select the Publish option in the unit details pop-up. Or open your unit in the Authoring Tool, go to Unit Info, and tap Publish! - - src/app/modules/library/public-unit-type-selector/community-library-details.html + src/app/modules/library/public-unit-type-selector/community-library-details.html 5,10 - *Please note: While WISE staff have reviewed these units, we cannot specifically - vouch for their effectiveness or quality. Please examine the units carefully before using - in your classrooms. Thanks! + *Please note: While WISE staff have reviewed these units, we cannot specifically vouch for their effectiveness or quality. Please examine the units carefully before using in your classrooms. Thanks! - - src/app/modules/library/public-unit-type-selector/community-library-details.html + src/app/modules/library/public-unit-type-selector/community-library-details.html 10,16 WISE Tested - - src/app/modules/library/public-unit-type-selector/official-library-details.html + src/app/modules/library/public-unit-type-selector/official-library-details.html 1,4 - - src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html + src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html 4,6 "WISE Tested" units are curricula developed by the WISE team. - - src/app/modules/library/public-unit-type-selector/official-library-details.html + src/app/modules/library/public-unit-type-selector/official-library-details.html 4,6 - Each of the units in this collection has been designed and iteratively refined - through a partnership of university-based education researchers and science teachers. They - have all been implemeneted and tested in real classrooms and have shown proven learning - gains. + Each of the units in this collection has been designed and iteratively refined through a partnership of university-based education researchers and science teachers. They have all been implemeneted and tested in real classrooms and have shown proven learning gains. - - src/app/modules/library/public-unit-type-selector/official-library-details.html + src/app/modules/library/public-unit-type-selector/official-library-details.html 6,11 - Learn - more about our design - process and check - out our research and publications. - - - src/app/modules/library/public-unit-type-selector/official-library-details.html + Learn more about our design process and check out our research and publications. + + src/app/modules/library/public-unit-type-selector/official-library-details.html 11,16 WISE Tested explanation - - src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html + src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html 7,10 Community Built explanation - - src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html + src/app/modules/library/public-unit-type-selector/public-unit-type-selector.component.html 15,19 - Sharing permissions updated for . + Sharing permissions updated for . - - src/app/modules/library/share-item-dialog/share-item-dialog.component.ts + src/app/modules/library/share-item-dialog/share-item-dialog.component.ts 126 - Added shared teacher: . + Added shared teacher: . - - src/app/modules/library/share-item-dialog/share-item-dialog.component.ts + src/app/modules/library/share-item-dialog/share-item-dialog.component.ts 143 - Removed shared teacher: . + Removed shared teacher: . - - src/app/modules/library/share-item-dialog/share-item-dialog.component.ts + src/app/modules/library/share-item-dialog/share-item-dialog.component.ts 153 Share Unit - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 1,3 - Sharing a curriculum unit allows other WISE teachers to use it with their own - students and optionally edit the unit's content. + Sharing a curriculum unit allows other WISE teachers to use it with their own students and optionally edit the unit's content. - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 8,12 Shared units appear in a teacher's "My Units" library. - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 12,15 Find a teacher - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 15,18 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 39,41 Clear - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 30,32 - - src/app/modules/shared/search-bar/search-bar.component.html + src/app/modules/shared/search-bar/search-bar.component.html 17,21 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 54,56 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html 54,56 Teacher is already on shared list. - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 35,37 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 62,65 Revoke - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 58,63 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 88,92 Permissions - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 64,66 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 94,96 Owner. Full permissions. - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 67,70 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 97,99 View & Use with Students - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 72,75 Edit Unit Content - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 85,89 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 131,134 Done - - src/app/modules/library/share-project-dialog/share-project-dialog.component.html + src/app/modules/library/share-project-dialog/share-project-dialog.component.html 96,98 - - src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html + src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html 18,20 - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 171,174 - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 93,96 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 134,136 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 166,169 @@ -7611,207 +6560,170 @@ Current Password - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 10,14 Current Password required - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 20,22 Current Password is incorrect - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 23,27 Google logo - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 53,55 - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 2,4 - - src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html + src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 2,5 - - src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html + src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html 2,6 - - src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html + src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 15,17 - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 24,26 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 22,24 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 68,70 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 147,149 This account was created using Google and doesn't use a WISE password. - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 55,59 Unlink Google Account - - src/app/modules/shared/edit-password/edit-password.component.html + src/app/modules/shared/edit-password/edit-password.component.html 64,68 - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 3,5 - - src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html + src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 3,6 - - src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html + src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html 3,7 - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 73,79 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 152,158 Successfully changed password. - - src/app/modules/shared/edit-password/edit-password.component.ts + src/app/modules/shared/edit-password/edit-password.component.ts 82 more - - src/app/modules/shared/select-menu/select-menu.component.html + src/app/modules/shared/select-menu/select-menu.component.html 14,18 - - src/app/modules/shared/standards-select-menu/standards-select-menu.component.html + src/app/modules/shared/standards-select-menu/standards-select-menu.component.html 14,18 Select an option - - src/app/modules/shared/select-menu/select-menu.component.ts + src/app/modules/shared/select-menu/select-menu.component.ts 25 - To remove the link to your Google account, you will be asked to create a WISE - password. In the future, you'll sign in to WISE using your username and password. + To remove the link to your Google account, you will be asked to create a WISE password. In the future, you'll sign in to WISE using your username and password. - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 10,15 - You will no longer be able to sign in to WISE using Google. Would you like to - continue? + You will no longer be able to sign in to WISE using Google. Would you like to continue? - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 15,21 Continue - - src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html + src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html 23,25 Create a WISE password: - - src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html + src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 7,8 - Success! You have unlinked your Google account from WISE. To sign in to WISE in the - future, please use your username and the password you just created. + Success! You have unlinked your Google account from WISE. To sign in to WISE in the future, please use your username and the password you just created. - - src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html + src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html 8,12 - Your username is: . - - - src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html + Your username is: . + + src/app/modules/shared/unlink-google-account-success/unlink-google-account-success.component.html 12,16 - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 6,10 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 6,10 @@ -7822,144 +6734,121 @@ 40,46 - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 65,71 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 121,126 - Delete + Delete - - src/app/notebook/notebook-item/notebook-item.component.html + src/app/notebook/notebook-item/notebook-item.component.html 38,39 - Revive + Revive - - src/app/notebook/notebook-item/notebook-item.component.html + src/app/notebook/notebook-item/notebook-item.component.html 49,50 - Are you sure you want to delete this ? + Are you sure you want to delete this ? - - src/app/notebook/notebook-item/notebook-item.component.ts + src/app/notebook/notebook-item/notebook-item.component.ts 90 - Delete + Delete - - src/app/notebook/notebook-item/notebook-item.component.ts + src/app/notebook/notebook-item/notebook-item.component.ts 91 - Are you sure you want to revive this ? + Are you sure you want to revive this ? - - src/app/notebook/notebook-item/notebook-item.component.ts + src/app/notebook/notebook-item/notebook-item.component.ts 107 - Revive + Revive - - src/app/notebook/notebook-item/notebook-item.component.ts + src/app/notebook/notebook-item/notebook-item.component.ts 108 - You haven't created any - yet. + You haven't created any yet. - - src/app/notebook/notebook-notes/notebook-notes.component.html + src/app/notebook/notebook-notes/notebook-notes.component.html 4,6 Select item to insert - - src/app/notebook/notebook-notes/notebook-notes.component.html + src/app/notebook/notebook-notes/notebook-notes.component.html 49,53 - Add + Add - - src/app/notebook/notebook-notes/notebook-notes.component.html + src/app/notebook/notebook-notes/notebook-notes.component.html 76,77 - Team hasn't created any - yet. + Team hasn't created any yet. - - src/app/notebook/notebook-notes/notebook-notes.component.html + src/app/notebook/notebook-notes/notebook-notes.component.html 94,96 Personal - - src/app/notebook/notebook-notes/notebook-notes.component.ts + src/app/notebook/notebook-notes/notebook-notes.component.ts 121 Toggle Full Screen - - src/app/notebook/notebook-report/notebook-report.component.html + src/app/notebook/notebook-report/notebook-report.component.html 26,28 Collapse - - src/app/notebook/notebook-report/notebook-report.component.html + src/app/notebook/notebook-report/notebook-report.component.html 41,43 Save - - src/app/notebook/notebook-report/notebook-report.component.html + src/app/notebook/notebook-report/notebook-report.component.html 74,77 - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 12,14 - - src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html + src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html 10,15 - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 91,96 @@ -7968,151 +6857,133 @@ - Team hasn't worked on yet. + Team hasn't worked on yet. - - src/app/notebook/notebook-report/notebook-report.component.html + src/app/notebook/notebook-report/notebook-report.component.html 100,102 Password required - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 20,23 Password Strength: - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 30,33 Very Weak - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 33,36 Weak - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 36,39 Good - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 39,42 Strong - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 42,45 Very Strong - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 45,50 Your password needs to: - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 51,53 Password does not match - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.html + src/app/password/new-password-and-confirm/new-password-and-confirm.component.html 74,79 Confirm New Password - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts + src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts 27 New Password - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts + src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts 32 include a letter - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts + src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts 34 include a number - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts + src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts 35 be at least 8 characters long - - src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts + src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts 36 Requirement failed - - src/app/password/password-requirement/password-requirement.component.html + src/app/password/password-requirement/password-requirement.component.html 15,17 Requirement passed - - src/app/password/password-requirement/password-requirement.component.html + src/app/password/password-requirement/password-requirement.component.html 17,20 - point + point src/app/possible-score/possible-score.component.html 4,5 - points + points src/app/possible-score/possible-score.component.html 6,8 @@ -8121,18 +6992,14 @@ Choose a Branch Path - - src/app/preview/modules/choose-branch-path-dialog/choose-branch-path-dialog.component.html + src/app/preview/modules/choose-branch-path-dialog/choose-branch-path-dialog.component.html 1,4 - Note: This chooser screen is only available in preview mode. Students will not see - this screen in a classroom run and will instead be assigned a branch path automatically. - Once you have chosen a branch, complete the current step and then click the Next arrow. + Note: This chooser screen is only available in preview mode. Students will not see this screen in a classroom run and will instead be assigned a branch path automatically. Once you have chosen a branch, complete the current step and then click the Next arrow. - - src/app/preview/modules/choose-branch-path-dialog/choose-branch-path-dialog.component.html + src/app/preview/modules/choose-branch-path-dialog/choose-branch-path-dialog.component.html 4,10 @@ -8200,33 +7067,21 @@ - We understand how important privacy is to our community, especially the teachers - and students all over the world who use WISE resources in their educational endeavors. - This policy explains what information we collect, how we use it, and what we do to keep it - safe. + We understand how important privacy is to our community, especially the teachers and students all over the world who use WISE resources in their educational endeavors. This policy explains what information we collect, how we use it, and what we do to keep it safe. src/app/privacy/privacy.component.html 17,22 - These Terms of Use and Privacy Policy constitute an agreement between you and the - Web-based Inquiry Science Environment team that governs your use of wise.berkeley.edu and - all associated services and websites (collectively "WISE"). The WISE team is a - federally-funded research group headquartered at the University of California, Berkeley - and is a non-profit organization. + These Terms of Use and Privacy Policy constitute an agreement between you and the Web-based Inquiry Science Environment team that governs your use of wise.berkeley.edu and all associated services and websites (collectively "WISE"). The WISE team is a federally-funded research group headquartered at the University of California, Berkeley and is a non-profit organization. src/app/privacy/privacy.component.html 22,29 - Please read this document carefully. By using WISE you affirm that you have read, - understood, and accepted the terms and conditions outlined here. If you do not agree with - any of these conditions, please do not use WISE. If you have questions about this policy, - please feel free to contact us using our Contact Form. + Please read this document carefully. By using WISE you affirm that you have read, understood, and accepted the terms and conditions outlined here. If you do not agree with any of these conditions, please do not use WISE. If you have questions about this policy, please feel free to contact us using our Contact Form. src/app/privacy/privacy.component.html 29,34 @@ -8254,41 +7109,28 @@ - In order to use some features of WISE, you will need to register by creating a user - account. Creating an account is optional, but without an account you will not be able to - create or publish curriculum units or use WISE curricula to capture, store, review, or - assess student work. + In order to use some features of WISE, you will need to register by creating a user account. Creating an account is optional, but without an account you will not be able to create or publish curriculum units or use WISE curricula to capture, store, review, or assess student work. src/app/privacy/privacy.component.html 39,45 - When creating a WISE teacher account, we ask you to provide your first and last - name, email address, password, city, state, country, school name, school level, and school - subjects. To create a WISE student account, we ask you to provide your first and last - name, birth day and month, gender, and password, and choose a security question and - answer. + When creating a WISE teacher account, we ask you to provide your first and last name, email address, password, city, state, country, school name, school level, and school subjects. To create a WISE student account, we ask you to provide your first and last name, birth day and month, gender, and password, and choose a security question and answer. src/app/privacy/privacy.component.html 45,51 - To help ensure unauthorized use of your account, please keep your password secret. - You are solely responsible for any use of your account, even if your account is used by - another person. If any use of your account violates the Terms of Use, your account may be - suspended or deleted. + To help ensure unauthorized use of your account, please keep your password secret. You are solely responsible for any use of your account, even if your account is used by another person. If any use of your account violates the Terms of Use, your account may be suspended or deleted. src/app/privacy/privacy.component.html 51,57 - If you believe that your account is no longer secure for any reason, please change - your password. If you cannot access your account to change your password, contact us using - our Contact - Form. + If you believe that your account is no longer secure for any reason, please change your password. If you cannot access your account to change your password, contact us using our Contact Form. src/app/privacy/privacy.component.html 57,62 @@ -8302,38 +7144,21 @@ - When students submit work in a WISE unit run (while logged into their accounts), we - save their responses to questions and any content they create within the WISE platform. - Teachers can review the responses and artifacts students create in the WISE runs they own. - Teachers can also grade student work and provide feedback. Scores and comments generated - by teachers through the WISE platform are stored by WISE and can be viewed by the students - they are sent to. + When students submit work in a WISE unit run (while logged into their accounts), we save their responses to questions and any content they create within the WISE platform. Teachers can review the responses and artifacts students create in the WISE runs they own. Teachers can also grade student work and provide feedback. Scores and comments generated by teachers through the WISE platform are stored by WISE and can be viewed by the students they are sent to. src/app/privacy/privacy.component.html 64,72 - Curriculum units that teachers author using the WISE platform are also saved and - stored on our servers and may be published to a public units library that is accessible to - other WISE users or visitors (with the owner's permission). Please note: Every WISE - unit hosted by the WISE site (whether it is shared in a unit project library or not) is - viewable by anyone using the internet via the unit's unique URL. + Curriculum units that teachers author using the WISE platform are also saved and stored on our servers and may be published to a public units library that is accessible to other WISE users or visitors (with the owner's permission). Please note: Every WISE unit hosted by the WISE site (whether it is shared in a unit project library or not) is viewable by anyone using the internet via the unit's unique URL. src/app/privacy/privacy.component.html 72,79 - Some sections or features of WISE may allow you to share information concerning - your opinions, experiences, or preferences about WISE content or other topics. For - example, you might be able to voluntarily review or rate WISE resources, answer user - questions, designate favorite WISE projects, respond to surveys, share personal - information or social media profile links to your public WISE profile, etc. Information - you provide will be stored by WISE and may be shared with other WISE users either - anonymously or not (as long as you provide permission). Unless otherwise expressly - provided for in this policy, WISE shall have no liability to you or to any third party - with respect to information submitted voluntarily by you via the WISE site. + Some sections or features of WISE may allow you to share information concerning your opinions, experiences, or preferences about WISE content or other topics. For example, you might be able to voluntarily review or rate WISE resources, answer user questions, designate favorite WISE projects, respond to surveys, share personal information or social media profile links to your public WISE profile, etc. Information you provide will be stored by WISE and may be shared with other WISE users either anonymously or not (as long as you provide permission). Unless otherwise expressly provided for in this policy, WISE shall have no liability to you or to any third party with respect to information submitted voluntarily by you via the WISE site. src/app/privacy/privacy.component.html 79,88 @@ -8347,29 +7172,16 @@ - All units that you create on or share to the WISE site shall be licensed under the - Creative Commons Attribution-ShareAlike 4.0 license. For more information about the terms - of this license, visit - https://creativecommons.org/licenses/by-sa/4.0/. The WISE team reserves the right to remove any - content that, in the WISE team's discretion, is harmful to the community or violates - the WISE Terms of Use. Harmful use includes spam or repeated commercial advertisement - through projects, comments, or discussion posts, as well as inappropriate or offensive - material. + All units that you create on or share to the WISE site shall be licensed under the Creative Commons Attribution-ShareAlike 4.0 license. For more information about the terms of this license, visit https://creativecommons.org/licenses/by-sa/4.0/. The WISE team reserves the right to remove any content that, in the WISE team's discretion, is harmful to the community or violates the WISE Terms of Use. Harmful use includes spam or repeated commercial advertisement through projects, comments, or discussion posts, as well as inappropriate or offensive material. src/app/privacy/privacy.component.html 90,98 - You may link to or include outside resources or materials in your WISE units or in - any public parts of the WISE site, but it is your responsibility to obtain any necessary - permission from the original owners and include any required attribution for your use of - such content. WISE will not be held responsible for the unauthorized use by a WISE account - holder of any third-party content in WISE units or on any other sections of the WISE site. + You may link to or include outside resources or materials in your WISE units or in any public parts of the WISE site, but it is your responsibility to obtain any necessary permission from the original owners and include any required attribution for your use of such content. WISE will not be held responsible for the unauthorized use by a WISE account holder of any third-party content in WISE units or on any other sections of the WISE site. src/app/privacy/privacy.component.html 101,107 @@ -8383,10 +7195,7 @@ - When students and teachers use WISE, we save event data such as mouse clicks, time - spent viewing pages, and other site interactions. This data is used for research purposes - and for automated analyses and tools within WISE unit runs. (See 'How We Use the - Data' for more information.) + When students and teachers use WISE, we save event data such as mouse clicks, time spent viewing pages, and other site interactions. This data is used for research purposes and for automated analyses and tools within WISE unit runs. (See 'How We Use the Data' for more information.) src/app/privacy/privacy.component.html 109,115 @@ -8400,9 +7209,7 @@ - When you log in, WISE will ask your browser to put a "cookie" on your - computer. This allows WISE to remember that you are logged in when you go to a different - page. You can delete this cookie at any time through your browser's settings. + When you log in, WISE will ask your browser to put a "cookie" on your computer. This allows WISE to remember that you are logged in when you go to a different page. You can delete this cookie at any time through your browser's settings. src/app/privacy/privacy.component.html 116,120 @@ -8416,11 +7223,7 @@ - WISE uses Google Analytics to help us understand our site usage. We use data like - which pages you visit and clicks you make to help us improve the site. Information - collected and processed by Google Analytics is anonymized and does not contain IP - addresses or similar personally identifiable information. Some browsers allow you to - opt-out of the Google Analytics tracking by installing add-ons for your browser. + WISE uses Google Analytics to help us understand our site usage. We use data like which pages you visit and clicks you make to help us improve the site. Information collected and processed by Google Analytics is anonymized and does not contain IP addresses or similar personally identifiable information. Some browsers allow you to opt-out of the Google Analytics tracking by installing add-ons for your browser. src/app/privacy/privacy.component.html 122,128 @@ -8441,68 +7244,42 @@ - The WISE team uses de-identified user data to perform research. Researchers in the - School of Education at the University of California, Berkeley and partner institutions may - use de-identified data to perform data analyses and explore research topics. This data - includes both user-generated and auto-generated content (see 'Information We - Collect' section). Results of our research may be shared with educators and other - researchers through conferences, journals, and other publications. + The WISE team uses de-identified user data to perform research. Researchers in the School of Education at the University of California, Berkeley and partner institutions may use de-identified data to perform data analyses and explore research topics. This data includes both user-generated and auto-generated content (see 'Information We Collect' section). Results of our research may be shared with educators and other researchers through conferences, journals, and other publications. src/app/privacy/privacy.component.html 131,139 - When generating and analyzing research data, student names are removed from all - student work and replaced with identification numbers. This process of replacing names - with identification numbers is performed automatically by the WISE platform when exporting - research data and will be performed by teachers if any other student work (e.g., from - other instructional materials) is to be analyzed by researchers. + When generating and analyzing research data, student names are removed from all student work and replaced with identification numbers. This process of replacing names with identification numbers is performed automatically by the WISE platform when exporting research data and will be performed by teachers if any other student work (e.g., from other instructional materials) is to be analyzed by researchers. src/app/privacy/privacy.component.html 139,146 - Email addresses for teacher accounts are used for communication: (a) for support, - and (b) for occasional public announcements from the WISE Team. Teacher email addresses - are also used to facilitate resetting of passwords. + Email addresses for teacher accounts are used for communication: (a) for support, and (b) for occasional public announcements from the WISE Team. Teacher email addresses are also used to facilitate resetting of passwords. src/app/privacy/privacy.component.html 146,151 - We do not ask students for their email address (unless they create a WISE account - using a Google account) and do not share any student personal information with outside - parties. Only the students' teachers and, in some cases, fellow classmates can access - student names and/or usernames within WISE (for purposes of reviewing student work, - grading, sending feedback, etc.). Each participating teacher will have access to their own - students' unit work and will not be able to see any information from other - teachers' students (unless another unit's teacher owner shares access through - WISE). Teachers are also able to reset passwords for their students. + We do not ask students for their email address (unless they create a WISE account using a Google account) and do not share any student personal information with outside parties. Only the students' teachers and, in some cases, fellow classmates can access student names and/or usernames within WISE (for purposes of reviewing student work, grading, sending feedback, etc.). Each participating teacher will have access to their own students' unit work and will not be able to see any information from other teachers' students (unless another unit's teacher owner shares access through WISE). Teachers are also able to reset passwords for their students. src/app/privacy/privacy.component.html 151,161 - A small set of WISE administrators are able to access user account information and - data for support and technical purposes. A few select researchers may access teacher - accounts to view anonymized student work or support teachers in setting up and managing - units and runs. + A small set of WISE administrators are able to access user account information and data for support and technical purposes. A few select researchers may access teacher accounts to view anonymized student work or support teachers in setting up and managing units and runs. src/app/privacy/privacy.component.html 161,166 - We will not disclose your personally identifying information to any other parties - except in the following cases: 1) In cases where you (or a legal guardian) have provided - your express consent; 2) As required by applicable law; or 3) With the appropriate - authorities (including schools, school districts, and law enforcement, when necessary) for - the purposes of protecting the safety of users, other individuals, or the security of the - site. + We will not disclose your personally identifying information to any other parties except in the following cases: 1) In cases where you (or a legal guardian) have provided your express consent; 2) As required by applicable law; or 3) With the appropriate authorities (including schools, school districts, and law enforcement, when necessary) for the purposes of protecting the safety of users, other individuals, or the security of the site. src/app/privacy/privacy.component.html 166,172 @@ -8516,52 +7293,35 @@ - WISE promotes and supports freedom of speech and expression and strives to create a - welcoming, supportive, and productive community of educators and learners. + WISE promotes and supports freedom of speech and expression and strives to create a welcoming, supportive, and productive community of educators and learners. src/app/privacy/privacy.component.html 174,178 - You may not use WISE to promote bigotry, discrimination, hatred, or violence - against any individual or group. You may not expose any other person's identifying or - contact information without that person's permission. Threatening, harassing, or - intimidating any other person is not allowed and we reserve the right to remove any - user-generated content that, in our discretion, does so. Projects, discussion posts, and - user-profile pages containing offensive or sexually explicit material will not be - tolerated and removed from the site immediately once brought to the attention of the WISE - team. + You may not use WISE to promote bigotry, discrimination, hatred, or violence against any individual or group. You may not expose any other person's identifying or contact information without that person's permission. Threatening, harassing, or intimidating any other person is not allowed and we reserve the right to remove any user-generated content that, in our discretion, does so. Projects, discussion posts, and user-profile pages containing offensive or sexually explicit material will not be tolerated and removed from the site immediately once brought to the attention of the WISE team. src/app/privacy/privacy.component.html 178,187 - You may not deliberately perform actions that are intended to negatively affect the - WISE website or its users. You may not post links to harmful sites to download viruses or - malware. + You may not deliberately perform actions that are intended to negatively affect the WISE website or its users. You may not post links to harmful sites to download viruses or malware. src/app/privacy/privacy.component.html 187,191 - All user-generated content is provided as-is. The WISE Team is not responsible for - the accuracy or reliability of any user-generated content available through WISE. The WISE - Team does not endorse any views, opinions, or advice expressed in user-generated content. - You agree to relieve the WISE Team of any and all liability arising from your - user-generated content. + All user-generated content is provided as-is. The WISE Team is not responsible for the accuracy or reliability of any user-generated content available through WISE. The WISE Team does not endorse any views, opinions, or advice expressed in user-generated content. You agree to relieve the WISE Team of any and all liability arising from your user-generated content. src/app/privacy/privacy.component.html 191,197 - If you notice any offensive material or user-generated content that are in - violation with the rules above, please report it to the WISE Team using our Contact - Form. + If you notice any offensive material or user-generated content that are in violation with the rules above, please report it to the WISE Team using our Contact Form. src/app/privacy/privacy.component.html 197,200 @@ -8575,19 +7335,14 @@ - The security of your information is important to us and we try to maintain a high - standard for security by using technical safeguards. We will try our best to keep your - data safe. However, no system can ever be 100% secure so we can not guarantee your - personal information will be 100% safe from unauthorized access, either while stored on - our site or our databases or while being transmitted to WISE over the internet. + The security of your information is important to us and we try to maintain a high standard for security by using technical safeguards. We will try our best to keep your data safe. However, no system can ever be 100% secure so we can not guarantee your personal information will be 100% safe from unauthorized access, either while stored on our site or our databases or while being transmitted to WISE over the internet. src/app/privacy/privacy.component.html 202,209 - You can help us protect against unauthorized access to your account by choosing a - strong password and keeping your password secret at all times. + You can help us protect against unauthorized access to your account by choosing a strong password and keeping your password secret at all times. src/app/privacy/privacy.component.html 209,212 @@ -8608,17 +7363,7 @@ - If you live in California and are under the age of 18 or the parent or legal - guardian of a student under the age of 18, you may request the removal of your information - from our site. When you request removal of your information, we will remove all your - personal information to the best of our ability. Please note that we may not be able to - remove all de-identified information or pieces of content stored in our databases and we - may not remove content that we are required to retain under applicable federal and state - laws. If you would like to request removal of your or your child's content or - information, please contact us for assistance or you can delete specific information from - you or your child's account. + If you live in California and are under the age of 18 or the parent or legal guardian of a student under the age of 18, you may request the removal of your information from our site. When you request removal of your information, we will remove all your personal information to the best of our ability. Please note that we may not be able to remove all de-identified information or pieces of content stored in our databases and we may not remove content that we are required to retain under applicable federal and state laws. If you would like to request removal of your or your child's content or information, please contact us for assistance or you can delete specific information from you or your child's account. src/app/privacy/privacy.component.html 215,224 @@ -8632,21 +7377,14 @@ - Our collection of personal information for children under 13 is intended to follow - the principles of the Children's Online Privacy Protection Act (COPPA), a U.S. law - designed to protect the online privacy of children under the age of 13. + Our collection of personal information for children under 13 is intended to follow the principles of the Children's Online Privacy Protection Act (COPPA), a U.S. law designed to protect the online privacy of children under the age of 13. src/app/privacy/privacy.component.html 227,233 - Please note that it is the responsibility of any teacher, school, school district, - or any other entity or institution that intends to use WISE with any child under the age - of 13 to obtain consent from the child's parent(s) or legal guardian(s) before having - the child create a WISE account, utilizing the WISE platform to collect personal - information from the child, or having the child generate stored content on the platform. - WISE does not obtain and is not responsible for obtaining this consent. + Please note that it is the responsibility of any teacher, school, school district, or any other entity or institution that intends to use WISE with any child under the age of 13 to obtain consent from the child's parent(s) or legal guardian(s) before having the child create a WISE account, utilizing the WISE platform to collect personal information from the child, or having the child generate stored content on the platform. WISE does not obtain and is not responsible for obtaining this consent. src/app/privacy/privacy.component.html 233,241 @@ -8660,10 +7398,7 @@ - We take care to be familiar with FERPA legislation and we take all possible - measures to ensure compliance with FERPA's requirements when you use WISE. We are - confident that the protection of data outlined in this document satisfies its - requirements. + We take care to be familiar with FERPA legislation and we take all possible measures to ensure compliance with FERPA's requirements when you use WISE. We are confident that the protection of data outlined in this document satisfies its requirements. src/app/privacy/privacy.component.html 256,261 @@ -8677,22 +7412,14 @@ - We may occasionally update or modify our Terms of Use and Privacy Policy. We will - always display the date this document was last updated. If we make significant changes to - these terms, we will display a prominent notice on the WISE home page and may notify users - via registered email. We encourage you to review this document periodically. By continuing - to use WISE after any changes to this document, you acknowledge that you agree to the - current version of these terms. + We may occasionally update or modify our Terms of Use and Privacy Policy. We will always display the date this document was last updated. If we make significant changes to these terms, we will display a prominent notice on the WISE home page and may notify users via registered email. We encourage you to review this document periodically. By continuing to use WISE after any changes to this document, you acknowledge that you agree to the current version of these terms. src/app/privacy/privacy.component.html 264,272 - If you have any questions or concerns about this document or the WISE site, please - contact us using our Contact Form. We can also be reached by mail at: + If you have any questions or concerns about this document or the WISE site, please contact us using our Contact Form. We can also be reached by mail at: src/app/privacy/privacy.component.html 272,275 @@ -8729,513 +7456,432 @@ Hi! This Google user already has a WISE account. - - src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html + src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 7,8 Sorry, your Google User ID was not found in WISE. - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 3,6 Sorry, your Microsoft User ID was not found in WISE. - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 7,10 Create WISE Account - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 10,11 Students can view and complete WISE lessons offered by teachers. - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 19,22 Teachers can select, author, and run WISE lessons with their students. - - src/app/register/register-home/register-home.component.html + src/app/register/register-home/register-home.component.html 29,34 Hi! This Microsoft user already has a WISE account. - - src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html 7,8 Microsoft logo - - src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html 15,17 - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 37,39 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 35,37 Your WISE account has been created! - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 3,6 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 3,6 Please write this down. You will need it when signing in to WISE in the future. - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 11,15 Sign In to Get Started - - src/app/register/register-student-complete/register-student-complete.component.html + src/app/register/register-student-complete/register-student-complete.component.html 15,19 - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 13,17 Create Student Account - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 4,7 - - src/app/register/register-student/register-student.component.html + src/app/register/register-student/register-student.component.html 3,6 - First Name must only contain characters A-Z, a-z, spaces, or dashes and can not - start or end with a space or dash + First Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 21,25 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 21,25 - Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start - or end with a space or dash + Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 36,40 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 36,40 Gender - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 44,46 Gender required - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 53,58 Security Question - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 91,92 Security Question required - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 102,106 Security Question Answer - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 108,109 Security Question Answer required - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 115,119 - By clicking "Create Account", you agree to our Privacy - Policy & Terms of Use. + By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 132,135   - - src/app/register/register-student-form/register-student-form.component.html + src/app/register/register-student-form/register-student-form.component.html 150,155 - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 164,169 Female - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 29 Male - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 30 No Answer/Other - - src/app/register/register-student-form/register-student-form.component.ts + src/app/register/register-student-form/register-student-form.component.ts 31 Sign Up - - src/app/register/register-student/register-student.component.html + src/app/register/register-student/register-student.component.html 18,21 - - src/app/register/register-teacher/register-teacher.component.html + src/app/register/register-teacher/register-teacher.component.html 12,15 Sign up with Microsoft - - src/app/register/register-student/register-student.component.html + src/app/register/register-student/register-student.component.html 37,42 - - src/app/register/register-teacher/register-teacher.component.html + src/app/register/register-teacher/register-teacher.component.html 31,36 You should receive an email with your account details shortly. - - src/app/register/register-teacher-complete/register-teacher-complete.component.html + src/app/register/register-teacher-complete/register-teacher-complete.component.html 10,13 Create Teacher Account - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 4,7 - - src/app/register/register-teacher/register-teacher.component.html + src/app/register/register-teacher/register-teacher.component.html 3,6 - We’ll never share your email address or personal information with anyone without - your consent. + We’ll never share your email address or personal information with anyone without your consent. - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 47,50 Please enter a valid email address - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 54,59 City - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 60,61 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 54,55 City required - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 63,68 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 57,62 State - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 69,70 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 63,64 State required - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 72,77 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 66,71 Country - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 78,79 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 72,73 Country required - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 81,86 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 75,80 School Name - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 87,88 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 81,82 School Name required - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 90,95 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 84,89 School Level - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 96,99 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 90,92 School Level required - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 110,115 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 99,104 How did you hear about us? - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 116,119 - I agree to the WISE Privacy - Policy & Terms of Use * + I agree to the WISE Privacy Policy & Terms of Use * - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 139,141 You must agree to the Privacy Policy & Terms of Use - - src/app/register/register-teacher-form/register-teacher-form.component.html + src/app/register/register-teacher-form/register-teacher-form.component.html 145,149 - or - - - src/app/register/register-teacher/register-teacher.component.html + src/app/register/register-teacher/register-teacher.component.html 16,19 Confirm Password - - src/app/register/register-user-form/register-user-form.component.ts + src/app/register/register-user-form/register-user-form.component.ts 9 - Error: First Name and Last Name must only contain characters A-Z, a-z, spaces, or - dashes and can not start or end with a space or dash + Error: First Name and Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash - - src/app/register/register-user-form/register-user-form.component.ts + src/app/register/register-user-form/register-user-form.component.ts 34 - Error: First Name must only contain characters A-Z, a-z, spaces, or dashes and can - not start or end with a space or dash + Error: First Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash - - src/app/register/register-user-form/register-user-form.component.ts + src/app/register/register-user-form/register-user-form.component.ts 36 - Error: Last Name must only contain characters A-Z, a-z, spaces, or dashes and can - not start or end with a space or dash + Error: Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash - - src/app/register/register-user-form/register-user-form.component.ts + src/app/register/register-user-form/register-user-form.component.ts 38 - Successfully unit. + Successfully unit. src/app/services/archive-project.service.ts 43 @@ -9252,8 +7898,7 @@ 124 - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 103,109 @@ -9294,14 +7939,14 @@ - Successfully archived unit(s). + Successfully archived unit(s). src/app/services/archive-project.service.ts 122 - Successfully restored unit(s). + Successfully restored unit(s). src/app/services/archive-project.service.ts 123 @@ -9324,65 +7969,55 @@ User Name required - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 26,31 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 26,31 Language - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 32,33 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 105,107 - - src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html 1,4 Language required - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 41,47 Save Changes - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 59,62 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 138,141 This profile is linked to a Google account. - - src/app/student/account/edit-profile/edit-profile.component.html + src/app/student/account/edit-profile/edit-profile.component.html 70,72 - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 149,151 @@ -9400,174 +8035,147 @@ Add Unit - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 1,5 - - src/app/student/student-home/student-home.component.html + src/app/student/student-home/student-home.component.html 16,21 Access Code - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 6,9 Invalid Access Code - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 17,19 You have already added this unit. - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 20,22 This run has ended. Please talk to your teacher. - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 23,28 Choose Period - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 29,30 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 23,24 Add - - src/app/student/add-project-dialog/add-project-dialog.component.html + src/app/student/add-project-dialog/add-project-dialog.component.html 51,55 - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 59,64 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 95,100 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 302,305 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 418,421 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 230,233 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 118,121 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 404,409 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 497,500 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 126,131 Add unit - - src/app/student/student-home/student-home.component.html + src/app/student/student-home/student-home.component.html 12,16 Teacher: - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 3,4 - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 8,9 Period: - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 4,5 - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 9,10 Code: - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 5,7 - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 10,12 Team: - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 14,15 - Run ID: + Run ID: - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 33,34 @@ -9578,8 +8186,7 @@ Report Problem - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 54,56 @@ -9588,259 +8195,215 @@ - Starts + Starts - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 58,59 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 125,126 Launch - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 63,67 Review Work - - src/app/student/student-run-list-item/student-run-list-item.component.html + src/app/student/student-run-list-item/student-run-list-item.component.html 68,73 Hey there! Looks like you don't have any WISE units yet. - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 4,6 - Ask your teacher for an Access - Code and then tap the Add Unit button to get started. + Ask your teacher for an Access Code and then tap the Add Unit button to get started. - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 6,9 - Units found: + Units found: - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 25,26 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 32,33 - My WISE units: + My WISE units: - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 27,28 - - scheduled + scheduled - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 32,33 - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 53,54 - active + active - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 34,35 Clear search - - src/app/student/student-run-list/student-run-list.component.html + src/app/student/student-run-list/student-run-list.component.html 40,46 Your responses have been submitted. You can close this window. - - src/app/student/survey/survey-completed/survey-completed.component.html + src/app/student/survey/survey-completed/survey-completed.component.html 18,22 Sorry, this unit has reached the maximum number of submissions. - - src/app/student/survey/workgroup-limit-reached/workgroup-limit-reached.component.html + src/app/student/survey/workgroup-limit-reached/workgroup-limit-reached.component.html 18,22 Team Sign In - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 1,3 Signed In - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 6,8 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 18,21 Add Teammate - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 37,41 Launch Unit - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html 81,84 A teacher cannot be added as a team member. - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 91 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 158 - is - already in a team that is full + )"/> is already in a team that is full - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 111,113 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 174,176 - is already in the - team + is already in the team - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 118 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 180 - is - already on another team + )"/> is already on another team - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 125,127 - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 184,186 Invalid username. Please try again. - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 133 Invalid password. Please try again. - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 136 Incorrect Google user. Please try again. - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 148 No WISE user with this Google ID found. - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 191 - is - already in a team with + )"/> is already in a team with - - src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts + src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.ts 294,296 @@ -9903,79 +8466,66 @@ Display Name - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 32,33 This is the name your students will see. - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 34,35 Display Name required - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 36,41 If you want to change your email, unlink your Google account. - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 45,47 - Help us translate WISE! Visit - https://crowdin.com/project/wise. - - - src/app/teacher/account/edit-profile/edit-profile.component.html + Help us translate WISE! Visit https://crowdin.com/project/wise. + + src/app/teacher/account/edit-profile/edit-profile.component.html 114,118 Language required - - src/app/teacher/account/edit-profile/edit-profile.component.html + src/app/teacher/account/edit-profile/edit-profile.component.html 120,126 Apply tags - - src/app/teacher/apply-tags-button/apply-tags-button.component.html + src/app/teacher/apply-tags-button/apply-tags-button.component.html 4,8 - - src/app/teacher/apply-tags-button/apply-tags-button.component.html + src/app/teacher/apply-tags-button/apply-tags-button.component.html 11,12 Manage Tags - - src/app/teacher/apply-tags-button/apply-tags-button.component.html + src/app/teacher/apply-tags-button/apply-tags-button.component.html 26,28 - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html 1,3 @@ -9986,413 +8536,346 @@ Successfully applied tag - - src/app/teacher/apply-tags-button/apply-tags-button.component.ts + src/app/teacher/apply-tags-button/apply-tags-button.component.ts 75 Successfully removed tag - - src/app/teacher/apply-tags-button/apply-tags-button.component.ts + src/app/teacher/apply-tags-button/apply-tags-button.component.ts 85 1. Choose Run Type - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 9,11 Default - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 12,13 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 15,16 Survey - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 15,17 Participants complete survey units anonymously without a WISE account. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 20,23 2. Choose Periods - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 28,30 Add your own periods - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 39,40 - For "Period 9", just enter the number 9. Separate periods with commas - (e.g. "Section 1, Section 2"). Manually named periods should be no more than 16 - characters long. + For "Period 9", just enter the number 9. Separate periods with commas (e.g. "Section 1, Section 2"). Manually named periods should be no more than 16 characters long. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 43,47 3. Choose Students Per Team - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 47,48 Only 1 student - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 49,50 1-3 students - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 50,52 4. Set Schedule - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 53,57 2. Set Schedule - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 55,57 Start date - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 60,63 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 79,82 Start date is required - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 70,74 End date - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 75,78 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 97,100 Lock After End Date - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 90,93 - If the End Date has passed and the unit is locked, students will no longer be able - to save new work + If the End Date has passed and the unit is locked, students will no longer be able to save new work - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 95,98 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 124,127 - Note: These dates can be changed at any time from your Class Schedule. Just select - "Edit Settings" from the unit's dropdown menu. + Note: These dates can be changed at any time from your Class Schedule. Just select "Edit Settings" from the unit's dropdown menu. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 104,108 Create Run - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 120,124 Success! This unit has been added to your Class Schedule. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 127,129 - Access Code: + Access Code: - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 130,131 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 44,45 - Important: Every classroom unit has a unique Access Code. Students use this code to - register for a unit. Give the code to your students when they first sign up for a WISE - account. If they already have WISE accounts, have them log in and then select "Add - Unit" from the student home page. + Important: Every classroom unit has a unique Access Code. Students use this code to register for a unit. Give the code to your students when they first sign up for a WISE account. If they already have WISE accounts, have them log in and then select "Add Unit" from the student home page. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 132,138 You can always find the Access Code for each classroom unit in your Class Schedule. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 138,141 Access Link: - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 142,145 Copy link - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 148,150 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 23,25 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 39,41 - Important: Every survey unit has a unique Access Link. Participants can use this - link to complete the unit without a WISE account. + Important: Every survey unit has a unique Access Link. Participants can use this link to complete the unit without a WISE account. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 158,161 You can always find the Access Link for each survey unit in your Class Schedule. - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 161,165 Share to Google Classroom - - src/app/teacher/create-run-dialog/create-run-dialog.component.html + src/app/teacher/create-run-dialog/create-run-dialog.component.html 168,171 Copied to clipboard. - - src/app/teacher/create-run-dialog/create-run-dialog.component.ts + src/app/teacher/create-run-dialog/create-run-dialog.component.ts 270 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.ts + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.ts 52 Latest from the WISE Community - - src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html + src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html 5,10 Visit the WISE Community - - src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html + src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html 13,19 Edit Classroom Unit - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 2,4 - (Run ID: ) + (Run ID: ) - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 11,13 - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 23,24 - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 68,69 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 4,6 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 9,11 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 21,22 - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 47,48 - Warning! You will be editing the content of a classroom unit. If students have - already started working, this may result in lost data or other problems. + Warning! You will be editing the content of a classroom unit. If students have already started working, this may result in lost data or other problems. - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 15,19 Are you sure you wish to proceed? - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 18,22 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 17,21 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 20,24 Proceed - - src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html + src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 23,25 - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 163,166 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 25,27 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 28,31 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 31,34 @@ -10407,8 +8890,7 @@ 21,26 - - src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.html + src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.html 3,5 @@ -10433,43 +8915,35 @@ 18,19 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 238,239 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 114,115 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 165,166 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 194,197 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 259,262 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 425,426 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 134,137 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 154,157 @@ -10480,18 +8954,15 @@ 39 - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 54,56 - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 56,58 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 74,77 @@ -10502,23 +8973,19 @@ 59 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 99,101 - - src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html + src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html 27,31 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 67,69 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 525,528 @@ -10543,170 +9010,144 @@ Share to Google Classroom - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 3,7 - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 77,82 Hey there! Looks like you don't have any active Google Classroom classes. - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 8,10 - Visit Google - Classroom to create a class and - try again. + Visit Google Classroom to create a class and try again. - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 10,12 OK - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 16,20 Add an assignment for this unit to Google Classroom. - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 25,27 1. Choose from your Google Classroom classes - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 26,28 - (Section ) + (Section ) - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 33,34 2. Add Description - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 40,42 Assignment description - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 42,43 Description is required. - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 44,47 The unit has been successfully added to the following Google Classroom classes: - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 74,76 There was a problem adding the unit to the following Google Classroom classes: - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 84,86 - Hi class! Please complete the "" WISE unit. (Access Code: ) + Hi class! Please complete the "" WISE unit. (Access Code: ) - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.ts + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.ts 70 - (Section ) + (Section ) - - src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.ts + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.ts 143 + New Tag - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html 9,13 Tag deleted - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts 83 - There is unit with this tag. + There is unit with this tag. - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts 94 - There are units with this tag. + There are units with this tag. - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts 95 Are you sure you want to delete this tag? - - src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts 96 Teams - - src/app/teacher/milestone/milestone-report-graph/milestone-report-graph.component.ts + src/app/teacher/milestone/milestone-report-graph/milestone-report-graph.component.ts 71 @@ -10724,8 +9165,7 @@ 11,14 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 1,3 @@ -10736,23 +9176,19 @@ 20,23 - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 84 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 73 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/node-progress-view/node-progress-view.component.html 8,12 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 11,14 @@ -10787,366 +9223,311 @@ Class Periods - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 7,9 Delete period - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 17,21 Add new period - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 26,29 Add period - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 42,46 For "Period 9", just enter the number 9. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 51,55 Students Per Team - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 55,56 Only 1 student - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 58,60 1-3 students - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 61,64 Schedule - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 67,70 - (Last student login: ) + (Last student login: ) - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 71,73 Start date is required. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 89,91 Lock After End Date - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.html + src/app/teacher/run-settings-dialog/run-settings-dialog.component.html 120,123 There is already a period with that name. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 92 You do not have permission to add periods to this unit. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 93 You are not allowed to delete a period that contains students. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 94 You do not have permission to delete periods from this unit. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 95 You do not have permission to change the number of students per team for this unit. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 96 - You are not allowed to decrease the number of students per team because this unit - already has teams with more than 1 student. + You are not allowed to decrease the number of students per team because this unit already has teams with more than 1 student. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 97 You do not have permission to change the dates for this unit. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 98 End date can't be before start date. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 99 Start date can't be after end date. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 100 You do not have permission to change whether unit is locked after end date. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 101 Please enter a new period name. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 119 1-3 - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 160 - Are you sure you want to change the students per team to ? + Are you sure you want to change the students per team to ? - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 164 - Are you sure you want to change the start date to ? + Are you sure you want to change the start date to ? - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 195 - Are you sure you want to change the end date to ? + Are you sure you want to change the end date to ? - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 251 Are you sure you want to remove the end date? - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 253 Unit settings updated. - - src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts + src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 336 Select - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 8,11 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 69,71 Select units - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 15,19 All - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 21,22 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.ts 12 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 117,119 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 402,404 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 87,90 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 15,17 None - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 22,23 - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 25,29 Completed - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 23,24 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 107,109 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 143 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 137 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 104 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 96 - - src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html + src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html 16,20 Running - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 24,25 Scheduled - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 25,29 - selected + selected - - src/app/teacher/select-runs-controls/select-runs-controls.component.html + src/app/teacher/select-runs-controls/select-runs-controls.component.html 29,31 @@ -11160,162 +9541,133 @@ Share with Participants - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 2,6 Share with Students - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 4,8 - This is a survey unit. Participants complete survey units anonymously and do not - need a WISE account. + This is a survey unit. Participants complete survey units anonymously and do not need a WISE account. - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 13,16 Copy this link to share with participants: - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 16,19 Copy this link to share with your students: - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 33,37 - Students with WISE accounts can also select Add Unit+ and type the Access Code: + Students with WISE accounts can also select Add Unit+ and type the Access Code: - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 49,52 Copy Access Code - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 57,59 Add as an assignment in Google Classroom: - - src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 67,71 Share Classroom Access - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 2,7 Transfer Classroom Unit - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 10,12 - Sharing access allows other WISE teachers to view student work and optionally view - student names, grade, manage teams, and edit unit content. + Sharing access allows other WISE teachers to view student work and optionally view student names, grade, manage teams, and edit unit content. - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 26,31 - If you have customized the content in this unit and want to share so other teachers - can use with their students, make - a copy of the unit. + If you have customized the content in this unit and want to share so other teachers can use with their students, make a copy of the unit. - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 31,34 View Student Work - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 102,104 View Student Names - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 110,112 Grade and Manage - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 118,120 - Are you sure you want to make the new owner of this unit? + Are you sure you want to make the new owner of this unit? - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 143,145 - You will still be able to access the unit but the new owner will have the ability - to take away or change your access permissions. + You will still be able to access the unit but the new owner will have the ability to take away or change your access permissions. - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 146,151 Transfer Ownership - - src/app/teacher/share-run-dialog/share-run-dialog.component.html + src/app/teacher/share-run-dialog/share-run-dialog.component.html 156,160 - Transferred classroom unit ownership to . + Transferred classroom unit ownership to . - - src/app/teacher/share-run-dialog/share-run-dialog.component.ts + src/app/teacher/share-run-dialog/share-run-dialog.component.ts 213 @@ -11329,187 +9681,160 @@ periods - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 11,12 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 13,17 period - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 12,13 students - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 21,22 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 23,27 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 31,32 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 33,38 student - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 22,23 - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 32,33 Survey Unit - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 40,41 Share with participants - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 41,44 Share with students - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 49,54 - Shared by + Shared by - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 54,56 (Legacy Unit) - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 92,96 - Last student login: + Last student login: - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 120,122 Teacher Tools - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.html 136,141 Class Periods: - - src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.ts + src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.ts 138 Archived classroom units: - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 36,39 Active classroom units: - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 39,43 - completed + completed - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 47,48 - running + running - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 50 Clear filters - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 66,72 Hey there! Looks like you don't have any active classroom units. - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 75,76 Browse the "Unit Library" to find titles to use with your students. - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 76,79 Looks like you don't have any archived classroom units. - - src/app/teacher/teacher-run-list/teacher-run-list.component.html + src/app/teacher/teacher-run-list/teacher-run-list.component.html 81,85 @@ -11523,732 +9848,617 @@ Add lesson - - src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html + src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html 6,10 - - src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html + src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html 20,24 Add lesson before - - src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html + src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html 29,31 Add lesson after - - src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html + src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html 32,38 - - src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html + src/assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component.html 41,45 Enter a title for the new unit - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 4,7 Unit Title - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 11,14 Unit Title is required - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 24,27 cancel - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 34,37 Cancel - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 37,40 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 111,114 - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 81,85 - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 33,37 create - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 44,45 Create - - src/assets/wise5/authoringTool/add-project/add-project.component.html + src/assets/wise5/authoringTool/add-project/add-project.component.html 48,53 Creating Unit... - - src/assets/wise5/authoringTool/add-project/add-project.component.ts + src/assets/wise5/authoringTool/add-project/add-project.component.ts 59 There was an error creating this unit. Please contact WISE staff. - - src/assets/wise5/authoringTool/add-project/add-project.component.ts + src/assets/wise5/authoringTool/add-project/add-project.component.ts 77 Add step - - src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html + src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html 6,9 - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 74,77 Add step before - - src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html + src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html 17,21 Add step after - - src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html + src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html 22,26 Branch off this step - - src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html + src/assets/wise5/authoringTool/add-step-button/add-step-button.component.html 27,31 Start from scratch or choose a Lesson Structure*: - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html 1,2 Select - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html 21,26 - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html 19,24 - - src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html + src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html 29,32 - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html 17,20 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 123,126 - *Based on our work with classroom teachers, we have developed several lesson - structures that follow the Knowledge - Integration framework and help - teachers productively integrate open educational resources (OERs) into their curricula. - These structures have also proven useful for developing students' capacity for - self-directed learning. We have made the structures very general, so that teachers can - customize and incorporate them into any WISE unit to strengthen support for knowledge - integration and self-directed learning. - - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html + *Based on our work with classroom teachers, we have developed several lesson structures that follow the Knowledge Integration framework and help teachers productively integrate open educational resources (OERs) into their curricula. These structures have also proven useful for developing students' capacity for self-directed learning. We have made the structures very general, so that teachers can customize and incorporate them into any WISE unit to strengthen support for knowledge integration and self-directed learning. + + + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.html 28,36 Create Your Own - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts 16 - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts 17 Jigsaw - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts 21 - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 1,3 Self-Directed Investigation - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts 26 - - src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html + src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 1,3 Peer Review & Revision - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts 31 - - src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html + src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html 1,3 KI Lesson with OER - - src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts + src/assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component.ts 36 - - src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html + src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 1,3 Enter a title for the new lesson - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 1,5 Lesson Title - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 8,13 - - src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts + src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts 22 Lesson Title is required - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html 21,25 Step Title - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 3,4 - - src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts + src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts 22 Step Title is required - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 6,9 Select components to add to your new step (optional): - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 9,11 No components added - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 13,16 Delete component - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 26,28 *Note: You can always add or remove content later by editing the step. - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 47,52 New Step - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts 44 Automated Assessment - - src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html 1,3 - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts 27 - Automated Assessments will automatically score student responses and provide - feedback for reflection. + Automated Assessments will automatically score student responses and provide feedback for reflection. - - src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html 3,7 Choose an assessment item: - - src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html 6,8 Preview assessment - - src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html 26,29 Start from scratch, import from another unit, or choose a step template: - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html 1,3 Import From Another Unit - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts 22 Interactive Simulation - - src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts + src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts 32 - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 1,3 - Select from a curated library of interactive simulations addressing various science - topics. + Select from a curated library of interactive simulations addressing various science topics. - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 3,6 Filter by Topic - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 7,8 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 42,44 Clear All - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 22,26 - - Item(s) Found + Item(s) Found - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html 29,31 Customize Feedback (optional) - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 1,3 - Choose whether students should see their score and whether they should receive - feedback after submitting an answer. Customize the feedback students will receive for each - automated score value. + Choose whether students should see their score and whether they should receive feedback after submitting an answer. Customize the feedback students will receive for each automated score value. - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 3,8 Show Score - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 10,11 Show Feedback - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 11,12 - Score + Score - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 14,15 Feedback - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 16,19 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 59,61 - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 100,103 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 405 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 414 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 203,206 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 223,225 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 69,72 - - src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts + src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts 184 The step you chose has nothing to customize. Click "Next" to continue. - - src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html 30,34 Show Rubric - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 6,9 Download Unit - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 29,32 Edit Unit JSON - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 46,50 - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 65,69 Navigation mode: - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 58,61 Default (lessons appear in drop-down list and unit plan) - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 65,67 Tabbed (lessons appear as tabs) - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 68,72 Unit URL - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 74,75 Copy Unit URL to Clipboard - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 81,84 Open Unit URL in New Tab - - src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html + src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html 92,95 Unit Home - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 77 File Manager - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 91 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 72 Notebook Settings - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 98 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 75 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 2,7 Milestones - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 105 - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts 74 - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 101 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 64 Unit List - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 119 You have been inactive for a long time. Do you want to stay logged in? - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 133 - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 156 @@ -12259,13 +10469,11 @@ Session Timeout - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 134 - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 157 @@ -12276,8 +10484,7 @@ Saving... - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 158 @@ -12288,965 +10495,815 @@ Saved - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 172 Error Saving Unit. Please refresh the page. - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 179 You do not have permission to edit this unit. - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 186 - - src/assets/wise5/authoringTool/authoring-tool.component.ts + src/assets/wise5/authoringTool/authoring-tool.component.ts 269 Choose a new location by clicking one of the buttons below - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 2,3 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 2,3 Unused Lessons - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 26,28 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 36,38 - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 80,82 There are no Unused Lessons - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 28,30 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 42,44 Unused Steps - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 52,53 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 80,81 - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 105,107 There are no Unused Steps - - src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html 56,58 - - src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html + src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html 84,86 Insert after - - src/assets/wise5/authoringTool/choose-node-location/insert-node-after-button/insert-node-after-button.component.html + src/assets/wise5/authoringTool/choose-node-location/insert-node-after-button/insert-node-after-button.component.html 6,10 Insert inside - - src/assets/wise5/authoringTool/choose-node-location/insert-node-inside-button/insert-node-inside-button.component.html + src/assets/wise5/authoringTool/choose-node-location/insert-node-inside-button/insert-node-inside-button.component.html 5,9 Selected - - src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html + src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html 15,18 - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 92,94 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 102,104 No results found - - src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html + src/assets/wise5/authoringTool/components/card-selector/card-selector.component.html 37,41 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 131,137 Edit content - - src/assets/wise5/authoringTool/components/component-authoring.component.ts + src/assets/wise5/authoringTool/components/component-authoring.component.ts 44,49 Component Info - - src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html + src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html 2,5 Description: - - src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html + src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html 11,13 Example: - - src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html + src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html 14,16 More Info - - src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html + src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html 9,13 Previous component type - - src/assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component.html + src/assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component.html 6,10 Next component type - - src/assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component.html + src/assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component.html 22,26 Advanced - - src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.html + src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.html 6,10 - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 9,13 Authoring Tool Menu - - src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.html + src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.html 3,5 Project Info - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 14,17 Switch to Grading View - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 30,34 Language to translate - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 47,53 Help - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 59,64 User Menu - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 63,66 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 71,74 Go Home - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 87,90 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 97,100 Sign Out - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 91,96 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 101,106 - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 67,71 - ID: + ID: - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.ts + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.ts 88 - Run ID: | Access Code: + Run ID: | Access Code: - - src/assets/wise5/authoringTool/components/top-bar/top-bar.component.ts + src/assets/wise5/authoringTool/components/top-bar/top-bar.component.ts 90 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts 73 Choose image - - src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts + src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts 19 - Copy content from - + Copy content from - - src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html 13,14 - Note: Editing is disabled. Please switch back to if you want to edit. + Note: Editing is disabled. Please switch back to if you want to edit. - - src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html 27,28 - Copy content to - + Copy content to - - src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html 37,38 - Are you sure you want to replace the content in with content in for this item? + Are you sure you want to replace the content in with content in for this item? - - src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts 50,52 - Also currently editing this unit: . Be - careful not to overwrite each other's work! + )"/>. Be careful not to overwrite each other's work! - - src/assets/wise5/authoringTool/concurrent-authors-message/concurrent-authors-message.component.ts + src/assets/wise5/authoringTool/concurrent-authors-message/concurrent-authors-message.component.ts 50,52 Please Choose an Action - - src/assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component.ts 30 - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 30 Make This Component Not Visible - - src/assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component.ts 31 Action - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 3,4 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 3,4 - - src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html + src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html 21,23 Removal Conditional - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 17,18 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 17,18 Add Removal Criteria - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 37,41 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 37,41 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 42,46 - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html 42,46 Any - - src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.ts 13 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 116,117 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 401,402 - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 21 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 66,67 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 86,87 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 99,100 Are you sure you want to delete this constraint? - - src/assets/wise5/authoringTool/constraint/constraints-authoring/constraints-authoring.component.ts + src/assets/wise5/authoringTool/constraint/constraints-authoring/constraints-authoring.component.ts 45 Removal Criteria - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 2,6 Delete Removal Criteria - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 7,11 Removal Criteria Name - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 16,17 Please Choose a Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 40,42 - ( () + }}"/>) - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 45,48 Please Choose a Component - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 63,66 - . (Prompt: ) + . (Prompt: ) - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 73,75 Please Select a From Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 91,93 Please Select a To Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 112,114 Please Select a Choice - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 175,178 - - - + - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 213,214 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 231,232 - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html 249,250 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html 34,35 - - src/assets/wise5/common/main-menu/main-menu.component.html + src/assets/wise5/common/main-menu/main-menu.component.html 23,24 - - src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html 10,11 Please Choose a Removal Criteria - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 51 Is Completed - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 52 Score(s) - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 56 Branch Path Taken - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 58 From Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 59 To Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 60 Choices - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 65 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 59 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 39,43 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.ts + src/assets/wise5/components/match/match-authoring/match-authoring.component.ts 288 - - src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts + src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 124 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 16,20 Is Correct - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 67 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 58,63 Used X Submits - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 68 Required Submit Count - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 71 Is Visible - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 73 Is Visitable - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 74 Is Visited - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 75 Wrote X Number of Words - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 76 Required Number of Words - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 79 Add X Number of Notes On This Step - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 83 Required Number of Notes - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 86 Fill X Number of Rows - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 89 Required Number of Filled Rows (Not Including Header Row) - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 94 Table Has Header Row - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 96 Require All Cells In a Row To Be Filled - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 99 Teacher Removes Constraint - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 103 Are you sure you want to delete this removal criteria? - - src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts + src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 136 Make all nodes after this not visitable - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 33 Make all nodes after this not visible - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 37 Make all other nodes not visitable - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 41 Make all other nodes not visible - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 45 Make this node not visitable - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 47 Make this node not visible - - src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts + src/assets/wise5/authoringTool/constraint/node-constraint-authoring/node-constraint-authoring.component.ts 48 - Path + Path - - src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html + src/assets/wise5/authoringTool/create-branch-paths/create-branch-paths.component.html 13,14 - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 7,8 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 24,25 Create Branching Structure - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 1,3 - Branch Step: + Branch Step: - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 2,3 - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 7,8 Reference component: - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 19,22 - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 18,21 Paths: - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 36,39 - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 34,36 Submit - - src/assets/wise5/authoringTool/create-branch/create-branch.component.html + src/assets/wise5/authoringTool/create-branch/create-branch.component.html 58,62 - - src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html + src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html 21,25 @@ -13257,415 +11314,354 @@ Creating Branch - - src/assets/wise5/authoringTool/create-branch/create-branch.component.ts + src/assets/wise5/authoringTool/create-branch/create-branch.component.ts 83 A new step will automatically be created in this path - - src/assets/wise5/authoringTool/display-branch-path-steps/display-branch-path-steps.component.html + src/assets/wise5/authoringTool/display-branch-path-steps/display-branch-path-steps.component.html 12,14 This path will be deleted and its steps will be moved after the branching structure - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 28,32 Delete branch path - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 35,38 Add Path - - src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html + src/assets/wise5/authoringTool/edit-branch-paths/edit-branch-paths.component.html 54,57 Edit Branching Structure - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 2,3 Remove Branching - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 4,7 - Merge Step: + Merge Step: - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.html 44,45 Are you sure you want to remove this branching structure? - The branches will be removed but the steps will remain in the unit. +The branches will be removed but the steps will remain in the unit. - - src/assets/wise5/authoringTool/edit-branch/edit-branch.component.ts + src/assets/wise5/authoringTool/edit-branch/edit-branch.component.ts 157 Add a new resource - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 5,8 Resources - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 15,16 Resource Name - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 34,37 Resource URL - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 42,45 Delete resource - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.html 56,58 Are you sure you want to delete this resource? - - src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.ts + src/assets/wise5/authoringTool/edit-unit-resources/edit-unit-resources.component.ts 96 WISE Platform (Uses features on this platform to collect student data) - - src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html + src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html 4,7 - Other Platform (Contains activities and resources for teachers and does not collect - student data) + Other Platform (Contains activities and resources for teachers and does not collect student data) - - src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html + src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html 7,11 Choose the component(s) that you want to import, then select Submit. - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 1,3 Preview unit - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 8,12 Preview step - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 33,36 Preview component - - src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html + src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 53,55 Milestones Authoring - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 2,6 Enable Milestones - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 11,15 Add Milestone - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 19,22 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 612,619 Click to Collapse - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 32,35 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 363,365 Click to Expand - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 44,47 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 375,377 - Milestone + Milestone - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 50,51 Delete Milestone - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 55,58 Milestone Name - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 67,69 Milestone Description - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 76,78 Enable Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 88,90 Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 93,95 Satisfy Minimum Percentage - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 96,98 Satisfy Minimum Number Of Workgroups - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 105,107 Satisfy Conditional - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 114,115 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 396,398 Add Milestone Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 128,131 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 220,223 Milestone Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 138,140 Delete Milestone Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 143,146 Node ID - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 151,152 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 246,247 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 445,447 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 47 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 57 Component ID - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 161,163 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 256,257 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 458,460 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 48 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 58 Copy Node ID and Component ID to Milestone - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 208,211 Report - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 227,229 src/assets/wise5/authoringTool/new-project-template.ts 80 - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 38,42 - src/assets/wise5/services/notebookService.ts 45 @@ -13674,297 +11670,254 @@ Add Report Location - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 232,235 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 294,297 - Location + Location - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 244,245 Delete Location - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 281,284 Custom Score Values - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 300,302 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 324,326 Delete Custom Score Values - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 311,314 Custom Score Key - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 320,321 Add Custom Score Values - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 339,342 Add Template - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 346,349 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 599,602 - Template + Template - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 381,382 Delete Template - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 386,388 Add Template Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 414,416 - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 549,551 - Template Satisfy Criteria - + Template Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 426,427 Delete Template Satisfy Criteria - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 437,439 Function - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 485,487 Percent Threshold - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 503,505 Target Variable - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 522,524 Value - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 530,532 Content Preview - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 571,572 Recommendations - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 579,581 Recommendations Preview - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 584,585 Percent of Scores Less Than - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 41 Percent of Scores Less Than or Equal To - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 45 Percent of Scores Greater Than - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 49 Percent of Scores Greater Than or Equal To - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 53 Percent of Scores Equal To - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 57 - Are you sure you want to delete Milestone ? + Are you sure you want to delete Milestone ? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 187 - Are you sure you want to delete Milestone Satisfy Criteria ? + Are you sure you want to delete Milestone Satisfy Criteria ? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 231,233 - Are you sure you want to copy the Node ID and Component ID to the rest of this - Milestone? + Are you sure you want to copy the Node ID and Component ID to the rest of this Milestone? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 250 Are you sure you want to delete this location? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 331 Error: Key must not be empty - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 356 Error: Values must not be empty - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 359 Are you sure you want to delete this custom score value? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 381 - Are you sure you want to delete Template ? + Are you sure you want to delete Template ? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 418 - Are you sure you want to delete Template Satisfy Criteria ? + Are you sure you want to delete Template Satisfy Criteria ? - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts + src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 468 @@ -14034,18 +11987,15 @@ 112 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html 43,45 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 89,91 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 97,99 @@ -14152,1472 +12102,1261 @@ Add component - - src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts + src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts 34 Add component after - - src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts + src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts 51 - Constraint + Constraint - - src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html 21,22 Show Save Button - - src/assets/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts 11,14 Show Submit Button - - src/assets/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts 15,19 Edit Step JSON - - src/assets/wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component.ts 15,19 General Advanced - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 18,22 Edit Step Rubric - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 31,35 - - src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts + src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts 8,11 Edit Transitions - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 43,47 Edit Constraints - - src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 55,59 Paths - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 2,6 Add a path - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 7,11 There are no paths out of this step - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 15,19 Delete path - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 29,33 Which step this path leads to - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 38,39 Requirements - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 56,59 Add a requirement for this path - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 61,64 There are no requirements for this transition - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 69,72 The student needs to - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 79,81 Delete this requirement - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 102,104 The student needs to choose this choice - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 192,194 The student needs to choose these choices - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 219,221 Tag - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 241,244 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 36 - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 65 How to choose among available paths - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 259,261 When to choose path - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 278,280 Can change path - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 294,296 Max paths visitable - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 311,315 True - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 28 False - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 29 First Available - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 34 Last Available - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 35 Get a specific score on a component - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 45 Scores(s) - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 49 Score ID (Optional) - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 50 Choose a specific choice on a component - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 55 Have Tag Assigned To Workgroup - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 64 Enter Node - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 69 Exit Node - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 70 Score Changed - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 71 Student Data Changed - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 72 Are you sure you want to delete this requirement? - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 153 - Are you sure you want to delete this path to " - "? + Are you sure you want to delete this path to ""? - - src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts + src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 221 Copy component - - src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html + src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html 5,9 This step does not have any components. - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 17,18 Delete Component - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 65,67 - Are you sure you want to delete this component? . + Are you sure you want to delete this component? + +. - - src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts + src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts 166 Student Notebook - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 12,16 Notebook Label - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 21,23 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 202,205 Enable Note - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 34,37 Label (Singular) - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 43,45 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 118,120 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 223,226 Label (Plural) - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 51,53 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 126,128 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 231,234 Label (Link) - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 59,61 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 134,136 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 239,242 Enable Add Note Button - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 71,75 Require students to write text on every note - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 81,85 Enable Clipping - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 90,94 Enable Student Uploads - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 99,103 Enable Report - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 110,112 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 217,219 Title - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 146,147 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 250,251 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 49,50 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 189,190 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 254,255 Starter Text - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 175,177 - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 274,276 Teacher Notebook - - src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html + src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 195,199 Different Ideas - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 6 Different Scores - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 9 Manual - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 15 - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 8 Maximize - - src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts + src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 22 You are not allowed to perform this action. - - src/assets/wise5/authoringTool/peer-grouping/author-peer-grouping-dialog/author-peer-grouping-dialog.component.ts + src/assets/wise5/authoringTool/peer-grouping/author-peer-grouping-dialog/author-peer-grouping-dialog.component.ts 64 Create New Peer Grouping - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 1,4 Grouping Name - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 5,7 - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 4,6 Logic - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 11,13 - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 9,11 Mode - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 28,30 - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 26,28 Teams Per Group - - src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html 47,48 - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 39,40 Edit Peer Grouping - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 1,3 Used in - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 45,46 Not used in any steps. - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 57,62 Delete - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 71,75 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 122,126 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 42,46 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 118,121 Update - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 76,78 Are you sure you want to delete this Peer Grouping? - - src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.ts + src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.ts 84 Grouping Logic: - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html 2,4 (None Selected) - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html 4,8 Select Grouping Logic - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html 12,17 Select Peer Grouping - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 1,3 Choose a Peer Grouping to use for this component: - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 3,5 (There are no Peer Groupings. Please create a new one.) - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 5,8 New Grouping - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 22,26 Steps Used In: - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 15,16 Logic: - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 29,32 Teams Per Group: - - src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 32,34 Drop image or file here or click to upload! - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 8,11 - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 48,51 - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html 23,27 - You are using - out of (%) + You are using out of (%) - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 20,23 Sort Assets - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 48,49 File Name A->Z - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 50,51 File Name Z->A - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 51,52 File Size Small -> Large - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 52,53 File Size Large -> Small - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 53,56 Choose - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 67,69 (Not Used) - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 72,75 Download - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 80,82 - Are you sure you want to delete this file? + Are you sure you want to delete this file? + + - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 149 - The file you are trying to upload is larger than 500 KB. We recommend using smaller - files so they load faster for students. Are you sure you want to upload this large file? + The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 212 - One of the files you are trying to upload is larger than 500 KB. We recommend using - smaller files so they load faster for students. Are you sure you want to upload the large - file? + One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 214 - of the files you are trying to upload - are larger than 500 KB. We recommend using smaller files so they load faster for students. - Are you sure you want to upload these large files? + of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? + - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 216 Successfully uploaded: - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 245 Error uploading: - - src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 254 Expand/collapse lesson - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 7,10 Select lesson - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 15,18 Edit lesson - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 26,30 Move lesson - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 36,40 Delete lesson - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 46,50 This lesson has no steps - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 69,72 Are you sure you want to delete this lesson? - - src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts 84 Edit step - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 10,15 - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 63,67 Select step - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 18,22 - Edit branch point: paths based on paths based on + }}"/> - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 29,32 - - Constraint(s) Constraint(s) + }}"/> - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 42,45 Has rubric/teaching tips - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 54,57 Move step - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 73,77 Copy step - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 83,87 Delete step - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 93,97 Are you sure you want to delete this step? - - src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts + src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts 162 Move - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 8,11 + Expand All - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 44,48 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 23,27 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 24,27 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 35,39 - Collapse All - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 54,58 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 35,39 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 46,50 There are no lessons - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 60,64 There are no unused lessons - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 83,87 There are no unused steps - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 107,109 - Are you sure you want to delete the - selected item(s)? + Are you sure you want to delete the selected item(s)? - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts + src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts 105 Unit Icon - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 9,10 This unit does not have a unit icon. - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 20,22 Click the edit button to set one. - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 21,26 Choose a new Unit Icon by clicking on one below or upload your own custom icon. - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 34,36 Upload - - src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html + src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html 37,41 Default language: - - src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html 2,6 Additional languages: - - src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html 10,14 Back to Teacher Home - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 8,12 Create a New Unit - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 17,20 You have no units - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 54,56 Shared Units - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 62,64 You have no shared units - - src/assets/wise5/authoringTool/project-list/project-list.component.html + src/assets/wise5/authoringTool/project-list/project-list.component.html 64,66 Copying Unit... - - src/assets/wise5/authoringTool/project-list/project-list.component.ts + src/assets/wise5/authoringTool/project-list/project-list.component.ts 53 There was an error copying this unit. Please contact WISE staff. - - src/assets/wise5/authoringTool/project-list/project-list.component.ts + src/assets/wise5/authoringTool/project-list/project-list.component.ts 60 - (Run ID: ) + (Run ID: ) - - src/assets/wise5/authoringTool/project-list/project-list.component.ts + src/assets/wise5/authoringTool/project-list/project-list.component.ts 75 - Are you sure you want to copy this unit? + Are you sure you want to copy this unit? + + - - src/assets/wise5/authoringTool/project-list/project-list.component.ts + src/assets/wise5/authoringTool/project-list/project-list.component.ts 77 Loading Unit... - - src/assets/wise5/authoringTool/project-list/project-list.component.ts + src/assets/wise5/authoringTool/project-list/project-list.component.ts 100 Recovery View - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 2,4 Go to Authoring View - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 15,19 JSON Valid - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 20,23 JSON Invalid - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 23,27 - Warning: Modifying the JSON may break the project. Please make a backup copy of the - JSON before you modify it. + Warning: Modifying the JSON may break the project. Please make a backup copy of the JSON before you modify it. - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 35,39 Potential Problems - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 40,42 - This group references the node ID but the node does not exist: - + This group references the node ID but the node does not exist: - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 46,48 - This group references the same node ID multiple times: - + This group references the same node ID multiple times: - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 52,54 This node has a transition to null - - src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html + src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 57,64 Edit Unit Rubric - - src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts + src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts 9,12 Branching Criteria Options - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 1,3 - Automatically assigns students a branch path based on their WISE Workgroup ID - number. This option ensures a relatively even distribution of students per path. + Automatically assigns students a branch path based on their WISE Workgroup ID number. This option ensures a relatively even distribution of students per path. - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 5,9 - *Assigning paths based on Workgroup ID also can ensure that students are branched - to the same path across multiple branching structures in the unit (assuming each branching - structure contains the same number of paths). + *Assigning paths based on Workgroup ID also can ensure that students are branched to the same path across multiple branching structures in the unit (assuming each branching structure contains the same number of paths). - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 9,16 Assigns students a branch path based on their score from another item in the unit. - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 30,32 - Assigns students a branch path based on their selection from a multiple choice item - in the unit. + Assigns students a branch path based on their selection from a multiple choice item in the unit. - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 38,41 - Randomly assigns student teams a branch path. This option ensures a relatively even - distribution of students per path. + Randomly assigns student teams a branch path. This option ensures a relatively even distribution of students per path. - - src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html + src/assets/wise5/authoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html 47,52 How to Choose Among Paths - - src/assets/wise5/authoringTool/select-branch-criteria/select-branch-criteria.component.html + src/assets/wise5/authoringTool/select-branch-criteria/select-branch-criteria.component.html 2,3 Merge Step - - src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html + src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html 2,3 @@ -15626,1024 +13365,856 @@ - Use Next Step In Unit () + Use Next Step In Unit () - - src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html + src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html 6,7 Create New Step - - src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html + src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html 9,11 All students will be directed here after completing their branch paths. - - src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html + src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html 11,13 Number of Branch Paths - - src/assets/wise5/authoringTool/select-path-count/select-path-count.component.html + src/assets/wise5/authoringTool/select-path-count/select-path-count.component.html 2,6 - The Jigsaw KI lesson structure guides students through learning about specific - aspects of a science topic of their choice and engages them in collaboration to learn - more. Students share their own ideas and reflect on what they learned from their - classmates. + The Jigsaw KI lesson structure guides students through learning about specific aspects of a science topic of their choice and engages them in collaboration to learn more. Students share their own ideas and reflect on what they learned from their classmates. - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 3,8 Choose number of groups in this Jigsaw activity: - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 8,11 Two groups - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 14,15 Three groups - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 15,16 Four groups - - src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html + src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 16,19 - The KI Lesson with OER guides you to embed an open educational resource (OER) of - your choice in a lesson structure that promotes knowledge integration (KI). The structure - suggests different step types that engage students in eliciting their ideas, discovering - new ideas through use of the OER, distinguishing among their initial and new ideas, and - making connections to form integrated understanding. + The KI Lesson with OER guides you to embed an open educational resource (OER) of your choice in a lesson structure that promotes knowledge integration (KI). The structure suggests different step types that engage students in eliciting their ideas, discovering new ideas through use of the OER, distinguishing among their initial and new ideas, and making connections to form integrated understanding. - - src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html + src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 3,11 - The Peer Review & Revision KI lesson structure guides students through writing - their own explanation, critiquing explanations of peer learners, and ultimately revising - their own initial explanation. + The Peer Review & Revision KI lesson structure guides students through writing their own explanation, critiquing explanations of peer learners, and ultimately revising their own initial explanation. - - src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html + src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html 3,9 - The Self-Directed Investigation KI lesson structure helps students ask research - questions about a science topic, guides them through refining their initial questions to - researchable questions, and supports them in finding and evaluating evidence using online - resources of their choice. Students synthesize their findings into a product of your - choice. + The Self-Directed Investigation KI lesson structure helps students ask research questions about a science topic, guides them through refining their initial questions to researchable questions, and supports them in finding and evaluating evidence using online resources of their choice. Students synthesize their findings into a product of your choice. - - src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html + src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 3,10 Create a WISE Link - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 1,3 Choose a Step - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 8,10 Component (Optional) - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 22,25 Choose a Component - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 25,29 Link Text - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 42,44 Link - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 48,49 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 83,84 Button - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 49,53 You must select a step. - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts 69 You must enter text. - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts 71 Classroom Monitor - - src/assets/wise5/classroomMonitor/classroom-monitor.component.html + src/assets/wise5/classroomMonitor/classroom-monitor.component.html 6,8 Grade by Step - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 108 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 67 Grade by Student - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 121 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 66 Manage Students - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 128 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 63 Student Notebooks - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 135 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 65 Data Export - - src/assets/wise5/classroomMonitor/classroom-monitor.component.ts + src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 142 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 62 No feedback given for this version - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 5,9 Auto Comment - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 85,87 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 138,140 Teacher Comment: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.html 2,4 Enter comment here - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.html 6,10 Saved comment - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.ts 80 Auto Score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 5,7 Teacher Score: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 13,17 Item Score: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 15,21 Saved score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.ts 69 Create a new team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html 4,8 New Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html 9,12 - Create New Team (Period - ) + Create New Team (Period ) - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 1,2 Select students to add to the new team: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 3,5 No team members added - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 7,10 Delete team member - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 27,29 Select to add student to new team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 45,48 - - stop = - Student without a current team + stop = Student without a current team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 55,57 - New Team has been created. + New Team has been created. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.ts 84 Error: Could not create team. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.ts 91 Change Student Password - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 1,3 Change password for - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 4,7 - Student + Student - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 10,11 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 15,16 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 6,8 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/show-student-info/show-student-info.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/show-student-info/show-student-info.component.ts 13,14 Teacher Password - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 17,18 Teacher Password required - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 20,22 Teacher Password is incorrect - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 23,27 Confirm - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 47,50 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 44,47 Confirm New Student Password - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 21 New Student Password - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 24 - Changed password for (). + Changed password for (). - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 72 - Changed password for Student . + Changed password for Student . - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 73 Change Period - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 1,3 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 21,27 - Select a new period for Team : - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html + Select a new period for Team : + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 5,8 - Moved Team to Period . + Moved Team to Period . - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.ts 56 - Period + Period - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html 10,11 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html 4,5 - Students: | Teams: - + Students: | Teams: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html 12,14 Empty Teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html 25,28 Student ID - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 13,16 Most Recent Login - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 23,25 Registration Date - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 30,31 Number of Logins - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 34,37 Tip: Drag a student to change teams within current period. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-students/manage-students.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-students/manage-students.component.html 4,6 Students without a team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 12,14 - Team + Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 14,16 No students - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 19,21 - Moved student to Team . + Moved student to Team . - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts 118 Error: Could not move student. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts 123 View student info - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 7,10 Student signs in with Google - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 18,22 Change student password - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 28,31 Remove student - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 39,42 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 42,46 - Removed () from unit. + Removed () from unit. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts 55 - Error: Could not remove () from unit. + Error: Could not remove () from unit. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts 62 Move Student - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 2,5 - Warning: Removing a student from a team will result in the student losing all the - work they completed with that team. + Warning: Removing a student from a team will result in the student losing all the work they completed with that team. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 12,16 The student will adopt the work of their new team. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 16,19 Proceed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 23,26 Remove Student - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 1,5 - Are you sure you want to remove from the unit? + Are you sure you want to remove from the unit? - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 5,8 - Warning: All of the students' work in the unit will be deleted and they will - be removed from the class. + Warning: All of the students' work in the unit will be deleted and they will be removed from the class. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 9,13 - If you would like to move a student to a different team, drag them to that team. - You can also create a new team and add the student there. + If you would like to move a student to a different team, drag them to that team. You can also create a new team and add the student there. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 13,17 - *Note that removing a student does not delete their WISE account, only their - association with this unit. + *Note that removing a student does not delete their WISE account, only their association with this unit. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 17,21 Expand All - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 17,19 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 18,21 Collapse All - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 28,30 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 29,32 Sort by team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 47,50 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html 34,38 Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 50,52 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 83,86 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + 105,108 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html 37,38 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 52,54 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 40 Sort by completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 67,70 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 78,81 + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 79,82 Status - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 70,72 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html 54,55 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 81,83 + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 82,84 Sort by score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 87,90 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html 68,72 - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 97,100 + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 99,102 - Sort by score on Step + Sort by score on Step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 107,108 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 109,110 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 130,131 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 132,133 Sort by change in score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 154,156 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 156,159 +/- - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-class-responses/milestone-class-responses.component.html 160,162 - Milestone: + Milestone: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.html 1,2 Description: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 15,17 Requirements: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 21,22 Item Location: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 34,36 Step Info - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 36,40 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 54,57 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 20,22 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html 5,7 @@ -16654,570 +14225,299 @@ Class Report - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 42,44 - This milestone includes automated reports that analyze student progress. Reports - become available for each period once the following conditions are met: + This milestone includes automated reports that analyze student progress. Reports become available for each period once the following conditions are met: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 46,49 - At least - team(s) or % - of the class have completed the milestone + At least team(s) or % of the class have completed the milestone - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 51,54 - At least - team(s) and % - of the class have completed the milestone + At least team(s) and % of the class have completed the milestone - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 57,60 Recommendation - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 76,77 Student Work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 79,81 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 89,90 Student Completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 97,99 - - Team - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html - 105,108 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 50,52 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 116,118 - - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 52,54 - - - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 40 - - Not Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 132,137 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 152 - - Expand All - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 17,19 - - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 18,21 - - - - Collapse All - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 28,30 - - - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html - 29,32 - - - - Sort by team - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 47,50 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 113,116 - - - - Sort by completion - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 68,71 - - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 79,82 - - - - Status - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 71,73 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 136,138 - - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 82,84 - - - - Sort by score - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 90,93 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 154,157 - - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 99,102 - - - - Sort by score on Step - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 112,113 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 114,115 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 137,138 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 139,140 - - - - Sort by change in score - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 163,165 - - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 165,168 - - - - +/- - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html - 169,170 - - Show/hide team's work for this step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html 11,13 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html 12,14 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html 12,14 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html 12,14 - Step + Step - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html 71,72 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html 94,95 Not Assigned - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 139 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 132 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 99 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 91 Partially Completed - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 147 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 144 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 111 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 103 No Work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 154 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 149 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 116 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 108 - Showing / items - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 12,15 - - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 13,16 - - - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 65 - - - - N/A - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 19,21 - - - - Mean Score - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 21,26 - - - - Peer Groups + Showing / items - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 46,50 - - - - Info + Tips () - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 57,58 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts + 32 Expand all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 78,81 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 8,11 + Expand all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 84,87 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 14,18 Collapse all teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 88,91 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 18,21 - Collapse all - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 94,98 - - - - This step doesn't require any student work - - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html - 102,107 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + 24,28 Sorty by completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-class-responses/node-class-responses.component.html 51,55 Step Completion - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 6,9 Mean Step Score - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 11,15 - Info + Tips () + Info + Tips () - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 22,23 Class Responses - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html 28,31 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 412 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 411 Visited - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 139 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 106 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 98 Not Visited - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.ts 151 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.ts 118 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 110 - (Team ) + (Team ) - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html 5,7 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-workgroup/peer-group-workgroup.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-workgroup/peer-group-workgroup.component.html 12,14 - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 8,9 - has been locked for . + has been locked for . - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 254 - has been unlocked for . + has been unlocked for . - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 255 All Periods - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 381 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html 12,14 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts 82 @@ -17226,268 +14526,228 @@ - Period: + Period: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 382 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts 83 - Unlock for + Unlock for - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 387 - Lock for + Lock for - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 388 Show/hide team's notebook contents - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html 7,11 - Latest Work: - + Latest Work: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html 28,29 No Work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html 32,37 Pause Student Screens - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 10,15 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 53,55 Pause student screens (Period: All Periods) - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 16,19 All Periods - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 22,25 - Pause student screens (Period: ) + Pause student screens (Period: ) - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 28,29 - Period: - + Period: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 34,35 - Groupings for + Groupings for - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html 8,9 Tip: Drag students to change groups for this peer grouping. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html 13,15 - Group + Group - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-grouping/peer-group-grouping.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-grouping/peer-group-grouping.component.html 3,5 Change Grouping - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 2,5 - Warning: If you remove students from a Peer Group, they will no longer see any - contributions they made to that group. + Warning: If you remove students from a Peer Group, they will no longer see any contributions they made to that group. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 12,15 Are you sure you want to move this team? - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 17,21 Create a new group - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html 9,13 New Group - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html 15,18 Ungrouped - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-unassigned-workgroups/peer-group-unassigned-workgroups.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-unassigned-workgroups/peer-group-unassigned-workgroups.component.html 2,5 Empty Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-workgroup/peer-group-workgroup.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-workgroup/peer-group-workgroup.component.ts 26 - Period: + Period: - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html 14,15 0 teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html 18,20 1 team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html 20,22 - teams + teams - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.html 22,23 Item Info - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html 30,32 Alerts - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html 10,14 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 40,43 - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 3,5 Clear all notifications - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html 17,21 You have no new alerts at this time. - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html 27,30 - Go to + Go to - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.html 38,39 @@ -17498,1302 +14758,1110 @@ Are you sure you want to clear all your alerts? - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts 51 Clear all alerts - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts 52 Main Menu - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.html 6,10 Switch to Authoring View - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 19,22 - Warning! You will be editing the content of a classroom unit. If students have - already started working, this may result in lost data or other problems. + Warning! You will be editing the content of a classroom unit. If students have already started working, this may result in lost data or other problems. - Are you sure you want to proceed? +Are you sure you want to proceed? - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts + src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts 106 Previous Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/student-grading-tools/student-grading-tools.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/student-grading-tools/student-grading-tools.component.html 6,10 Next Team - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/student-grading-tools/student-grading-tools.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/student-grading-tools/student-grading-tools.component.html 18,22 - Completed / steps with work + Completed / steps with work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html 5,6 - Revisions for + Revisions for - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html 1,2 Show more - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html 53,58 - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 29,35 Team has not saved any work - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html 18,22 See revisions - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html + src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html 29,35 Downloading Export - - src/assets/wise5/classroomMonitor/dataExport/abstract-export.component.ts + src/assets/wise5/classroomMonitor/dataExport/abstract-export.component.ts 52 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts 133 Export One Workgroup Per Row - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 8,12 Export One Workgroup Per Row - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 12,17 Export Student Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19,23 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 12,14 Export Student Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 23,28 Export Events - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 30,34 Export Events - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 34,39 Export Latest Notebook Items - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 41,45 Export Latest Notebook Items - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 45,50 Export All Notebook Items - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 52,56 Export All Notebook Items - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 56,61 Export Notifications - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 63,67 Export Notifications - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 67,72 Export Student Assets - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 74,78 Export Student Assets - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 78,83 Export Item Data - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 85,89 - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 12,14 Export Item Data - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 89,94 Export Raw Data - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 96,100 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 12,14 Export Raw Data - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 100,105 Export Step Visits - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 107,111 Export Step Visits - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 111,117 Include Student Events - - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html 14,16 Include Teacher Events - - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html 17,19 Include Names - - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html 19,24 Export - - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html 29,33 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 38,42 Include student names - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 17,21 Include correctness columns - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 22,27 Include only submits - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 28,32 Download all revisions export - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 82,84 Download latest revisions export - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 96,98 Latest - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 101,104 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 14,15 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong - position + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts 59 Downloading export - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts 159 Export Gradebook - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 12,14 Include Student Work - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 15,19 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 20,24 Include Student Work IDs - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 20,24 Include Student Names - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 26,31 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 26,31 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 20,24 Include Student Work Timestamps - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 32,36 Include Branch Path Taken - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 37,41 Include Branch Path Taken Node ID - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 42,46 Include Branch Path Taken Step Title - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 47,51 Include Scores - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 51,54 Include Score Timestamps - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 55,59 Include Comments - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 60,64 Include Comment Timestamps - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 65,68 Export - - src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html 74,77 - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 44,49 - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 58,60 - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 88,91 - - src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html 35,40 Everything - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 16,19 Include Annotations - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 32,36 Include Events - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 36,39 Export Step Visit Events - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 14,16 Hide Column Explanations - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 18,20 - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 40,44 Show Column Explanations - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 20,24 Column Name - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 28,31 Explanation - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 29,31 Include Student Names - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 51,55 Choose Steps - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 54,56 Select All - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 56,57 - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 21,27 Deselect All - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 57,58 - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 31,37 Include Deleted Steps (If Any) - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 84,88 Back To Top - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 94,97 The row number. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 118 The ID of the group. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 119 - The User ID of the first student in the group. This ID follows the student for all - runs. + The User ID of the first student in the group. This ID follows the student for all runs. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 122 - The name of the first student. This only shows up if you have permission to view the - student names and you enabled the 'Include Student Names' checkbox. + The name of the first student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 126 - The UserID of the second student in the group. This ID follows the student for all - runs. + The UserID of the second student in the group. This ID follows the student for all runs. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 130 - The name of the second student. This only shows up if you have permission to view - the student names and you enabled the 'Include Student Names' checkbox. + The name of the second student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 134 - The User ID of the third student in the group. This ID follows the student for all - runs. + The User ID of the third student in the group. This ID follows the student for all runs. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 138 - The name of the third student. This only shows up if you have permission to view the - student names and you enabled the 'Include Student Names' checkbox. + The name of the third student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 142 The ID of the run. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 144 The ID of the project. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 145 The name of the project. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 146 The ID of the period that this student is in. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 147 - The period name that this student is in. This name is chosen by the teacher that - created the run. + The period name that this student is in. This name is chosen by the teacher that created the run. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 150 The start date of the run. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 152 The end date of the run. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 153 The ID of the step. Each step in a unit has a unique Node ID. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 156 The title of the step. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 158 The timestamp when the student entered the step. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 161 - The timestamp when the student exited the step. This value can be empty if WISE did - not get the chance to save a step exit event. This can happen if the student closes their - laptop without signing out of WISE or if they refresh the WISE page. + The timestamp when the student exited the step. This value can be empty if WISE did not get the chance to save a step exit event. This can happen if the student closes their laptop without signing out of WISE or if they refresh the WISE page. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 165 - The amount of time the student spent on the step during this visit measured in - seconds. + The amount of time the student spent on the step during this visit measured in seconds. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 169 The number of times the student has visited this step so far. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 173 - The number of times the student has revisited this step so far. This will always be - 1 less than the 'Visit Counter' for a given visit. + The number of times the student has revisited this step so far. This will always be 1 less than the 'Visit Counter' for a given visit. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 177 The Node ID of the step the student was on before visiting this step. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 181 The step title of the step the student was on before visiting this step. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 185 - A list of Node IDs that contain the steps the student visited before revisiting this - step. This cell will only contain values if they revisit a step. For example if the - student navigated to node1, then node2, then node3, then node1. For the second visit to - node1, the 'Node IDs Since Last Visit' will show node2, node3. + A list of Node IDs that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to node1, then node2, then node3, then node1. For the second visit to node1, the 'Node IDs Since Last Visit' will show node2, node3. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 189 - A list of step numbers that contain the steps the student visited before revisiting - this step. This cell will only contain values if they revisit a step. For example if the - student navigated to 1.1, then 1.2, then 1.3, then 1.1. For the second visit to 1.1, the - 'Steps Since Last Visit' will show 1.2, 1.3. + A list of step numbers that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to 1.1, then 1.2, then 1.3, then 1.1. For the second visit to 1.1, the 'Steps Since Last Visit' will show 1.2, 1.3. - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 193 Export All Steps - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 9,11 Select Steps To Export - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 12,15 Select All - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 25,29 - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 56,60 Deselect All - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 35,39 Item - - src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 63,65 Team ID - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 46,48 Sort By Team - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 48,52 Names - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 66,68 - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 73,75 Sort By Student - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 68,71 Sort by number of notes - - src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html + src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 91,94 Completion - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 13,16 - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 65 Total Score - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 17,22 - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 39,41 Expand all - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 29,31 Collapse all - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 40,42 Sort by step - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 59,62 - Sort by + Sort by - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html 7,8 Location - - src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts + src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 60 Add response... - - src/assets/wise5/common/chat-input/chat-input.component.html + src/assets/wise5/common/chat-input/chat-input.component.html 6,9 - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html 6,9 Send - - src/assets/wise5/common/chat-input/chat-input.component.html + src/assets/wise5/common/chat-input/chat-input.component.html 20,23 - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html 22,25 Selected icon - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 12,14 - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 24,29 Choose an Icon - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 28,31 Use a Knowledge Integration (KI) icon: - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 32,36 More about WISE and Knowledge Integration - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 36,39 Select a KI icon - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 45,47 Or choose your own icon: - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 65,66 Select an icon - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 66,68 Color: - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 81,82 Select a color - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 82,84 Knowledge Integration elicit ideas - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 102 Knowledge Integration discover ideas - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 107 Knowledge Integration distinguish ideas - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 112 Knowledge Integration connect ideas and reflect - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 117 Connect Ideas & Reflect - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 118 Knowledge Integration cycle - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 122 KI Cycle - - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts + src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 123 - Submitted + Submitted - - src/assets/wise5/common/save-time-message/save-time-message.component.ts + src/assets/wise5/common/save-time-message/save-time-message.component.ts 29 - Auto Saved + Auto Saved - - src/assets/wise5/common/save-time-message/save-time-message.component.ts + src/assets/wise5/common/save-time-message/save-time-message.component.ts 31 - Saved + Saved - - src/assets/wise5/common/save-time-message/save-time-message.component.ts + src/assets/wise5/common/save-time-message/save-time-message.component.ts 33 Previous Step - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 7,11 - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 7,11 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 9,13 Select a Step - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 21,24 - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 21,24 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 21,24 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 23,26 Select a Step - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 32,35 - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 32,35 Next Step - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 52,56 - - src/assets/wise5/common/stepTools/step-tools.component.html + src/assets/wise5/common/stepTools/step-tools.component.html 52,56 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 60,63 @@ -18820,132 +15888,109 @@ - Use the system prompt to instruct the chat bot how to behave. Students will not see - the system prompt. + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 3,8 Toggle system prompt instructions - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 13,18 System Prompt Instructions - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 21,23 - Provide context, instructions, and other relevant information to help the chat bot - act the way you want it to. Be as specific as possible. + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 23,27 Example System Prompt - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 26,28 - You are a teacher helping a student understand the greenhouse effect by using the - example of a car that has been sitting in the sun on a cold day. The student is asked how - the temperature inside the car will feel. Do not tell them the correct answer, but guide - them to better understand the science by asking questions. Also make sure they explain - their reasoning. Limit your response to 100 words or less. - - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 28,36 System Prompt - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 37,40 Use the prompt to introduce the chatbot activity. Students will see the prompt. - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 46,49 Enable Computer Avatar - - src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html 57,60 - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html 21,24 Automated guidance response - - src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html 5,9 - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html 15,19 - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html 23,28 Student response - - src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html 5,9 - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html 6,11 An error occurred. - - src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts 104 Model - - src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html 2,3 @@ -18967,2082 +16012,1721 @@ 8 - - src/assets/wise5/components/animation/animationService.ts + src/assets/wise5/components/animation/animationService.ts 9 Width (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 7,12 Height (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 17,22 Width (Units) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 29,34 Height (Units) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 39,44 Data Origin X (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 51,56 Data Origin Y (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 61,66 Screen - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 78,80 Cartesian - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 81,85 Objects - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 86,90 Add Object - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 91,94 Image - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 116,118 Text - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 119,122 Image - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 129,130 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 106,107 - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 58,59 Text - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 145,146 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 105,106 - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 156,157 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 159,160 Move Object Up - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 157,160 Up - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 161,163 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 371,373 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 279,281 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 172,174 Move Object Down - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 171,174 Down - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 175,177 - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 385,387 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 293,295 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 186,188 Delete Object - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 184,187 Image Width (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 196,199 Image Height (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 206,209 Image Moving Left - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 222,224 Image Moving Right - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 236,238 Location X (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 251,255 Location Y (Pixels) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 261,265 Data X (Units) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 271,275 Data Y (Units) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 281,285 Data Points - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 292,296 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 488,492 Add Data Point - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 298,301 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 493,496 Time - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 317,320 X - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 327,330 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 522,525 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 181,184 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 203,206 Y - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 337,340 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 531,534 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 190,193 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 212,215 Change to Image (Optional) - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 349,351 Delete Data Point - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 394,397 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 584,587 Data Source - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 407,410 Add Data Source - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 414,417 Delete Data Source - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 428,431 Trial Index - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 478,481 Series Index - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 488,491 Time Column Index - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 498,501 X Column Index - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 508,511 Y Column Index - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 518,521 - You can only have Data Points or a Data Source. If you add a Data Point, the Data - Source will be deleted. Are you sure you want to add a Data Point? + You can only have Data Points or a Data Source. If you add a Data Point, the Data Source will be deleted. Are you sure you want to add a Data Point? - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 90 Are you sure you want to delete this data point? - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 107 Are you sure you want to delete this object? - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 164 - You can only have Data Points or a Data Source. If you add a Data Source, the Data - Points will be deleted. Are you sure you want to add a Data Source? + You can only have Data Points or a Data Source. If you add a Data Source, the Data Points will be deleted. Are you sure you want to add a Data Source? - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 178 Are you sure you want to delete the Data Source? - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 207 Number of Times Animation Played - - src/assets/wise5/components/animation/animation-show-work/animation-show-work.component.html + src/assets/wise5/components/animation/animation-show-work/animation-show-work.component.html 2,4 Play - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 11,14 - - src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts + src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts 281 Pause - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 24,27 Resume - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 37,40 Reset - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 49,52 - - src/assets/wise5/components/draw/draw-student/draw-student.component.html + src/assets/wise5/components/draw/draw-student/draw-student.component.html 44,48 - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 93,96 Slower - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 55,58 Faster - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 64,67 Add File - - src/assets/wise5/components/animation/animation-student/animation-student.component.html + src/assets/wise5/components/animation/animation-student/animation-student.component.html 76,79 - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html 58,60 You do not have any more chances to receive feedback on your answer. - - src/assets/wise5/components/animation/animation-student/animation-student.component.ts + src/assets/wise5/components/animation/animation-student/animation-student.component.ts 908 - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 179 - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 195 - You have 1 chance to receive feedback on your answer so this this should be your - best work. + You have 1 chance to receive feedback on your answer so this this should be your best work. - Are you ready to receive feedback on this answer? +Are you ready to receive feedback on this answer? - - src/assets/wise5/components/animation/animation-student/animation-student.component.ts + src/assets/wise5/components/animation/animation-student/animation-student.component.ts 911 - You have chances to receive feedback - on your answer so this this should be your best work. Are you ready to receive feedback on - this answer? + You have chances to receive feedback on your answer so this this should be your best work. + +Are you ready to receive feedback on this answer? - - src/assets/wise5/components/animation/animation-student/animation-student.component.ts + src/assets/wise5/components/animation/animation-student/animation-student.component.ts 915 - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 330 - Students change the frequency and amplitude of a sound wave. They listen to the - resulting sounds and view graphs of the waves. + Students change the frequency and amplitude of a sound wave. They listen to the resulting sounds and view graphs of the waves. - - src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts + src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts 4 Audio Oscillator - - src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts + src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts 5 - - src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts + src/assets/wise5/components/audioOscillator/AudioOscillatorInfo.ts 8 - - src/assets/wise5/components/audioOscillator/audioOscillatorService.ts + src/assets/wise5/components/audioOscillator/audioOscillatorService.ts 11 Oscillator Types - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 5,6 - (There are no oscillator types selected. Please select at least one oscillator - type.) + (There are no oscillator types selected. Please select at least one oscillator type.) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 8,12 Sine - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 19,24 Square - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 29,34 Triangle - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 39,44 Sawtooth - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 49,53 Frequency - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 55,57 Starting Frequency (Hz) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 57,62 Show Frequency Input - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 72,76 Allow Student to Edit Frequency - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 81,85 Amplitude - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 87,89 Starting Amplitude (dB) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 89,94 Show Amplitude Input - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 105,110 Allow Student to Edit Amplitude - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 115,120 Oscillator Width (Pixels) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 124,129 Oscillator Height (Pixels) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 134,139 Oscillator Grid Size (Pixels) - - src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 144,149 Frequencies (Hz) - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 2,4 Frequencies Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 4,7 Frequencies Played Sorted - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 7,10 Number of Frequencies Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 10,12 Number of Unique Frequencies Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 14,16 Minimum Frequency Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 19,22 Maximum Frequency Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 22,24 Amplitudes (dB) - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 25,27 Amplitudes Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 27,30 Amplitudes Played Sorted - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 30,33 Number of Amplitudes Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 33,36 Number of Unique Amplitudes Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 36,38 Min Amplitude Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 40,43 Max Amplitude Played - - src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 43,47 Oscillator Type - - src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html 5,8 Frequency (Hz) - - src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html 21,25 Ampitude (dB) - - src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html + src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html 33,37 Stop - - src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts + src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts 285 Idea detection rubric - - src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html + src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html 2,4 Close rubric - - src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html + src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html 4,9 ID - - src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html + src/assets/wise5/components/common/cRater/crater-rubric/crater-rubric.component.html 17,20 Model Description - - src/assets/wise5/components/common/cRater/edit-crater-description/edit-crater-description.component.html + src/assets/wise5/components/common/cRater/edit-crater-description/edit-crater-description.component.html 3,5 User-Friendly Description - - src/assets/wise5/components/common/cRater/edit-crater-description/edit-crater-description.component.html + src/assets/wise5/components/common/cRater/edit-crater-description/edit-crater-description.component.html 7,10 - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 38,41 Idea Descriptions - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 3,7 Add a new idea description - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 7,10 - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 68,71 Idea ID - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 30,33 Delete idea description - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html 52,54 Are you sure you want to delete this idea description? - - src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.ts + src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.ts 83 Edit CRater Information - - src/assets/wise5/components/common/cRater/edit-crater-info/edit-crater-info.component.ts + src/assets/wise5/components/common/cRater/edit-crater-info/edit-crater-info.component.ts 13,15 Thanks for submitting your response. - - src/assets/wise5/components/common/feedbackRule/FeedbackRuleEvaluator.ts + src/assets/wise5/components/common/feedbackRule/FeedbackRuleEvaluator.ts 14 Feedback Rules - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 3,7 - Feedback # + Feedback # - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 62,63 Delete feedback - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 75,77 Add new feedback - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 87,89 Are you sure you want to delete this feedback? - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts 97 Are you sure you want to delete this feedback rule? - - src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts 104 Note: this term currently only works in the Dialog Guidance component. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 2,4 Feedback Rule Authoring - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 4,6 Introduction - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 6,8 - Rules are evaluated top to bottom. The first rule Expression that matches the student's response is used to provide - feedback. + Rules are evaluated top to bottom. The first rule Expression that matches the student's response is used to provide feedback. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 8,11 - You can add multiple - Feedback items per rule. The - first time a rule matches, Feedback #1 will be shown to the student. If the rule matches a second time (in a - subsequent round), Feedback #2 will be shown, and so on. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + You can add multiple Feedback items per rule. The first time a rule matches, Feedback #1 will be shown to the student. If the rule matches a second time (in a subsequent round), Feedback #2 will be shown, and so on. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 12,16 - Expressions are made up of terms, - operators, and parentheses: + Expressions are made up of terms, operators, and parentheses: - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 16,17 Terms - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 17,18 Terms lets you specify what to look for in a student response. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 18,22 Term - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 21,25 Evaluates to true if idea 1, 2, 18, etc was found in the student's response. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 26,30 - Evaluates to true if the student received a KI score of X. Ex: hasKIScore(3) evaluates to true if the student received KI score 3. + Evaluates to true if the student received a KI score of X. Ex: hasKIScore(3) evaluates to true if the student received KI score 3. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 31,34 - Evaluates to true if more than X ideas were found in all (both past and current) of - student's responses. Ex: - accumulatedIdeaCountMoreThan(2) - evaluates to true if the student had more than 2 ideas in all of their responses. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if more than X ideas were found in all (both past and current) of student's responses. Ex: accumulatedIdeaCountMoreThan(2) evaluates to true if the student had more than 2 ideas in all of their responses. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 38,45 - Evaluates to true if less than X ideas were found in all (both past and current) of - student's responses. Ex: - accumulatedIdeaCountLessThan(2) - evaluates to true if the student had less than 2 ideas in all of their responses. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if less than X ideas were found in all (both past and current) of student's responses. Ex: accumulatedIdeaCountLessThan(2) evaluates to true if the student had less than 2 ideas in all of their responses. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 48,55 - Evaluates to true if exactly X ideas were found in all (both past and current) of - student's responses. Ex: accumulatedIdeaCountEquals(2) evaluates to true if the - student had exactly 2 ideas in all of their responses. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if exactly X ideas were found in all (both past and current) of student's responses. Ex: accumulatedIdeaCountEquals(2) evaluates to true if the student had exactly 2 ideas in all of their responses. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 58,65 - Evaluates to true if more than X ideas were found in the student's response. Ex: ideaCountMoreThan(2) evaluates to true if the student had more than 2 - ideas. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if more than X ideas were found in the student's response. Ex: ideaCountMoreThan(2) evaluates to true if the student had more than 2 ideas. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 68,71 - Evaluates to true if more than X ideas were found in the student's Y-th - response. Ex: ideaCountMoreThan(2, 3) evaluates to true if the - student had more than 2 ideas in their 3rd response. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if more than X ideas were found in the student's Y-th response. Ex: ideaCountMoreThan(2, 3) evaluates to true if the student had more than 2 ideas in their 3rd response. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 75,81 - Evaluates to true if less than X ideas were found in the student's response. Ex: ideaCountLessThan(2) evaluates to true if the student had less than 2 - ideas. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if less than X ideas were found in the student's response. Ex: ideaCountLessThan(2) evaluates to true if the student had less than 2 ideas. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 84,87 - Evaluates to true if less than X ideas were found in the student's Y-th - response. Ex: ideaCountLessThan(2, 3) evaluates to true if the - student had less than 2 ideas in their 3rd response. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if less than X ideas were found in the student's Y-th response. Ex: ideaCountLessThan(2, 3) evaluates to true if the student had less than 2 ideas in their 3rd response. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 91,97 - Evaluates to true if exactly X ideas were found in the student's response. Ex: ideaCountEquals(2) evaluates to true if the student had exactly 2 - ideas. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if exactly X ideas were found in the student's response. Ex: ideaCountEquals(2) evaluates to true if the student had exactly 2 ideas. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 100,103 - Evaluates to true if exactly X ideas were found in the student's Y-th - response. Ex: ideaCountEquals(2, 3) evaluates to true if the - student had exactly 2 ideas in their 3rd response. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if exactly X ideas were found in the student's Y-th response. Ex: ideaCountEquals(2, 3) evaluates to true if the student had exactly 2 ideas in their 3rd response. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 107,113 - Evaluates to true if this is the student's X-th response. Ex: isSubmitNumber(3) evaluates to true if this is the student's third - response. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if this is the student's X-th response. Ex: isSubmitNumber(3) evaluates to true if this is the student's third response. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 116,119 - Evaluates to true if this is the student's second to last response when the - max number of submits is specified. + Evaluates to true if this is the student's second to last response when the max number of submits is specified. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 123,128 - Evaluates to true if this is the student's final response when the max number - of submits is specified. + Evaluates to true if this is the student's final response when the max number of submits is specified. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 130,135 Evaluates to true if the student's response was not scorable. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 136,140 - Evaluates to true if no other terms were matched. Add this term as the final rule - to specify a default feedback. + Evaluates to true if no other terms were matched. Add this term as the final rule to specify a default feedback. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 141,146 Operators - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 146,147 Operators let you combine one or more terms together to make a rule. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 147,151 Operator - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 150,154 - Evaluates to true if terms on both sides of this operator evaluate to true. Ex: 1 && 2 evaluates to true if both idea 1 and 2 were found. Ex: 1 && hasKIScore(2) evaluates to true if idea 1 was found and the - student received a KI score of 2. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if terms on both sides of this operator evaluate to true. Ex: 1 && 2 evaluates to true if both idea 1 and 2 were found. Ex: 1 && hasKIScore(2) evaluates to true if idea 1 was found and the student received a KI score of 2. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 156,160 - Evaluates to true if a term on either side of this operator evaluates to true. Ex: 1 || 2 evaluates to true if either idea 1 or 2 was found. Ex: 1 && 2 || 3 evaluates to true if both idea 1 and 2 were found - or idea 3 was found. - - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + Evaluates to true if a term on either side of this operator evaluates to true. Ex: 1 || 2 evaluates to true if either idea 1 or 2 was found. Ex: 1 && 2 || 3 evaluates to true if both idea 1 and 2 were found or idea 3 was found. + + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 165,169 - Evaluates to true if a term following this operator evaluates to false. Ex: !1 evaluates to true if idea 1 was not found. + Evaluates to true if a term following this operator evaluates to false. Ex: !1 evaluates to true if idea 1 was not found. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 174,177 Parentheses - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 179,180 Parentheses let you group expressions and prioritize evaluation. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 180,181 You can add multiple parentheses in an expression. You can even nest parentheses. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 181,185 Example - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 184,188 Evaluates to true if neither idea 4a nor idea 12 were found. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 189,193 Evaluates to true if idea 5a and either idea 4a or idea 12 was found. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 193,196 - Evaluates to true if idea 5a and either idea 4a or idea 12 was found, and the - student received a KI score of 3. + Evaluates to true if idea 5a and either idea 4a or idea 12 was found, and the student received a KI score of 3. - - src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html + src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 198,204 Teaching Tips - - src/assets/wise5/components/component/component.component.html + src/assets/wise5/components/component/component.component.html 3,7 Students add items to a canvas and connect the items with links. - - src/assets/wise5/components/conceptMap/ConceptMapInfo.ts + src/assets/wise5/components/conceptMap/ConceptMapInfo.ts 4 Concept Map - - src/assets/wise5/components/conceptMap/ConceptMapInfo.ts + src/assets/wise5/components/conceptMap/ConceptMapInfo.ts 5 - - src/assets/wise5/components/conceptMap/ConceptMapInfo.ts + src/assets/wise5/components/conceptMap/ConceptMapInfo.ts 8 - - src/assets/wise5/components/conceptMap/conceptMapService.ts + src/assets/wise5/components/conceptMap/conceptMapService.ts 22 Background Image (Optional) - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 10,12 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 9,11 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 305,307 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 9,11 Stretch background to fit - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 28,33 Allow student to upload background image - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 38,41 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 27,31 Canvas Width (Optional) - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 43,46 Canvas Height (Optional) - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 52,55 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 41,45 Nodes - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 63,67 Add Node - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 68,71 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 71,75 There are no nodes. Click the "Add Node" button to add a node. - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 79,84 Node Label - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 95,97 Width - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 118,121 Height - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 127,130 Show Node Labels - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 187,191 Links Title - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 195,197 Links - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 201,205 Add Link - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 206,209 - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 209,213 There are no links. Click the "Add Link" button to add a link. - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 217,222 Link Label - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 233,235 - Are you sure you want to delete this node? File Name: Label: + Are you sure you want to delete this node? + +File Name: +Label: - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts 67 - Are you sure you want to delete this link? Label: + Are you sure you want to delete this link? + +Label: - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts 79 Reset - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 13,16 Upload Background Image - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 30,33 - - src/assets/wise5/components/draw/draw-student/draw-student.component.html + src/assets/wise5/components/draw/draw-student/draw-student.component.html 32,37 - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 65,69 Delete Background Image - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 42,45 - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 77,81 You have no more chances to receive feedback on your answer. - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 324 - You have 1 chance to receive feedback on your answer so this should be your best - work. + You have 1 chance to receive feedback on your answer so this should be your best work. - Are you ready to receive feedback on this answer? +Are you ready to receive feedback on this answer? - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 327 - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 182 Are you sure you want to reset your work? - - src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts + src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 1413 Show Auto Score - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 9,14 Show Auto Feedback - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 19,22 Rules - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 23,24 - add + add - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 25,27 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 318,320 Rule Name - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 31,32 Rule Type - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 36,37 should contain - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 38,39 should not contain - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 39,42 Comparison - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 43,44 exactly - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 45,46 more than - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 46,47 less than - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 47,50 Count - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 51,54 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 547 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 551 Node - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 63,64 - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 96,97 Link Connection - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 75,76 with any or no link - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 77,78 with specific link - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 78,81 to - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 94,96 Add Category (Optional) - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 112,115 Category Name - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 118,121 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 130,133 Delete Catagory - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 129,132 - - arrow_upward + arrow_upward - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 148,150 - - arrow_downward + arrow_downward - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 159,161 - delete + delete - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 170,172 Custom Rule Evaluator - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 177,180 - Are you sure you want to delete this rule? Rule Name: + Are you sure you want to delete this rule? + +Rule Name: - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts 72 - Are you sure you want to delete the category from this rule? Rule Name: Category Name: + Are you sure you want to delete the category from this rule? + +Rule Name: +Category Name: - - src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts + src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts 94 Students chat with a computer avatar about a specific topic. - - src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts + src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts 4 Dialog Guidance - - src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts + src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts 5 - - src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts + src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts 8 - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts + src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts 12 Ideas detected: - - src/assets/wise5/components/dialogGuidance/detected-ideas/detected-ideas.component.html + src/assets/wise5/components/dialogGuidance/detected-ideas/detected-ideas.component.html 7,9 Item ID - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html 7,10 Detectable ideas - - src/assets/wise5/components/dialogGuidance/dialog-responses/dialog-responses.component.html + src/assets/wise5/components/dialogGuidance/dialog-responses/dialog-responses.component.html 8,12 Use Global Computer Avatar - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 7,10 Computer Avatar Label - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 12,16 Thought Buddy - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 14,16 @@ -21053,24 +17737,21 @@ This is what the computer avatar will be referred to as - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 18,22 Computer Avatar Prompt - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 24,26 Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 26,28 @@ -21081,24 +17762,21 @@ This text will introduce the avatar selection task - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 30,34 Computer Avatar Initial Response - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 36,38 Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 38,40 @@ -21109,191 +17787,164 @@ Computer avatar will initiate dialog with this text - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 42,46 Select all avatars - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 52,57 Select no avatars - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 62,67 Select None - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 66,69 Avatars available to students - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 72,75 - Toggle + Toggle - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 81,82 Not selected - - src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html + src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 97,100 - Students post messages for the whole class to see and can reply to other - students' posts. + Students post messages for the whole class to see and can reply to other students' posts. - - src/assets/wise5/components/discussion/DiscussionInfo.ts + src/assets/wise5/components/discussion/DiscussionInfo.ts 4 Discussion - - src/assets/wise5/components/discussion/DiscussionInfo.ts + src/assets/wise5/components/discussion/DiscussionInfo.ts 5 - - src/assets/wise5/components/discussion/DiscussionInfo.ts + src/assets/wise5/components/discussion/DiscussionInfo.ts 8 - - src/assets/wise5/components/discussion/discussionService.ts + src/assets/wise5/components/discussion/discussionService.ts 19 Post attachment - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 23,25 Delete this post so students will not see it - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 37,40 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 114,117 Make this post viewable to students - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 53,56 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 144,146 Undo Delete - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 58,64 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 148,151 - Comments () + Comments () - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 71,72 - Comments () + Comments () - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 75,76 Students will not see this post - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 128,130 Parent Deleted - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 132,135 Add Comment - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 165,168 - - src/assets/wise5/components/discussion/class-response/class-response.component.html + src/assets/wise5/components/discussion/class-response/class-response.component.html 167,170 Are you sure you want to delete this post? - - src/assets/wise5/components/discussion/class-response/class-response.component.ts + src/assets/wise5/components/discussion/class-response/class-response.component.ts 118 Are you sure you want to show this post? - - src/assets/wise5/components/discussion/class-response/class-response.component.ts + src/assets/wise5/components/discussion/class-response/class-response.component.ts 124 @@ -21301,8 +17952,7 @@ Students can upload and use images in their posts - - src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html + src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html 11,15 @@ -21310,48 +17960,42 @@ Students must create a post before viewing classmates' posts - - src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html + src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html 19,21 Share with class... - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 38,40 Remove file - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 65,67 Add picture - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 81,84 Post - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 95,99 - replied to a discussion you were in! + replied to a discussion you were in! - - src/assets/wise5/components/discussion/discussion-student/discussion-student.component.ts + src/assets/wise5/components/discussion/discussion-student/discussion-student.component.ts 204 @@ -21380,269 +18024,235 @@ Enable All Tools - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 55,58 Enable All - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 58,64 Disable All Tools - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 68,71 Disable All - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 71,75 Select Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 84,88 Line Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 93,97 Shape Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 102,106 Free Hand Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 111,115 Text Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 121,125 Stamp Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 130,134 Clone Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 139,143 Stroke Color Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 148,152 Fill Color Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 158,162 Stroke Width Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 167,171 Send Back Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 176,180 Send Forward Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 185,189 Undo Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 195,199 Redo Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 204,208 Delete Tool - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 213,217 Stamps - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 220,224 Add Stamp - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 226,229 There are no stamps. Click the "Add Stamp" button to add a stamp. - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 236,241 Stamp Image - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 247,250 Choose an Image - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 252,256 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 261,264 - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 264,267 above - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 291,293 - Are you sure you want to delete this stamp? + Are you sure you want to delete this stamp? + + - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts 260 Import Classmate Work - - src/assets/wise5/components/draw/draw-student/draw-student.component.html + src/assets/wise5/components/draw/draw-student/draw-student.component.html 12,16 Are you sure you want to clear your drawing? - - src/assets/wise5/components/draw/draw-student/draw-student.component.ts + src/assets/wise5/components/draw/draw-student/draw-student.component.ts 200 Do you want to update the connected drawing? - - src/assets/wise5/components/draw/draw-student/draw-student.component.ts + src/assets/wise5/components/draw/draw-student/draw-student.component.ts 287 Update On - - src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html + src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html 21,23 Import Work As Background - - src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html + src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html 39,43 - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 156,160 - - src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html + src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 27,32 @@ -21674,77 +18284,64 @@ Model Parameters - - src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html + src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html 5,8 Model file name - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 5,8 Enter model file name here - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 7,9 Choose model file - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 16,19 Width (px) (optional) - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 28,32 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 12,16 Height (px) - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 37,41 - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 21,25 Saves Student Work - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 52,55 - Checking this box will enable the Grading Tool to show the student work for the - model if the model saves student work. You can also come back later to check this box even - after students have saved work for this model. If the model does not save student work, - this check box will not do anything. + Checking this box will enable the Grading Tool to show the student work for the model if the model saves student work. You can also come back later to check this box even after students have saved work for this model. If the model does not save student work, this check box will not do anything. - - src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html + src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 55,61 @@ -21773,954 +18370,823 @@ Subtitle - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 5,8 Show Mouse X Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 17,20 Highlight X Range From Zero - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 28,33 Show Mouse Y Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 38,43 Save Mouse Over Points - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 48,53 Hide Trial Select - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 58,63 Use Custom Legend - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 68,71 Custom Legend - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 75,77 X Axis Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 82,86 Add X Axis Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 87,91 X Value - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 110,111 Y Axis Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 133,137 Add Y Axis Plot Line - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 138,142 Y Value - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 161,162 Show Classmate Work - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 25,29 Show Classmate Work Source - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 34,36 Period - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 39,40 Class - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 40,44 Import Graph Settings - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 52,56 Skip First Row - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 64,67 X Column - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 67,70 Y Column - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 76,79 Show X Plot Line On Latest Point - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 95,98 Highlight Latest Point - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 103,106 Series Numbers - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 107,110 Add Series Number - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 112,115 Series Number - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 126,129 Delete Series Number - - src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html + src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 138,140 Graph Title - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 9,11 Plot Type - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 15,16 Graph Width - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 25,29 Graph Height - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 34,38 X Axis - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 44,46 Axis Type - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 54,56 Units - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 75,76 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 205,206 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 270,271 Min - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 79,83 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 209,213 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 274,278 Max - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 88,92 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 218,222 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 283,287 Locked - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 102,106 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 232,235 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 297,301 Categories - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 109,113 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 142 Add Category - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 114,117 Delete Category - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 141,144 Enable Multiple Y Axes - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 162,165 Y Axis - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 184,186 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 249,251 - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 476,477 - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 98,99 Right Side - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 240,244 Left Side - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 242,248 Round Values To - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 317,318 Enable Trials - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 333,337 Can Student Create Trials - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 344,348 Can Student Delete Trials - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 353,357 Hide Existing Trials On New Trial - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 362,367 Can Student Hide Series By Clicking On Legend - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 372,377 Enable File Upload - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 381,386 Hide Legend - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 390,394 Series - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 395,399 - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 87,89 Add Series - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 400,404 There are no series. Click the "Add Series" button to add a series. - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 411,414 Symbol - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 430,431 Line Type - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 456,457 Can Student Edit - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 472,475 - Y Axis : - + Y Axis : - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 480,481 - This series has no starter data points. Click the "Add Data Point" button - to add a starter data point if you'd like. + This series has no starter data points. Click the "Add Data Point" button to add a starter data point if you'd like. - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 504,509 Delete Series - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 600,603 Line Plot - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 47 Column Plot - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 51 Scatter Plot - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 55 No Rounding - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 62 Integer (example 1) - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 66 Tenth (exapmle 0.1) - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 70 Hundredth (example 0.01) - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 74 Circle - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 81 Square - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 85 Triangle - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 89 Triangle Down - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 93 Diamond - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 97 Line - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 104 Point - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 108 Solid - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 115 Dash - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 119 Dot - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 123 Short Dash - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 127 Short Dot - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 131 Limits - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 138 Are you sure you want to delete the series? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 212 - Are you sure you want to delete the "" - series? + Are you sure you want to delete the "" series? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 214 Are you sure you want to delete the category? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 246 - Are you sure you want to delete the "" - category? + Are you sure you want to delete the "" category? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 248 Are you sure you want to delete the data point? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 272 Category One - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 311 Category Two - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 311 Are you sure you want to remove multiple Y axes? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 355 Are you sure you want to decrease the number of Y Axes? - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 448 Select trials to show - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 9,12 Delete trial - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 36,38 Select trial to edit - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 51,54 Select series to edit - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 70,73 Reset Series - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 95,100 New Trial - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 113,117 Add to Notebook - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 119,123 - - src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html + src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html 2,4 Import Data - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 125,130 Y Max - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 134,137 Y Min - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 145,148 X Min - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 173,176 X Max - - src/assets/wise5/components/graph/graph-student/graph-student.component.html + src/assets/wise5/components/graph/graph-student/graph-student.component.html 184,187 Are you sure you want to overwrite the current line data? - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 238 - The series you are trying to add a point to is currently hidden. Please show the - series by clicking the series name in the legend and try adding the point again. + The series you are trying to add a point to is currently hidden. Please show the series by clicking the series name in the legend and try adding the point again. - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 853 You can not edit this series. Please choose a series that can be edited. - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 867 Are you sure you want to reset the series? - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 1100 - Are you sure you want to reset the "" - series? + Are you sure you want to reset the "" series? - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 1102 Trial - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 1519 - - src/assets/wise5/components/graph/graph-student/graph-student.component.ts + src/assets/wise5/components/graph/graph-student/graph-student.component.ts 2351 @@ -22810,248 +19276,217 @@ 23 - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 149,150 Characters Per Line - - src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html + src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 36,39 Space Inbetween Lines - - src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html + src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 45,48 Font Size - - src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html + src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 54,57 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 51,55 Canvas Width (px) - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 22,26 Canvas Height (px) - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 31,35 Point Radius Size (px) - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 42,46 Label Max Character Width - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 60,64 Can Student Create Labels - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 77,81 Enable Dots - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 87,91 Allow Student to Upload Image for Background - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 97,102 Starter Labels - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 103,107 Add Starter Label - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 108,111 add - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 112,115 - There are no starter labels. Click the "Add Label" button to add a - starter label. + There are no starter labels. Click the "Add Label" button to add a starter label. - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 119,122 Label Text - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 128,130 - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 20,23 View Colors - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 146,149 Color Palette - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 149,152 Can Student Edit Label - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 163,166 Can Student Delete Label - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 173,177 Point Location - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 179,181 Text Location - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 201,203 Delete Label - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 225,228 Enter text here - - src/assets/wise5/components/label/label-authoring/label-authoring.component.ts + src/assets/wise5/components/label/label-authoring/label-authoring.component.ts 58 - Are you sure you want to delete this label? + Are you sure you want to delete this label? + + - - src/assets/wise5/components/label/label-authoring/label-authoring.component.ts + src/assets/wise5/components/label/label-authoring/label-authoring.component.ts 73 - - src/assets/wise5/components/label/label-student/label-student.component.ts + src/assets/wise5/components/label/label-student/label-student.component.ts 662 Add new label - - src/assets/wise5/components/label/label-student/label-student.component.html + src/assets/wise5/components/label/label-student/label-student.component.html 10,14 A New Label - - src/assets/wise5/components/label/label-student/label-student.component.ts + src/assets/wise5/components/label/label-student/label-student.component.ts 367 Are you sure you want to reset to the initial state? - - src/assets/wise5/components/label/label-student/label-student.component.ts + src/assets/wise5/components/label/label-student/label-student.component.ts 766 Are you sure you want to delete the background image? - - src/assets/wise5/components/label/label-student/label-student.component.ts + src/assets/wise5/components/label/label-student/label-student.component.ts 813 @@ -23080,16 +19515,14 @@ Delete item - - src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.ts + src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.ts 20,24 Are you sure you want to delete this item? - - src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.ts + src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.ts 35 @@ -23097,1179 +19530,1016 @@ Student Can Create Choices - - src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html + src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html 8,13 Do you want to copy the choices and buckets from the connected component? - Warning: This will delete all existing choices and buckets in this component. +Warning: This will delete all existing choices and buckets in this component. - - src/assets/wise5/components/match/edit-match-connected-components/edit-match-connected-components.component.ts + src/assets/wise5/components/match/edit-match-connected-components/edit-match-connected-components.component.ts 35 Show source and target buckets side-by-side - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 13,19 Show choices after target buckets - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 24,30 Students can put each choice in multiple buckets - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 35,39 Add choice - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 45,49 There are no choices. Click the "Add choice" button to add a choice. - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 52,56 Choice name - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 63,66 Type text or choose an image - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 65,67 - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 152,154 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 41,43 Delete choice - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 105,109 Source bucket name - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 118,120 Target buckets - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 124,128 Add target bucket - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 130,134 - There are no target buckets. Click the "Add target bucket" button to add - a bucket. + There are no target buckets. Click the "Add target bucket" button to add a bucket. - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 138,143 Target bucket name - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 150,153 Delete bucket - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 192,196 Choices need to be ordered within buckets - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 210,213 - Bucket name: + Bucket name: - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 215,216 - Choice: - + Choice: - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 218,219 Is correct - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 235,238 Position - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 241,244 Incorrect position feedback - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html + src/assets/wise5/components/match/match-authoring/match-authoring.component.html 252,254 Are you sure you want to delete this choice? - - src/assets/wise5/components/match/match-authoring/match-authoring.component.ts + src/assets/wise5/components/match/match-authoring/match-authoring.component.ts 123 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.ts + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.ts 75 Are you sure you want to delete this bucket? - - src/assets/wise5/components/match/match-authoring/match-authoring.component.ts + src/assets/wise5/components/match/match-authoring/match-authoring.component.ts 181 Correct - - src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts + src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts 10,13 - - src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html + src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html 10,12 - - src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts + src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 469 - - src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html 73,76 - - src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html 39,41 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 292 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 296 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 355 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 359 Incorrect - - src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts + src/assets/wise5/components/match/match-status-icon/match-status-icon.component.ts 16,21 - - src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html + src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html 12,16 - - src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts + src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 469 - - src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html 75,79 - - src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html 41,47 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 292 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 296 - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 359 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 363 Add item - - src/assets/wise5/components/match/match-student/add-choice-button/add-choice-button.component.ts + src/assets/wise5/components/match/match-student/add-choice-button/add-choice-button.component.ts 15,19 Enter Item Text - - src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html + src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 2,5 Item Text required - - src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html + src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 7,11 OK - - src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html + src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 20,24 - You have used of - . + You have used of . - - src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html + src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html 4,6 {VAR_PLURAL, plural, =1 {attempt} other {attempts}} - - src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html + src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html 5,8 Correct bucket but wrong position - - src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts + src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 462 Students select one or more choices. - - src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts + src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 4 Multiple Choice - - src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts + src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 5 - - src/assets/wise5/components/multipleChoice/multipleChoiceService.ts + src/assets/wise5/components/multipleChoice/multipleChoiceService.ts 10 Single Answer - - src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts + src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 8 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 12,13 Multiple Answer - - src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts + src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 39 - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 13,16 Show Feedback - - src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html + src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html 8,11 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 90,94 Do you want to copy the choices from the connected component? - Warning: This will delete all existing choices in this component. +Warning: This will delete all existing choices in this component. - - src/assets/wise5/components/multipleChoice/edit-multiple-choice-connected-components/edit-multiple-choice-connected-components.component.ts + src/assets/wise5/components/multipleChoice/edit-multiple-choice-connected-components/edit-multiple-choice-connected-components.component.ts 36 There are no choices. Click the "Add Choice" button to add a choice. - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 30,33 Choice Text - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 39,42 Is Correct - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 61,65 Optional - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 71,73 - You have used of attempt(s) + You have used of attempt(s) - - src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html + src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html 66,71 - You have used of - - - - src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html + You have used of + + src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html 26,31 Choose an option from below - - src/assets/wise5/components/multipleChoice/multipleChoiceService.ts + src/assets/wise5/components/multipleChoice/multipleChoiceService.ts 16 Choice 1 - - src/assets/wise5/components/multipleChoice/multipleChoiceService.ts + src/assets/wise5/components/multipleChoice/multipleChoiceService.ts 19 Choice 2 - - src/assets/wise5/components/multipleChoice/multipleChoiceService.ts + src/assets/wise5/components/multipleChoice/multipleChoiceService.ts 20 Students type a response to a question or prompt. - - src/assets/wise5/components/openResponse/OpenResponseInfo.ts + src/assets/wise5/components/openResponse/OpenResponseInfo.ts 4 Open Response - - src/assets/wise5/components/openResponse/OpenResponseInfo.ts + src/assets/wise5/components/openResponse/OpenResponseInfo.ts 5 - - src/assets/wise5/components/openResponse/OpenResponseInfo.ts + src/assets/wise5/components/openResponse/OpenResponseInfo.ts 8 - - src/assets/wise5/components/openResponse/openResponseService.ts + src/assets/wise5/components/openResponse/openResponseService.ts 14 Stop Recording - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 10,12 - Recording Time Left: - + Recording Time Left: - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 12,13 Record Response - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 21,24 Delete Recording - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 34,37 - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 37,40 Are you sure you want to delete your recording? - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts 72 This will replace your existing recording. Is this OK? - - src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts + src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts 79 Starter Sentence - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 4,8 Allow students to record audio response - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 16,22 Enable CRater - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 27,31 Item Id - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 33,36 Verify - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 47,51 Verifying... - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 51,54 Valid - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 54,57 Invalid - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 56,61 Score On - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 61,63 Change - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 68,73 Show Score - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 80,85 Enable Feedback Rules - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 100,102 Scoring Rule - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 111,114 Add Scoring Rule - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 116,119 Feedback Text - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 144,146 Move Scoring Rule Up - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 155,158 Move Scoring Rule Down - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 166,169 Delete Scoring Rule - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 176,179 Enable Multiple Attempt Feedback - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 196,199 Multiple Attempt Scoring Rules - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 201,204 Add Multiple Attempt Scoring Rule - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 206,209 Previous Score - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 222,225 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 331,334 Current Score - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 231,234 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 341,344 Feedback to Student - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 242,244 - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 429,431 Move Multiple Attempt Scoring Rule Up - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 258,261 Move Multiple Attempt Scoring Rule Down - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 274,277 Delet Multiple Attempt Scoring - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 284,287 Enable Notifications - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 304,307 Notifications - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 309,312 Move Notification Up - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 362,364 Move Notification Down - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 378,380 Delete Notification - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 388,390 Enable Ambient Display Dismiss Mode - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 403,405 Dismiss Code - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 407,410 - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 14,17 Notify Student - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 423,425 Notify Teacher - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 443,445 Feedback to Teacher - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 449,451 Use Custom Completion Criteria - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 468,470 Custom Completion Criteria - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 472,475 Add Completion Criteria - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 477,480 Move Completion Criteria Up - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 535,538 Move Completion Criteria Down - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 546,549 Delete Completion Criteria - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 556,559 Hide - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 574,575 Show Idea Descriptions - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 575,580 Default feedback - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 50 - Are you sure you want to delete this scoring rule? Score: Feedback Text: + Are you sure you want to delete this scoring rule? + +Score: + +Feedback Text: - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 136 - Are you sure you want to delete this multiple attempt scoring rule? Previous Score: Current Score: Feedback Text: + Are you sure you want to delete this multiple attempt scoring rule? + +Previous Score: + +Current Score: + +Feedback Text: - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 184 you got a score of - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 214 Please talk to your teacher - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 216 got a score of - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 218 - Are you sure you want to delete this notification? Previous Score: Current Score: + Are you sure you want to delete this notification? + +Previous Score: + +Current Score: - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 232 Are you sure you want to delete the custom completion criteria? - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 266 Are you sure you want to delete this completion criteria? - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts 298 - If you want to use rich visuals (images, videos, links, bullets, etc.) in your - prompt, use an HTML component above this + If you want to use rich visuals (images, videos, links, bullets, etc.) in your prompt, use an HTML component above this - - src/assets/wise5/components/openResponse/open-response-authoring/open-response-authoring.component.html + src/assets/wise5/components/openResponse/open-response-authoring/open-response-authoring.component.html 5,8 - - note_add - Add to Notebook + note_add Add to Notebook - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html 11,14 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 11,14 - - file_download - Import Classmate Work + file_download Import Classmate Work - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.html 23,26 - You have chances to receive feedback - on your answer so this should be your best work. Are you ready to receive feedback on this - answer? + You have chances to receive feedback on your answer so this should be your best work. + +Are you ready to receive feedback on this answer? - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 186 - You have chance to receive feedback - on your answer so this should be your best work. Are you ready to receive feedback on this - answer? + You have chance to receive feedback on your answer so this should be your best work. + +Are you ready to receive feedback on this answer? - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 198 - You have chances to submit your - answer so this should be your best work. Are you ready to submit this answer? + You have chances to submit your answer so this should be your best work. + +Are you ready to submit this answer? - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 202 We are scoring your work... - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 321 Please Wait - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 322 There was an issue scoring your work. Please try again. - If this problem continues, let your teacher know and move on to the next activity. Your - work will still be saved. +If this problem continues, let your teacher know and move on to the next activity. Your work will still be saved. - - src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts + src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 344 Speak to add to your response: - - src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html + src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html 2,5 Recording... - - src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html + src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html 48,51 - An error occurred while recording: + An error occurred while recording: - - src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.ts + src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.ts 56 Students view an external website. - - src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts + src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts 4 Outside Resource - - src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts + src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts 5 - - src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts + src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts 8 - - src/assets/wise5/components/outsideURL/outsideURLService.ts + src/assets/wise5/components/outsideURL/outsideURLService.ts 14 URL - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 6,7 @@ -24277,92 +20547,77 @@ Show Open Education Resources - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 31,34 - Select from our curated library of OERs or enter your own in the 'URL' - field. (Note: Outside resources must start with 'https://' to be displayed.) + Select from our curated library of OERs or enter your own in the 'URL' field. (Note: Outside resources must start with 'https://' to be displayed.) - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 36,40 - - - + - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 50,51 Remove Filters - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 70,73 - - Item(s) Found + Item(s) Found - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 77,78 Info - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 113,116 Earth and Space Sciences - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 53 Life Sciences - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 57 Physical Sciences - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 61 Engineering, Technology, and Applications of Science - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts + src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 65 - Credit: + Credit: - - src/assets/wise5/components/outsideURL/outside-url-student/outside-url-student.component.html + src/assets/wise5/components/outsideURL/outside-url-student/outside-url-student.component.html 7,9 @@ -24389,305 +20644,260 @@ - You are not allowed to delete this Grouping Logic because you must have at least - one. + You are not allowed to delete this Grouping Logic because you must have at least one. - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts 68 Are you sure you want to delete this Grouping Logic? - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts 70 Maximize Similar Ideas - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 12 Maximize Different Ideas - - src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts + src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 16 - This Peer Chat activity is not yet available. Please check back later or wait for a - notification to return. + This Peer Chat activity is not yet available. Please check back later or wait for a notification to return. - - src/assets/wise5/components/peerChat/peer-chat-grading/peer-chat-grading.component.html + src/assets/wise5/components/peerChat/peer-chat-grading/peer-chat-grading.component.html 38,40 - - src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.html + src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.html 4,6 - are typing... + are typing... - - src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts + src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts 59 - is typing... + is typing... - - src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts + src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts 60 Chat members: - - src/assets/wise5/components/peerChat/peer-chat-members/peer-chat-members.component.html + src/assets/wise5/components/peerChat/peer-chat-members/peer-chat-members.component.html 2,3 Make this message viewable to students again - - src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html + src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html 26,29 Delete this message so students won't see it - - src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html + src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html 36,39 Question Bank - - src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html + src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 7,12 Add to chat - - src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html + src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 21,23 Used in chat - - src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html + src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 30,34 You have new chat messages - - src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts + src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts 242 - Are you sure you want to replace the current text in your response input box with - this text? + Are you sure you want to replace the current text in your response input box with this text? - - src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts + src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts 292 Students are shown work that everyone in their group submitted for a specific item. - - src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts + src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts 4 Show Group Work - - src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts + src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts 5 - - src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts + src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts 8 - - src/assets/wise5/components/showGroupWork/showGroupWorkService.ts + src/assets/wise5/components/showGroupWork/showGroupWorkService.ts 7 Show Work Step - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 7,9 - - src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html + src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 7,9 (None) - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 12,14 - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 28,30 - - src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html + src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 12,14 - - src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html + src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 28,30 - - src/assets/wise5/components/table/table-show-work/table-show-work.component.ts + src/assets/wise5/components/table/table-show-work/table-show-work.component.ts 24 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 61,62 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 87,88 Show Work Component - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 23,25 - - src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html + src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 23,25 Show My Work - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 56,59 Layout: - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 60,63 Stacked Vertically - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 73,76 Side-by-Side - - src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html + src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 78,83 You have not been paired with a classmate yet. Please check back later. - - src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html + src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html 5,10 (Waiting for response...) - - src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html + src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html 38,40 Students are shown work that they submitted for a specific item. - - src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts + src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts 4 Show My Work - - src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts + src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts 5 - - src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts + src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts 8 (No response) - - src/assets/wise5/components/showMyWork/show-my-work-student/show-my-work-student.component.html + src/assets/wise5/components/showMyWork/show-my-work-student/show-my-work-student.component.html 5,8 Show Student Work - - src/assets/wise5/components/showMyWork/showMyWorkService.ts + src/assets/wise5/components/showMyWork/showMyWorkService.ts 7 @@ -24701,205 +20911,175 @@ Choose the step and component to show the summary data for: - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 5,7 Student Data Type - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 48,50 Responses - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 54,56 Scores - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 56,59 Source - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 60,63 Only Self - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 66,67 Only Students In Period - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 67,68 Students In All Periods - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 68,71 Chart Type - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 72,73 Bar - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 74,76 Pie - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 76,80 Required to View Summary - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 81,83 Complete Component - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 86,87 Submit Work - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 87,89 None - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 88,92 Highlight Correct Answer - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 101,106 Show Prompt From Source Component - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 112,116 Custom Label Colors (Optional) - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 117,121 Add Custom Label Color - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 122,126 - There are no custom label colors. Click the "Add Custom Label Color" - button to give a label a specific color. + There are no custom label colors. Click the "Add Custom Label Color" button to give a label a specific color. - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 133,138 Are you sure you want to delete this custom label color? - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.ts + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.ts 194 - You must submit work on "" - to view the summary. + You must submit work on "" to view the summary. - - src/assets/wise5/components/summary/summary-student/summary-student.component.ts + src/assets/wise5/components/summary/summary-student/summary-student.component.ts 138 - You must complete "" to view - the summary. + You must complete "" to view the summary. - - src/assets/wise5/components/summary/summary-student/summary-student.component.ts + src/assets/wise5/components/summary/summary-student/summary-student.component.ts 140 - You must submit work on "" - to view the class summary. + You must submit work on "" to view the class summary. - - src/assets/wise5/components/summary/summary-student/summary-student.component.ts + src/assets/wise5/components/summary/summary-student/summary-student.component.ts 146 - You must complete "" to view - the class summary. + You must complete "" to view the class summary. - - src/assets/wise5/components/summary/summary-student/summary-student.component.ts + src/assets/wise5/components/summary/summary-student/summary-student.component.ts 148 @@ -24928,850 +21108,720 @@ Enable Data Explorer - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 9,12 Allowed Graph Types: - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 15,18 Scatter Plot - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 22,25 Line Graph - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 30,33 Bar Graph - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 38,41 Show Scatter Plot Regression Line - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 49,54 Number of Series - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 55,58 Number of Y Axes - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 67,70 Choose the Y Axis for each Series - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 79,81 Can Student Edit Axis Labels - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 114,118 Fix Data to Table Column - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 119,121 - You can author x or y data to always use a specific table column. The student will - not be able to change the table column for that x or y data. If you want the student to be - able to choose the table column, you can leave the select option blank for that x or y - data. + You can author x or y data to always use a specific table column. The student will not be able to change the table column for that x or y data. If you want the student to be able to choose the table column, you can leave the select option blank for that x or y data. - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 121,124 X Data - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 129,131 - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html + src/assets/wise5/components/table/table-show-work/table-show-work.component.html 30,31 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 55,57 (Allow student to select) - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 134,135 - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 167,168 Table Column - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 138,140 - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 171,173 - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 193,195 - Y Data + }}"/> - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 155,158 - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html + src/assets/wise5/components/table/table-show-work/table-show-work.component.html 46,47 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 78,79 Tooltip Header Column - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 184,186 (Default) - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 189,190 - When the student hovers their mouse over a data point on a scatter plot or line - graph, the tooltip will display the value from this column along with the x and y values. - This can be left blank and the tooltip will still show the x and y values like normal. + When the student hovers their mouse over a data point on a scatter plot or line graph, the tooltip will display the value from this column along with the x and y values. This can be left blank and the tooltip will still show the x and y values like normal. - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 203,206 Import Table - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 219,223 Only .csv (comma separated values) files are allowed - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 228,233 Enable Row Selection - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 256,260 Are you sure you want to overwrite the existing table? - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts 221 Importing table... - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts 223 - Error: The table contains more than cells + Error: The table contains more than cells - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts 231 Successfully imported table - - src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts + src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts 235 Merge - - src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html + src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html 26,27 Append - - src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html + src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html 27,31 Only Show Data At Mouse X Position - - src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html + src/assets/wise5/components/table/edit-table-connected-components/edit-table-connected-components.component.html 39,43 Columns - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 8,12 Invalid Value - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 17,20 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 30,34 Rows - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 21,25 Global Cell Size - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 35,40 Insert Column Before - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 62,65 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 65,68 Delete Column - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 76,79 Insert Column After - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 90,92 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 93,96 Insert Row Before - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 114,117 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 117,120 Delete Row - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 128,131 Insert Row After - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 142,145 - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 145,148 Editable - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 169,172 Column Cell Size - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 190,193 - You can freeze the first column and any next to it to the beginning of the table. - Other columns you freeze will be pinned to the end. + You can freeze the first column and any next to it to the beginning of the table. Other columns you freeze will be pinned to the end. - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 206,209 Freeze - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 210,214 Make All Cells Editable - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 226,231 Make All Cells Uneditable - - src/assets/wise5/components/table/table-authoring/table-authoring.component.html + src/assets/wise5/components/table/table-authoring/table-authoring.component.html 235,238 Are you sure you want to decrease the number of rows? - - src/assets/wise5/components/table/table-authoring/table-authoring.component.ts + src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 116 Are you sure you want to decrease the number of columns? - - src/assets/wise5/components/table/table-authoring/table-authoring.component.ts + src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 154 Are you sure you want to delete this row? - - src/assets/wise5/components/table/table-authoring/table-authoring.component.ts + src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 264 Are you sure you want to delete this column? - - src/assets/wise5/components/table/table-authoring/table-authoring.component.ts + src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 291 Graph Type - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html + src/assets/wise5/components/table/table-show-work/table-show-work.component.html 18,19 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 41,42 X Axis Label - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html - 66,67 + src/assets/wise5/components/table/table-show-work/table-show-work.component.html + 64,65 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 105,108 Y Axis Label - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html - 76,77 + src/assets/wise5/components/table/table-show-work/table-show-work.component.html + 74,75 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 116,119 - Y Axis Label + Y Axis Label - - src/assets/wise5/components/table/table-show-work/table-show-work.component.html - 93,94 + src/assets/wise5/components/table/table-show-work/table-show-work.component.html + 91,92 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 134,135 - image Import Data + image Import Data - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 17,20 Choose the table data you want to graph: - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 52,54 Enter Text Here - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 110,114 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 121,124 - - src/assets/wise5/components/table/table-student/table-student.component.html + src/assets/wise5/components/table/table-student/table-student.component.html 139,142 - Score: + Score: - - src/assets/wise5/directives/componentAnnotations/component-annotations.component.html + src/assets/wise5/directives/componentAnnotations/component-annotations.component.html 26,28 Teacher Feedback - - src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts + src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts 187 No - - src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html + src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html 11,12 Yes - - src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html + src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html 14,16 Open In New Window - - src/assets/wise5/directives/dialog-with-open-in-new-window/dialog-with-open-in-new-window.component.html + src/assets/wise5/directives/dialog-with-open-in-new-window/dialog-with-open-in-new-window.component.html 11,13 Importing Work... - - src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html + src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html 9,13 Error: Failed to import work. - - src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html + src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html 20,21 Previous step - - src/assets/wise5/directives/node-navigation/node-navigation.component.html + src/assets/wise5/directives/node-navigation/node-navigation.component.html 4,9 Next step - - src/assets/wise5/directives/node-navigation/node-navigation.component.html + src/assets/wise5/directives/node-navigation/node-navigation.component.html 10,14 Your Response - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 384 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 388 Your Score - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 386 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 390 Period Responses - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 393 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 397 Period Scores - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 398 - - - - Class Responses - - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 407 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 402 Class Scores - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 412 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 416 - % Responded (/) + % Responded (/) - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 423 + src/assets/wise5/directives/summary-display/summary-display.component.ts + 427 Student Ideas Detected - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 10,12 Most Common: - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 17,19 Least Common: - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 30,32 All Ideas: - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 44,46 Hide all ideas - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 55,57 Show all ideas - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 57,61 Your students' ideas will show up here as they are detected in the activity. - - src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html + src/assets/wise5/directives/teacher-summary-display/ideas-summary-display/ideas-summary.component.html 61,66 Source Bucket - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 6,10 Show less - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 27,30 Choice Frequency - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 39,42 - This summary shows how many students moved each choice item into the different - buckets (categories). + This summary shows how many students moved each choice item into the different buckets (categories). - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 42,45 Your students' choices will show up here when they complete the activity. - - src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html + src/assets/wise5/directives/teacher-summary-display/match-summary-display/match-summary-display.component.html 67,72 The student will see a graph of their individual data here. - - src/assets/wise5/directives/teacher-summary-display/teacher-summary-display.component.ts + src/assets/wise5/directives/teacher-summary-display/teacher-summary-display.component.ts 46 Go to step - - src/assets/wise5/directives/wise-link/wise-link.component.html + src/assets/wise5/directives/wise-link/wise-link.component.html 6,10 - - src/assets/wise5/directives/wise-link/wise-link.component.html + src/assets/wise5/directives/wise-link/wise-link.component.html 19,23 Alignment - - src/assets/wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component.ts 39 Insert WISE Link - - src/assets/wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component.ts 70 File - - src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts 164 Insert from Notebook - - src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts 178 Insert note + - - src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts 179 Image from notebook - - src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts 205 - Path + Path src/assets/wise5/services/authorBranchService.ts 23 @@ -25858,124 +21908,112 @@ A name for a computer avatar - Student + Student src/assets/wise5/services/configService.ts 563 - Complete <b></b> + Complete <b></b> src/assets/wise5/services/constraintService.ts 325 - Visit <b></b> + Visit <b></b> src/assets/wise5/services/constraintService.ts 331 - Correctly answer <b></b> + Correctly answer <b></b> src/assets/wise5/services/constraintService.ts 337 - Obtain a score of <b></b> on - <b></b> + Obtain a score of <b></b> on <b></b> src/assets/wise5/services/constraintService.ts 352 - You must choose "" on "" + You must choose "" on "" src/assets/wise5/services/constraintService.ts 360 - Submit <b></b> time on - <b></b> + Submit <b></b> time on <b></b> src/assets/wise5/services/constraintService.ts 372 - Submit <b></b> times on - <b></b> + Submit <b></b> times on <b></b> src/assets/wise5/services/constraintService.ts 374 - Take the branch path from <b></b> - to <b></b> + Take the branch path from <b></b> to <b></b> src/assets/wise5/services/constraintService.ts 381 - Write <b></b> words on - <b></b> + Write <b></b> words on <b></b> src/assets/wise5/services/constraintService.ts 387 - "" is visible + "" is visible src/assets/wise5/services/constraintService.ts 393 - "" is visitable + "" is visitable src/assets/wise5/services/constraintService.ts 399 - Add <b></b> note on - <b></b> + Add <b></b> note on <b></b> src/assets/wise5/services/constraintService.ts 406 - Add <b></b> notes on - <b></b> + Add <b></b> notes on <b></b> src/assets/wise5/services/constraintService.ts 408 - You must fill in <b></b> - row in the <b>Table</b> on <b> - </b> + You must fill in <b></b> row in the <b>Table</b> on <b></b> src/assets/wise5/services/constraintService.ts 415 - You must fill in <b></b> - rows in the <b>Table</b> on <b> - </b> + You must fill in <b></b> rows in the <b>Table</b> on <b></b> src/assets/wise5/services/constraintService.ts 417 @@ -26080,8 +22118,7 @@ - There was an error uploading. You might have reached your file upload limit or the - file you tried to upload was too large. Please ask your teacher for help. + There was an error uploading. You might have reached your file upload limit or the file you tried to upload was too large. Please ask your teacher for help. src/assets/wise5/services/studentAssetService.ts 128 @@ -26095,16 +22132,14 @@ - StudentDataService.saveComponentEvent: component, category, event args must not be - null + StudentDataService.saveComponentEvent: component, category, event args must not be null src/assets/wise5/services/studentDataService.ts 243 - StudentDataService.saveComponentEvent: nodeId, componentId, componentType must not - be null + StudentDataService.saveComponentEvent: nodeId, componentId, componentType must not be null src/assets/wise5/services/studentDataService.ts 253 @@ -26132,8 +22167,7 @@ - <p>To visit <b></b> you need - to:</p><ul> + <p>To visit <b></b> you need to:</p><ul> src/assets/wise5/services/studentNodeService.ts 55 @@ -26142,8 +22176,7 @@ Error saving translation. Please try again later. - - src/assets/wise5/services/teacherProjectTranslationService.ts + src/assets/wise5/services/teacherProjectTranslationService.ts 46 @@ -26164,92 +22197,78 @@ Unit Plan - - src/assets/wise5/themes/default/navigation/navigation.component.html + src/assets/wise5/themes/default/navigation/navigation.component.html 2,4 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 70,73 - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 72,75 - required + required - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 15,16 Remove File - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 27,31 - Share with Class + Share with Class - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 67,68 Copy to My Notes - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html 108,112 - Note from + Note from - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts 63 - Edit + Edit - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts 91 - Add + Add - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts 93 - View + View - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts 96 - text + text - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.ts 99 Label for note text input @@ -26257,104 +22276,91 @@ Completed with warning - - src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html + src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html 10,12 Completed with success - - src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html + src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html 13,16 Previous Item - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 7,10 Next Item - - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 58,61 - Your : + Your : - - src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html + src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html 8,9 - Choose Your : + Choose Your : - - src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html + src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html 10,12 Selected avatar - - src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html + src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html 16,19 Continue - - src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html + src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html 41,45 Action Required - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 2,4 Teacher, enter code to dismiss this alert: - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 12,14 Dismiss code - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 20,23 Dismiss - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 43,47 Invalid dismiss code. Please try again. - - src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.ts + src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.ts 26 @@ -26366,24 +22372,20 @@ - % - completed + % completed src/assets/wise5/vle/nav-item/nav-item.component.html 53,54 - - / items + / items src/assets/wise5/vle/nav-item/nav-item.component.html 59,60 - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 18,20 @@ -26415,133 +22417,115 @@ Dismiss all alerts - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 9,13 Hi there! You currently have no alerts. - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 20,25 View alert - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 36,39 Are you sure you want to dismiss all your alerts? - - src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.ts + src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.ts 104 - This unit ended on . You can no longer save new - work. + This unit ended on . You can no longer save new work. - - src/assets/wise5/vle/run-ended-and-locked-message/run-ended-and-locked-message.component.ts + src/assets/wise5/vle/run-ended-and-locked-message/run-ended-and-locked-message.component.ts 17 Unit Completion - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 16,18 - / points + / points - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 41,43 Go Home - - src/assets/wise5/vle/student-account-menu/student-account-menu.component.html + src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 64,66 My Files - - src/assets/wise5/vle/studentAsset/student-assets-dialog/student-assets-dialog.component.html + src/assets/wise5/vle/studentAsset/student-assets-dialog/student-assets-dialog.component.html 1,3 Use this file - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html 8,14 The student assets will appear here once you set up a classroom run. - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html 27,29 Thank you for taking the time to provide your responses! - - src/assets/wise5/vle/submit-survey/submit-survey.component.html + src/assets/wise5/vle/submit-survey/submit-survey.component.html 1,2 When you have finished answering all the questions, press the button below to exit. - - src/assets/wise5/vle/submit-survey/submit-survey.component.html + src/assets/wise5/vle/submit-survey/submit-survey.component.html 2,3 Complete Survey - - src/assets/wise5/vle/submit-survey/submit-survey.component.html + src/assets/wise5/vle/submit-survey/submit-survey.component.html 5,7 Are you sure you want to submit your final responses? - - src/assets/wise5/vle/submit-survey/submit-survey.component.ts + src/assets/wise5/vle/submit-survey/submit-survey.component.ts 14 You have not completed the following steps: - - src/assets/wise5/vle/submit-survey/submit-survey.component.ts + src/assets/wise5/vle/submit-survey/submit-survey.component.ts 49 - \ No newline at end of file + From 824867f809052c982da7bc048ae3d747a7bc1e4e Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Wed, 27 Aug 2025 15:35:06 -0700 Subject: [PATCH 085/127] Add component summaries in tabs --- .../component-average-score.component.ts | 8 +-- .../component-completion.component.ts | 10 +-- .../component-grading-view.component.html | 72 +++++++++++-------- .../component-grading-view.component.ts | 35 ++++++++- .../node-grading/node-grading.component.html | 13 ++++ .../node-grading/node-grading.component.ts | 18 +++-- .../summary-display.component.html | 22 +++--- .../summary-display.component.scss | 2 +- .../summary-display.component.ts | 65 +++++++---------- 9 files changed, 148 insertions(+), 97 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts index c8c3d4ba9fc..c28dbde3c10 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts @@ -7,15 +7,13 @@ import { DecimalPipe } from '@angular/common'; imports: [DecimalPipe], selector: 'component-average-score', template: ` - @if (avgScore) { - {{ avgScore | number: '1.0-1' }} - } @else { - - + @if (avgScore || avgScore === 0) { + {{ avgScore }}/{{ component?.maxScore ?? 0 }} } ` }) export class ComponentAverageScoreComponent { - protected avgScore: number | 'NA'; + protected avgScore: number | '-'; @Input() component: any; @Input() node: Node; @Input() periodId: number; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts index f8b55522c06..859ff51eca5 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts @@ -8,13 +8,15 @@ import { DecimalPipe } from '@angular/common'; @Component({ imports: [DecimalPipe], selector: 'component-completion', - template: `{{ completion | number: '1.0-0' }}%` + template: `{{ this.numWorkgroupsCompleted }} ({{ completion | number: '1.0-0' }}%)` }) export class ComponentCompletionComponent { protected completion: number; @Input() component: any; @Input() node: Node; @Input() periodId: number; + protected workgroups: Map; + protected numWorkgroupsCompleted: number; constructor( private componentServiceLookupService: ComponentServiceLookupService, @@ -24,11 +26,11 @@ export class ComponentCompletionComponent { ngOnChanges(): void { if (this.component && this.node) { - const workgroups = this.workgroupService.getWorkgroupsInPeriod(this.periodId); - const numWorkgroupsCompleted = Array.from(workgroups.keys()).filter((workgroupId) => + this.workgroups = this.workgroupService.getWorkgroupsInPeriod(this.periodId); + this.numWorkgroupsCompleted = Array.from(this.workgroups.keys()).filter((workgroupId) => this.isCompleted(workgroupId) ).length; - this.completion = (numWorkgroupsCompleted / workgroups.size) * 100; + this.completion = (this.numWorkgroupsCompleted / this.workgroups.size) * 100; } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 9660500f5a1..380e7b8b017 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -1,35 +1,47 @@ -
-
- - - -  Component Completion - - / {{ component?.maxScore ?? 0 }} Mean -
-
- @if (component?.type === 'MultipleChoice' && hasStudentWork) { - +
+
+ @if (component.prompt) { +
} - @if (hasScoresSummary && hasScoreAnnotation) { - + Responses:  - } +
+
+
+ +
+ @if (hasSummaryData) { +
+ @if (component?.type === 'MultipleChoice' && hasStudentWork) { + + } + @if (hasScoresSummary && hasScoreAnnotation) { + + } +
+ }
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts index 1f0de804660..4490c59219d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.ts @@ -10,26 +10,38 @@ import { Node } from '../../../common/Node'; import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; import { PeerGroupButtonComponent } from '../peer-group-button/peer-group-button.component'; import { ComponentCompletionComponent } from '../component-completion/component-completion.component'; -import { ComponentAverageScoreComponent } from '../component-average-score/component-average-score.component'; import { ComponentContent } from '../../../common/ComponentContent'; @Component({ imports: [ - ComponentAverageScoreComponent, ComponentCompletionComponent, MilestoneReportButtonComponent, PeerGroupButtonComponent, TeacherSummaryDisplayComponent ], selector: 'component-grading-view', + styles: [ + ` + .notice { + max-width: none; + margin: 0; + } + + .mat-body-1 { + margin-bottom: 0; + } + ` + ], templateUrl: './component-grading-view.component.html' }) export class ComponentGradingViewComponent { + protected avgScore: number; @Input() component: ComponentContent; protected hasCorrectAnswer: boolean; protected hasScoresSummary: boolean; protected hasScoreAnnotation: boolean; protected hasStudentWork: boolean; + protected hasSummaryData: boolean; @Input() node: Node; protected periodId: number; protected source: 'allPeriods' | 'period'; @@ -57,6 +69,9 @@ export class ComponentGradingViewComponent { this.dataService.retrieveStudentDataForNode(this.node).subscribe(() => this.setComponent()); this.periodId = this.dataService.getCurrentPeriodId(); this.setSource(); + const annotations = this.getLatestScoreAnnotations(); + const totalScore = annotations.reduce((sumSoFar, a) => sumSoFar + a.data.value, 0); + this.avgScore = totalScore / annotations.length; } } @@ -74,6 +89,9 @@ export class ComponentGradingViewComponent { this.dataService .getComponentStatesByComponentId(this.component.id) .filter((state) => state.periodId === this.periodId).length > 0; + this.hasSummaryData = + (this.component?.type === 'MultipleChoice' && this.hasStudentWork) || + (this.hasScoresSummary && this.hasScoreAnnotation); } private setSource(): void { @@ -95,4 +113,17 @@ export class ComponentGradingViewComponent { ['score', 'autoScore'].includes(annotation.type) ); } + + private getLatestScoreAnnotations() { + return this.annotationService + .getAnnotationsByNodeIdComponentId(this.node.id, this.component.id) + .filter((annotation) => this.periodId === -1 || annotation.periodId === this.periodId) + .filter((annotation) => ['score', 'autoScore'].includes(annotation.type)) + .reduceRight((soFar, currentA) => { + if (!soFar.some((soFarA) => soFarA.toWorkgroupId === currentA.toWorkgroupId)) { + soFar.push(currentA); + } + return soFar; + }, []); + } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index b9f248ef0c2..b5a1c1cdecb 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -24,6 +24,19 @@

+
+

Question Summaries

+
+ + @for (component of components; track component; let i = $index) { + + + + } + +
+
+

Class Responses

- - @if (hasWarning) { -

{{ warningMessage }}

- } - @if (doRender && chartConfig != null) { - - - } - - + +@if (hasWarning) { +

{{ warningMessage }}

+} +@if (doRender && chartConfig != null) { + + +} + diff --git a/src/assets/wise5/directives/summary-display/summary-display.component.scss b/src/assets/wise5/directives/summary-display/summary-display.component.scss index ec03009306b..5702e8c9abe 100644 --- a/src/assets/wise5/directives/summary-display/summary-display.component.scss +++ b/src/assets/wise5/directives/summary-display/summary-display.component.scss @@ -1,5 +1,5 @@ .highcharts-chart { display: block; - height: 400px; + height: 300px; width: 100%; } \ No newline at end of file diff --git a/src/assets/wise5/directives/summary-display/summary-display.component.ts b/src/assets/wise5/directives/summary-display/summary-display.component.ts index 707029ad94e..ccae02c97ce 100644 --- a/src/assets/wise5/directives/summary-display/summary-display.component.ts +++ b/src/assets/wise5/directives/summary-display/summary-display.component.ts @@ -20,6 +20,7 @@ import { ScoreSummaryData } from './summary-data/ScoreSummaryData'; import { TableSummaryData } from './summary-data/TableSummaryData'; import { Choice } from '../../components/multipleChoice/Choice'; import { SummaryData } from './summary-data/SummaryData'; +import { distance } from 'colorjs.io/fn'; @Component({ imports: [MatCardModule], styleUrl: 'summary-display.component.scss', @@ -54,6 +55,7 @@ export abstract class SummaryDisplayComponent { hasCorrectness: boolean = false; protected Highcharts: typeof Highcharts = Highcharts; maxScore: number = 5; + private meanScore: number = 0; numResponses: number; otherComponent: ComponentContent; @@ -323,13 +325,16 @@ export abstract class SummaryDisplayComponent { private createScoresSeriesData(summaryData: ScoreSummaryData): [SeriesData, number] { const seriesData = new SeriesData(); + let sum = 0; let total = 0; for (let scoreValue = 1; scoreValue <= this.maxScore; scoreValue++) { const count = this.getSummaryDataCount(summaryData, scoreValue); const dataPoint = new SeriesDataPoint(scoreValue, count); seriesData.addDataPoint(dataPoint); + sum += count * scoreValue; total += count; } + this.meanScore = Math.round((sum / total) * 100) / 100; return [seriesData, total]; } @@ -374,9 +379,6 @@ export abstract class SummaryDisplayComponent { case 'self': graphTitle = this.getGraphTitleForSelf(); break; - case 'period': - graphTitle = this.getGraphTitleForPeriod(); - break; default: graphTitle = this.getGraphTitleForClass(); } @@ -391,42 +393,16 @@ export abstract class SummaryDisplayComponent { } } - getGraphTitleForPeriod(): string { - if (this.isStudentDataTypeResponses()) { - return this.getGraphTitleWithLabelAndPercent( - $localize`Period Responses`, - this.getPercentOfClassRespondedText() - ); - } else if (this.isStudentDataTypeScores()) { - return this.getGraphTitleWithLabelAndPercent( - $localize`Period Scores`, - this.getPercentOfClassRespondedText() - ); - } - } - getGraphTitleForClass(): string { if (this.isStudentDataTypeResponses()) { - return this.getGraphTitleWithLabelAndPercent( - $localize`Class Responses`, - this.getPercentOfClassRespondedText() - ); + return $localize`Responses`; } else if (this.isStudentDataTypeScores()) { - return this.getGraphTitleWithLabelAndPercent( - $localize`Class Scores`, - this.getPercentOfClassRespondedText() + return ( + $localize`Scores` + ' (' + $localize`Mean: ` + this.meanScore + '/' + this.maxScore + ')' ); } } - private getGraphTitleWithLabelAndPercent(label: string, percentDisplayText: string): string { - return `${label} | ${percentDisplayText}`; - } - - getPercentOfClassRespondedText(): string { - return $localize`${this.percentResponded}% Responded (${this.numResponses}/${this.totalWorkgroups})`; - } - getChartColors(): string[] { if (this.studentDataType === 'responses') { return this.colors.palette; @@ -500,7 +476,9 @@ export abstract class SummaryDisplayComponent { enabled: false }, legend: { - enabled: false + enabled: function () { + return chartType === 'pie' ? true : false; + } }, plotOptions: { series: { @@ -509,16 +487,26 @@ export abstract class SummaryDisplayComponent { formatter: function () { if (chartType === 'pie') { const pct = Math.round((this.y / this.total) * 100); - return this.key + ': ' + pct + '%'; + return pct + '%'; } else { - return this.y; + const pct = Math.round((this.y / thisSummaryDisplay.total) * 100); + return this.y + ' (' + pct + '%)'; } }, - style: { fontSize: '12px' } + style: { fontSize: '12px' }, + enabled: true } }, column: { maxPointWidth: 80 + }, + pie: { + allowPointSelect: true, + cursor: 'pointer', + showInLegend: true, + dataLabels: { + distance: -30 + } } }, series: series, @@ -533,10 +521,11 @@ export abstract class SummaryDisplayComponent { tooltip: { formatter: function (s, point) { if (chartType === 'pie') { - return '' + this.key + ': ' + this.y; + const pct = Math.round((this.y / this.total) * 100); + return this.key + '
' + this.y + ' (' + pct + '%)
'; } else { const pct = Math.round((this.y / thisSummaryDisplay.total) * 100); - return '' + this.key + ': ' + pct + '%'; + return '' + this.key + '
Count:' + this.y + ''; } } }, From e414120082b19a77ae6f201a55a92882d9bf3e55 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 29 Aug 2025 11:19:10 -0700 Subject: [PATCH 086/127] Added displayIndex to fix issue where component select dropdown's index was not matching the index in the grading view. --- .../filter-components/filter-components.component.html | 2 +- .../nodeGrading/node-grading/node-grading.component.ts | 6 +++++- .../node-workgroup-item/node-workgroup-item.component.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html index 723ede07dd7..75a3fddd93d 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.html @@ -13,7 +13,7 @@ {{ selectedText }} @for (component of components; track component.id; let i = $index) { - {{ i + 1 }}: {{ getComponentTypeLabel(component.type) }} + {{ component.displayIndex }}: {{ getComponentTypeLabel(component.type) }} } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index c41bcba353c..813532df0ae 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -93,7 +93,11 @@ export class NodeGradingComponent { this.nodeMaxScore = this.projectService.getMaxScoreForNode(this.nodeId); this.components = this.projectService .getComponents(this.nodeId) - .filter((component) => this.projectService.componentHasWork(component)); + .filter((component) => this.projectService.componentHasWork(component)) + .map((component, index) => { + component['displayIndex'] = index + 1; + return component; + }); this.visibleComponents = this.components; this.numRubrics = this.node.getNumRubrics(); this.setPeriod(); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html index 29810d3cf82..1aefee35ce2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-workgroup-item/node-workgroup-item.component.html @@ -43,7 +43,7 @@ >

- {{ i + 1 + '. ' + getComponentTypeLabel(component.type) }}  + {{ component.displayIndex + '. ' + getComponentTypeLabel(component.type) }}  Date: Fri, 29 Aug 2025 17:14:46 -0700 Subject: [PATCH 087/127] Fix component completion display and update styles --- .../component-completion.component.html | 13 +++++++++++ .../component-completion.component.ts | 23 ++++++++++++++----- .../component-grading-view.component.html | 17 +++++++------- .../filter-components.component.ts | 2 +- 4 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html new file mode 100644 index 00000000000..6b039401910 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html @@ -0,0 +1,13 @@ +
+
+ +
+
Responses: {{ this.numWorkgroupsCompleted }}
+
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts index 859ff51eca5..55f3471b762 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.ts @@ -3,12 +3,14 @@ import { Node } from '../../../common/Node'; import { WorkgroupService } from '../../../../../app/services/workgroup.service'; import { TeacherDataService } from '../../../services/teacherDataService'; import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService'; -import { DecimalPipe } from '@angular/common'; +import { ClassroomStatusService } from '../../../services/classroomStatusService'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ - imports: [DecimalPipe], + imports: [MatProgressBarModule, MatTooltipModule], selector: 'component-completion', - template: `{{ this.numWorkgroupsCompleted }} ({{ completion | number: '1.0-0' }}%)` + templateUrl: 'component-completion.component.html' }) export class ComponentCompletionComponent { protected completion: number; @@ -21,16 +23,24 @@ export class ComponentCompletionComponent { constructor( private componentServiceLookupService: ComponentServiceLookupService, private dataService: TeacherDataService, + private statusService: ClassroomStatusService, private workgroupService: WorkgroupService ) {} ngOnChanges(): void { if (this.component && this.node) { - this.workgroups = this.workgroupService.getWorkgroupsInPeriod(this.periodId); + this.workgroups = new Map( + Array.from(this.workgroupService.getWorkgroupsInPeriod(this.periodId)).filter( + ([workgroupId]) => this.statusService.hasStudentStatus(workgroupId) + ) + ); this.numWorkgroupsCompleted = Array.from(this.workgroups.keys()).filter((workgroupId) => this.isCompleted(workgroupId) ).length; - this.completion = (this.numWorkgroupsCompleted / this.workgroups.size) * 100; + this.completion = + this.workgroups.size > 0 + ? Math.round((this.numWorkgroupsCompleted / this.workgroups.size) * 100) + : 0; } } @@ -40,7 +50,7 @@ export class ComponentCompletionComponent { workgroupId, this.component.id ); - return ['OpenResponse', 'Discussion'].includes(this.component.type) + const isCompleted = ['OpenResponse', 'Discussion'].includes(this.component.type) ? service.isCompletedV2(this.node, this.component, { componentStates: componentStates }) @@ -50,5 +60,6 @@ export class ComponentCompletionComponent { this.dataService.getEventsByNodeId(this.node.id), this.node ); + return isCompleted; } } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 380e7b8b017..64bad60a2cd 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -1,15 +1,14 @@
-
- @if (component.prompt) { +
+
+
Prompt
- } -
- Responses: 
+ @if (hasStudentWork) { +
+ +
+ }
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts index 74cea9ce3dc..442a0e0ac0c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts @@ -29,7 +29,7 @@ export class FilterComponentsComponent { } private updateSelectedText(): void { - this.selectedText = $localize`Showing ${this.selectedComponents.length}/${this.components.length} items`; + this.selectedText = $localize`Showing ${this.selectedComponents.length}/${this.components.length} questions`; } protected getComponentTypeLabel(componentType: string): string { From 706c206793c92ec2c9f8762a1d12d02eff09f481 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Wed, 3 Sep 2025 12:09:42 -0700 Subject: [PATCH 088/127] Set selected component tab to 0 on node change --- .../nodeGrading/node-grading/node-grading.component.html | 8 ++++++-- .../nodeGrading/node-grading/node-grading.component.ts | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index b5a1c1cdecb..a99d5a5ea35 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -27,7 +27,12 @@

Question Summaries

- + @for (component of components; track component; let i = $index) { @@ -36,7 +41,6 @@

Question Summaries
-

Class Responses

this.setPeriod()) ); + this.subscriptions.add( + this.dataService.currentNodeChanged$.subscribe(() => this.selectedComponent.setValue(0)) + ); } ngOnDestroy(): void { From 9dff6c589f226f0f4f48a94fe0b9ae94afd05d78 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 3 Sep 2025 15:39:46 -0700 Subject: [PATCH 089/127] Fix issue where AT wasn't loading --- src/app/teacher/teacher-authoring.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/teacher/teacher-authoring.module.ts b/src/app/teacher/teacher-authoring.module.ts index 3cf872a6683..efbcbdd07a4 100644 --- a/src/app/teacher/teacher-authoring.module.ts +++ b/src/app/teacher/teacher-authoring.module.ts @@ -40,9 +40,10 @@ import { NotifyAuthorService } from '../../assets/wise5/services/notifyAuthorSer import { RemoveNodeIdFromTransitionsService } from '../../assets/wise5/services/removeNodeIdFromTransitionsService'; import { RegisterProjectService } from '../../assets/wise5/services/registerProjectService'; import { ComponentAuthoringModule } from './component-authoring.module'; +import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module'; @NgModule({ - imports: [AuthoringRoutingModule, ComponentAuthoringModule], + imports: [AuthoringRoutingModule, ComponentAuthoringModule, StudentTeacherCommonServicesModule], providers: [ ClassroomStatusService, ComponentInfoService, From 983eeb8881c6b547ef54e680ec47beafa356db2e Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 3 Sep 2025 15:48:28 -0700 Subject: [PATCH 090/127] Open preview with current node. Show tooltip text --- .../shared/top-bar/top-bar.component.ts | 55 ++++++---- src/messages.xlf | 100 +++++++++++------- 2 files changed, 93 insertions(+), 62 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts index 2acdf321cf5..41d392badcf 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts @@ -15,21 +15,23 @@ import { CommonModule } from '@angular/common'; import { FlexLayoutModule } from '@angular/flex-layout'; import { NotificationsMenuComponent } from '../notifications-menu/notifications-menu.component'; import { PauseScreensMenuComponent } from '../../pause-screens-menu/pause-screens-menu.component'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ - imports: [ - CommonModule, - FlexLayoutModule, - MatButtonModule, - MatIconModule, - MatMenuModule, - MatToolbarModule, - NotificationsMenuComponent, - PauseScreensMenuComponent - ], - selector: 'top-bar', - styleUrl: './top-bar.component.scss', - templateUrl: './top-bar.component.html' + imports: [ + CommonModule, + FlexLayoutModule, + MatButtonModule, + MatIconModule, + MatMenuModule, + MatToolbarModule, + MatTooltipModule, + NotificationsMenuComponent, + PauseScreensMenuComponent + ], + selector: 'top-bar', + styleUrl: './top-bar.component.scss', + templateUrl: './top-bar.component.html' }) export class TopBarComponent implements OnInit { protected avatarColor: any; @@ -106,21 +108,28 @@ export class TopBarComponent implements OnInit { $localize`Warning! You will be editing the content of a classroom unit. If students have already started working, this may result in lost data or other problems.\n\nAre you sure you want to proceed?` ) ) { - if (/unit\/(\d*)\/node\/(\w*)$/.test(this.router.url)) { - this.router.navigate([ - '/teacher/edit/unit', - this.projectId, - 'node', - this.router.url.match(/\/node\/(\w+)$/)[1] - ]); - } else { - this.router.navigate(['/teacher/edit/unit', this.projectId]); + const urlFragments = ['/teacher/edit/unit', this.projectId]; + if (this.isViewingNode()) { + urlFragments.push('node', this.getCurrentNodeId()); } + this.router.navigate(urlFragments); } } + private isViewingNode(): boolean { + return /unit\/(\d*)\/node\/(\w*)$/.test(this.router.url); + } + + private getCurrentNodeId(): string { + return this.router.url.match(/\/node\/(\w+)$/)[1]; + } + protected previewProject(): void { - window.open(`${this.configService.getConfigParam('previewProjectURL')}`); + let previewUrl = this.configService.getConfigParam('previewProjectURL'); + if (this.isViewingNode()) { + previewUrl += `/${this.getCurrentNodeId()}`; + } + window.open(previewUrl); } protected goHome(): void { diff --git a/src/messages.xlf b/src/messages.xlf index e473edb6da0..96b871dcce4 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -978,6 +978,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 265,268 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html + 4,5 + Enter Prompt Here @@ -10800,7 +10804,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts - 73 + 75 @@ -11695,6 +11699,10 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/authoringTool/new-project-template.ts 80 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestone-report-button/milestone-report-button.component.html + 5,9 + src/assets/wise5/services/notebookService.ts 45 @@ -13614,6 +13622,24 @@ The branches will be removed but the steps will remain in the unit. 62 + + % completed + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html + 4,5 + + + src/assets/wise5/vle/nav-item/nav-item.component.html + 53,54 + + + + Responses: + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.html + 12,14 + + No feedback given for this version @@ -14406,8 +14432,8 @@ The branches will be removed but the steps will remain in the unit. 108 - - Showing / items + + Showing / questions src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts 32 @@ -14469,15 +14495,18 @@ The branches will be removed but the steps will remain in the unit. 22,23 - - Class Responses + + Question Summaries src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 28,31 + 28,30 + + + Class Responses - src/assets/wise5/directives/summary-display/summary-display.component.ts - 411 + src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html + 45,48 @@ -14643,6 +14672,13 @@ The branches will be removed but the steps will remain in the unit. 34,35 + + Peer Groups + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html + 5,9 + + Groupings for @@ -14822,7 +14858,7 @@ The branches will be removed but the steps will remain in the unit. Are you sure you want to proceed? src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.ts - 106 + 108 @@ -17585,7 +17621,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/summary-display/summary-display.component.ts - 551 + 540 @@ -19766,11 +19802,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 296 + 298 src/assets/wise5/directives/summary-display/summary-display.component.ts - 359 + 364 @@ -19797,11 +19833,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 296 + 298 src/assets/wise5/directives/summary-display/summary-display.component.ts - 363 + 368 @@ -21671,42 +21707,35 @@ If this problem continues, let your teacher know and move on to the next activit Your Response src/assets/wise5/directives/summary-display/summary-display.component.ts - 388 + 390 Your Score src/assets/wise5/directives/summary-display/summary-display.component.ts - 390 - - - - Period Responses - - src/assets/wise5/directives/summary-display/summary-display.component.ts - 397 + 392 - - Period Scores + + Responses src/assets/wise5/directives/summary-display/summary-display.component.ts - 402 + 398 - - Class Scores + + Scores src/assets/wise5/directives/summary-display/summary-display.component.ts - 416 + 401 - - % Responded (/) + + Mean: src/assets/wise5/directives/summary-display/summary-display.component.ts - 427 + 401 @@ -22404,13 +22433,6 @@ If this problem continues, let your teacher know and move on to the next activit 13,17 - - % completed - - src/assets/wise5/vle/nav-item/nav-item.component.html - 53,54 - - / items From 22a8fd85283810f300c57c00583086751b826088 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 4 Sep 2025 10:06:35 -0700 Subject: [PATCH 091/127] Reenabled ComponentGradingViewComponent and added tests for when student has work --- .../component-grading-view.component.spec.ts | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts index d8e2c9a7da3..b1eb7082f2c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.spec.ts @@ -3,19 +3,20 @@ import { ComponentGradingViewComponent } from './component-grading-view.componen import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { MockComponent } from 'ng-mocks'; +import { MockComponents } from 'ng-mocks'; import { MilestoneReportButtonComponent } from '../milestone-report-button/milestone-report-button.component'; +import { ComponentCompletionComponent } from '../component-completion/component-completion.component'; +import { By } from '@angular/platform-browser'; -xdescribe('ComponentGradingViewComponent', () => { - let component: ComponentGradingViewComponent; - let fixture: ComponentFixture; - +let component: ComponentGradingViewComponent; +let fixture: ComponentFixture; +describe('ComponentGradingViewComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ ClassroomMonitorTestingModule, ComponentGradingViewComponent, - MockComponent(MilestoneReportButtonComponent) + MockComponents(ComponentCompletionComponent, MilestoneReportButtonComponent) ], providers: [ { provide: ActivatedRoute, useValue: { parent: { params: of({ nodeId: 'node1' }) } } } @@ -24,10 +25,38 @@ xdescribe('ComponentGradingViewComponent', () => { fixture = TestBed.createComponent(ComponentGradingViewComponent); component = fixture.componentInstance; + component.node = { id: 'node1', title: 'Node 1' } as any; + component.component = { id: 'abc', prompt: 'hi' } as any; fixture.detectChanges(); }); + testHasStudentWork(); + testNoStudentWork(); +}); - it('should create', () => { - expect(component).toBeTruthy(); +function testHasStudentWork() { + describe('has student work', () => { + beforeEach(() => { + component['hasStudentWork'] = true; + fixture.detectChanges(); + }); + it('should show component completion', () => { + expect(getComponentCompletion()).toBeTruthy(); + }); }); -}); +} + +function testNoStudentWork() { + describe('no student work', () => { + beforeEach(() => { + component['hasStudentWork'] = false; + fixture.detectChanges(); + }); + it('should not show component completion', () => { + expect(getComponentCompletion()).toBeFalsy(); + }); + }); +} + +function getComponentCompletion() { + return fixture.debugElement.query(By.css('component-completion')); +} From 7d4e87b66ff8244692949639bc23fd80e1fdb66f Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 4 Sep 2025 17:47:07 -0700 Subject: [PATCH 092/127] Fix unit tests --- .../component-average-score.component.spec.ts | 8 ++-- .../component-completion.component.spec.ts | 42 ++++++++++------- .../node-grading.component.spec.ts | 8 +++- .../student-summary-display.component.spec.ts | 45 +++---------------- 4 files changed, 43 insertions(+), 60 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts index 8749b70d21e..60454de2565 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts @@ -38,10 +38,10 @@ function ngChanges_NoScoresAvailable_ShowNA() { [] as Annotation[] ) ); - it('should show "-"', () => { + it('should show ""', () => { component.ngOnChanges(); fixture.detectChanges(); - expect(fixture.nativeElement.textContent.trim()).toEqual('-'); + expect(fixture.nativeElement.textContent.trim()).toEqual(''); }); }); } @@ -93,7 +93,7 @@ function ngChanges_ScoresAvailable_ShowAverage() { fixture.detectChanges(); }); it('should show average score for period 1', () => { - expect(fixture.nativeElement.textContent.trim()).toEqual('4'); + expect(fixture.nativeElement.textContent.trim()).toEqual('4/10'); }); }); @@ -104,7 +104,7 @@ function ngChanges_ScoresAvailable_ShowAverage() { fixture.detectChanges(); }); it('should show average score for all periods', () => { - expect(fixture.nativeElement.textContent.trim()).toEqual('6'); + expect(fixture.nativeElement.textContent.trim()).toEqual('6/10'); }); }); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.spec.ts index f9514d07767..c5af15a40a9 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-completion/component-completion.component.spec.ts @@ -6,15 +6,21 @@ import { ComponentServiceLookupService } from '../../../services/componentServic import { TeacherDataService } from '../../../services/teacherDataService'; import { MultipleChoiceService } from '../../../components/multipleChoice/multipleChoiceService'; import { ComponentCompletionComponent } from './component-completion.component'; +import { ClassroomStatusService } from '../../../services/classroomStatusService'; let component: ComponentCompletionComponent; let fixture: ComponentFixture; -describe('ComponentProgressComponent', () => { +let workgroupService: WorkgroupService; +let componentServiceLookupService: ComponentServiceLookupService; +let teacherDataService: TeacherDataService; +let classroomStatusService: ClassroomStatusService; +describe('ComponentCompletionComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ComponentCompletionComponent], providers: [ MockProviders( + ClassroomStatusService, ComponentServiceLookupService, MultipleChoiceService, TeacherDataService, @@ -28,6 +34,10 @@ describe('ComponentProgressComponent', () => { component.component = { id: 'component1', maxScore: 10 }; component.node = { id: 'node1' } as Node; component.periodId = 1; + workgroupService = TestBed.inject(WorkgroupService); + componentServiceLookupService = TestBed.inject(ComponentServiceLookupService); + teacherDataService = TestBed.inject(TeacherDataService); + classroomStatusService = TestBed.inject(ClassroomStatusService); }); ngOnChanges(); }); @@ -38,35 +48,35 @@ function ngOnChanges() { const workgroups = new Map(); workgroups.set(1, {}); workgroups.set(2, {}); - spyOn(TestBed.inject(WorkgroupService), 'getWorkgroupsInPeriod').and.returnValue(workgroups); - spyOn(TestBed.inject(ComponentServiceLookupService), 'getService').and.returnValue( + spyOn(workgroupService, 'getWorkgroupsInPeriod').and.returnValue(workgroups); + spyOn(componentServiceLookupService, 'getService').and.returnValue( new MultipleChoiceService() ); + spyOn(classroomStatusService, 'hasStudentStatus').and.returnValue(true); }); describe('no student completed this work', () => { beforeEach(() => - spyOn( - TestBed.inject(TeacherDataService), - 'getComponentStatesByWorkgroupIdAndComponentId' - ).and.returnValue([]) + spyOn(teacherDataService, 'getComponentStatesByWorkgroupIdAndComponentId').and.returnValue( + [] + ) ); - it('shows "0%"', () => { + it('shows "Responses: 0"', () => { component.ngOnChanges(); fixture.detectChanges(); - expect(fixture.nativeElement.textContent.trim()).toEqual('0%'); + expect(fixture.nativeElement.textContent.trim()).toEqual('Responses: 0'); }); }); - describe('half of the students completed this work', () => { + describe('one of the students completed this work', () => { beforeEach(() => - spyOn( - TestBed.inject(TeacherDataService), - 'getComponentStatesByWorkgroupIdAndComponentId' - ).and.returnValues([], [{ studentData: { studentChoices: [{ id: 'choice1' }] } }]) + spyOn(teacherDataService, 'getComponentStatesByWorkgroupIdAndComponentId').and.returnValues( + [], + [{ studentData: { studentChoices: [{ id: 'choice1' }] } }] + ) ); - it('shows "50%"', () => { + it('shows "Responses: 1"', () => { component.ngOnChanges(); fixture.detectChanges(); - expect(fixture.nativeElement.textContent.trim()).toEqual('50%'); + expect(fixture.nativeElement.textContent.trim()).toEqual('Responses: 1'); }); }); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index 3a9c7d17585..ae4c4986f34 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -9,6 +9,7 @@ import { Observable, Subject } from 'rxjs'; import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { WorkgroupService } from '../../../../../../app/services/workgroup.service'; import { FilterComponentsComponent } from '../filter-components/filter-components.component'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; let classroomStatusService: ClassroomStatusService; let component: NodeGradingComponent; @@ -42,7 +43,12 @@ describe('NodeGradingComponent', () => { declarations: [MockComponent(FilterComponentsComponent)], imports: [NodeGradingComponent, ClassroomMonitorTestingModule], providers: [ - MockProviders(ClassroomStatusService, TeacherProjectService, WorkgroupService), + MockProviders( + ClassroomStatusService, + ComponentTypeService, + TeacherProjectService, + WorkgroupService + ), { provide: TeacherDataService, useClass: MockDataService } ] }).compileComponents(); diff --git a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.spec.ts b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.spec.ts index 3838c79abfd..078d7be7450 100644 --- a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.spec.ts +++ b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.spec.ts @@ -3,10 +3,9 @@ import { Choice } from '../../components/multipleChoice/Choice'; import { ComponentContent } from '../../common/ComponentContent'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfigService } from '../../services/configService'; -import { MultipleChoiceSummaryData } from '../summary-display/summary-data/MultipleChoiceSummaryData'; import { MultipleChoiceSummaryDataPoint } from '../summary-display/summary-data/MultipleChoiceSummaryDataPoint'; import { ProjectService } from '../../services/projectService'; -import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; +import { provideHttpClient } from '@angular/common/http'; import { ScoreSummaryData } from '../summary-display/summary-data/ScoreSummaryData'; import { ScoreSummaryDataPoint } from '../summary-display/summary-data/ScoreSummaryDataPoint'; import { SeriesData } from '../../common/SeriesData'; @@ -17,12 +16,11 @@ import { SummaryData } from '../summary-display/summary-data/SummaryData'; let component: StudentSummaryDisplay; let fixture: ComponentFixture; - describe('StudentSummaryDisplayComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [StudentSummaryDisplay, StudentTeacherCommonServicesModule], - providers: [provideHttpClient(withInterceptorsFromDi())] + providers: [provideHttpClient()] }); fixture = TestBed.createComponent(StudentSummaryDisplay); component = fixture.componentInstance; @@ -40,9 +38,7 @@ describe('StudentSummaryDisplayComponent', () => { filterLatestScoreAnnotations(); getChartColors(); getGraphForSelf(); - getGraphTitleForPeriod(); getGraphTitleForClass(); - getPercentOfClassRespondedText(); getPercentResponded(); getTotalWorkgroups(); initializeOtherComponent(); @@ -302,39 +298,21 @@ function getChartColors() { }); } -function getGraphTitleForPeriod() { - describe('getGraphTitleForPeriod', () => { - it('should get graph title for period when student data type is responses', () => { - expectGraphTitleForX('Period', 'responses'); - }); - it('should get graph title for period when student data type is scores', () => { - expectGraphTitleForX('Period', 'scores'); - }); - }); -} - function getGraphTitleForClass() { describe('getGraphTitleForClass', () => { it('should get graph title for class when student data type is responses', () => { - expectGraphTitleForX('Class', 'responses'); + expectGraphTitleForX('responses', 'Responses'); }); it('should get graph title for class when student data type is scores', () => { - expectGraphTitleForX('Class', 'scores'); + expectGraphTitleForX('scores', 'Scores (Mean: 0/5)'); }); }); } -function expectGraphTitleForX(source: string, studentDataType: string) { +function expectGraphTitleForX(studentDataType: string, expectedTitle: string) { setResponseNumbers(component); component.studentDataType = studentDataType; - let title: string; - if (source === 'Period') { - title = component.getGraphTitleForPeriod(); - } else { - title = component.getGraphTitleForClass(); - } - const upperCaseStudentDataType = studentDataType[0].toUpperCase() + studentDataType.substring(1); - expect(title).toEqual(`${source} ${upperCaseStudentDataType} | 60% Responded (6/10)`); + expect(component.getGraphTitleForClass()).toEqual(expectedTitle); } function getGraphForSelf() { @@ -352,17 +330,6 @@ function getGraphForSelf() { }); } -function getPercentOfClassRespondedText() { - describe('getPercentOfClassRespondedText', () => { - it('should get percent of class responded text', () => { - setResponseNumbers(component); - component.studentDataType = 'responses'; - const text = component.getPercentOfClassRespondedText(); - expect(text).toEqual(`60% Responded (6/10)`); - }); - }); -} - function setResponseNumbers(component: any) { component.percentResponded = 60; component.numResponses = 6; From b959fe8816bba81cbd49dff9f003e39abc09cfef Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Fri, 5 Sep 2025 10:08:28 -0700 Subject: [PATCH 093/127] Lazy load component grading views Fixes graph sizing by rendering when visible. --- .../nodeGrading/node-grading/node-grading.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index a99d5a5ea35..96e3e3b05bd 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -35,7 +35,9 @@

Question Summaries

> @for (component of components; track component; let i = $index) { - + + + } From 56ac9df8821d0ed78d4ee404d8ec012bfd73df5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 5 Sep 2025 17:12:40 +0000 Subject: [PATCH 094/127] Updated messages --- src/messages.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messages.xlf b/src/messages.xlf index 96b871dcce4..efcb65aaf17 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -14506,7 +14506,7 @@ The branches will be removed but the steps will remain in the unit. Class Responses src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html - 45,48 + 47,50 From 96fa1aecfb7a3c32becf8ef04d35bb7ccfe63630 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 10:46:42 -0700 Subject: [PATCH 095/127] Remove unnecessary FlexLayoutModule dep --- .../nodeGrading/node-grading/node-grading.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts index 72de5966001..23baaf81a69 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts @@ -3,7 +3,6 @@ import { TeacherProjectService } from '../../../../services/teacherProjectServic import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { TeacherDataService } from '../../../../services/teacherDataService'; import { CommonModule } from '@angular/common'; -import { FlexLayoutModule } from '@angular/flex-layout'; import { MatIconModule } from '@angular/material/icon'; import { MatDialog } from '@angular/material/dialog'; import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; @@ -23,7 +22,6 @@ import { FormControl } from '@angular/forms'; CommonModule, ComponentGradingViewComponent, FilterComponentsComponent, - FlexLayoutModule, MatButtonModule, MatIconModule, NodeClassResponsesComponent, From f62afdc1adc1ab4b5eab574862629e44247fef25 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 10:48:10 -0700 Subject: [PATCH 096/127] Clean up NodeGradingComponent spec. Remove dep on ClassroomMonitorTestingModule. --- .../node-grading/node-grading.component.spec.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts index ae4c4986f34..7187562a36c 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.spec.ts @@ -2,14 +2,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NodeGradingComponent } from './node-grading.component'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; import { TeacherDataService } from '../../../../services/teacherDataService'; -import { MockComponent, MockProviders } from 'ng-mocks'; +import { MockComponents, MockProviders } from 'ng-mocks'; import { ClassroomStatusService } from '../../../../services/classroomStatusService'; import { Node } from '../../../../common/Node'; import { Observable, Subject } from 'rxjs'; -import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { WorkgroupService } from '../../../../../../app/services/workgroup.service'; import { FilterComponentsComponent } from '../filter-components/filter-components.component'; import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { ComponentGradingViewComponent } from '../../component-grading-view/component-grading-view.component'; +import { NodeClassResponsesComponent } from '../node-class-responses/node-class-responses.component'; let classroomStatusService: ClassroomStatusService; let component: NodeGradingComponent; @@ -40,8 +41,14 @@ class MockDataService { describe('NodeGradingComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [MockComponent(FilterComponentsComponent)], - imports: [NodeGradingComponent, ClassroomMonitorTestingModule], + declarations: [ + MockComponents( + ComponentGradingViewComponent, + FilterComponentsComponent, + NodeClassResponsesComponent + ) + ], + imports: [NodeGradingComponent], providers: [ MockProviders( ClassroomStatusService, From 852847e83cb0bf3855e2bd1d9a6a03bd35163cbd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 10:58:08 -0700 Subject: [PATCH 097/127] Clean up GradingStepToolsComponent spec. Remove dep on ClassroomMonitorTestingModule. --- .../grading-step-tools.component.spec.ts | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts index 4bcce04a485..1ddbf865bad 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/grading-step-tools/grading-step-tools.component.spec.ts @@ -1,7 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GradingStepToolsComponent } from './grading-step-tools.component'; -import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; -import { ActivatedRoute, provideRouter, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MockComponent, MockProvider, MockProviders } from 'ng-mocks'; +import { TeacherDataService } from '../../../services/teacherDataService'; +import { GradingNodeService } from '../../../services/gradingNodeService'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { of } from 'rxjs'; +import { NodeIconComponent } from '../../../vle/node-icon/node-icon.component'; describe('GradingStepToolsComponent', () => { let component: GradingStepToolsComponent; @@ -9,9 +14,16 @@ describe('GradingStepToolsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [GradingStepToolsComponent, ClassroomMonitorTestingModule], + imports: [GradingStepToolsComponent, MockComponent(NodeIconComponent)], providers: [ - provideRouter([]), + MockProviders(GradingNodeService), + MockProvider(TeacherDataService, { + currentNodeChanged$: of() + }), + MockProvider(TeacherProjectService, { + idToOrder: {}, + projectParsed$: of() + }), { provide: ActivatedRoute, useValue: { firstChild: { snapshot: { params: { nodeId: 'nodeId' } } } } From 2f4ab85a2f26ecb4c8686d73f8e33befdf81e873 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 11:04:28 -0700 Subject: [PATCH 098/127] Remove no-longer used components: ComponentClassResponsesComponent, ComponentAverageScoreComponent, ComponentWorkgroupItemComponent --- .../component-average-score.component.spec.ts | 111 ---------------- .../component-average-score.component.ts | 43 ------- .../component-class-responses.component.html | 102 --------------- ...omponent-class-responses.component.spec.ts | 116 ----------------- .../component-class-responses.component.ts | 119 ------------------ .../component-workgroup-item.component.html | 55 -------- .../component-workgroup-item.component.scss | 19 --- ...component-workgroup-item.component.spec.ts | 34 ----- .../component-workgroup-item.component.ts | 92 -------------- 9 files changed, 691 deletions(-) delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts deleted file mode 100644 index 60454de2565..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.spec.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ComponentAverageScoreComponent } from './component-average-score.component'; -import { AnnotationService } from '../../../services/annotationService'; -import { MockProvider } from 'ng-mocks'; -import { Node } from '../../../common/Node'; -import { Annotation } from '../../../common/Annotation'; - -let component: ComponentAverageScoreComponent; -let fixture: ComponentFixture; -describe('ComponentAverageScoreComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ComponentAverageScoreComponent], - providers: [MockProvider(AnnotationService)] - }).compileComponents(); - - fixture = TestBed.createComponent(ComponentAverageScoreComponent); - component = fixture.componentInstance; - component.component = { id: 'component1', maxScore: 10 }; - component.node = { id: 'node1' } as Node; - component.periodId = 1; - }); - - ngOnChanges(); -}); - -function ngOnChanges() { - describe('ngOnChanges()', () => { - ngChanges_NoScoresAvailable_ShowNA(); - ngChanges_ScoresAvailable_ShowAverage(); - }); -} - -function ngChanges_NoScoresAvailable_ShowNA() { - describe('no scores available', () => { - beforeEach(() => - spyOn(TestBed.inject(AnnotationService), 'getAnnotationsByNodeIdComponentId').and.returnValue( - [] as Annotation[] - ) - ); - it('should show ""', () => { - component.ngOnChanges(); - fixture.detectChanges(); - expect(fixture.nativeElement.textContent.trim()).toEqual(''); - }); - }); -} - -function ngChanges_ScoresAvailable_ShowAverage() { - describe('scores available', () => { - beforeEach(() => { - spyOn(TestBed.inject(AnnotationService), 'getAnnotationsByNodeIdComponentId').and.returnValue( - [ - { - nodeId: 'node1', - componentId: 'component1', - type: 'score', - toWorkgroupId: 1, - periodId: 1, - data: { value: 3 } - }, - { - nodeId: 'node1', - componentId: 'component1', - type: 'autoScore', - toWorkgroupId: 2, - periodId: 1, - data: { value: 4 } - }, - { - nodeId: 'node1', - componentId: 'component1', - type: 'score', - toWorkgroupId: 5, - periodId: 2, - data: { value: 10 } - }, - { - nodeId: 'node1', - componentId: 'component1', - type: 'score', - toWorkgroupId: 2, - periodId: 1, - data: { value: 5 } - } - ] as Annotation[] - ); - }); - - describe('period 1 is chosen', () => { - beforeEach(() => { - component.ngOnChanges(); - fixture.detectChanges(); - }); - it('should show average score for period 1', () => { - expect(fixture.nativeElement.textContent.trim()).toEqual('4/10'); - }); - }); - - describe('all periods is chosen', () => { - beforeEach(() => { - component.periodId = -1; - component.ngOnChanges(); - fixture.detectChanges(); - }); - it('should show average score for all periods', () => { - expect(fixture.nativeElement.textContent.trim()).toEqual('6/10'); - }); - }); - }); -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts deleted file mode 100644 index c28dbde3c10..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-average-score/component-average-score.component.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Node } from '../../../common/Node'; -import { AnnotationService } from '../../../services/annotationService'; -import { DecimalPipe } from '@angular/common'; - -@Component({ - imports: [DecimalPipe], - selector: 'component-average-score', - template: ` - @if (avgScore || avgScore === 0) { - {{ avgScore }}/{{ component?.maxScore ?? 0 }} - } - ` -}) -export class ComponentAverageScoreComponent { - protected avgScore: number | '-'; - @Input() component: any; - @Input() node: Node; - @Input() periodId: number; - - constructor(private annotationService: AnnotationService) {} - - ngOnChanges(): void { - if (this.component && this.node) { - const annotations = this.getLatestScoreAnnotations(); - const totalScore = annotations.reduce((sumSoFar, a) => sumSoFar + a.data.value, 0); - this.avgScore = totalScore / annotations.length; - } - } - - private getLatestScoreAnnotations() { - return this.annotationService - .getAnnotationsByNodeIdComponentId(this.node.id, this.component.id) - .filter((annotation) => this.periodId === -1 || annotation.periodId === this.periodId) - .filter((annotation) => ['score', 'autoScore'].includes(annotation.type)) - .reduceRight((soFar, currentA) => { - if (!soFar.some((soFarA) => soFarA.toWorkgroupId === currentA.toWorkgroupId)) { - soFar.push(currentA); - } - return soFar; - }, []); - } -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html deleted file mode 100644 index 1c98fb7211f..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.html +++ /dev/null @@ -1,102 +0,0 @@ - - -
- - - - -
- - -
- - - -
- -
- @for (workgroup of sortedWorkgroups; track workgroup.workgroupId) { - @if (isWorkgroupShown(workgroup)) { - - } - } -
- diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts deleted file mode 100644 index 35adc958554..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.spec.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ComponentClassResponsesComponent } from './component-class-responses.component'; -import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; -import { TeacherDataService } from '../../../services/teacherDataService'; -import { of } from 'rxjs'; -import { MockComponent } from 'ng-mocks'; -import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; -import { ConfigService } from '../../../services/configService'; -import { ClassroomStatusService } from '../../../services/classroomStatusService'; -import { Node } from '../../../common/Node'; -import { By } from '@angular/platform-browser'; -import { AnnotationService } from '../../../services/annotationService'; -import { Annotation } from '../../../common/Annotation'; -import { NotificationService } from '../../../services/notificationService'; -import { CompletionStatus } from '../shared/CompletionStatus'; - -let component: ComponentClassResponsesComponent; -let fixture: ComponentFixture; -describe('ComponentClassResponsesComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [MockComponent(WorkgroupSelectAutocompleteComponent)], - imports: [ComponentClassResponsesComponent, ClassroomMonitorTestingModule] - }).compileComponents(); - spyOn(TestBed.inject(TeacherDataService), 'retrieveStudentDataForNode').and.returnValue(of({})); - spyOn(TestBed.inject(TeacherDataService), 'isWorkgroupShown').and.returnValue(true); - spyOn(TestBed.inject(AnnotationService), 'getAnnotationsByNodeIdComponentId').and.returnValue([ - // team 1 does not have a score (should appear as '-' in the page) - { toWorkgroupId: 2, data: { value: 4 }, type: 'score' } as Annotation, - { toWorkgroupId: 3, data: { value: 2 }, type: 'score' } as Annotation, - { toWorkgroupId: 4, data: { value: 1 }, type: 'score' } as Annotation, - { toWorkgroupId: 5, data: { value: 5 }, type: 'score' } as Annotation - ]); - spyOn(TestBed.inject(ClassroomStatusService), 'hasStudentStatus').and.returnValue(true); - spyOn(TestBed.inject(ClassroomStatusService), 'getStudentStatusForWorkgroupId').and.returnValue( - { nodeStatuses: {} } - ); - spyOn(TestBed.inject(NotificationService), 'getAlertNotifications').and.returnValue([]); - spyOn(TestBed.inject(ConfigService), 'getClassmateUserInfos').and.returnValue([ - { workgroupId: 1 }, - { workgroupId: 2 }, - { workgroupId: 3 }, - { workgroupId: 4 }, - { workgroupId: 5 } - ]); - fixture = TestBed.createComponent(ComponentClassResponsesComponent); - component = fixture.componentInstance; - component['node'] = { id: 'node1' } as Node; - component['component'] = { id: 'component1' }; - component['getCompletionStatusByWorkgroupId'] = () => new CompletionStatus(); - component.ngOnChanges(); - fixture.detectChanges(); - }); - ngOnInit(); - sortByTeam(); - sortByScore(); -}); - -function ngOnInit() { - describe('ngOnInit', () => { - it('should display workgroups', () => { - expect(component).toBeTruthy(); - expectWorkgroupItemsInOrder(['Team 1', 'Team 2', 'Team 3', 'Team 4', 'Team 5']); - }); - }); -} - -function sortByTeam() { - describe('sortByTeam', () => { - it('should sort workgroups by team', () => { - const sortByTeamButton = fixture.debugElement - .queryAll(By.css('button')) - .find((element) => element.nativeElement.textContent.trim().includes('Team')); - // sort descending - sortByTeamButton.nativeElement.click(); - fixture.detectChanges(); - expectWorkgroupItemsInOrder(['Team 5', 'Team 4', 'Team 3', 'Team 2', 'Team 1']); - - // sort ascending when the button is clicked again - sortByTeamButton.nativeElement.click(); - fixture.detectChanges(); - expectWorkgroupItemsInOrder(['Team 1', 'Team 2', 'Team 3', 'Team 4', 'Team 5']); - }); - }); -} - -function sortByScore() { - describe('sortByScore', () => { - it('should sort workgroups by score', () => { - const sortByTeamButton = fixture.debugElement - .queryAll(By.css('button')) - .find((element) => element.nativeElement.textContent.trim().includes('Score')); - // sort ascending - sortByTeamButton.nativeElement.click(); - fixture.detectChanges(); - expectWorkgroupItemsInOrder(['Team 1', 'Team 4', 'Team 3', 'Team 2', 'Team 5']); - - // sort descending when the button is clicked again - sortByTeamButton.nativeElement.click(); - fixture.detectChanges(); - expectWorkgroupItemsInOrder(['Team 5', 'Team 2', 'Team 3', 'Team 4', 'Team 1']); - }); - }); -} - -function getWorkgroupItems() { - return fixture.debugElement.queryAll(By.css('component-workgroup-item')); -} - -function expectWorkgroupItemsInOrder(workgroupNames: string[]) { - const workgroupItems = getWorkgroupItems(); - expect(workgroupItems.length).toBe(workgroupNames.length); - workgroupNames.forEach((workgroupName, index) => { - expect(workgroupItems[index].nativeElement.textContent).toContain(workgroupName); - }); -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts deleted file mode 100644 index 6395a462552..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-class-responses/component-class-responses.component.ts +++ /dev/null @@ -1,119 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { MatListModule } from '@angular/material/list'; -import { FlexLayoutModule } from '@angular/flex-layout'; -import { WorkgroupSelectAutocompleteComponent } from '../../../../../app/classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; -import { TeacherDataService } from '../../../services/teacherDataService'; -import { Node } from '../../../common/Node'; -import { ConfigService } from '../../../services/configService'; -import { ClassroomStatusService } from '../../../services/classroomStatusService'; -import { AnnotationService } from '../../../services/annotationService'; -import { NotificationService } from '../../../services/notificationService'; -import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { ComponentWorkgroupItemComponent } from '../component-workgroup-item/component-workgroup-item.component'; -import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'; -import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService'; -import { AbstractClassResponsesComponent } from '../AbstractClassResponsesComponent'; - -@Component({ - imports: [ - CommonModule, - ComponentWorkgroupItemComponent, - FlexLayoutModule, - IntersectionObserverModule, - MatButtonModule, - MatIconModule, - MatListModule, - WorkgroupSelectAutocompleteComponent - ], - selector: 'component-class-responses', - styles: [ - ` - .user-list { - padding-top: 0; - } - - .table--list__thead__link { - padding: 0; - } - - .mdc-list-item.user-list-controls { - height: auto; - padding: 8px 16px; - } - ` - ], - templateUrl: './component-class-responses.component.html' -}) -export class ComponentClassResponsesComponent extends AbstractClassResponsesComponent { - @Input() component: any; - @Input() node: Node; - - constructor( - protected annotationService: AnnotationService, - protected classroomStatusService: ClassroomStatusService, - private componentServiceLookupService: ComponentServiceLookupService, - protected configService: ConfigService, - protected dataService: TeacherDataService, - protected notificationService: NotificationService, - protected projectService: TeacherProjectService - ) { - super( - annotationService, - classroomStatusService, - configService, - dataService, - notificationService, - projectService - ); - } - - ngOnChanges(): void { - if (this.node && this.component) { - this.retrieveStudentData(this.node); - this.collapseAll(); - } - } - - protected getWorkgroupScore(workgroupId: number): number { - return ( - this.annotationService.getLatestScoreAnnotation(this.node.id, this.component.id, workgroupId) - ?.data.value ?? null - ); - } - - protected hasWork(): boolean { - return this.projectService.componentHasWork(this.component); - } - - protected getComponentStates(): any[] { - return this.dataService.getComponentStatesByComponentId(this.component.id); - } - - protected isAnnotationForWorkgroup(annotation: any, workgroupId: number): boolean { - return ( - super.isAnnotationForWorkgroup(annotation, workgroupId) && - annotation.componentId === this.component.id - ); - } - - protected isCompleted(workgroupId: number, nodeStatus: any): boolean { - const service = this.componentServiceLookupService.getService(this.component.type); - const workgroupComponentStates = this.dataService.getComponentStatesByWorkgroupIdAndComponentId( - workgroupId, - this.component.id - ); - return ['OpenResponse', 'Discussion'].includes(this.component.type) - ? service.isCompletedV2(this.node, this.component, { - componentStates: workgroupComponentStates - }) - : service.isCompleted( - this.component, - workgroupComponentStates, - this.dataService.getEventsByNodeId(this.node.id), - this.node - ); - } -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html deleted file mode 100644 index bdce5b87ff3..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.html +++ /dev/null @@ -1,55 +0,0 @@ -
- - @if (expanded && !disabled) { - -
-
- - -
-
- - } -
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss deleted file mode 100644 index 7e28238d934..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.scss +++ /dev/null @@ -1,19 +0,0 @@ -.component-workgroup-item { - .team-button { - min-height: 56px; - text-align: initial; - } - - .mdc-button__label { - text-transform: none; - width: 100%; - } - - .mdc-list-item.mdc-list-item--with-one-line { - height: auto; - } - - .mat-headline-5 { - margin: 0; - } -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts deleted file mode 100644 index a7e4eb2140a..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ComponentWorkgroupItemComponent } from './component-workgroup-item.component'; -import { MockProvider } from 'ng-mocks'; -import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { By } from '@angular/platform-browser'; - -let component: ComponentWorkgroupItemComponent; -let fixture: ComponentFixture; -describe('ComponentWorkgroupItemComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ComponentWorkgroupItemComponent], - providers: [MockProvider(TeacherProjectService)] - }).compileComponents(); - - fixture = TestBed.createComponent(ComponentWorkgroupItemComponent); - component = fixture.componentInstance; - component.workgroupId = 1; - component.workgroupData = {}; - fixture.detectChanges(); - }); - - clickOnButton_EmitOnUpdatedEvent(); -}); - -function clickOnButton_EmitOnUpdatedEvent() { - describe('click on button', () => { - it('should emit onUpdateExpand event', () => { - const spy = spyOn(component.onUpdateExpand, 'emit'); - fixture.debugElement.query(By.css('button')).nativeElement.click(); - expect(spy).toHaveBeenCalledWith({ workgroupId: 1, value: true }); - }); - }); -} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts deleted file mode 100644 index ac71377a091..00000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-workgroup-item/component-workgroup-item.component.ts +++ /dev/null @@ -1,92 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core'; -import { WorkgroupInfoComponent } from '../nodeGrading/workgroupInfo/workgroup-info.component'; -import { MatListItem } from '@angular/material/list'; -import { ComponentNewWorkBadgeComponent } from '../../../../../app/classroom-monitor/component-new-work-badge/component-new-work-badge.component'; -import { WorkgroupComponentGradingComponent } from '../workgroup-component-grading/workgroup-component-grading.component'; -import { WorkgroupNodeStatusComponent } from '../../../../../app/classroom-monitor/workgroup-node-status/workgroup-node-status.component'; -import { WorkgroupNodeScoreComponent } from '../shared/workgroupNodeScore/workgroup-node-score.component'; -import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { FlexLayoutModule } from '@angular/flex-layout'; - -@Component({ - imports: [ - CommonModule, - ComponentNewWorkBadgeComponent, - FlexLayoutModule, - MatListItem, - WorkgroupComponentGradingComponent, - WorkgroupInfoComponent, - WorkgroupNodeScoreComponent, - WorkgroupNodeStatusComponent - ], - selector: 'component-workgroup-item', - styleUrl: './component-workgroup-item.component.scss', - templateUrl: './component-workgroup-item.component.html' -}) -export class ComponentWorkgroupItemComponent { - @Input() componentId: string; - protected disabled: boolean; - @Input() expanded: boolean; - @Input() hasAlert: boolean; - @Input() hasNewAlert: boolean; - protected maxScore: number; - @Input() nodeId: string; - @Output() onUpdateExpand: EventEmitter = new EventEmitter(); - @Input() score: number | '-'; - @Input() status: any; - protected statusClass: any; - protected statusText: string = ''; - @Input() workgroupId: number; - @Input() workgroupData: any; - - constructor(private projectService: TeacherProjectService) {} - - ngOnInit(): void { - this.setComponent(); - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes.nodeId || changes.componentId) { - this.setComponent(); - } - this.update(); - } - - private setComponent(): void { - this.score = this.score ?? '-'; - this.maxScore = this.projectService.getMaxScoreForComponent(this.nodeId, this.componentId) ?? 0; - } - - private update(): void { - switch (this.status) { - case -1: - this.statusClass = ' '; - this.statusText = $localize`Not Assigned`; - break; - case 2: - this.statusClass = 'success'; - this.statusText = $localize`Completed`; - break; - case 1: - this.statusClass = 'text'; - this.statusText = $localize`Partially Completed`; - break; - default: - this.statusClass = 'text-secondary'; - if (this.componentId) { - this.statusText = $localize`Not Completed`; - } else { - this.statusText = $localize`No Work`; - } - } - if (this.hasNewAlert) { - this.statusClass = 'warn'; - } - this.disabled = this.status === -1; - } - - protected toggleExpand(): void { - this.onUpdateExpand.emit({ workgroupId: this.workgroupId, value: !this.expanded }); - } -} From 2bdd04b460300da3c68ca4e160f008d284083285 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 13:43:19 -0700 Subject: [PATCH 099/127] Clean up WorkgroupItemComponent spec. Add test for toggle button. Remove dep on ClassroomMonitorTestingModule. --- .../workgroup-item.component.spec.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.spec.ts index db074bf87f1..bece0071fcc 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.spec.ts @@ -1,8 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ClassroomMonitorTestingModule } from '../../../classroom-monitor-testing.module'; import { WorkgroupItemComponent } from './workgroup-item.component'; import { TeacherProjectService } from '../../../../services/teacherProjectService'; -import { ComponentTypeServiceModule } from '../../../../services/componentTypeService.module'; +import { MockProviders } from 'ng-mocks'; +import { ComponentTypeService } from '../../../../services/componentTypeService'; +import { By } from '@angular/platform-browser'; let component: WorkgroupItemComponent; let fixture: ComponentFixture; @@ -11,8 +12,8 @@ let teacherProjectService: TeacherProjectService; describe('WorkgroupItemComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [WorkgroupItemComponent, ClassroomMonitorTestingModule, ComponentTypeServiceModule], - providers: [TeacherProjectService] + imports: [WorkgroupItemComponent], + providers: [MockProviders(ComponentTypeService, TeacherProjectService)] }).compileComponents(); }); @@ -29,7 +30,8 @@ describe('WorkgroupItemComponent', () => { fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); + it('toggle expand button should be enabled', () => { + const button = fixture.debugElement.query(By.css('button')); + expect(button.nativeElement.disabled).toBe(false); }); }); From 16758e2c9ebebb0763e1c364c93b799694abc060 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Fri, 5 Sep 2025 13:49:16 -0700 Subject: [PATCH 100/127] Remove FlexLayout from PeerGroupButtonComponent --- .../peer-group-button/peer-group-button.component.html | 2 +- .../peer-group-button/peer-group-button.component.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html index 6418d17bb56..c195f340f01 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group-button/peer-group-button.component.html @@ -1,6 +1,6 @@ @if (peerGroupingTag) {
-

Question Summaries

-
- - @for (component of components; track component; let i = $index) { - - - - - - } - +
+

Question Summaries

+ @if (summariesVisible) { + Hide + } @else { + Show + }
+ @if (summariesVisible) { +
+ + @for (component of components; track component; let i = $index) { + + + + + + } + +
+ }
-
+

Class Responses

Date: Tue, 9 Sep 2025 14:13:03 -0700 Subject: [PATCH 111/127] Only show idea summary if component has idea rubric --- .../component-grading-view.component.html | 2 +- .../component-grading-view.component.ts | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 2fde6e39fd2..83c65e1fa50 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -45,7 +45,7 @@ class="w-full md:w-1/2" /> } - @if (hasResponsesSummary && ['DialogGuidance', 'OpenResponse'].includes(component?.type)) { + @if (hasIdeaRubricData) { state.periodId === this.periodId).length > 0; - this.hasResponsesSummary = this.summaryService.isResponsesSummaryAvailableForComponentType( - this.component?.type - ); + this.hasIdeaRubricData = this.cRaterService + .getCRaterRubric(this.node.id, this.component.id) + .hasRubricData(); this.hasSummaryData = (this.component?.type === 'MultipleChoice' && this.hasStudentWork) || (this.hasScoresSummary && this.hasScoreAnnotation) || - this.hasResponsesSummary; + this.hasIdeaRubricData || + this.component?.type === 'Match'; } private setSource(): void { From 55549671325f870087f0447b4e32fb3bb3a831d4 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Wed, 10 Sep 2025 08:50:55 -0700 Subject: [PATCH 112/127] Remove ShowNodeInfoDialog Replace by loading step in preview mode. --- .../show-node-info-dialog.component.html | 8 --- .../show-node-info-dialog.component.scss | 3 - .../show-node-info-dialog.component.spec.ts | 67 ------------------- .../show-node-info-dialog.component.ts | 49 -------------- src/app/teacher/classroom-monitor.module.ts | 2 - .../component-grading-view.component.html | 2 +- .../component-grading-view.component.scss | 1 + .../milestone-details.component.html | 2 +- .../milestone-details.component.ts | 18 +++-- .../node-grading/node-grading.component.html | 2 +- .../node-grading/node-grading.component.ts | 8 +-- .../shared/top-bar/top-bar.component.ts | 6 +- .../wise5/services/teacherDataService.ts | 9 +++ 13 files changed, 24 insertions(+), 153 deletions(-) delete mode 100644 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html delete mode 100644 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.scss delete mode 100644 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts delete mode 100644 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.ts diff --git a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html deleted file mode 100644 index 568e63eaeca..00000000000 --- a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html +++ /dev/null @@ -1,8 +0,0 @@ -

{{ stepNumberAndTitle }}

- - - - - - - diff --git a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.scss b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.scss deleted file mode 100644 index 713984189e2..00000000000 --- a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.mat-mdc-dialog-content { - border: 1px solid lightgrey; -} \ No newline at end of file diff --git a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts deleted file mode 100644 index f4895ceea0d..00000000000 --- a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { ClassroomMonitorTestingModule } from '../../../assets/wise5/classroomMonitor/classroom-monitor-testing.module'; -import { NotebookService } from '../../../assets/wise5/services/notebookService'; -import { ProjectService } from '../../../assets/wise5/services/projectService'; -import { TeacherDataService } from '../../../assets/wise5/services/teacherDataService'; -import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService'; -import { VLEProjectService } from '../../../assets/wise5/vle/vleProjectService'; -import { ShowNodeInfoDialogComponent } from './show-node-info-dialog.component'; -import { ComponentTypeServiceModule } from '../../../assets/wise5/services/componentTypeService.module'; - -let component: ShowNodeInfoDialogComponent; -const componentRubric: string = 'This is the component rubric.'; -let fixture: ComponentFixture; -const nodeId1: string = 'node1'; -const prompt: string = 'This is the prompt.'; -const stepRubric: string = 'This is the step rubric.'; -const stepTitle: string = 'This is the title'; -const node: any = { - components: [ - { - id: 'component1', - type: 'OpenResponse', - prompt: prompt, - rubric: componentRubric - } - ], - id: nodeId1, - rubric: stepRubric, - title: stepTitle -}; - -describe('ShowNodeInfoDialogComponents', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ - ClassroomMonitorTestingModule, - ComponentTypeServiceModule, - ShowNodeInfoDialogComponent - ], - providers: [ - { provide: MAT_DIALOG_DATA, useValue: nodeId1 }, - { provide: MatDialogRef, useValue: {} } - ] - }).compileComponents(); - - fixture = TestBed.createComponent(ShowNodeInfoDialogComponent); - component = fixture.componentInstance; - component.nodeId = nodeId1; - spyOn(TestBed.inject(TeacherDataService), 'getCurrentPeriodId').and.returnValue(1); - spyOn(TestBed.inject(TeacherProjectService), 'getNodeById').and.returnValue(node); - spyOn(TestBed.inject(ProjectService), 'getThemeSettings').and.returnValue({}); - spyOn(TestBed.inject(ProjectService), 'getNodeById').and.returnValue(node); - spyOn(TestBed.inject(ProjectService), 'getNodePositionById').and.returnValue('1.1'); - spyOn(TestBed.inject(VLEProjectService), 'getSpaces').and.returnValue([]); - spyOn(TestBed.inject(ProjectService), 'getSpeechToTextSettings').and.returnValue({}); - spyOn(TestBed.inject(NotebookService), 'isNotebookEnabled').and.returnValue(false); - fixture.detectChanges(); - }); - - it('should render the step content in the dialog', () => { - expect(fixture.debugElement.nativeElement.innerHTML).toContain(stepTitle); - expect(fixture.debugElement.nativeElement.innerHTML).toContain(prompt); - expect(fixture.debugElement.nativeElement.innerHTML).toContain(stepRubric); - expect(fixture.debugElement.nativeElement.innerHTML).toContain(componentRubric); - }); -}); diff --git a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.ts b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.ts deleted file mode 100644 index a6de55feae0..00000000000 --- a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; -import { MatButtonModule } from '@angular/material/button'; -import { ProjectService } from '../../../assets/wise5/services/projectService'; -import { NodeInfoComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component'; - -@Component({ - imports: [MatButtonModule, MatDialogModule, NodeInfoComponent], - selector: 'show-node-info-dialog', - templateUrl: './show-node-info-dialog.component.html', - styleUrl: './show-node-info-dialog.component.scss' -}) -export class ShowNodeInfoDialogComponent implements OnInit { - @ViewChild('nodeInfoDiv') nodeInfoDiv: ElementRef; - protected stepNumberAndTitle: string; - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public nodeId: string, - private projectService: ProjectService - ) {} - - ngOnInit(): void { - this.stepNumberAndTitle = this.projectService.getNodePositionAndTitle(this.nodeId); - } - - protected openInNewWindow(): void { - const newWindow = window.open('', '_blank'); - newWindow.document.write(this.generateHtmlForNewWindow()); - } - - private generateHtmlForNewWindow(): string { - return ` - - - -
-

- ${this.stepNumberAndTitle} -

-
${this.nodeInfoDiv.nativeElement.innerHTML}
-
- `; - } - - protected close(): void { - this.dialogRef.close(); - } -} diff --git a/src/app/teacher/classroom-monitor.module.ts b/src/app/teacher/classroom-monitor.module.ts index 567df6eee76..565015e0591 100644 --- a/src/app/teacher/classroom-monitor.module.ts +++ b/src/app/teacher/classroom-monitor.module.ts @@ -15,7 +15,6 @@ import { NotebookGradingComponent } from '../../assets/wise5/classroomMonitor/no import { StudentGradingComponent } from '../../assets/wise5/classroomMonitor/student-grading/student-grading.component'; import { StudentProgressComponent } from '../../assets/wise5/classroomMonitor/student-progress/student-progress.component'; import { ClassroomMonitorComponent } from '../../assets/wise5/classroomMonitor/classroom-monitor.component'; -import { ShowNodeInfoDialogComponent } from '../classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; import { MilestoneModule } from './milestone/milestone.module'; import { GradingCommonModule } from './grading-common.module'; import { ManageStudentsModule } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-students.module'; @@ -50,7 +49,6 @@ import { GradingNodeService } from '../../assets/wise5/services/gradingNodeServi PreviewComponentComponent, RouterModule, SelectPeriodComponent, - ShowNodeInfoDialogComponent, StepItemComponent, StudentProgressComponent, StudentTeacherCommonModule, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html index 83c65e1fa50..33a71310343 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.html @@ -14,7 +14,7 @@
}
-
+
diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss index 1bf4bce11d4..7d7af5c6dd1 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading-view/component-grading-view.component.scss @@ -23,5 +23,6 @@ milestone-report-button > *, peer-group-button > * { margin-top: 12px; + margin-inline-end: 8px; } } \ No newline at end of file diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html index 65584cc1d6e..fafa0eccc2a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html @@ -33,7 +33,7 @@

Item Location: {{ getNodeNumberAndTitleByNodeId(milestone.nodeId) }} - (Step Info) + (Step Info)

} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.ts index cbcf4458d18..13b653a524f 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.ts @@ -6,14 +6,13 @@ import { MatTabChangeEvent } from '@angular/material/tabs'; import { ConfigService } from '../../../../services/configService'; import { Subscription } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; -import { ShowNodeInfoDialogComponent } from '../../../../../../app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component'; import { getAvatarColorForWorkgroupId } from '../../../../common/workgroup/workgroup'; @Component({ - selector: 'milestone-details', - styleUrls: ['./milestone-details.component.scss'], - templateUrl: './milestone-details.component.html', - standalone: false + selector: 'milestone-details', + styleUrls: ['./milestone-details.component.scss'], + templateUrl: './milestone-details.component.html', + standalone: false }) export class MilestoneDetailsComponent implements OnInit { currentPeriod: any; @@ -120,11 +119,10 @@ export class MilestoneDetailsComponent implements OnInit { this.dataService.saveEvent(context, nodeId, componentId, componentType, category, event, data); } - protected showMilestoneStepInfo(): void { - this.dialog.open(ShowNodeInfoDialogComponent, { - data: this.milestone.nodeId, - width: '100%' - }); + protected previewProject(): void { + window.open( + this.configService.getConfigParam('previewProjectURL') + `/${this.milestone.nodeId}` + ); } sortAchievementTimeDescending(workgroup: any[]): any[] { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index c4386fb7171..c38b5501b34 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -13,7 +13,7 @@

}

-