Skip to content

Commit 1b0b690

Browse files
hirokiterashimahirokiterashima
committed
Converted component max score authoring to Angular component. #2830 
1 parent 95dad14 commit 1b0b690

16 files changed

Lines changed: 97 additions & 123 deletions

File tree

‎src/main/webapp/site/src/app/authoring-tool/edit-component-max-score/edit-component-max-score.component.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<mat-form-field>
2+
<mat-label i18n>Max Score</mat-label>
3+
<input matInput
4+
type='number'
5+
[(ngModel)]='authoringComponentContent.maxScore'
6+
(ngModelChange)='maxScoreChanged.next($event)'/>
7+
</mat-form-field>

‎src/main/webapp/site/src/app/authoring-tool/edit-component-max-score/edit-component-max-score.component.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { Component, Input } from "@angular/core";
2+
import { Subject, Subscription } from "rxjs";
3+
import { debounceTime, distinctUntilChanged } from "rxjs/operators";
4+
import { TeacherProjectService } from "../../../../../wise5/services/teacherProjectService";
5+
6+
@Component({
7+
selector: 'edit-component-max-score',
8+
templateUrl: 'edit-component-max-score.component.html'
9+
})
10+
export class EditComponentMaxScoreComponent {
11+
12+
@Input()
13+
authoringComponentContent: any;
14+
maxScoreChanged: Subject<string> = new Subject<string>();
15+
maxScoreChangedSubscription: Subscription;
16+
17+
constructor(private ProjectService: TeacherProjectService) {
18+
}
19+
20+
ngOnInit() {
21+
this.maxScoreChangedSubscription = this.maxScoreChanged
22+
.pipe(
23+
debounceTime(1000),
24+
distinctUntilChanged()
25+
)
26+
.subscribe(() => {
27+
this.ProjectService.componentChanged();
28+
});
29+
}
30+
31+
ngOnDestroy() {
32+
this.maxScoreChangedSubscription.unsubscribe();
33+
}
34+
}

‎src/main/webapp/site/src/app/teacher-hybrid-angular.module.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ import { NodeAdvancedJsonAuthoringComponent } from '../../../wise5/authoringTool
2828
import { WorkgroupInfoComponent } from '../../../wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component';
2929
import { NodeAdvancedGeneralAuthoringComponent } from '../../../wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component';
3030
import { WiseAuthoringTinymceEditorComponent } from '../../../wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component';
31-
import { EditComponentRubricComponent } from './authoring-tool/edit-component-rubric/edit-component-rubric.component';
3231
import { EditComponentJsonComponent } from './authoring-tool/edit-component-json/edit-component-json.component';
33-
import { RubricAuthoringComponent } from '../../../wise5/authoringTool/rubric/rubric-authoring.component';
32+
import { EditComponentMaxScoreComponent } from './authoring-tool/edit-component-max-score/edit-component-max-score.component';
3433
import { EditComponentWidthComponent } from './authoring-tool/edit-component-width/edit-component-width.component';
34+
import { EditComponentRubricComponent } from './authoring-tool/edit-component-rubric/edit-component-rubric.component';
35+
import { RubricAuthoringComponent } from '../../../wise5/authoringTool/rubric/rubric-authoring.component';
3536

