forked from WISE-Community/WISE-DEPRECATED
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added WorkgroupComponentGrading and replaced it in WorkgroupItem. #18
- Loading branch information
1 parent
8508e58
commit 888d4b9
Showing
5 changed files
with
167 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...lassroomMonitorComponents/shared/workgroupComponentGrading/workgroupComponentGrading.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <ng-content ng-switch="::$ctrl.component.type"> | ||
| <div ng-switch-when="AudioOscillator|ConceptMap|Discussion|Draw|Graph|Label|Match|MultipleChoice|OpenResponse|Table" ng-switch-when-separator="|" class="component__content" layout="row" layout-wrap> | ||
| <div flex="100" flex-gt-sm="66" layout="column" class="component--grading__response"> | ||
| <ng-content ng-if="$ctrl.latestComponentState != null && $ctrl.latestComponentState !== ''"> | ||
| <audio-oscillator-grading | ||
| ng-if="$ctrl.component.type === 'AudioOscillator'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </audio-oscillator-grading> | ||
| <concept-map-grading | ||
| ng-if="$ctrl.component.type === 'ConceptMap'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </concept-map-grading> | ||
| <discussion-grading | ||
| ng-if="$ctrl.component.type === 'Discussion'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}" | ||
| workgroup-id="{{::$ctrl.workgroupId}}"> | ||
| </discussion-grading> | ||
| <draw-grading | ||
| ng-if="$ctrl.component.type === 'Draw'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </draw-grading> | ||
| <graph-grading | ||
| ng-if="$ctrl.component.type === 'Graph'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </graph-grading> | ||
| <label-grading | ||
| ng-if="$ctrl.component.type === 'Label'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </label-grading> | ||
| <match-grading | ||
| ng-if="$ctrl.component.type === 'Match'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </match-grading> | ||
| <multiple-choice-grading | ||
| ng-if="$ctrl.component.type === 'MultipleChoice'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </multiple-choice-grading> | ||
| <open-response-grading | ||
| ng-if="$ctrl.component.type === 'OpenResponse'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </open-response-grading> | ||
| <table-grading | ||
| ng-if="$ctrl.component.type === 'Table'" | ||
| node-id="{{::$ctrl.nodeId}}" | ||
| component-id="{{::$ctrl.component.id}}" | ||
| component-state="{{$ctrl.latestComponentState}}"> | ||
| </table-grading> | ||
| <span flex></span> | ||
| <component-revisions-info node-id="::$ctrl.nodeId" | ||
| component-id="::$ctrl.component.id" | ||
| from-workgroup-id="::$ctrl.teacherWorkgroupId" | ||
| to-workgroup-id="::$ctrl.workgroupId" | ||
| component-state="$ctrl.latestComponentState" | ||
| active='true'> | ||
| </component-revisions-info> | ||
| </ng-content> | ||
| </div> | ||
| <div flex="100" flex-gt-sm="33" class="component--grading__annotations"> | ||
| <component-grading node-id="::$ctrl.nodeId" | ||
| component-id="::$ctrl.component.id" | ||
| max-score="$ctrl.component.maxScore" | ||
| from-workgroup-id="::$ctrl.teacherWorkgroupId" | ||
| to-workgroup-id="::$ctrl.workgroupId" | ||
| component-state-id="$ctrl.latestComponentState.id" | ||
| show-all-annotations="false" | ||
| is-disabled="false"> | ||
| </component-grading> | ||
| </div> | ||
| </div> | ||
| <component ng-switch-default class="component-container" | ||
| node-id='{{::$ctrl.nodeId}}' | ||
| component-id='{{::$ctrl.component.id}}' | ||
| component-state='{{$ctrl.latestComponentState}}' | ||
| workgroup-id='::$ctrl.workgroupId' | ||
| teacher-workgroup-id='::$ctrl.teacherWorkgroupId' | ||
| mode='grading'> | ||
| </component> | ||
| </ng-content> |
44 changes: 44 additions & 0 deletions
44
.../classroomMonitorComponents/shared/workgroupComponentGrading/workgroupComponentGrading.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| 'use strict'; | ||
|
|
||
| import { TeacherDataService } from '../../../../services/teacherDataService'; | ||
| import { TeacherProjectService } from '../../../../services/teacherProjectService'; | ||
|
|
||
| class WorkgroupComponentGradingController { | ||
| component: any; | ||
| componentId: string; | ||
| latestComponentState: any; | ||
| nodeId: string; | ||
| workgroupId: number; | ||
|
|
||
| static $inject = ['ProjectService', 'TeacherDataService']; | ||
|
|
||
| constructor( | ||
| private ProjectService: TeacherProjectService, | ||
| private TeacherDataService: TeacherDataService | ||
| ) {} | ||
|
|
||
| $onInit() { | ||
| this.component = this.ProjectService.getComponentByNodeIdAndComponentId( | ||
| this.nodeId, | ||
| this.componentId | ||
| ); | ||
| this.latestComponentState = this.TeacherDataService.getLatestComponentStateByWorkgroupIdNodeIdAndComponentId( | ||
| this.workgroupId, | ||
| this.nodeId, | ||
| this.componentId | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const WorkgroupComponentGrading = { | ||
| bindings: { | ||
| nodeId: '<', | ||
| componentId: '<', | ||
| workgroupId: '<' | ||
| }, | ||
| templateUrl: | ||
| '/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/workgroupComponentGrading/workgroupComponentGrading.html', | ||
| controller: WorkgroupComponentGradingController | ||
| }; | ||
|
|
||
| export default WorkgroupComponentGrading; |