3637
@NgModule({
3738
declarations: [
@@ -43,6 +44,7 @@ import { EditComponentWidthComponent } from './authoring-tool/edit-component-wid
4344
ComponentNewWorkBadgeComponent,
4445
EditComponentRubricComponent,
4546
EditComponentJsonComponent,
47+
EditComponentMaxScoreComponent,
4648
EditComponentWidthComponent,
4749
ManageStudentsComponent,
4850
MilestoneReportDataComponent,

‎src/main/webapp/wise5/components/animation/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
4242
ng-change='animationController.authoringViewComponentChanged()'/>
4343
</md-input-container>
4444
</div>
45-
<div>
46-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
47-
<label>{{ ::'MAX_SCORE' | translate }}</label>
48-
<input type='number'
49-
ng-model='animationController.authoringComponentContent.maxScore'
50-
ng-model-options='{ debounce: 1000 }'
51-
ng-change='animationController.authoringViewComponentChanged()'/>
52-
</md-input-container>
45+
<div layout="column" layout-align="start start">
46+
<edit-component-max-score [authoring-component-content]="animationController.authoringComponentContent"></edit-component-max-score>
47+
<edit-component-width [authoring-component-content]="animationController.authoringComponentContent"></edit-component-width>
48+
<edit-component-rubric [authoring-component-content]="animationController.authoringComponentContent"></edit-component-rubric>
5349
</div>
54-
<edit-component-width [authoring-component-content]="animationController.authoringComponentContent"></edit-component-width>
55-
<edit-component-rubric [authoring-component-content]="animationController.authoringComponentContent"></edit-component-rubric>
5650
<div>
5751
<div style='height: 50;'>
5852
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/audioOscillator/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
3838
ng-change='audioOscillatorController.authoringViewComponentChanged()'/>
3939
</md-input-container>
4040
</div>
41-
<div>
42-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
43-
<label>{{ ::'MAX_SCORE' | translate }}</label>
44-
<input type='number'
45-
ng-model='audioOscillatorController.authoringComponentContent.maxScore'
46-
ng-model-options='{ debounce: 1000 }'
47-
ng-change='audioOscillatorController.authoringViewComponentChanged()'/>
48-
</md-input-container>
41+
<div layout="column" layout-align="start start">
42+
<edit-component-max-score [authoring-component-content]="audioOscillatorController.authoringComponentContent"></edit-component-max-score>
43+
<edit-component-width [authoring-component-content]="audioOscillatorController.authoringComponentContent"></edit-component-width>
44+
<edit-component-rubric [authoring-component-content]="audioOscillatorController.authoringComponentContent"></edit-component-rubric>
4945
</div>
50-
<edit-component-width [authoring-component-content]="audioOscillatorController.authoringComponentContent"></edit-component-width>
51-
<edit-component-rubric [authoring-component-content]="audioOscillatorController.authoringComponentContent"></edit-component-rubric>
5246
<div>
5347
<div style='height: 50;'>
5448
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/conceptMap/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
129129
ng-change='conceptMapController.authoringViewComponentChanged()'/>
130130
</md-input-container>
131131
</div>
132-
<div>
133-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
134-
<label>{{ ::'MAX_SCORE' | translate }}</label>
135-
<input type='number'
136-
ng-model='conceptMapController.authoringComponentContent.maxScore'
137-
ng-model-options='{ debounce: 1000 }'
138-
ng-change='conceptMapController.authoringViewComponentChanged()'/>
139-
</md-input-container>
132+
<div layout="column" layout-align="start start">
133+
<edit-component-max-score [authoring-component-content]="conceptMapController.authoringComponentContent"></edit-component-max-score>
134+
<edit-component-width [authoring-component-content]="conceptMapController.authoringComponentContent"></edit-component-width>
135+
<edit-component-rubric [authoring-component-content]="conceptMapController.authoringComponentContent"></edit-component-rubric>
140136
</div>
141-
<edit-component-width [authoring-component-content]="conceptMapController.authoringComponentContent"></edit-component-width>
142-
<edit-component-rubric [authoring-component-content]="conceptMapController.authoringComponentContent"></edit-component-rubric>
143137
<div>
144138
<div style='height: 50;'>
145139
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/discussion/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,11 @@
44
<div>
55
<h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
66
</div>
7-
<div>
8-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
9-
<label>{{ ::'MAX_SCORE' | translate }}</label>
10-
<input type='number'
11-
ng-model='discussionController.authoringComponentContent.maxScore'
12-
ng-model-options='{ debounce: 1000 }'
13-
ng-change='discussionController.authoringViewComponentChanged()'/>
14-
</md-input-container>
7+
<div layout="column" layout-align="start start">
8+
<edit-component-max-score [authoring-component-content]="discussionController.authoringComponentContent"></edit-component-max-score>
9+
<edit-component-width [authoring-component-content]="discussionController.authoringComponentContent"></edit-component-width>
10+
<edit-component-rubric [authoring-component-content]="discussionController.authoringComponentContent"></edit-component-rubric>
1511
</div>
16-
<edit-component-width [authoring-component-content]="discussionController.authoringComponentContent"></edit-component-width>
17-
<edit-component-rubric [authoring-component-content]="discussionController.authoringComponentContent"></edit-component-rubric>
1812
<div>
1913
<div style='height: 50;'>
2014
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/draw/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
4343
ng-change='drawController.authoringViewComponentChanged()'/>
4444
</md-input-container>
4545
</div>
46-
<div>
47-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
48-
<label>{{ ::'MAX_SCORE' | translate }}</label>
49-
<input type='number'
50-
ng-model='drawController.authoringComponentContent.maxScore'
51-
ng-model-options='{ debounce: 1000 }'
52-
ng-change='drawController.authoringViewComponentChanged()'/>
53-
</md-input-container>
46+
<div layout="column" layout-align="start start">
47+
<edit-component-max-score [authoring-component-content]="drawController.authoringComponentContent"></edit-component-max-score>
48+
<edit-component-width [authoring-component-content]="drawController.authoringComponentContent"></edit-component-width>
49+
<edit-component-rubric [authoring-component-content]="drawController.authoringComponentContent"></edit-component-rubric>
5450
</div>
55-
<edit-component-width [authoring-component-content]="drawController.authoringComponentContent"></edit-component-width>
56-
<edit-component-rubric [authoring-component-content]="drawController.authoringComponentContent"></edit-component-rubric>
5751
<div>
5852
<div style='height: 50;'>
5953
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/embedded/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
4747
ng-change='embeddedController.authoringViewComponentChanged()'/>
4848
</md-input-container>
4949
</div>
50-
<div>
51-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
52-
<label>{{ ::'MAX_SCORE' | translate }}</label>
53-
<input type='number'
54-
ng-model='embeddedController.authoringComponentContent.maxScore'
55-
ng-model-options='{ debounce: 1000 }'
56-
ng-change='embeddedController.authoringViewComponentChanged()'/>
57-
</md-input-container>
50+
<div layout="column" layout-align="start start">
51+
<edit-component-max-score [authoring-component-content]="embeddedController.authoringComponentContent"></edit-component-max-score>
52+
<edit-component-width [authoring-component-content]="embeddedController.authoringComponentContent"></edit-component-width>
53+
<edit-component-rubric [authoring-component-content]="embeddedController.authoringComponentContent"></edit-component-rubric>
5854
</div>
59-
<edit-component-width [authoring-component-content]="embeddedController.authoringComponentContent"></edit-component-width>
60-
<edit-component-rubric [authoring-component-content]="embeddedController.authoringComponentContent"></edit-component-rubric>
6155
<div>
6256
<div style='height: 50;'>
6357
<label class='node__label--vertical-alignment'>

‎src/main/webapp/wise5/components/graph/authoring.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,11 @@ <h6>{{ ::'advancedAuthoringOptions' | translate }}</h6>
180180
</md-button>
181181
</div>
182182
</div>
183-
<div>
184-
<md-input-container style='margin-right: 20px; width: 150px; height: 25px;'>
185-
<label>{{ ::'MAX_SCORE' | translate }}</label>
186-
<input type='number'
187-
ng-model='graphController.authoringComponentContent.maxScore'
188-
ng-model-options='{ debounce: 1000 }'
189-
ng-change='graphController.authoringViewComponentChanged()'/>
190-
</md-input-container>
183+
<div layout="column" layout-align="start start">
184+
<edit-component-max-score [authoring-component-content]="graphController.authoringComponentContent"></edit-component-max-score>
185+
<edit-component-width [authoring-component-content]="graphController.authoringComponentContent"></edit-component-width>
186+
<edit-component-rubric [authoring-component-content]="graphController.authoringComponentContent"></edit-component-rubric>
191187
</div>
192-
<edit-component-width [authoring-component-content]="graphController.authoringComponentContent"></edit-component-width>
193-
<edit-component-rubric [authoring-component-content]="graphController.authoringComponentContent"></edit-component-rubric>
194188
<div>
195189
<div style='height: 50;'>
196190
<label class='node__label--vertical-alignment'>

0 commit comments

Comments
 (0)