;
+ @ContentChild('headlineTemplate', { static: false }) headlineRef: TemplateRef;
@Input()
tagline: string;
- @ContentChild('taglineTemplate', {static:false}) taglineRef: TemplateRef;
+ @ContentChild('taglineTemplate', { static: false }) taglineRef: TemplateRef;
+
+ @ViewChild('bgRef') bgRef: ElementRef;
bgStyle: SafeStyle;
@@ -28,8 +36,10 @@ export class HeroSectionComponent implements OnInit {
this.sanitizer = sanitizer;
}
- ngOnInit() {
- this.bgStyle = this.getBgStyle();
+ ngAfterViewInit() {
+ this.bgRef.nativeElement.onload = () => {
+ this.bgStyle = this.getBgStyle();
+ }
}
/**
@@ -37,7 +47,7 @@ export class HeroSectionComponent implements OnInit {
* @returns {SafeStyle}
*/
getBgStyle(): SafeStyle {
- const STYLE = `url(${this.imgSrc})`;
- return this.sanitizer.bypassSecurityTrustStyle(STYLE);
+ const style: string = `url(${this.bgRef.nativeElement.currentSrc})`;
+ return this.sanitizer.bypassSecurityTrustStyle(style);
}
}
diff --git a/src/main/webapp/site/src/app/preview/preview-angular-js-module.ts b/src/main/webapp/site/src/app/preview/preview-angular-js-module.ts
index a1b90b68bc..c5a6dd2db9 100644
--- a/src/main/webapp/site/src/app/preview/preview-angular-js-module.ts
+++ b/src/main/webapp/site/src/app/preview/preview-angular-js-module.ts
@@ -9,6 +9,9 @@ import { UtilService } from '../../../../wise5/services/utilService';
import { ConfigService } from '../../../../wise5/services/configService';
import { ProjectService } from '../../../../wise5/services/projectService';
import { VLEProjectService } from '../../../../wise5/vle/vleProjectService';
+import { CRaterService } from '../../../../wise5/services/cRaterService';
+import { SessionService } from '../../../../wise5/services/sessionService';
+import { StudentAssetService } from '../../../../wise5/services/studentAssetService';
@Component({template: ``})
export class EmptyComponent {}
@@ -26,7 +29,10 @@ export class EmptyComponent {}
providers: [
UtilService,
ConfigService,
+ CRaterService,
ProjectService,
+ SessionService,
+ StudentAssetService,
VLEProjectService
]
})
diff --git a/src/main/webapp/site/src/app/services/cRaterService.spec.ts b/src/main/webapp/site/src/app/services/cRaterService.spec.ts
new file mode 100644
index 0000000000..9d5e7c060f
--- /dev/null
+++ b/src/main/webapp/site/src/app/services/cRaterService.spec.ts
@@ -0,0 +1,410 @@
+import { TestBed } from '@angular/core/testing';
+import { CRaterService } from '../../../../wise5/services/cRaterService';
+import { UpgradeModule } from '@angular/upgrade/static';
+import ConfigService from '../../../../wise5/services/configService';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+let service: CRaterService;
+let configService: ConfigService;
+let http: HttpTestingController;
+
+describe('CRaterService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [ HttpClientTestingModule, UpgradeModule ],
+ providers: [ ConfigService, CRaterService ]
+ });
+ http = TestBed.get(HttpTestingController);
+ configService = TestBed.get(ConfigService);
+ service = TestBed.get(CRaterService);
+ });
+
+ makeCRaterScoringRequest();
+ getCRaterItemType();
+ getCRaterItemId();
+ getCRaterScoreOn();
+ isCRaterEnabled();
+ isCRaterScoreOnSave();
+ isCRaterScoreOnSubmit();
+ isCRaterScoreOnChange();
+ getCRaterScoringRuleByScore();
+ getCRaterFeedbackTextByScore();
+ getMultipleAttemptCRaterFeedbackTextByScore();
+ getMultipleAttemptCRaterScoringRuleByScore();
+ makeCRaterVerifyRequest();
+});
+
+function makeCRaterScoringRequest() {
+ describe('makeCRaterScoringRequest()', () => {
+ it('should make a CRater scoring request', () => {
+ spyOn(configService, 'getCRaterRequestURL').and.returnValue('/c-rater')
+ const itemId = 'ColdBeverage1Sub';
+ const responseId = 1;
+ const studentData = 'Hello World.';
+ service.makeCRaterScoringRequest(itemId, responseId, studentData);
+ http.expectOne({
+ url: `/c-rater/score?itemId=${itemId}&responseId=${responseId}` +
+ `&studentData=${encodeURI(studentData)}`,
+ method: 'GET'
+ });
+ });
+ });
+}
+
+function getCRaterItemType() {
+ describe('getCRaterItemType()', () => {
+ it('should get the CRater item type', () => {
+ const itemType = 'CRATER';
+ const component = {
+ cRater: {
+ itemType: itemType
+ }
+ };
+ expect(service.getCRaterItemType(component)).toEqual(itemType);
+ });
+ });
+}
+
+function getCRaterItemId() {
+ describe('getCRaterItemId()', () => {
+ it('should get the CRater Id', () => {
+ const itemId = 'ColdBeverage1Sub';
+ const component = {
+ cRater: {
+ itemId: itemId
+ }
+ };
+ expect(service.getCRaterItemId(component)).toEqual(itemId);
+ });
+ });
+}
+
+function getCRaterScoreOn() {
+ describe('getCRaterScoreOn()', () => {
+ it('should get the CRater score on submit', () => {
+ const scoreOn = 'submit';
+ const component = {
+ enableCRater: true,
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.getCRaterScoreOn(component)).toEqual(scoreOn);
+ });
+
+ it('should get the CRater score on save', () => {
+ const scoreOn = 'save';
+ const component = {
+ enableCRater: true,
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.getCRaterScoreOn(component)).toEqual(scoreOn);
+ });
+
+ it('should get the CRater score on change', () => {
+ const scoreOn = 'change';
+ const component = {
+ enableCRater: true,
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.getCRaterScoreOn(component)).toEqual(scoreOn);
+ });
+ });
+}
+
+function isCRaterEnabled() {
+ describe('isCRaterEnabled()', () => {
+ it('should check if CRater is enabled when true', () => {
+ const component = {
+ enableCRater: true,
+ cRater: {
+ itemType: 'CRATER',
+ itemId: 'ColdBeverage1Sub'
+ }
+ };
+ expect(service.isCRaterEnabled(component)).toEqual(true);
+ });
+
+ it('should check if CRater is enabled when false', () => {
+ const component = {
+ enableCRater: false,
+ cRater: {
+ itemType: 'CRATER',
+ itemId: 'ColdBeverage1Sub'
+ }
+ };
+ expect(service.isCRaterEnabled(component)).toEqual(false);
+ });
+ });
+}
+
+function isCRaterScoreOnSave() {
+ describe('isCRaterScoreOnSave()', () => {
+ it('should get is CRater score on save when true', () => {
+ const scoreOn = 'save';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnSave(component)).toEqual(true);
+ });
+
+ it('should get is CRater score on save when false', () => {
+ const scoreOn = 'submit';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnSave(component)).toEqual(false);
+ });
+ });
+}
+
+function isCRaterScoreOnSubmit() {
+ describe('isCRaterScoreOnSubmit()', () => {
+ it('should get is CRater score on submit when true', () => {
+ const scoreOn = 'submit';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnSubmit(component)).toEqual(true);
+ });
+
+ it('should get is CRater score on submit when false', () => {
+ const scoreOn = 'save';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnSubmit(component)).toEqual(false);
+ });
+ });
+}
+
+function isCRaterScoreOnChange() {
+ describe('isCRaterScoreOnChange()', () => {
+ it('should get is CRater score on change when true', () => {
+ const scoreOn = 'change';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnChange(component)).toEqual(true);
+ });
+
+ it('should get is CRater score on change when false', () => {
+ const scoreOn = 'submit';
+ const component = {
+ cRater: {
+ scoreOn: scoreOn
+ }
+ };
+ expect(service.isCRaterScoreOnChange(component)).toEqual(false);
+ });
+ });
+}
+
+function createScoringRule(score, feedbackText) {
+ return {
+ score: score,
+ feedbackText: feedbackText
+ }
+}
+
+function getCRaterScoringRuleByScore() {
+ describe('getCRaterScoringRuleByScore()', () => {
+ it('should get CRater scoring rule by score 1', () => {
+ const scoringRule1 = createScoringRule(1, 'You received a score of 1.');
+ const scoringRule2 = createScoringRule(2, 'You received a score of 2.');
+ const component = {
+ cRater: {
+ scoringRules: [
+ scoringRule1,
+ scoringRule2
+ ]
+ }
+ };
+ expect(service.getCRaterScoringRuleByScore(component, 1)).toEqual(scoringRule1);
+ });
+
+ it('should get CRater scoring rule by score 2', () => {
+ const scoringRule1 = createScoringRule(1, 'You received a score of 1.');
+ const scoringRule2 = createScoringRule(2, 'You received a score of 2.');
+ const component = {
+ cRater: {
+ scoringRules: [
+ scoringRule1,
+ scoringRule2
+ ]
+ }
+ };
+ expect(service.getCRaterScoringRuleByScore(component, 2)).toEqual(scoringRule2);
+ });
+ });
+}
+
+function getCRaterFeedbackTextByScore() {
+ describe('getCRaterFeedbackTextByScore()', () => {
+ it('should get CRater feedback text by score 1', () => {
+ const feedbackText = 'You received a score of 1.';
+ const scoringRule1 = createScoringRule(1, feedbackText);
+ const scoringRule2 = createScoringRule(2, 'You received a score of 2.');
+ const component = {
+ cRater: {
+ scoringRules: [
+ scoringRule1,
+ scoringRule2
+ ]
+ }
+ };
+ expect(service.getCRaterFeedbackTextByScore(component, 1)).toEqual(feedbackText);
+ });
+
+ it('should get CRater feedback text by score 2', () => {
+ const feedbackText = 'You received a score of 2.';
+ const scoringRule1 = createScoringRule(1, 'You received a score of 1.');
+ const scoringRule2 = createScoringRule(2, feedbackText);
+ const component = {
+ cRater: {
+ scoringRules: [
+ scoringRule1,
+ scoringRule2
+ ]
+ }
+ };
+ expect(service.getCRaterFeedbackTextByScore(component, 2)).toEqual(feedbackText);
+ });
+ });
+}
+
+function getMultipleAttemptCRaterFeedbackTextByScore() {
+ describe('getMultipleAttemptCRaterFeedbackTextByScore()', () => {
+ it('should get multiple attempt CRater feedback text by score 1 then 2', () => {
+ const feedbackText = 'You improved a little.';
+ const component = {
+ cRater: {
+ multipleAttemptScoringRules: [
+ {
+ scoreSequence: [1, 2],
+ feedbackText: feedbackText
+ },
+ {
+ scoreSequence: [2, 1],
+ feedbackText: 'You got worse.'
+ }
+ ]
+ }
+ };
+ expect(service.getMultipleAttemptCRaterFeedbackTextByScore(component, 1, 2))
+ .toEqual(feedbackText);
+ });
+
+ it('should get multiple attempt CRater feedback text by score 2 then 1', () => {
+ const feedbackText = 'You got worse.';
+ const component = {
+ cRater: {
+ multipleAttemptScoringRules: [
+ {
+ scoreSequence: [1, 2],
+ feedbackText: 'You improved a little.'
+ },
+ {
+ scoreSequence: [2, 1],
+ feedbackText: feedbackText
+ }
+ ]
+ }
+ };
+ expect(service.getMultipleAttemptCRaterFeedbackTextByScore(component, 2, 1))
+ .toEqual(feedbackText);
+ });
+ });
+}
+
+function getMultipleAttemptCRaterScoringRuleByScore() {
+ it('should get multiple attempt CRater scoring rule by specific score', () => {
+ const multipleAttemptScoringRule1To2 = {
+ scoreSequence: [1, 2],
+ feedbackText: 'You improved a little.'
+ };
+ const multipleAttemptScoringRule2To1 = {
+ scoreSequence: [2, 1],
+ feedbackText: 'You got worse.'
+ };
+ const component = {
+ cRater: {
+ multipleAttemptScoringRules: [
+ multipleAttemptScoringRule1To2,
+ multipleAttemptScoringRule2To1
+ ]
+ }
+ };
+ expect(service.getMultipleAttemptCRaterScoringRuleByScore(component, 1, 2))
+ .toEqual(multipleAttemptScoringRule1To2);
+ });
+
+ it('should get multiple attempt CRater scoring rule by score with range', () => {
+ const multipleAttemptScoringRule1To45 = {
+ scoreSequence: [1, "4-5"],
+ feedbackText: 'You improved a lot.'
+ };
+ const multipleAttemptScoringRule2To1 = {
+ scoreSequence: [2, 1],
+ feedbackText: 'You got worse.'
+ };
+ const component = {
+ cRater: {
+ multipleAttemptScoringRules: [
+ multipleAttemptScoringRule1To45,
+ multipleAttemptScoringRule2To1
+ ]
+ }
+ };
+ expect(service.getMultipleAttemptCRaterScoringRuleByScore(component, 1, 5))
+ .toEqual(multipleAttemptScoringRule1To45);
+ });
+
+ it('should get multiple attempt CRater scoring rule by score with comma separated values', () => {
+ const multipleAttemptScoringRule1To345 = {
+ scoreSequence: [1, "3,4,5"],
+ feedbackText: 'You improved a lot.'
+ };
+ const multipleAttemptScoringRule2To1 = {
+ scoreSequence: [2, 1],
+ feedbackText: 'You got worse.'
+ };
+ const component = {
+ cRater: {
+ multipleAttemptScoringRules: [
+ multipleAttemptScoringRule1To345,
+ multipleAttemptScoringRule2To1
+ ]
+ }
+ };
+ expect(service.getMultipleAttemptCRaterScoringRuleByScore(component, 1, 4))
+ .toEqual(multipleAttemptScoringRule1To345);
+ });
+}
+
+function makeCRaterVerifyRequest() {
+ describe('makeCRaterVerifyRequest()', () => {
+ it('should make a CRater verify request', () => {
+ spyOn(configService, 'getCRaterRequestURL').and.returnValue('/c-rater')
+ const itemId = 'ColdBeverage1Sub';
+ service.makeCRaterVerifyRequest(itemId);
+ http.expectOne({
+ url: `/c-rater/verify?itemId=${itemId}`,
+ method: 'GET'
+ });
+ });
+ });
+}
\ No newline at end of file
diff --git a/src/main/webapp/site/src/app/services/projectService.spec.ts b/src/main/webapp/site/src/app/services/projectService.spec.ts
index f34bf6bcb4..9ac48d0148 100644
--- a/src/main/webapp/site/src/app/services/projectService.spec.ts
+++ b/src/main/webapp/site/src/app/services/projectService.spec.ts
@@ -25,10 +25,10 @@ describe('ProjectService', () => {
providers: [ ProjectService, ConfigService, UtilService ]
});
http = TestBed.get(HttpTestingController);
- service = TestBed.get(ProjectService);
configService = TestBed.get(ConfigService);
utilService = TestBed.get(UtilService);
- spyOn(utilService, 'broadcastEventInRootScope');
+ spyOn(utilService, 'broadcastEventInRootScope').and.callFake(() => {});
+ service = TestBed.get(ProjectService);
demoProjectJSON = JSON.parse(JSON.stringify(demoProjectJSON_import));
scootersProjectJSON = JSON.parse(JSON.stringify(scootersProjectJSON_import));
});
@@ -71,18 +71,23 @@ describe('ProjectService', () => {
shouldBeAbleToInsertAStepNodeAfterAnotherStepNode();
shouldBeAbleToInsertAnActivityNodeAfterAnotherActivityNode();
shouldNotBeAbleToInsertANodeAfterAnotherNodeWhenTheyAreDifferentTypes();
- shouldBeAbleToInsertAStepNodeInsideAnGroupNode();
+ shouldBeAbleToInsertAStepNodeInsideAGroupNode();
shouldBeAbleToInsertAGroupNodeInsideAGroupNode();
shouldNotBeAbleToInsertAStepNodeInsideAStepNode();
shouldDeleteAStepFromTheProject();
shouldDeleteAnInactiveStepFromTheProject();
shouldDeleteAStepThatIsTheStartIdOfTheProject();
+ shouldDeleteAStepThatIsTheLastStepOfTheProject();
shouldDeleteAStepThatIsTheStartIdOfAnAactivityThatIsNotTheFirstActivity();
shouldDeleteTheFirstActivityFromTheProject();
- shouldDeleteAnActivityThatIsNotTheFirstFromTheProject();
+ shouldDeleteAnActivityInTheMiddleOfTheProject();
+ shouldDeleteTheLastActivityFromTheProject();
calculateNodeOrder();
getGroupNodesIdToOrder();
getUniqueAuthors();
+ deleteActivityWithBranching();
+ deleteTheLastStepInAnActivity();
+ deleteAllStepsInAnActivity();
// TODO: add test for service.getFlattenedProjectAsNodeIds()
// TODO: add test for service.getAllPaths()
// TODO: add test for service.consolidatePaths()
@@ -190,7 +195,7 @@ function shouldRetrieveProjectWhenConfigProjectURLIsValid() {
service.retrieveProject().then((response) => {
expect(response).toEqual(scootersProjectJSON);
});
- http.expectOne(projectURL).flush(scootersProjectJSON);
+ http.expectOne(projectURL);
});
}
@@ -215,7 +220,7 @@ function shouldSaveProject() {
service.setProject(scootersProjectJSON);
service.saveProject();
expect(configService.getConfigParam).toHaveBeenCalledWith('saveProjectURL');
- http.expectOne(saveProjectURL).flush({status: 'success'});
+ http.expectOne(saveProjectURL);
});
}
@@ -713,7 +718,7 @@ function shouldNotBeAbleToInsertANodeAfterAnotherNodeWhenTheyAreDifferentTypes()
});
}
-function shouldBeAbleToInsertAStepNodeInsideAnGroupNode() {
+function shouldBeAbleToInsertAStepNodeInsideAGroupNode() {
it('should be able to insert a step node inside an group node', () => {
service.setProject(demoProjectJSON);
const node1 = service.getNodeById('node1');
@@ -759,7 +764,7 @@ function shouldNotBeAbleToInsertAStepNodeInsideAStepNode() {
function shouldDeleteAStepFromTheProject() {
it('should delete a step from the project', () => {
service.setProject(demoProjectJSON);
- expect(service.getNodes().length).toEqual(37);
+ expect(service.getNodes().length).toEqual(48);
expect(service.getNodeById('node5')).not.toBeNull();
expect(
service.nodeHasTransitionToNodeId(service.getNodeById('node4'), 'node5')
@@ -769,7 +774,7 @@ function shouldDeleteAStepFromTheProject() {
).toBeTruthy();
expect(service.getNodesWithTransitionToNodeId('node6').length).toEqual(1);
service.deleteNode('node5');
- expect(service.getNodes().length).toEqual(36);
+ expect(service.getNodes().length).toEqual(47);
expect(service.getNodeById('node5')).toBeNull();
expect(
service.nodeHasTransitionToNodeId(service.getNodeById('node4'), 'node6')
@@ -800,8 +805,24 @@ function shouldDeleteAStepThatIsTheStartIdOfTheProject() {
});
}
+function shouldDeleteAStepThatIsTheLastStepOfTheProject() {
+ it('should delete a step that is the last step of the project', () => {
+ service.setProject(demoProjectJSON);
+ expect(service.getTransitionsByFromNodeId('node797').length).toEqual(1);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('node797'), 'node798')
+ ).toBeTruthy();
+ service.deleteNode('node798');
+ expect(service.getTransitionsByFromNodeId('node797').length).toEqual(0);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('node797'), 'node798')
+ ).toBeFalsy();
+ });
+}
+
function shouldDeleteAStepThatIsTheStartIdOfAnAactivityThatIsNotTheFirstActivity() {
- it('should delete a step that is the start id of an activity that is not the first activity', () => {
+ it('should delete a step that is the start id of an activity that is not the first activity',
+ () => {
service.setProject(demoProjectJSON);
expect(service.getGroupStartId('group2')).toEqual('node20');
expect(
@@ -823,31 +844,49 @@ function shouldDeleteTheFirstActivityFromTheProject() {
service.setProject(demoProjectJSON);
expect(service.getGroupStartId('group0')).toEqual('group1');
expect(service.getStartNodeId()).toEqual('node1');
- expect(service.getNodes().length).toEqual(37);
+ expect(service.getNodes().length).toEqual(48);
expect(service.getNodesWithTransitionToNodeId('node20').length).toEqual(1);
service.deleteNode('group1');
expect(service.getNodeById('group1')).toBeNull();
expect(service.getGroupStartId('group0')).toEqual('group2');
expect(service.getStartNodeId()).toEqual('node20');
- expect(service.getNodes().length).toEqual(17);
+ expect(service.getNodes().length).toEqual(28);
expect(service.getNodesWithTransitionToNodeId('node20').length).toEqual(0);
});
}
-function shouldDeleteAnActivityThatIsNotTheFirstFromTheProject() {
- it('should delete an activity that is not the first from the project', () => {
+function shouldDeleteAnActivityInTheMiddleOfTheProject() {
+ it('should delete an activity that is in the middle of the project', () => {
service.setProject(demoProjectJSON);
expect(
- service.nodeHasTransitionToNodeId(service.getNodeById('group1'), 'group2')
+ service.nodeHasTransitionToNodeId(service.getNodeById('group2'), 'group3')
).toBeTruthy();
- expect(service.getTransitionsByFromNodeId('group1').length).toEqual(1);
- expect(service.getNodes().length).toEqual(37);
- service.deleteNode('group2');
+ expect(service.getNodes().length).toEqual(48);
+ service.deleteNode('group3');
expect(
- service.nodeHasTransitionToNodeId(service.getNodeById('group1'), 'group2')
+ service.nodeHasTransitionToNodeId(service.getNodeById('group2'), 'group3')
).toBeFalsy();
- expect(service.getTransitionsByFromNodeId('group1').length).toEqual(0);
- expect(service.getNodes().length).toEqual(21);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('group2'), 'group4')
+ ).toBeTruthy();
+ expect(service.getNodes().length).toEqual(45);
+ });
+}
+
+function shouldDeleteTheLastActivityFromTheProject() {
+ it('should delete the last activity from the project', () => {
+ service.setProject(demoProjectJSON);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('group3'), 'group4')
+ ).toBeTruthy();
+ expect(service.getTransitionsByFromNodeId('group3').length).toEqual(1);
+ expect(service.getNodes().length).toEqual(48);
+ service.deleteNode('group4');
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('group3'), 'group4')
+ ).toBeFalsy();
+ expect(service.getTransitionsByFromNodeId('group3').length).toEqual(0);
+ expect(service.getNodes().length).toEqual(40);
});
}
@@ -878,7 +917,9 @@ function getGroupNodesIdToOrder() {
expect(service.getGroupNodesIdToOrder()).toEqual({
group0: { order: 0 },
group1: { order: 1 },
- group2: { order: 21 }
+ group2: { order: 21 },
+ group3: { order: 37 },
+ group4: { order: 40 }
});
});
});
@@ -945,3 +986,68 @@ function getUniqueAuthors() {
});
});
}
+
+function deleteActivityWithBranching() {
+ it(`should delete an activity with branching and is also the first activity in the project
+ and properly set the project start node id`, () => {
+ service.setProject(demoProjectJSON);
+ expect(service.getStartNodeId()).toEqual('node1');
+ service.deleteNode('group1');
+ expect(service.getStartNodeId()).toEqual('node20');
+ });
+
+ it(`should delete an activity in the middle of the project with branching and properly remove
+ transitions from remaining steps`, () => {
+ service.setProject(demoProjectJSON);
+ const node19 = service.getNodeById('node19');
+ const node19Transitions = node19.transitionLogic.transitions;
+ expect(node19Transitions.length).toEqual(1);
+ expect(node19Transitions[0].to).toEqual('node20');
+ service.deleteNode('group2');
+ expect(node19Transitions.length).toEqual(1);
+ expect(node19Transitions[0].to).toEqual('node790');
+ });
+
+ it(`should delete an activity at the end of the project with branching and properly remove
+ transitions from remaining steps`, () => {
+ service.setProject(demoProjectJSON);
+ const node791 = service.getNodeById('node791');
+ const node791Transitions = node791.transitionLogic.transitions;
+ expect(node791Transitions.length).toEqual(1);
+ expect(node791Transitions[0].to).toEqual('node792');
+ service.deleteNode('group4');
+ expect(node791Transitions.length).toEqual(0);
+ });
+}
+
+function deleteTheLastStepInAnActivity() {
+ it(`should delete the last step in an activity in the middle of the project and set previous
+ step to transition to the first step of the next activity`, () => {
+ service.setProject(demoProjectJSON);
+ const node790Transitions = service.getTransitionsByFromNodeId('node790');
+ expect(node790Transitions.length).toEqual(1);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('node790'), 'node791')
+ ).toBeTruthy();
+ service.deleteNode('node791');
+ expect(node790Transitions.length).toEqual(1);
+ expect(
+ service.nodeHasTransitionToNodeId(service.getNodeById('node790'), 'node792')
+ ).toBeTruthy();
+ });
+}
+
+function deleteAllStepsInAnActivity() {
+ it(`should delete all steps in an activity in the middle of the project and set previous step
+ to transition to activity`, () => {
+ service.setProject(demoProjectJSON);
+ const node34 = service.getNodeById('node34');
+ const node34Transitions = node34.transitionLogic.transitions;
+ expect(node34Transitions.length).toEqual(1);
+ expect(node34Transitions[0].to).toEqual('node790');
+ service.deleteNode('node790');
+ service.deleteNode('node791');
+ expect(node34Transitions.length).toEqual(1);
+ expect(node34Transitions[0].to).toEqual('group3');
+ });
+}
\ No newline at end of file
diff --git a/src/main/webapp/site/src/app/services/sampleData/curriculum/Demo.project.json b/src/main/webapp/site/src/app/services/sampleData/curriculum/Demo.project.json
index 8260dd8d7c..cd3a9426c3 100644
--- a/src/main/webapp/site/src/app/services/sampleData/curriculum/Demo.project.json
+++ b/src/main/webapp/site/src/app/services/sampleData/curriculum/Demo.project.json
@@ -1,1780 +1,2515 @@
{
"nodes": [
- {
- "id": "group0",
- "type": "group",
- "title": "Master",
- "startId": "group1",
- "ids": [
- "group1",
- "group2"
- ],
- "transitionLogic": {
- "transitions": [
- {
- "to": "group1"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- }
- },
- {
- "id": "group1",
- "type": "group",
- "title": "Example Steps",
- "startId": "node1",
- "ids": [
- "node1",
- "node2",
- "node3",
- "node4",
- "node5",
- "node6",
- "node7",
- "node8",
- "node9",
- "node10",
- "node11",
- "node12",
- "node13",
- "node14",
- "node15",
- "node16",
- "node17",
- "node18",
- "node19"
- ],
- "transitionLogic": {
- "transitions": [
- {
- "to": "group2"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- }
- },
- {
- "id": "node1",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node2"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- },
- "title": "HTML Step",
- "components": [
- {
- "id": "zh4h1urdys",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nThis is a step where authors can enter their own html. Authors can also embed images and videos.
\n![\"\"](\"nyan_cat.png\")
\n\n\n"
- }
- ]
- },
- {
- "id": "node2",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node3"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- },
- "title": "Open Response Step",
- "components": [
- {
- "id": "7edwu1p29b",
- "type": "OpenResponse",
- "prompt": "This is a step where students enter text.
"
- }
- ]
- },
- {
- "id": "node3",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node4"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- },
- "title": "Open Response Step Auto Graded",
- "components": [
- {
- "id": "0sef5ya2wj",
- "type": "OpenResponse",
- "prompt": "This is an auto-graded step that will give the student an automated score and automated text feedback. (Note: the auto graded functionality only works in a run and does not work when simply previewing the project)
\nExplain how the sun helps animals survive.
"
- }
- ]
- },
- {
- "id": "node4",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node5"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- },
- "title": "Note Step",
- "components": [
- {
- "id": "9rfz8yh32s",
- "type": "OpenResponse",
- "prompt": "This is similar to an open response step but the text entry area opens in a popup so that students can still see the content from the previous step.
"
- }
- ]
- },
- {
- "id": "node5",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node6"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
- },
- "title": "Multiple Choice Step Single Answer",
- "components": [
- {
- "id": "09hahe7wsm",
- "type": "MultipleChoice",
- "prompt": "This is a multiple choice step where the student is allowed to choose one choice.
\nWho lives in a pineapple under the sea?
",
- "choices": [
- {
- "id": "y6rvd7eziz",
- "text": "Spongebob",
- "feedback": "Great Job!",
- "isCorrect": true
- },
- {
- "id": "ti5rd0es02",
- "text": "Patrick",
- "feedback": "Patrick doesn't live in a pineapple, he lives under a rock",
- "isCorrect": false
- },
- {
- "id": "gb0cnkaiem",
- "text": "Squidward",
- "feedback": "Squidward doesn't live in a pineapple, he lives in an Easter island head",
- "isCorrect": false
- }
+ {
+ "id": "group0",
+ "type": "group",
+ "title": "Master",
+ "startId": "group1",
+ "ids": [
+ "group1",
+ "group2",
+ "group3",
+ "group4"
],
- "showSaveButton": false,
- "showSubmitButton": true,
- "choiceType": "radio"
- }
- ]
- },
- {
- "id": "node6",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node7"
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "group1"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
}
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Multiple Choice Step Multiple Answer",
- "components": [
- {
- "id": "ajsdwjugeb",
- "type": "MultipleChoice",
- "prompt": "This is a multiple choice step where the student is allowed to choose multiple choices.
\nWhich of these are Ninja Turtles?
",
- "choices": [
- {
- "id": "ofjky47v57",
- "text": "Leonardo",
- "feedback": "Great Job you know your Ninja Turtles",
- "isCorrect": true
- },
- {
- "id": "dvsbhlfemx",
- "text": "Donatello",
- "feedback": "Great Job you know your Ninja Turtles",
- "isCorrect": true
- },
- {
- "id": "i8et2px6m3",
- "text": "Michelangelo",
- "feedback": "Great Job you know your Ninja Turtles",
- "isCorrect": true
- },
- {
- "id": "60gxmv4c76",
- "text": "Raphael",
- "feedback": "Great Job you know your Ninja Turtles",
- "isCorrect": true
- },
- {
- "id": "2oxfbn09lk",
- "text": "Squirtle",
- "feedback": "Squirtle is a Pokemon",
- "isCorrect": false
- }
+ {
+ "id": "group1",
+ "type": "group",
+ "title": "Example Steps",
+ "startId": "node1",
+ "ids": [
+ "node1",
+ "node2",
+ "node3",
+ "node4",
+ "node5",
+ "node6",
+ "node7",
+ "node8",
+ "node9",
+ "node10",
+ "node11",
+ "node12",
+ "node13",
+ "node14",
+ "node15",
+ "node16",
+ "node17",
+ "node18",
+ "node19"
],
- "showSaveButton": false,
- "showSubmitButton": true,
- "choiceType": "checkbox"
- }
- ]
- },
- {
- "id": "node7",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node8"
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "group2"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
}
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Challenge Question Step",
- "components": [
- {
- "id": "ms0ene7xrh",
- "type": "MultipleChoice",
- "prompt": "This is a multiple choice step that the student must answer correctly before they can move forward in the project. If the student gets the question wrong, they must go back to Step 1.1 in order to attempt the step again. This type of step is used to get students to review content when they get the question wrong.
\nBulbasaur is what type of Pokemon?
",
- "choices": [
- {
- "id": "0wxjeaix4n",
- "text": "Grass/Poison",
- "feedback": "Correct",
- "isCorrect": true
- },
- {
- "id": "bwl0aqj90i",
- "text": "Fire",
- "feedback": "Sorry, Bulbasaur is not a fire type Pokemon.",
- "isCorrect": false
- },
- {
- "id": "9yyn6ng60p",
- "text": "Water",
- "feedback": "Sorry, Bulbasaur is not a water type Pokemon.",
- "isCorrect": false
- }
- ],
+ {
+ "id": "node1",
+ "type": "node",
"showSaveButton": false,
- "showSubmitButton": true,
- "choiceType": "radio"
- }
- ]
- },
- {
- "id": "node8",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node9"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node2"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "HTML Step",
+ "components": [
+ {
+ "id": "zh4h1urdys",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nThis is a step where authors can enter their own html. Authors can also embed images and videos.
\n
\n\n\n"
+ }
+ ]
},
- "title": "Match Sequence Step",
- "components": [
- {
- "id": "ja98ry0n0e",
- "type": "Match",
- "prompt": "This is a step where students must drag and drop choices into the appropriate bucket.
\nMatch the controllers with the appropriate console. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
",
- "choices": [
- {
- "id": "w2jmubyq0i",
- "value": "
",
- "type": "choice"
- },
- {
- "id": "zxi4ncxv0x",
- "value": "
",
- "type": "choice"
- }
- ],
- "buckets": [
- {
- "id": "rrisawrk19",
- "value": "Playstation 4",
- "type": "bucket"
- },
- {
- "id": "b04777i4m1",
- "value": "Xbox One",
- "type": "bucket"
- }
- ],
- "feedback": [
- {
- "bucketId": "rrisawrk19",
- "choices": [
- {
- "choiceId": "w2jmubyq0i",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zxi4ncxv0x",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- },
- {
- "bucketId": "b04777i4m1",
- "choices": [
- {
- "choiceId": "w2jmubyq0i",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zxi4ncxv0x",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- }
- ],
- "showSaveButton": false,
- "showSubmitButton": true,
- "ordered": false
- }
- ]
- },
- {
- "id": "node9",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node10"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node2",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node3"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Open Response Step",
+ "components": [
+ {
+ "id": "7edwu1p29b",
+ "type": "OpenResponse",
+ "prompt": "This is a step where students enter text.
"
+ }
+ ]
},
- "title": "Match Sequence Step Ordered",
- "components": [
- {
- "id": "8h4fxsg2wi",
- "type": "Match",
- "prompt": "Authors can require the choices to be placed in a specific order within a bucket. Place the Playstation console images into the Playstation History bucket in the order of oldest to newest. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
",
- "choices": [
- {
- "id": "87b5i860r9",
- "value": "
",
- "type": "choice"
- },
- {
- "id": "zy2uvk0i2k",
- "value": "
",
- "type": "choice"
- },
- {
- "id": "py0oik2bdx",
- "value": "
",
- "type": "choice"
- },
- {
- "id": "cxi69s3hqo",
- "value": "
",
- "type": "choice"
- },
- {
- "id": "kg0daqbcg4",
- "value": "Xbone",
- "type": "choice"
- },
- {
- "id": "1gfvbimpj3",
- "value": "Xbox 360",
- "type": "choice"
- },
- {
- "id": "sxfctzt39y",
- "value": "Xbox 1",
- "type": "choice"
- }
- ],
- "buckets": [
- {
- "id": "pf7ym43t9m",
- "value": "Playstation History",
- "type": "bucket"
- },
- {
- "id": "btvrrgacyr",
- "value": "Xbox History",
- "type": "bucket"
- }
- ],
- "feedback": [
- {
- "bucketId": "pf7ym43t9m",
- "choices": [
- {
- "choiceId": "87b5i860r9",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 1,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zy2uvk0i2k",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 2,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "py0oik2bdx",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 3,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "cxi69s3hqo",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 4,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "kg0daqbcg4",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "1gfvbimpj3",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "sxfctzt39y",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- },
- {
- "bucketId": "btvrrgacyr",
- "choices": [
- {
- "choiceId": "87b5i860r9",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zy2uvk0i2k",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "py0oik2bdx",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "cxi69s3hqo",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "kg0daqbcg4",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 3,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "1gfvbimpj3",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 2,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "sxfctzt39y",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 1,
- "incorrectPositionFeedback": null
- }
- ]
- }
- ],
- "showSaveButton": false,
- "showSubmitButton": true,
- "ordered": true
- }
- ]
- },
- {
- "id": "node10",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node11"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node3",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node4"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Open Response Step Auto Graded",
+ "components": [
+ {
+ "id": "0sef5ya2wj",
+ "type": "OpenResponse",
+ "prompt": "This is an auto-graded step that will give the student an automated score and automated text feedback. (Note: the auto graded functionality only works in a run and does not work when simply previewing the project)
\nExplain how the sun helps animals survive.
"
+ }
+ ]
},
- "title": "Questionnaire Step",
- "components": [
- {
- "id": "m97kyu4d4v",
- "type": "HTML",
- "html": "This is a step where students must answer a series of questions that are either text or mulitple choice questions. This step is set up so that the student must answer all the questions before they can move to any other step. Once the student submits their answer, they can no longer change their answer. These restrictions can be turned on or off for this step type.
"
- },
- {
- "id": "yhrumlct2t",
- "prompt": "What is your favorite type of food?",
- "type": "OpenResponse"
- },
- {
- "id": "2upmb3om1q",
- "prompt": "What is your favorite type of chocolate?",
- "type": "MultipleChoice",
- "choiceType": "radio",
- "choices": [
- {
- "id": "cri2anfnxg",
- "text": "White",
- "feedback": ""
- },
- {
- "id": "fzroe37gyx",
- "text": "Dark",
- "feedback": ""
- },
- {
- "id": "di49m0lc72",
- "text": "Milk",
- "feedback": ""
- }
- ],
- "correctChoice": "fzroe37gyx"
- },
- {
- "id": "srof14u22x",
- "prompt": "What is your favorite movie?",
- "type": "OpenResponse"
- },
- {
- "id": "cjv5kq5290",
- "prompt": "Edit prompt here",
- "type": "MultipleChoice",
- "choiceType": "checkbox",
- "choices": [
- {
- "id": "y1cdkafo2u",
- "text": [
- "Enter choice text here"
+ {
+ "id": "node4",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node5"
+ }
],
- "feedback": ""
- },
- {
- "id": "lcnhnc2myc",
- "text": [
- "Enter choice text here"
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Note Step",
+ "components": [
+ {
+ "id": "9rfz8yh32s",
+ "type": "OpenResponse",
+ "prompt": "This is similar to an open response step but the text entry area opens in a popup so that students can still see the content from the previous step.
"
+ }
+ ]
+ },
+ {
+ "id": "node5",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node6"
+ }
],
- "feedback": ""
- }
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Multiple Choice Step Single Answer",
+ "components": [
+ {
+ "id": "09hahe7wsm",
+ "type": "MultipleChoice",
+ "prompt": "This is a multiple choice step where the student is allowed to choose one choice.
\nWho lives in a pineapple under the sea?
",
+ "choices": [
+ {
+ "id": "y6rvd7eziz",
+ "text": "Spongebob",
+ "feedback": "Great Job!",
+ "isCorrect": true
+ },
+ {
+ "id": "ti5rd0es02",
+ "text": "Patrick",
+ "feedback": "Patrick doesn't live in a pineapple, he lives under a rock",
+ "isCorrect": false
+ },
+ {
+ "id": "gb0cnkaiem",
+ "text": "Squidward",
+ "feedback": "Squidward doesn't live in a pineapple, he lives in an Easter island head",
+ "isCorrect": false
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "choiceType": "radio"
+ }
]
- }
- ]
- },
- {
- "id": "node11",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node12"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Draw Step",
- "components": [
- {
- "id": "9qwqc5uslq",
- "type": "Draw",
- "prompt": "This is a draw step where the student can draw a diagram.
",
- "stamps": {
- "Stamps": []
- }
- }
- ]
- },
- {
- "id": "node12",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node13"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node6",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node7"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Multiple Choice Step Multiple Answer",
+ "components": [
+ {
+ "id": "ajsdwjugeb",
+ "type": "MultipleChoice",
+ "prompt": "This is a multiple choice step where the student is allowed to choose multiple choices.
\nWhich of these are Ninja Turtles?
",
+ "choices": [
+ {
+ "id": "ofjky47v57",
+ "text": "Leonardo",
+ "feedback": "Great Job you know your Ninja Turtles",
+ "isCorrect": true
+ },
+ {
+ "id": "dvsbhlfemx",
+ "text": "Donatello",
+ "feedback": "Great Job you know your Ninja Turtles",
+ "isCorrect": true
+ },
+ {
+ "id": "i8et2px6m3",
+ "text": "Michelangelo",
+ "feedback": "Great Job you know your Ninja Turtles",
+ "isCorrect": true
+ },
+ {
+ "id": "60gxmv4c76",
+ "text": "Raphael",
+ "feedback": "Great Job you know your Ninja Turtles",
+ "isCorrect": true
+ },
+ {
+ "id": "2oxfbn09lk",
+ "text": "Squirtle",
+ "feedback": "Squirtle is a Pokemon",
+ "isCorrect": false
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "choiceType": "checkbox"
+ }
+ ]
},
- "title": "Draw Step Auto Graded",
- "components": [
- {
- "id": "nvjkidstry",
- "type": "Draw",
- "prompt": "This is an auto graded draw step. Click the 'Submit' button to have your drawing auto graded.
\n
\n(1) Use stamps to create TWO methane molecules (CH4).
\n(2) Create EXACTLY the number of oxygen molecules (O2) needed to react with your TWO methane molecules.
\n(3) Create a new frame.
\n(4) REARRANGE the atoms in the 2nd frame to make carbon dioxide (CO2) and water (H2O) molecules. Show clearly which atoms belong to which molecules.
",
- "stamps": {
- "Stamps": [
- "carbon.png",
- "oxygen.png",
- "hydrogen.png"
- ]
- }
- }
- ]
- },
- {
- "id": "node13",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node14"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node7",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node8"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Challenge Question Step",
+ "components": [
+ {
+ "id": "ms0ene7xrh",
+ "type": "MultipleChoice",
+ "prompt": "This is a multiple choice step that the student must answer correctly before they can move forward in the project. If the student gets the question wrong, they must go back to Step 1.1 in order to attempt the step again. This type of step is used to get students to review content when they get the question wrong.
\nBulbasaur is what type of Pokemon?
",
+ "choices": [
+ {
+ "id": "0wxjeaix4n",
+ "text": "Grass/Poison",
+ "feedback": "Correct",
+ "isCorrect": true
+ },
+ {
+ "id": "bwl0aqj90i",
+ "text": "Fire",
+ "feedback": "Sorry, Bulbasaur is not a fire type Pokemon.",
+ "isCorrect": false
+ },
+ {
+ "id": "9yyn6ng60p",
+ "text": "Water",
+ "feedback": "Sorry, Bulbasaur is not a water type Pokemon.",
+ "isCorrect": false
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "choiceType": "radio"
+ }
+ ]
},
- "title": "Brainstorm Step",
- "components": [
- {
- "id": "dnz279bdvc",
- "type": "Discussion",
- "prompt": "This is a forum discussion type of step where students can post their response and then see their classmates' responses. (Note: the brainstorm step only works in a run and does not work when simply previewing the project)
",
- "showSaveButton": false,
- "showSubmitButton": true,
- "gateClassmateResponses": false
- }
- ]
- },
- {
- "id": "node14",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node15"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node8",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node9"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Match Sequence Step",
+ "components": [
+ {
+ "id": "ja98ry0n0e",
+ "type": "Match",
+ "prompt": "This is a step where students must drag and drop choices into the appropriate bucket.
\nMatch the controllers with the appropriate console. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
",
+ "choices": [
+ {
+ "id": "w2jmubyq0i",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "zxi4ncxv0x",
+ "value": "",
+ "type": "choice"
+ }
+ ],
+ "buckets": [
+ {
+ "id": "rrisawrk19",
+ "value": "Playstation 4",
+ "type": "bucket"
+ },
+ {
+ "id": "b04777i4m1",
+ "value": "Xbox One",
+ "type": "bucket"
+ }
+ ],
+ "feedback": [
+ {
+ "bucketId": "rrisawrk19",
+ "choices": [
+ {
+ "choiceId": "w2jmubyq0i",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zxi4ncxv0x",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ },
+ {
+ "bucketId": "b04777i4m1",
+ "choices": [
+ {
+ "choiceId": "w2jmubyq0i",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zxi4ncxv0x",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "ordered": false
+ }
+ ]
},
- "title": "Table Step",
- "components": [
- {
- "id": "y45mn2k7yl",
- "type": "Table",
- "prompt": "This is a table step where students fill out a table. You can make certain cells editable and other cells uneditable so the student can't change them. You can also allow the student to add/delete columns as well as add/delete rows.",
- "globalCellSize": 10,
- "tableData": [
- [
- {
- "text": "Object",
- "editable": false,
- "size": null
- },
+ {
+ "id": "node9",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node10"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Match Sequence Step Ordered",
+ "components": [
{
- "text": "Count",
- "editable": false,
- "size": null
+ "id": "8h4fxsg2wi",
+ "type": "Match",
+ "prompt": "Authors can require the choices to be placed in a specific order within a bucket. Place the Playstation console images into the Playstation History bucket in the order of oldest to newest. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
",
+ "choices": [
+ {
+ "id": "87b5i860r9",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "zy2uvk0i2k",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "py0oik2bdx",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "cxi69s3hqo",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "kg0daqbcg4",
+ "value": "Xbone",
+ "type": "choice"
+ },
+ {
+ "id": "1gfvbimpj3",
+ "value": "Xbox 360",
+ "type": "choice"
+ },
+ {
+ "id": "sxfctzt39y",
+ "value": "Xbox 1",
+ "type": "choice"
+ }
+ ],
+ "buckets": [
+ {
+ "id": "pf7ym43t9m",
+ "value": "Playstation History",
+ "type": "bucket"
+ },
+ {
+ "id": "btvrrgacyr",
+ "value": "Xbox History",
+ "type": "bucket"
+ }
+ ],
+ "feedback": [
+ {
+ "bucketId": "pf7ym43t9m",
+ "choices": [
+ {
+ "choiceId": "87b5i860r9",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 1,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zy2uvk0i2k",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 2,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "py0oik2bdx",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 3,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "cxi69s3hqo",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 4,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "kg0daqbcg4",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "1gfvbimpj3",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "sxfctzt39y",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ },
+ {
+ "bucketId": "btvrrgacyr",
+ "choices": [
+ {
+ "choiceId": "87b5i860r9",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zy2uvk0i2k",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "py0oik2bdx",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "cxi69s3hqo",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "kg0daqbcg4",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 3,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "1gfvbimpj3",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 2,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "sxfctzt39y",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 1,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "ordered": true
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node10",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node11"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Questionnaire Step",
+ "components": [
{
- "text": "Computers",
- "editable": true,
- "size": null
+ "id": "m97kyu4d4v",
+ "type": "HTML",
+ "html": "This is a step where students must answer a series of questions that are either text or mulitple choice questions. This step is set up so that the student must answer all the questions before they can move to any other step. Once the student submits their answer, they can no longer change their answer. These restrictions can be turned on or off for this step type.
"
},
{
- "text": "",
- "editable": true,
- "size": null
- }
- ],
- [
- {
- "text": "Phones",
- "editable": true,
- "size": null
+ "id": "yhrumlct2t",
+ "prompt": "What is your favorite type of food?",
+ "type": "OpenResponse"
},
{
- "text": "",
- "editable": true,
- "size": null
- }
- ],
- [
+ "id": "2upmb3om1q",
+ "prompt": "What is your favorite type of chocolate?",
+ "type": "MultipleChoice",
+ "choiceType": "radio",
+ "choices": [
+ {
+ "id": "cri2anfnxg",
+ "text": "White",
+ "feedback": ""
+ },
+ {
+ "id": "fzroe37gyx",
+ "text": "Dark",
+ "feedback": ""
+ },
+ {
+ "id": "di49m0lc72",
+ "text": "Milk",
+ "feedback": ""
+ }
+ ],
+ "correctChoice": "fzroe37gyx"
+ },
{
- "text": "",
- "editable": true,
- "size": null
+ "id": "srof14u22x",
+ "prompt": "What is your favorite movie?",
+ "type": "OpenResponse"
},
{
- "text": "",
- "editable": true,
- "size": null
+ "id": "cjv5kq5290",
+ "prompt": "Edit prompt here",
+ "type": "MultipleChoice",
+ "choiceType": "checkbox",
+ "choices": [
+ {
+ "id": "y1cdkafo2u",
+ "text": [
+ "Enter choice text here"
+ ],
+ "feedback": ""
+ },
+ {
+ "id": "lcnhnc2myc",
+ "text": [
+ "Enter choice text here"
+ ],
+ "feedback": ""
+ }
+ ]
}
- ]
]
- },
- {
- "id": "d9ioo01pa1",
- "type": "OpenResponse",
- "prompt": ""
- }
- ]
- },
- {
- "id": "node15",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node16"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Table Step Line Graph",
- "components": [
- {
- "id": "wtw3q7peip",
- "type": "Table",
- "prompt": "The table step can be authored to allow the student to graph the table data. Here is an example of using the table data to create a line graph. I have authored the step to pre-populate the table data so all you need to do is click \"Make Graph\".",
- "globalCellSize": 10,
- "tableData": [
- [
- {
- "text": "x",
- "editable": false,
- "size": null
- },
+ {
+ "id": "node11",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node12"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Draw Step",
+ "components": [
{
- "text": "y",
- "editable": false,
- "size": null
+ "id": "9qwqc5uslq",
+ "type": "Draw",
+ "prompt": "This is a draw step where the student can draw a diagram.
",
+ "stamps": {
+ "Stamps": []
+ }
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node12",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node13"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Draw Step Auto Graded",
+ "components": [
{
- "text": "0",
- "editable": true,
- "size": null
- },
+ "id": "nvjkidstry",
+ "type": "Draw",
+ "prompt": "This is an auto graded draw step. Click the 'Submit' button to have your drawing auto graded.
\n
\n(1) Use stamps to create TWO methane molecules (CH4).
\n(2) Create EXACTLY the number of oxygen molecules (O2) needed to react with your TWO methane molecules.
\n(3) Create a new frame.
\n(4) REARRANGE the atoms in the 2nd frame to make carbon dioxide (CO2) and water (H2O) molecules. Show clearly which atoms belong to which molecules.
",
+ "stamps": {
+ "Stamps": [
+ "carbon.png",
+ "oxygen.png",
+ "hydrogen.png"
+ ]
+ }
+ }
+ ]
+ },
+ {
+ "id": "node13",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node14"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Brainstorm Step",
+ "components": [
{
- "text": "0",
- "editable": true,
- "size": null
+ "id": "dnz279bdvc",
+ "type": "Discussion",
+ "prompt": "This is a forum discussion type of step where students can post their response and then see their classmates' responses. (Note: the brainstorm step only works in a run and does not work when simply previewing the project)
",
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "gateClassmateResponses": false
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node14",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node15"
+ },
+ {
+ "to": "node16"
+ },
+ {
+ "to": "node17"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": "workgroupId",
+ "whenToChoosePath": "enterNode",
+ "canChangePath": false,
+ "maxPathsVisitable": 1
+ },
+ "title": "Table Step",
+ "components": [
{
- "text": "1",
- "editable": true,
- "size": null
+ "id": "y45mn2k7yl",
+ "type": "Table",
+ "prompt": "This is a table step where students fill out a table. You can make certain cells editable and other cells uneditable so the student can't change them. You can also allow the student to add/delete columns as well as add/delete rows.",
+ "globalCellSize": 10,
+ "tableData": [
+ [
+ {
+ "text": "Object",
+ "editable": false,
+ "size": null
+ },
+ {
+ "text": "Count",
+ "editable": false,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Computers",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Phones",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "",
+ "editable": true,
+ "size": null
+ }
+ ]
+ ],
+ "showAddToNotebookButton": true
},
{
- "text": "1",
- "editable": true,
- "size": null
+ "id": "d9ioo01pa1",
+ "type": "OpenResponse",
+ "prompt": "",
+ "showAddToNotebookButton": true
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node15",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [
{
- "text": "2",
- "editable": true,
- "size": null
+ "id": "node15Constraint1",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node15",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node15"
+ }
+ }
+ ]
},
{
- "text": "2",
- "editable": true,
- "size": null
+ "id": "node15Constraint2",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node15",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node15"
+ }
+ }
+ ]
}
- ],
- [
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node18"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Table Step Line Graph",
+ "components": [
{
- "text": "3",
- "editable": true,
- "size": null
+ "id": "wtw3q7peip",
+ "type": "Table",
+ "prompt": "The table step can be authored to allow the student to graph the table data. Here is an example of using the table data to create a line graph. I have authored the step to pre-populate the table data so all you need to do is click \"Make Graph\".",
+ "globalCellSize": 10,
+ "tableData": [
+ [
+ {
+ "text": "x",
+ "editable": false,
+ "size": null
+ },
+ {
+ "text": "y",
+ "editable": false,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "0",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "0",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "1",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "1",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "2",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "2",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "3",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "6",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "7",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "4",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "10",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "4",
+ "editable": true,
+ "size": null
+ }
+ ]
+ ]
},
{
- "text": "6",
- "editable": true,
- "size": null
+ "id": "r2t378mp23",
+ "type": "OpenResponse",
+ "prompt": ""
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node16",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [
{
- "text": "7",
- "editable": true,
- "size": null
+ "id": "node16Constraint1",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node16",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node16"
+ }
+ }
+ ]
},
{
- "text": "4",
- "editable": true,
- "size": null
+ "id": "node16Constraint2",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node16",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node16"
+ }
+ }
+ ]
}
- ],
- [
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node18"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Table Step Bar Graph",
+ "components": [
{
- "text": "10",
- "editable": true,
- "size": null
+ "id": "xxcdra15fe",
+ "type": "Table",
+ "prompt": "Here is an example of a bar graph.",
+ "globalCellSize": 10,
+ "tableData": [
+ [
+ {
+ "text": "Color",
+ "editable": false,
+ "size": null
+ },
+ {
+ "text": "Count",
+ "editable": false,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Blue",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "4",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Red",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "2",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Green",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "3",
+ "editable": true,
+ "size": null
+ }
+ ]
+ ]
},
{
- "text": "4",
- "editable": true,
- "size": null
+ "id": "cxwpukq3n5",
+ "type": "OpenResponse",
+ "prompt": ""
}
- ]
]
- },
- {
- "id": "r2t378mp23",
- "type": "OpenResponse",
- "prompt": ""
- }
- ]
- },
- {
- "id": "node16",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node17"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Table Step Bar Graph",
- "components": [
- {
- "id": "xxcdra15fe",
- "type": "Table",
- "prompt": "Here is an example of a bar graph.",
- "globalCellSize": 10,
- "tableData": [
- [
- {
- "text": "Color",
- "editable": false,
- "size": null
- },
- {
- "text": "Count",
- "editable": false,
- "size": null
- }
- ],
- [
+ {
+ "id": "node17",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [
{
- "text": "Blue",
- "editable": true,
- "size": null
+ "id": "node17Constraint1",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node17",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node17"
+ }
+ }
+ ]
},
{
- "text": "4",
- "editable": true,
- "size": null
+ "id": "node17Constraint2",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node17",
+ "removalConditional": "all",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "fromNodeId": "node14",
+ "toNodeId": "node17"
+ }
+ }
+ ]
}
- ],
- [
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node18"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Table Step Pie Graph",
+ "components": [
{
- "text": "Red",
- "editable": true,
- "size": null
+ "id": "ejryyaaf8n",
+ "type": "Table",
+ "prompt": "Here is an example of a pie graph.",
+ "globalCellSize": 10,
+ "tableData": [
+ [
+ {
+ "text": "Topping",
+ "editable": false,
+ "size": null
+ },
+ {
+ "text": "Slices",
+ "editable": false,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Pepperoni",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "4",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Mushroom",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "4",
+ "editable": true,
+ "size": null
+ }
+ ],
+ [
+ {
+ "text": "Bell Pepper",
+ "editable": true,
+ "size": null
+ },
+ {
+ "text": "2",
+ "editable": true,
+ "size": null
+ }
+ ]
+ ]
},
{
- "text": "2",
- "editable": true,
- "size": null
+ "id": "f1qmd09sw8",
+ "type": "OpenResponse",
+ "prompt": ""
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node18",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": true,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node19"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Outside Url Step",
+ "components": [
{
- "text": "Green",
- "editable": true,
- "size": null
- },
+ "id": "u48j0eqq2t",
+ "type": "OutsideURL",
+ "url": "http://www.berkeley.edu/"
+ }
+ ]
+ },
+ {
+ "id": "node19",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node20"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Label Step",
+ "components": [
{
- "text": "3",
- "editable": true,
- "size": null
+ "id": "x4twq80e2n",
+ "prompt": "Label the picture.",
+ "type": "Label",
+ "backgroundImage": "ballon cars and skateboarder.png",
+ "canCreateLabels": true,
+ "canDeleteLabels": true,
+ "width": 800,
+ "height": 600,
+ "labels": [
+ {
+ "pointX": 25,
+ "pointY": 200,
+ "textX": 100,
+ "textY": -25,
+ "text": "more potential energy",
+ "color": "blue"
+ },
+ {
+ "pointX": 25,
+ "pointY": 250,
+ "textX": 100,
+ "textY": -25,
+ "text": "more potential energy",
+ "color": "blue"
+ },
+ {
+ "pointX": 25,
+ "pointY": 300,
+ "textX": 100,
+ "textY": -25,
+ "text": "more kinetic energy",
+ "color": "green"
+ },
+ {
+ "pointX": 25,
+ "pointY": 350,
+ "textX": 100,
+ "textY": -25,
+ "text": "more kinetic energy",
+ "color": "green"
+ }
+ ]
}
- ]
]
- },
- {
- "id": "cxwpukq3n5",
- "type": "OpenResponse",
- "prompt": ""
- }
- ]
- },
- {
- "id": "node17",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node18"
+ },
+ {
+ "id": "group2",
+ "type": "group",
+ "title": "Example Features",
+ "startId": "node20",
+ "ids": [
+ "node20",
+ "node21",
+ "node22",
+ "node23",
+ "node24",
+ "node25",
+ "node26",
+ "node27",
+ "node28",
+ "node29",
+ "node30",
+ "node31",
+ "node32",
+ "node33",
+ "node34"
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "group3"
+ }
+ ]
}
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Table Step Pie Graph",
- "components": [
- {
- "id": "ejryyaaf8n",
- "type": "Table",
- "prompt": "Here is an example of a pie graph.",
- "globalCellSize": 10,
- "tableData": [
- [
- {
- "text": "Topping",
- "editable": false,
- "size": null
- },
+ {
+ "id": "node20",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node21"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Show Previous Work 1",
+ "components": [
{
- "text": "Slices",
- "editable": false,
- "size": null
+ "id": "onwwrjuqu1",
+ "type": "OpenResponse",
+ "prompt": "The work you enter for this step will be displayed at the top of the next step.
"
}
- ],
- [
- {
- "text": "Pepperoni",
- "editable": true,
- "size": null
- },
+ ]
+ },
+ {
+ "id": "node21",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node22"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Show Previous Work 2",
+ "components": [
{
- "text": "4",
- "editable": true,
- "size": null
+ "id": "8n06hm4kaq",
+ "type": "OpenResponse",
+ "prompt": "You should see your work from the previous step at the top of this step. The previous step and this step do not need to be the same type of step.
"
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node22",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node23"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Import Work 1",
+ "components": [
{
- "text": "Mushroom",
- "editable": true,
- "size": null
- },
+ "id": "we8ry95yqa",
+ "type": "OpenResponse",
+ "prompt": "The work from this step will be imported into the next step.
"
+ }
+ ]
+ },
+ {
+ "id": "node23",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node24"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Import Work 2",
+ "components": [
{
- "text": "4",
- "editable": true,
- "size": null
+ "id": "d6sa31zcw8",
+ "type": "OpenResponse",
+ "prompt": "Your work from the previous step should be entered into the text area below. This feature works best if the previous step and this step are the same type of step.
"
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node24",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node25"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Must Complete Before Advancing",
+ "components": [
{
- "text": "Bell Pepper",
- "editable": true,
- "size": null
- },
+ "id": "5o5x8tujpg",
+ "type": "OpenResponse",
+ "prompt": "Authors can create constraints to control student navigation. For these constraint examples, I will be using open response steps but the constraints can be used with other step types as well. This step has been authored so that the student must complete the step before they can move forward. They are allowed to move backwards though.
"
+ }
+ ]
+ },
+ {
+ "id": "node25",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node26"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Must Complete Before Exiting",
+ "components": [
{
- "text": "2",
- "editable": true,
- "size": null
+ "id": "ade7umyd5r",
+ "type": "OpenResponse",
+ "prompt": "This step has been authored so that the student can't leave the step until they have completed it.
"
}
- ]
]
- },
- {
- "id": "f1qmd09sw8",
- "type": "OpenResponse",
- "prompt": ""
- }
- ]
- },
- {
- "id": "node18",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": true,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node19"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Outside Url Step",
- "components": [
- {
- "id": "u48j0eqq2t",
- "type": "OutsideURL",
- "url": "http://www.berkeley.edu/"
- }
- ]
- },
- {
- "id": "node19",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node20"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node26",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node27"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Must Complete Previous Step 1",
+ "components": [
+ {
+ "id": "3dvneo5lv3",
+ "type": "OpenResponse",
+ "prompt": "Do not enter any work for this step. Try to move to the next step \"Must Complete Previous Step 2\", you should not be able to. Try to move to the step after the next step \"Must Complete Previous Step 3\", you should be able to. This feature is used to make the student complete a specific step before they can work on another specific step. Now enter some work for this step and click save. You should then be able to move to the next step.
"
+ }
+ ]
},
- "title": "Label Step",
- "components": [
- {
- "id": "x4twq80e2n",
- "prompt": "Label the picture.",
- "type": "Label",
- "backgroundImage": "ballon cars and skateboarder.png",
- "canCreateLabels": true,
- "canDeleteLabels": true,
- "width": 800,
- "height": 600,
- "labels": [
- {
- "pointX": 25,
- "pointY": 200,
- "textX": 100,
- "textY": -25,
- "text": "more potential energy",
- "color": "blue"
- },
- {
- "pointX": 25,
- "pointY": 250,
- "textX": 100,
- "textY": -25,
- "text": "more potential energy",
- "color": "blue"
- },
- {
- "pointX": 25,
- "pointY": 300,
- "textX": 100,
- "textY": -25,
- "text": "more kinetic energy",
- "color": "green"
- },
- {
- "pointX": 25,
- "pointY": 350,
- "textX": 100,
- "textY": -25,
- "text": "more kinetic energy",
- "color": "green"
- }
+ {
+ "id": "node27",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node28"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Must Complete Previous Step 2",
+ "components": [
+ {
+ "id": "b7zhe3k6m3",
+ "type": "OpenResponse",
+ "prompt": "Good job, you completed \"Must Complete Previous Step 1\".
"
+ }
]
- }
- ]
- },
- {
- "id": "group2",
- "type": "group",
- "title": "Example Features",
- "startId": "node20",
- "ids": [
- "node20",
- "node21",
- "node22",
- "node23",
- "node24",
- "node25",
- "node26",
- "node27",
- "node28",
- "node29",
- "node30",
- "node31",
- "node32",
- "node33",
- "node34"
- ]
- },
- {
- "id": "node20",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node21"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "Show Previous Work 1",
- "components": [
- {
- "id": "onwwrjuqu1",
- "type": "OpenResponse",
- "prompt": "The work you enter for this step will be displayed at the top of the next step.
"
- }
- ]
- },
- {
- "id": "node21",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node22"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node28",
+ "type": "node",
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node29"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Must Complete Previous Step 3",
+ "components": [
+ {
+ "id": "dsre8jvudw",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nNow go back to \"Must Complete Previous Step 1\".
\n![\"\"](\"spongebob_and_patrick_shell.jpg?w=400&h=300\")
\n\n"
+ }
+ ]
},
- "title": "Show Previous Work 2",
- "components": [
- {
- "id": "8n06hm4kaq",
- "type": "OpenResponse",
- "prompt": "You should see your work from the previous step at the top of this step. The previous step and this step do not need to be the same type of step.
"
- }
- ]
- },
- {
- "id": "node22",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node23"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node29",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node30"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Aggregate Step 1",
+ "components": [
+ {
+ "id": "qo7zqlxoa1",
+ "type": "MultipleChoice",
+ "prompt": "The answers for this step will be aggregated for the whole class and displayed in the next step. (Note: the aggregating of class data only works in a run and does not work when simply previewing the project). The answer for this step will also determine which branch path you are assigned to in the Branching Point step.
\nWhat is your favorite type of chocolate?
",
+ "choices": [
+ {
+ "id": "isqtxst8ah",
+ "text": "Dark",
+ "feedback": "Thanks for submitting your answer",
+ "isCorrect": false
+ },
+ {
+ "id": "araznpws0b",
+ "text": "Milk",
+ "feedback": "Thanks for submitting your answer",
+ "isCorrect": false
+ },
+ {
+ "id": "fot1t36pcm",
+ "text": "White",
+ "feedback": "Thanks for submitting your answer",
+ "isCorrect": false
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "choiceType": "radio"
+ }
+ ]
},
- "title": "Import Work 1",
- "components": [
- {
- "id": "we8ry95yqa",
- "type": "OpenResponse",
- "prompt": "The work from this step will be imported into the next step.
"
- }
- ]
- },
- {
- "id": "node23",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node24"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node30",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node31"
+ },
+ {
+ "to": "node32"
+ },
+ {
+ "to": "node33"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": "criteriaMapping",
+ "whenToChoosePath": "enterNode",
+ "canChangePath": false,
+ "maxPathsVisitable": 1
+ },
+ "title": "Aggregate Step 2",
+ "components": [
+ {
+ "id": "9ppjsfsmzb",
+ "type": "OpenResponse",
+ "prompt": "You should see a pie graph with the aggregate student data for the class above.
"
+ }
+ ]
},
- "title": "Import Work 2",
- "components": [
- {
- "id": "d6sa31zcw8",
- "type": "OpenResponse",
- "prompt": "Your work from the previous step should be entered into the text area below. This feature works best if the previous step and this step are the same type of step.
"
- }
- ]
- },
- {
- "id": "node24",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node25"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node31",
+ "type": "node",
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "constraints": [
+ {
+ "id": "constraint0",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node31",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node31"
+ }
+ ]
+ },
+ {
+ "id": "constraint1",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node31",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node31"
+ }
+ ]
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node34"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "You chose dark chocolate",
+ "components": [
+ {
+ "id": "usk4gr3mq1",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nYou chose \"Dark\" in the multiple choice step. Enjoy your dark chocolate!
\n![\"\"](\"dark_chocolate.jpg\")
\n\n"
+ }
+ ]
},
- "title": "Must Complete Before Advancing",
- "components": [
- {
- "id": "5o5x8tujpg",
- "type": "OpenResponse",
- "prompt": "Authors can create constraints to control student navigation. For these constraint examples, I will be using open response steps but the constraints can be used with other step types as well. This step has been authored so that the student must complete the step before they can move forward. They are allowed to move backwards though.
"
- }
- ]
- },
- {
- "id": "node25",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node26"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node32",
+ "type": "node",
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "constraints": [
+ {
+ "id": "constraint2",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node32",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node32"
+ }
+ ]
+ },
+ {
+ "id": "constraint3",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node32",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node32"
+ }
+ ]
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node34"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "You chose milk chocolate",
+ "components": [
+ {
+ "id": "6b4xu5mk8y",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nYou chose \"Milk\" in the multiple choice step. Enjoy your milk chocolate!
\n![\"\"](\"milk_chocolate.jpg?w=368&h=285\")
\n\n"
+ }
+ ]
},
- "title": "Must Complete Before Exiting",
- "components": [
- {
- "id": "ade7umyd5r",
- "type": "OpenResponse",
- "prompt": "This step has been authored so that the student can't leave the step until they have completed it.
"
- }
- ]
- },
- {
- "id": "node26",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node27"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node33",
+ "type": "node",
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "constraints": [
+ {
+ "id": "constraint4",
+ "action": "makeThisNodeNotVisible",
+ "targetId": "node33",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node33"
+ }
+ ]
+ },
+ {
+ "id": "constraint5",
+ "action": "makeThisNodeNotVisitable",
+ "targetId": "node33",
+ "removalCriteria": [
+ {
+ "functionName": "branchPathTaken",
+ "fromNodeId": "node30",
+ "toNodeId": "node33"
+ }
+ ]
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node34"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "You chose white chocolate",
+ "components": [
+ {
+ "id": "ycqqha8xn2",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nYou chose \"White\" in the multiple choice step. Enjoy your white chocolate!
\n![\"\"](\"white_chocolate.jpg?w=265&h=205\")
\n\n"
+ }
+ ]
},
- "title": "Must Complete Previous Step 1",
- "components": [
- {
- "id": "3dvneo5lv3",
- "type": "OpenResponse",
- "prompt": "Do not enter any work for this step. Try to move to the next step \"Must Complete Previous Step 2\", you should not be able to. Try to move to the step after the next step \"Must Complete Previous Step 3\", you should be able to. This feature is used to make the student complete a specific step before they can work on another specific step. Now enter some work for this step and click save. You should then be able to move to the next step.
"
- }
- ]
- },
- {
- "id": "node27",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node28"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node34",
+ "type": "node",
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node790"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Merge point",
+ "components": [
+ {
+ "id": "xabcha8d4g",
+ "type": "HTML",
+ "html": "\n\nhtml \n\n\nLet us Merge!
\n\n",
+ "showAddToNotebookButton": true
+ }
+ ]
},
- "title": "Must Complete Previous Step 2",
- "components": [
- {
- "id": "b7zhe3k6m3",
- "type": "OpenResponse",
- "prompt": "Good job, you completed \"Must Complete Previous Step 1\".
"
- }
- ]
- },
- {
- "id": "node28",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node29"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "group3",
+ "type": "group",
+ "title": "Third Lesson",
+ "startId": "node790",
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "group4"
+ }
+ ]
+ },
+ "ids": [
+ "node790",
+ "node791"
+ ]
},
- "title": "Must Complete Previous Step 3",
- "components": [
- {
- "id": "dsre8jvudw",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nNow go back to \"Must Complete Previous Step 1\".
\n
\n\n"
- }
- ]
- },
- {
- "id": "node29",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node30"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node790",
+ "title": "Third Lesson Step 1",
+ "type": "node",
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node791"
+ }
+ ]
+ },
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "components": []
},
- "title": "Aggregate Step 1",
- "components": [
- {
- "id": "qo7zqlxoa1",
- "type": "MultipleChoice",
- "prompt": "The answers for this step will be aggregated for the whole class and displayed in the next step. (Note: the aggregating of class data only works in a run and does not work when simply previewing the project). The answer for this step will also determine which branch path you are assigned to in the Branching Point step.
\nWhat is your favorite type of chocolate?
",
- "choices": [
- {
- "id": "isqtxst8ah",
- "text": "Dark",
- "feedback": "Thanks for submitting your answer",
- "isCorrect": false
- },
- {
- "id": "araznpws0b",
- "text": "Milk",
- "feedback": "Thanks for submitting your answer",
- "isCorrect": false
- },
- {
- "id": "fot1t36pcm",
- "text": "White",
- "feedback": "Thanks for submitting your answer",
- "isCorrect": false
- }
- ],
+ {
+ "id": "node791",
+ "title": "Third Lesson Step 2",
+ "type": "node",
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node792"
+ }
+ ]
+ },
"showSaveButton": false,
"showSubmitButton": false,
- "choiceType": "radio"
- }
- ]
- },
- {
- "id": "node30",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node31"
+ "components": []
+ },
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "What do you want students to explore?
1. Outline and provide a brief description of the topics students can choose from for the Jigsaw activity here. You can add images and links using the tools above.
2. Edit the each jigsaw multiple-choice option below.
3. Do not add or remove any of the pre-populated choices, as this will break the branching logic that is built into the lesson. You only need to edit the Prompts you want students to choose from. If you would like to change the number of topics in the Jigsaw, let the WISE staff know and we can help.
",
+ "id": "nhbnnln5mm",
+ "type": "HTML",
+ "prompt": ""
+ },
+ {
+ "choiceType": "radio",
+ "showAddToNotebookButton": true,
+ "showSubmitButton": true,
+ "showSaveButton": false,
+ "id": "0w3e2kgerw",
+ "type": "MultipleChoice",
+ "choices": [
+ {
+ "feedback": "",
+ "id": "4z4f8xiqsj",
+ "text": "Edit this to be branch 1 choice",
+ "isCorrect": false
+ },
+ {
+ "feedback": "",
+ "id": "2824d0tdlr",
+ "text": "Edit this to be branch 2 choice",
+ "isCorrect": false
+ }
+ ],
+ "prompt": "Add your prompt here. Then, edit the student choices below. Each choice will open a new branch.",
+ "showFeedback": false,
+ "maxSubmitCount": 1
+ }
+ ],
+ "transitionLogic": {
+ "whenToChoosePath": "studentDataChanged",
+ "maxPathsVisitable": 1,
+ "howToChooseAmongAvailablePaths": "random",
+ "canChangePath": false,
+ "transitions": [
+ {
+ "criteria": [
+ {
+ "name": "choiceChosen",
+ "params": {
+ "componentId": "0w3e2kgerw",
+ "choiceIds": [
+ "4z4f8xiqsj"
+ ],
+ "nodeId": "node792"
+ }
+ }
+ ],
+ "to": "node793"
+ },
+ {
+ "criteria": [
+ {
+ "name": "choiceChosen",
+ "params": {
+ "componentId": "0w3e2kgerw",
+ "choiceIds": [
+ "2824d0tdlr"
+ ],
+ "nodeId": "node792"
+ }
+ }
+ ],
+ "to": "node795"
+ }
+ ]
},
- {
- "to": "node32"
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "node792",
+ "title": "Pick your topic",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI elicit ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-elicit.svg"
+ }
},
- {
- "to": "node33"
- }
- ],
- "howToChooseAmongAvailablePaths": "criteriaMapping",
- "whenToChoosePath": "enterNode",
- "canChangePath": false,
- "maxPathsVisitable": 1
+ "constraints": []
},
- "title": "Aggregate Step 2",
- "components": [
- {
- "id": "9ppjsfsmzb",
- "type": "OpenResponse",
- "prompt": "You should see a pie graph with the aggregate student data for the class above.
"
- }
- ]
- },
- {
- "id": "node31",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [
- {
- "id": "constraint0",
- "action": "makeThisNodeNotVisible",
- "targetId": "node31",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node31"
- }
- ]
- },
- {
- "id": "constraint1",
- "action": "makeThisNodeNotVisitable",
- "targetId": "node31",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node31"
- }
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "Topic A
1. Edit this to introduce the content for Topic A.
2. Choose a web-based resource for students to review in the step below about the topic. If you don't want to use a resource, delete the component. You can add a different type of component if you'd like by clicking the + above and choosing the type of you want to add. Then edit that one.
3. Edit the open response prompt at the end of this sequence to prompt student reflection on the ideas you presented.
4. Delete this text once you are done.
",
+ "id": "if7yrkajl3",
+ "type": "HTML",
+ "prompt": ""
+ },
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "vznhagylsn",
+ "type": "OutsideURL",
+ "prompt": "",
+ "url": "",
+ "height": 600
+ },
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "4t2qx4mwi6",
+ "type": "OpenResponse",
+ "prompt": "[EDIT REFLECTION PROMPT HERE] What did you notice about...? What did you learn about...? Record at least two observations about...",
+ "isStudentAttachmentEnabled": false
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node794"
+ }
+ ]
+ },
+ "showSubmitButton": false,
+ "showSaveButton": true,
+ "id": "node793",
+ "title": "Topic A",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI discover ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg"
+ }
+ },
+ "constraints": [
+ {
+ "removalConditional": "all",
+ "targetId": "node793",
+ "action": "makeThisNodeNotVisible",
+ "id": "node793Constraint1",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node793",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ },
+ {
+ "removalConditional": "all",
+ "targetId": "node793",
+ "action": "makeThisNodeNotVisitable",
+ "id": "node793Constraint2",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node793",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ }
]
- }
- ],
- "transitionLogic": {
- "transitions": [{
- "to": "node34"
- }],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "You chose dark chocolate",
- "components": [
- {
- "id": "usk4gr3mq1",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nYou chose \"Dark\" in the multiple choice step. Enjoy your dark chocolate!
\n
\n\n"
- }
- ]
- },
- {
- "id": "node32",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [
- {
- "id": "constraint2",
- "action": "makeThisNodeNotVisible",
- "targetId": "node32",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node32"
- }
- ]
- },
- {
- "id": "constraint3",
- "action": "makeThisNodeNotVisitable",
- "targetId": "node32",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node32"
- }
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "Discuss what you learned about your Selected Topic A
1. For this step in the Jigsaw, you can choose to have students who chose the same topic discuss what they learned in pairs or small groups in the classroom (offline) or in an online discussion. This will help them synthesize what they have learned before sharing with students who chose another topic.
2. If you would like to use the online discussion, edit the Discussion component below that asks students to post what they've learned and comment on their peer's ideas. Feel free to edit the 'Prompt' text to better suit your needs.
3. If you would like students to work offline, add instructions here to help facilitate that process. Then delete the Discussion component below.
4. Customize the prompt for the Open Response component at the bottom of this step to prompt reflection what they learned about their topic - before they meet with students who studied the other topic.
5. Delete this text once you are done.
",
+ "id": "qh56u3lupz",
+ "type": "HTML",
+ "prompt": ""
+ },
+ {
+ "showAddToNotebookButton": false,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "connectedComponents": [
+ {
+ "componentId": "4t2qx4mwi6",
+ "type": "showWork",
+ "nodeId": "node793"
+ }
+ ],
+ "showSaveButton": false,
+ "id": "e6zkfriesm",
+ "type": "OpenResponse",
+ "prompt": "Here is what you learned in the previous step:",
+ "isStudentAttachmentEnabled": false
+ },
+ {
+ "showAddToNotebookButton": true,
+ "gateClassmateResponses": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "t84sg6f05k",
+ "type": "Discussion",
+ "prompt": "[Customize instructions] Share what you've learned with the other members of Team [Enter topic #1 here].
Read the ideas from your teammates and comment on at least one.
When you're finished, answer the question at the bottom of the page.
",
+ "isStudentAttachmentEnabled": true
+ },
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "hylmcrchzv",
+ "type": "OpenResponse",
+ "prompt": "[Customize reflection prompt] After meeting with another team [OR] reviewing your teammates' ideas, how have your ideas about XXXX changed? Make sure you mention...",
+ "isStudentAttachmentEnabled": false
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node797"
+ }
+ ]
+ },
+ "showSubmitButton": false,
+ "showSaveButton": true,
+ "id": "node794",
+ "title": "Discuss what you learned about Topic A",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI discover ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg"
+ }
+ },
+ "constraints": [
+ {
+ "removalConditional": "all",
+ "targetId": "node794",
+ "action": "makeThisNodeNotVisible",
+ "id": "node794Constraint1",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node793",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ },
+ {
+ "removalConditional": "all",
+ "targetId": "node794",
+ "action": "makeThisNodeNotVisitable",
+ "id": "node794Constraint2",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node793",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ }
]
- }
- ],
- "transitionLogic": {
- "transitions": [{
- "to": "node34"
- }],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "You chose milk chocolate",
- "components": [
- {
- "id": "6b4xu5mk8y",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nYou chose \"Milk\" in the multiple choice step. Enjoy your milk chocolate!
\n
\n\n"
- }
- ]
- },
- {
- "id": "node33",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [
- {
- "id": "constraint4",
- "action": "makeThisNodeNotVisible",
- "targetId": "node33",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node33"
- }
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "Topic B
1. Edit this to introduce the content for Topic B.
2. Choose a web-based resource for students to review in the step below about the topic. If you don't want to use a resource, delete the component. You can add a different type of component if you'd like by clicking the + above and choosing the type of you want to add. Then edit that one.
3. Edit the open response prompt at the end of this sequence to prompt student reflection on the ideas you presented.
4. Delete this text once you are done.
",
+ "id": "k208vvl7g6",
+ "type": "HTML",
+ "prompt": ""
+ },
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "4gx3373z38",
+ "type": "OutsideURL",
+ "prompt": "",
+ "url": "",
+ "height": 600
+ },
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "kd43661ip3",
+ "type": "OpenResponse",
+ "prompt": "[EDIT REFLECTION PROMPT HERE] What did you notice about...? What did you learn about...? Record at least two observations about...",
+ "isStudentAttachmentEnabled": false
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node796"
+ }
+ ]
+ },
+ "showSubmitButton": false,
+ "showSaveButton": true,
+ "id": "node795",
+ "title": "Topic B",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI discover ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg"
+ }
+ },
+ "constraints": [
+ {
+ "removalConditional": "all",
+ "targetId": "node795",
+ "action": "makeThisNodeNotVisible",
+ "id": "node795Constraint1",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node795",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ },
+ {
+ "removalConditional": "all",
+ "targetId": "node795",
+ "action": "makeThisNodeNotVisitable",
+ "id": "node795Constraint2",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node795",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ }
]
- },
- {
- "id": "constraint5",
- "action": "makeThisNodeNotVisitable",
- "targetId": "node33",
- "removalCriteria": [
- {
- "functionName": "branchPathTaken",
- "fromNodeId": "node30",
- "toNodeId": "node33"
- }
+ },
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "Discuss what you learned about your Selected Topic B
1. For this step in the Jigsaw, you can choose to have students who chose the same topic discuss what they learned in pairs or small groups in the classroom (offline) or in an online discussion. This will help them synthesize what they have learned before sharing with students who chose another topic.
2. If you would like to use the online discussion, edit the Discussion component below that asks students to post what they've learned and comment on their peer's ideas. Feel free to edit the 'Prompt' text to better suit your needs.
3. If you would like students to work offline, add instructions here to help facilitate that process. Then delete the Discussion component below.
4. Customize the prompt for the Open Response component at the bottom of this step to prompt reflection what they learned about their topic - before they meet with students who studied the other topic.
5. Delete this text once you are done.
",
+ "id": "euc2uab7br",
+ "type": "HTML",
+ "prompt": ""
+ },
+ {
+ "showAddToNotebookButton": false,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "connectedComponents": [
+ {
+ "componentId": "4t2qx4mwi6",
+ "type": "showWork",
+ "nodeId": "node793"
+ }
+ ],
+ "showSaveButton": false,
+ "id": "4ds7yjc84z",
+ "type": "OpenResponse",
+ "prompt": "Here is what you learned in the previous step:",
+ "isStudentAttachmentEnabled": false
+ },
+ {
+ "showAddToNotebookButton": true,
+ "gateClassmateResponses": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "pf7msod64f",
+ "type": "Discussion",
+ "prompt": "[Customize instructions] Share what you've learned with the other members of Team XXXX.
Read the ideas from your teammates and comment on at least one.
When you're finished, answer the question at the bottom of the page.
",
+ "isStudentAttachmentEnabled": true
+ },
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "c10pptolm8",
+ "type": "OpenResponse",
+ "prompt": "[Customize reflection prompt] After meeting with another team [OR] reviewing your teammates' ideas, how have your ideas about XXXX changed? Make sure you mention...",
+ "isStudentAttachmentEnabled": false
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node797"
+ }
+ ]
+ },
+ "showSubmitButton": false,
+ "showSaveButton": true,
+ "id": "node796",
+ "title": "Discuss what you learned about Topic B",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI discover ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg"
+ }
+ },
+ "constraints": [
+ {
+ "removalConditional": "all",
+ "targetId": "node796",
+ "action": "makeThisNodeNotVisible",
+ "id": "node796Constraint1",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node795",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ },
+ {
+ "removalConditional": "all",
+ "targetId": "node796",
+ "action": "makeThisNodeNotVisitable",
+ "id": "node796Constraint2",
+ "removalCriteria": [
+ {
+ "name": "branchPathTaken",
+ "params": {
+ "toNodeId": "node795",
+ "fromNodeId": "node792"
+ }
+ }
+ ]
+ }
]
- }
- ],
- "transitionLogic": {
- "transitions": [ {
- "to": "node34"
- }],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
},
- "title": "You chose white chocolate",
- "components": [
- {
- "id": "ycqqha8xn2",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nYou chose \"White\" in the multiple choice step. Enjoy your white chocolate!
\n
\n\n"
- }
- ]
- },
- {
- "id": "node34",
- "type": "node",
- "showSaveButton": false,
- "showSubmitButton": false,
- "constraints": [
-
- ],
- "transitionLogic": {
- "transitions": [],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "html": "Jigsaw Time!
Make connections between Topic A and Topic B
Group students from Branch A with those in Branch B.
1. Customize the instructions above to help students form a group with someone who studied the other topic. You can have stations, for example, and tell students that 2 who studied Topic A and 2 who studied Topic B should go to each station.
2. Edit the text above to add more specific instructions about the sharing process.
3. Delete this help text when you're finished.
",
+ "id": "eqhhrsfynt",
+ "type": "HTML",
+ "prompt": ""
+ }
+ ],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node798"
+ }
+ ]
+ },
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "node797",
+ "title": "Share what you learned",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI distinguish ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-distinguish.svg"
+ }
+ },
+ "constraints": []
},
- "title": "Merge point",
- "components": [
- {
- "id": "xabcha8d4g",
- "type": "HTML",
- "html": "\n\nhtml \n\n\nLet us Merge!
\n\n"
- }
- ]
- }
+ {
+ "components": [
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": "I learned from the other team:\n1.\n2.",
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "blvba48xfw",
+ "type": "OpenResponse",
+ "prompt": "[Customize this reflection prompt] You had a chance to talk with a [classmate/group] who had learned about a different [topic/question]. Record two things you learned from talking with a [classmate/group] on the other team.",
+ "isStudentAttachmentEnabled": false
+ },
+ {
+ "showAddToNotebookButton": true,
+ "starterSentence": null,
+ "showSubmitButton": false,
+ "showSaveButton": false,
+ "id": "d84m1j8aao",
+ "type": "OpenResponse",
+ "prompt": "[Customize prompt] How does what you learned from the other team connect to the topic you investigated? Does it change or add to your understanding?",
+ "isStudentAttachmentEnabled": false
+ }
+ ],
+ "transitionLogic": {
+ "transitions": []
+ },
+ "showSubmitButton": false,
+ "showSaveButton": true,
+ "id": "node798",
+ "title": "What did you learn from your classmates?",
+ "type": "node",
+ "icons": {
+ "default": {
+ "imgAlt": "KI connect ideas",
+ "type": "img",
+ "imgSrc": "wise5/themes/default/nodeIcons/ki-color-connect.svg"
+ }
+ },
+ "constraints": []
+ },
+ {
+ "startId": "node792",
+ "transitionLogic": {
+ "transitions": []
+ },
+ "ids": [
+ "node792",
+ "node793",
+ "node794",
+ "node795",
+ "node796",
+ "node797",
+ "node798"
+ ],
+ "icons": {
+ "default": {
+ "color": "#2196F3",
+ "type": "font",
+ "fontSet": "material-icons",
+ "fontName": "info"
+ }
+ },
+ "id": "group4",
+ "type": "group",
+ "title": "Jigsaw",
+ "constraints": []
+ }
],
"spaces": [
- {
- "id": "sharePictures",
- "name": "Public",
- "isPublic": true,
- "isShowInNotebook": false
- }
+ {
+ "id": "sharePictures",
+ "name": "Public",
+ "isPublic": true,
+ "isShowInNotebook": false
+ }
],
"constraints": [],
"startGroupId": "group0",
"startNodeId": "node1",
"navigationMode": "guided",
"layout": {
- "template": "starmap|leftNav|rightNav",
- "studentIsOnGroupNode": "layout3",
- "studentIsOnApplicationNode": "layout4"
+ "template": "starmap|leftNav|rightNav",
+ "studentIsOnGroupNode": "layout3",
+ "studentIsOnApplicationNode": "layout4"
},
"metadata": {
- "title": "Demo Project"
+ "title": "Demo Project",
+ "authors": [
+ {
+ "firstName": "g",
+ "lastName": "k",
+ "id": 3,
+ "username": "gk"
+ }
+ ]
},
"inactiveNodes": [
- {
- "id": "node789",
- "title": "inactive node",
- "type": "node",
- "constraints": [],
- "transitionLogic": {
- "transitions": []
- },
- "showSaveButton": false,
- "showSubmitButton": false,
- "components": [],
- "checked": false
- }
+ {
+ "id": "node789",
+ "title": "inactive node",
+ "type": "node",
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": []
+ },
+ "showSaveButton": false,
+ "showSubmitButton": false,
+ "components": []
+ }
],
"theme": "MyCustomTheme"
-}
+}
\ No newline at end of file
diff --git a/src/main/webapp/site/src/app/services/sessionService.spec.ts b/src/main/webapp/site/src/app/services/sessionService.spec.ts
new file mode 100644
index 0000000000..305576a073
--- /dev/null
+++ b/src/main/webapp/site/src/app/services/sessionService.spec.ts
@@ -0,0 +1,143 @@
+import { TestBed, tick, fakeAsync } from '@angular/core/testing';
+import { SessionService } from '../../../../wise5/services/sessionService';
+import { UpgradeModule } from '@angular/upgrade/static';
+import ConfigService from '../../../../wise5/services/configService';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+let service: SessionService;
+let configService: ConfigService;
+let http: HttpTestingController;
+const renewSessionURL = '/wise/session/renew';
+
+describe('SessionService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [ HttpClientTestingModule, UpgradeModule ],
+ providers: [ ConfigService, SessionService ]
+ });
+ http = TestBed.get(HttpTestingController);
+ configService = TestBed.get(ConfigService);
+ service = TestBed.get(SessionService);
+ });
+
+ calculateIntervals();
+ initializeSession();
+ mouseMoved();
+ checkMouseevent();
+ checkForLogout();
+ renewSession();
+});
+
+function calculateIntervals() {
+ describe('calculateIntervals()', () => {
+ it('should calculate the warn and logout intervals when session timeout is 10 minutes', () => {
+ const sessionTimeout = 600;
+ const intervals = service.calculateIntervals(sessionTimeout);
+ expect(intervals.showWarningInterval).toEqual(540);
+ expect(intervals.forceLogoutAfterWarningInterval).toEqual(60);
+ });
+
+ it('should calculate the warn and logout intervals when session timeout is 30 minutes', () => {
+ const sessionTimeout = 1800;
+ const intervals = service.calculateIntervals(sessionTimeout);
+ expect(intervals.showWarningInterval).toEqual(1620);
+ expect(intervals.forceLogoutAfterWarningInterval).toEqual(180);
+ });
+
+ it('should calculate the warn and logout intervals when session timeout is 60 minutes', () => {
+ const sessionTimeout = 3600;
+ const intervals = service.calculateIntervals(sessionTimeout);
+ expect(intervals.showWarningInterval).toEqual(3300);
+ expect(intervals.forceLogoutAfterWarningInterval).toEqual(300);
+ });
+ });
+}
+
+function initializeSession() {
+ describe('initializeSession()', () => {
+ it('should start check mouse event if not in preview mode', () => {
+ spyOn(configService, 'isPreview').and.returnValue(false);
+ const startCheckMouseEventSpy = spyOn(service, 'startCheckMouseEvent');
+ service.initializeSession();
+ expect(startCheckMouseEventSpy).toHaveBeenCalled();
+ });
+ });
+}
+
+function mouseMoved() {
+ describe('mouseMoved()', () => {
+ it('should set last activity timestamp when mouse is moved', () => {
+ service.mouseMoved();
+ const renewSessionSpy = spyOn(service, 'renewSession');
+ service.checkMouseEvent();
+ expect(renewSessionSpy).toHaveBeenCalled();
+ });
+ });
+}
+
+function checkMouseevent() {
+ describe('checkMouseEvent()', () => {
+ it('should renew session if user has been active within last minute', () => {
+ spyOn(service, 'isActiveWithinLastMinute').and.returnValue(true);
+ const renewSessionSpy = spyOn(service, 'renewSession');
+ service.checkMouseEvent();
+ expect(renewSessionSpy).toHaveBeenCalled();
+ });
+
+ it('should check for logout if user has not been active within last minute', () => {
+ spyOn(service, 'isActiveWithinLastMinute').and.returnValue(false);
+ const checkForLogoutSpy = spyOn(service, 'checkForLogout');
+ service.checkMouseEvent();
+ expect(checkForLogoutSpy).toHaveBeenCalled();
+ });
+ });
+}
+
+function checkForLogout() {
+ describe('checkForLogout()', () => {
+ it('should force logout when user is inactive for long enough', () => {
+ spyOn(service, 'isInactiveLongEnoughToForceLogout').and.returnValue(true);
+ const forceLogOutSpy = spyOn(service, 'forceLogOut');
+ service.checkForLogout();
+ expect(forceLogOutSpy).toHaveBeenCalled();
+ });
+
+ it('should show warning when user is inactive for long enough to warn and warning is not showing', () => {
+ spyOn(service, 'isInactiveLongEnoughToForceLogout').and.returnValue(false);
+ spyOn(service, 'isInactiveLongEnoughToWarn').and.returnValue(true);
+ spyOn(service, 'isShowingWarning').and.returnValue(false);
+ const showWarningSpy = spyOn(service, 'showWarning');
+ service.checkForLogout();
+ expect(showWarningSpy).toHaveBeenCalled();
+ });
+ });
+}
+
+function renewSession() {
+ describe('renewSession()', () => {
+ it('should renew the session', fakeAsync(
+ () => {
+ spyOn(configService, 'getConfigParam')
+ .withArgs('renewSessionURL').and.returnValue(renewSessionURL);
+ const logOutSpy = spyOn(service, 'logOut')
+ service.renewSession();
+ expect(configService.getConfigParam).toHaveBeenCalledWith('renewSessionURL');
+ http.expectOne(renewSessionURL).flush('true');
+ tick();
+ expect(logOutSpy).not.toHaveBeenCalled();
+ })
+ );
+
+ it('should log the user out when renew session fails', fakeAsync(
+ () => {
+ spyOn(configService, 'getConfigParam')
+ .withArgs('renewSessionURL').and.returnValue(renewSessionURL);
+ const logOutSpy = spyOn(service, 'logOut');
+ service.renewSession();
+ expect(configService.getConfigParam).toHaveBeenCalledWith('renewSessionURL');
+ http.expectOne(renewSessionURL).flush('false');
+ tick();
+ expect(logOutSpy).toHaveBeenCalled();
+ })
+ );
+ });
+}
\ No newline at end of file
diff --git a/src/main/webapp/site/src/app/services/studentAssetService.spec.ts b/src/main/webapp/site/src/app/services/studentAssetService.spec.ts
new file mode 100644
index 0000000000..275c5b9156
--- /dev/null
+++ b/src/main/webapp/site/src/app/services/studentAssetService.spec.ts
@@ -0,0 +1,80 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { StudentAssetService } from '../../../../wise5/services/studentAssetService';
+import { ConfigService } from '../../../../wise5/services/configService';
+
+let configService: ConfigService;
+let service: StudentAssetService;
+let http: HttpTestingController;
+const studentAssetURL = '/student/asset/123';
+const workgroupId = 1;
+const periodId = 256;
+let asset1, asset2;
+
+describe('StudentAssetService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [ HttpClientTestingModule, UpgradeModule ],
+ providers: [ StudentAssetService, ConfigService ]
+ });
+ http = TestBed.get(HttpTestingController);
+ service = TestBed.get(StudentAssetService);
+ configService = TestBed.get(ConfigService);
+ });
+ initialize();
+ retrieveAssets();
+ deleteAsset();
+});
+
+function initialize() {
+ asset1 = {id:1, fileName:'wise.png', url:'/curriculum/1/wise.png'};
+ asset2 = {id:2, fileName:'wiser.png', url:'/curriculum/1/wiser.png'};
+}
+
+function retrieveAssets() {
+ describe('retrieveAssets', () => {
+ beforeEach(() => {
+ spyOn(configService, 'getWorkgroupId').and.returnValue(workgroupId);
+ spyOn(configService, 'getConfigParam').withArgs('mode').and
+ .returnValue('studentRun').withArgs('studentAssetsURL').and
+ .returnValue(studentAssetURL);
+ });
+ retrieveAssets_StudentMode_FetchAssetsAndSetAttributes();
+ });
+}
+
+function deleteAsset() {
+ describe('deleteAsset', () => {
+ beforeEach(() => {
+ spyOn(configService, 'getWorkgroupId').and.returnValue(workgroupId);
+ spyOn(configService, 'getPeriodId').and.returnValue(periodId);
+ spyOn(configService, 'getConfigParam').withArgs('mode').and
+ .returnValue('studentRun').withArgs('studentAssetsURL').and
+ .returnValue(studentAssetURL);
+ });
+ deleteAsset_StudentMode_DeleteAsset();
+ });
+}
+
+function retrieveAssets_StudentMode_FetchAssetsAndSetAttributes() {
+ it('should fetch assets and set attributes', () => {
+ service.retrieveAssets().then((response) => {
+ expect(response.length).toEqual(1);
+ expect(response[0].type).toEqual('image');
+ });
+ http.expectOne(`${studentAssetURL}?workgroupId=${workgroupId}`).flush([asset1]);
+ });
+}
+
+function deleteAsset_StudentMode_DeleteAsset() {
+ it('should delete', () => {
+ service.allAssets = [asset2];
+ expect(service.allAssets.length).toEqual(1);
+ service.deleteAsset(asset2);
+ const req = http.expectOne(`${studentAssetURL}/delete`);
+ expect(req.request.method).toEqual('POST');
+ expect(req.request.body.studentAssetId).toEqual(2);
+ expect(req.request.body.clientDeleteTime).toBeDefined();
+ });
+}
diff --git a/src/main/webapp/site/src/app/student/student-angular-js-module.ts b/src/main/webapp/site/src/app/student/student-angular-js-module.ts
index e5ed81c166..a9d0ff95ae 100644
--- a/src/main/webapp/site/src/app/student/student-angular-js-module.ts
+++ b/src/main/webapp/site/src/app/student/student-angular-js-module.ts
@@ -9,6 +9,9 @@ import { UtilService } from '../../../../wise5/services/utilService';
import { ConfigService } from '../../../../wise5/services/configService';
import { ProjectService } from '../../../../wise5/services/projectService';
import { VLEProjectService } from '../../../../wise5/vle/vleProjectService';
+import { CRaterService } from '../../../../wise5/services/cRaterService';
+import { SessionService } from '../../../../wise5/services/sessionService';
+import { StudentAssetService } from '../../../../wise5/services/studentAssetService';
@Component({template: ``})
export class EmptyComponent {}
@@ -26,7 +29,10 @@ export class EmptyComponent {}
providers: [
UtilService,
ConfigService,
+ CRaterService,
ProjectService,
+ SessionService,
+ StudentAssetService,
VLEProjectService
]
})
diff --git a/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts b/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts
index b919b49385..6614d07a7c 100644
--- a/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts
+++ b/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts
@@ -11,6 +11,9 @@ import { ProjectService } from '../../../../wise5/services/projectService';
import { AuthoringToolProjectService } from '../../../../wise5/authoringTool/authoringToolProjectService';
import { ClassroomMonitorProjectService } from '../../../../wise5/classroomMonitor/classroomMonitorProjectService';
import { MilestoneReportDataComponent } from './milestone/milestone-report-data/milestone-report-data.component';
+import { CRaterService } from '../../../../wise5/services/cRaterService';
+import { SessionService } from '../../../../wise5/services/sessionService';
+import { StudentAssetService } from '../../../../wise5/services/studentAssetService';
@Component({template: ``})
export class EmptyComponent {}
@@ -29,9 +32,12 @@ export class EmptyComponent {}
providers: [
UtilService,
ConfigService,
+ CRaterService,
ProjectService,
AuthoringToolProjectService,
- ClassroomMonitorProjectService
+ ClassroomMonitorProjectService,
+ SessionService,
+ StudentAssetService
],
entryComponents: [
MilestoneReportDataComponent
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg
new file mode 100644
index 0000000000..2cedda0f78
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg differ
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp
new file mode 100644
index 0000000000..a5a2d6aa32
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp differ
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg
new file mode 100644
index 0000000000..5c3d877c93
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg differ
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp
new file mode 100644
index 0000000000..833f29799c
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp differ
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg
new file mode 100644
index 0000000000..b25ab601c3
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg differ
diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp
new file mode 100644
index 0000000000..992079addb
Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp differ
diff --git a/src/main/webapp/site/src/tsconfig.app.json b/src/main/webapp/site/src/tsconfig.app.json
index 07a5190538..bccd35bea8 100644
--- a/src/main/webapp/site/src/tsconfig.app.json
+++ b/src/main/webapp/site/src/tsconfig.app.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
- "types": ["jquery"],
+ "types": ["jquery", "node", "dom-mediacapture-record"],
"paths": {
"moment": ["../node_modules/moment/min/moment.min.js"]
}
diff --git a/src/main/webapp/site/src/tsconfig.spec.json b/src/main/webapp/site/src/tsconfig.spec.json
index c771b489b4..3274c7f3b3 100644
--- a/src/main/webapp/site/src/tsconfig.spec.json
+++ b/src/main/webapp/site/src/tsconfig.spec.json
@@ -6,7 +6,8 @@
"types": [
"jasmine",
"jquery",
- "node"
+ "node",
+ "dom-mediacapture-record"
]
},
"files": [
diff --git a/src/main/webapp/wise5/authoringTool/authoringTool.ts b/src/main/webapp/wise5/authoringTool/authoringTool.ts
index be7787be55..80f21c6d09 100644
--- a/src/main/webapp/wise5/authoringTool/authoringTool.ts
+++ b/src/main/webapp/wise5/authoringTool/authoringTool.ts
@@ -24,7 +24,7 @@ import { AuthoringToolProjectService } from './authoringToolProjectService';
import AuthorNotebookController from './notebook/authorNotebookController';
import '../components/conceptMap/conceptMapAuthoringComponentModule';
import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
+import { CRaterService } from '../services/cRaterService';
import '../directives/components';
import ComponentService from '../components/componentService';
import '../components/discussion/discussionAuthoringComponentModule';
@@ -56,16 +56,15 @@ import ProjectAssetController from './asset/projectAssetController';
import ProjectAssetService from '../services/projectAssetService';
import ProjectController from './project/projectController';
import ProjectInfoController from './info/projectInfoController';
-import PlanningService from '../services/planningService';
import RubricAuthoringController from './rubric/rubricAuthoringController';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import * as SockJS from 'sockjs-client';
import * as StompJS from '@stomp/stompjs';
window['SockJS'] = SockJS;
window['Stomp'] = StompJS.Stomp;
import SpaceService from '../services/spaceService';
import './structure/structureAuthoringModule';
-import StudentAssetService from '../services/studentAssetService';
+import { StudentAssetService } from '../services/studentAssetService';
import StudentDataService from '../services/studentDataService';
import StudentStatusService from '../services/studentStatusService';
import StudentWebSocketService from '../services/studentWebSocketService';
@@ -76,6 +75,7 @@ import TeacherWebSocketService from '../services/teacherWebSocketService';
import { UtilService } from '../services/utilService';
import WISELinkAuthoringController from './wiseLink/wiseLinkAuthoringController';
import * as moment from 'moment';
+import { AudioRecorderService } from '../services/audioRecorderService';
const authoringModule = angular
.module('authoring', [
@@ -114,18 +114,18 @@ const authoringModule = angular
'ui.router'
])
.service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
.service('ComponentService', ComponentService)
.factory('ConfigService', downgradeInjectable(ConfigService))
- .service('CRaterService', CRaterService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
.service('NodeService', NodeService)
.service('NotebookService', NotebookService)
.service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
.factory('ProjectService', downgradeInjectable(AuthoringToolProjectService))
.service('ProjectAssetService', ProjectAssetService)
- .service('SessionService', SessionService)
+ .factory('SessionService', downgradeInjectable(SessionService))
.service('SpaceService', SpaceService)
- .service('StudentAssetService', StudentAssetService)
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
.service('StudentDataService', StudentDataService)
.service('StudentStatusService', StudentStatusService)
.service('StudentWebSocketService', StudentWebSocketService)
diff --git a/src/main/webapp/wise5/authoringTool/authoringToolController.ts b/src/main/webapp/wise5/authoringTool/authoringToolController.ts
index 11129103af..fc2234a980 100644
--- a/src/main/webapp/wise5/authoringTool/authoringToolController.ts
+++ b/src/main/webapp/wise5/authoringTool/authoringToolController.ts
@@ -1,7 +1,7 @@
'use strict';
import * as angular from 'angular';
import { ConfigService } from '../services/configService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import TeacherDataService from '../services/teacherDataService';
import { AuthoringToolProjectService } from './authoringToolProjectService';
@@ -193,11 +193,15 @@ class AuthoringToolController {
this.SessionService.closeWarningAndRenewSession();
},
() => {
- this.SessionService.forceLogOut();
+ this.logOut();
}
);
});
+ $scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('showRequestLogout', ev => {
const alert = this.$mdDialog
.confirm()
@@ -343,21 +347,31 @@ class AuthoringToolController {
this.$rootScope.$broadcast('setGlobalMessage', { globalMessage: globalMessage });
}
- saveEvent(eventName, category) {
+ logOut() {
+ this.saveEvent('logOut', 'Navigation').then(() => {
+ this.SessionService.logOut();
+ });
+ }
+
+ saveEvent(eventName, category): any {
const context = 'AuthoringTool';
const nodeId = null;
const componentId = null;
const componentType = null;
const data = {};
- this.TeacherDataService.saveEvent(
+ const projectId = null;
+ return this.TeacherDataService.saveEvent(
context,
nodeId,
componentId,
componentType,
category,
eventName,
- data
- );
+ data,
+ projectId
+ ).then((result) => {
+ return result;
+ });
}
}
diff --git a/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts b/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts
index cd78f58d76..0a99b93be1 100644
--- a/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts
+++ b/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts
@@ -2,6 +2,8 @@
import { ConfigService } from '../../../../services/configService';
import { AuthoringToolProjectService } from '../../../authoringToolProjectService';
+import { SessionService } from '../../../../services/sessionService';
+import TeacherDataService from '../../../../services/teacherDataService';
class TopBarController {
avatarColor: any;
@@ -11,14 +13,23 @@ class TopBarController {
contextPath: string;
runId: number;
- static $inject = ['$rootScope', '$state', '$window', 'ConfigService', 'ProjectService'];
+ static $inject = [
+ '$rootScope',
+ '$state',
+ '$window',
+ 'ConfigService',
+ 'ProjectService',
+ 'SessionService'
+ ];
constructor(
private $rootScope: any,
private $state: any,
private $window: any,
private ConfigService: ConfigService,
- private ProjectService: AuthoringToolProjectService
+ private ProjectService: AuthoringToolProjectService,
+ private SessionService: SessionService,
+ private TeacherDataService: TeacherDataService
) {
this.workgroupId = this.ConfigService.getWorkgroupId();
if (this.workgroupId == null) {
@@ -57,12 +68,31 @@ class TopBarController {
goHome() {
this.ProjectService.notifyAuthorProjectEnd().then(() => {
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
});
}
logOut() {
- this.$rootScope.$broadcast('logOut');
+ const context = 'AuthoringTool';
+ const category = 'Navigation';
+ const eventName = 'logOutButtonClicked';
+ const nodeId = null;
+ const componentId = null;
+ const componentType = null;
+ const data = {};
+ const projectId = null;
+ this.TeacherDataService.saveEvent(
+ context,
+ nodeId,
+ componentId,
+ componentType,
+ category,
+ eventName,
+ data,
+ projectId
+ ).then((result) => {
+ this.SessionService.logOut();
+ });
}
}
diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json
index dd3ce2e6f0..c9666b9360 100644
--- a/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json
@@ -156,7 +156,6 @@
"insertAsFirstStep": "أدرج كخطوة أولى",
"insertInside": "إدراج بالداخل",
"isCompleted": "اكتمل",
- "isPlanningActivityCompleted": "اكتمل نشاط التخطيط",
"isVisible": "مرئي",
"isVisitable": "قابل للزيارة",
"isVisited": "تمت زيارته",
@@ -305,4 +304,4 @@
"youAreNotAllowedToInsertTheSelectedItemAfterItself": "غير مسموح لك بإدراج العنصر المُحدد بعده.",
"youAreNotAllowedToInsertTheSelectedItemsAfterItself": "غير مسموح لك بإدراج العناصر المُحددة بعده.",
"youCannotCopyActivitiesAtThisTime": "لا يُمكنك نسخ هذه الأنشطة في هذا الوقت."
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json
index 8f685bead5..b9e8e41cd6 100644
--- a/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json
@@ -103,7 +103,6 @@
"insertAsFirstStep": "Εισαγωγή ως Πρώτο Βήμα",
"insertInside": "Εισαγωγή Εντός",
"isCompleted": "Είναι Ολοκληρωμένο",
- "isPlanningActivityCompleted": "Η Δραστηριότητα Σχεδιασμού Είναι Ολοκληρωμένη",
"isVisible": "Είναι Ορατό",
"isVisitable": "Είναι Επισκέψιμο",
"isVisited": "Έχει γίνει Επίσκεψη",
@@ -193,4 +192,4 @@
"yes": "Ναι",
"youAreNotAllowedToInsertTheSelectedItemAfterItself": "Δεν επιτρέπεται να εισάγετε το επιλεγμένο αντικείμενο ύστερα από το ίδιο",
"youAreNotAllowedToInsertTheSelectedItemsAfterItself": "Δεν επιτρέπεται να εισάγετε τα επιλεγμένα αντικείμενα ύστερα από τα ίδια"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json
index 1597e6c18e..fea32bfcf4 100644
--- a/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json
@@ -206,7 +206,6 @@
"insertAsFirstStep": "Insert As First Step",
"insertInside": "Insert Inside",
"isCompleted": "Is Completed",
- "isPlanningActivityCompleted": "Is Planning Lesson Completed",
"isVisible": "Is Visible",
"isVisitable": "Is Visitable",
"isVisited": "Is Visited",
diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json
index 526a0991cd..4ca6720e76 100644
--- a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json
@@ -78,7 +78,6 @@
"insertAfter": "在后面插入",
"insertInside": "在中间插入",
"isCompleted": "已完成",
- "isPlanningActivityCompleted": "规划活动完成了么",
"isVisible": "是否可见",
"isVisitable": "是否可以访问",
"isVisited": "是否访问过",
@@ -148,4 +147,4 @@
"viewHistory": "显示历史",
"whenToChoosePath": "什么时候选择路径",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json
index 78a3ec31a1..d1d3315edd 100755
--- a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json
@@ -80,7 +80,6 @@
"insertAfter": "在後面插入",
"insertInside": "在中間插入",
"isCompleted": "已完成",
- "isPlanningActivityCompleted": "規劃活動完成了嗎",
"isVisible": "是否可見",
"isVisitable": "是否可以訪問",
"isVisited": "是否訪問過",
@@ -156,4 +155,4 @@
"viewHistory": "顯示歷史",
"whenToChoosePath": "什麼時候選擇路徑",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts b/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts
index 0bba566c01..018dbd719e 100644
--- a/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts
+++ b/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts
@@ -64,9 +64,6 @@ class AuthoringToolMainController {
if (this.is_rtl) {
this.icons = { prev: 'arrow_forward', next: 'arrow_back' };
}
- this.$rootScope.$on('logOut', () => {
- this.saveEvent('logOut', 'Navigation', {}, null);
- });
}
getProjectByProjectId(projectId) {
diff --git a/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts b/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts
index d493bb07f0..e0499aa767 100644
--- a/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts
+++ b/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts
@@ -282,10 +282,6 @@ class NodeAuthoringController {
}
]
},
- {
- value: 'isPlanningActivityCompleted',
- text: this.$translate('isPlanningActivityCompleted')
- },
{
value: 'wroteXNumberOfWords',
text: this.$translate('wroteXNumberOfWords'),
diff --git a/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html b/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html
index 065f36d28b..6028df20da 100644
--- a/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html
+++ b/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html
@@ -4,7 +4,7 @@
+ ng-class="::{'groupHeader': item.node.type == 'group', 'stepHeader': item.node.type != 'group'}">
{{item.node.title}}:
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
index 66a6e0d63e..f59190dca7 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
@@ -24,7 +24,7 @@ import ClassroomMonitorController from './classroomMonitorController';
import { ClassroomMonitorProjectService } from './classroomMonitorProjectService';
import '../components/conceptMap/conceptMapComponentModule';
import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
+import { CRaterService } from '../services/cRaterService';
import '../directives/components';
import ComponentService from '../components/componentService';
import './dashboard/dashboardController';
@@ -58,13 +58,12 @@ import NotebookService from '../services/notebookService';
import NotificationService from '../services/notificationService';
import '../components/openResponse/openResponseComponentModule';
import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import * as SockJS from 'sockjs-client';
import * as StompJS from '@stomp/stompjs';
window['SockJS'] = SockJS;
window['Stomp'] = StompJS.Stomp;
-import StudentAssetService from '../services/studentAssetService';
+import { StudentAssetService } from '../services/studentAssetService';
import StudentDataService from '../services/studentDataService';
import StudentGradingController from './studentGrading/studentGradingController';
import StudentProgressController from './studentProgress/studentProgressController';
@@ -76,6 +75,7 @@ import TeacherDataService from '../services/teacherDataService';
import TeacherWebSocketService from '../services/teacherWebSocketService';
import { UtilService } from '../services/utilService';
import * as moment from 'moment';
+import { AudioRecorderService } from '../services/audioRecorderService';
const classroomMonitorModule = angular
.module('classroomMonitor', [
@@ -115,18 +115,18 @@ const classroomMonitorModule = angular
])
.service('AchievementService', AchievementService)
.service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
.service('ComponentService', ComponentService)
.factory('ConfigService', downgradeInjectable(ConfigService))
- .service('CRaterService', CRaterService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
.service('HttpInterceptor', HttpInterceptor)
.service('MilestoneService', MilestoneService)
.service('NodeService', NodeService)
.service('NotebookService', NotebookService)
.service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
.factory('ProjectService', downgradeInjectable(ClassroomMonitorProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
+ .factory('SessionService', downgradeInjectable(SessionService))
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
.service('StudentDataService', StudentDataService)
.service('StudentStatusService', StudentStatusService)
.service('StudentWebSocketService', StudentWebSocketService)
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
index e7835255a5..c1d1bc880e 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
@@ -13,9 +13,6 @@
-
- {{ ::'noteThisActivityIncludesStudentPlanning' | translate }}
-
-
-
@@ -47,7 +35,6 @@
class="md-long-text noright list-item md-whiteframe-1dp"
aria-label="{{::$ctrl.nodeTitle}}"
ng-class="{'nav-item--list--group': $ctrl.isGroup,
- 'nav-item--planning-mode': $ctrl.planningMode && $ctrl.isPlanningInstance,
'list-item--warn': $ctrl.newAlert,
'warn': $ctrl.newAlert,
'text-secondary': !$ctrl.nodeHasWork}">
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
index a8d2274397..52cced510a 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
@@ -3,7 +3,6 @@
import AnnotationService from '../../../../services/annotationService';
import { ConfigService } from '../../../../services/configService';
import NotificationService from '../../../../services/notificationService';
-import PlanningService from '../../../../services/planningService';
import { ClassroomMonitorProjectService } from '../../../classroomMonitorProjectService';
import StudentStatusService from '../../../../services/studentStatusService';
import TeacherDataService from '../../../../services/teacherDataService';
@@ -12,7 +11,6 @@ import * as $ from 'jquery';
class NavItemController {
$translate: any;
- availablePlanningNodes: any;
alertIconClass: string;
alertIconLabel: string;
alertIconName: string;
@@ -27,9 +25,6 @@ class NavItemController {
icon: any;
isCurrentNode: boolean;
isGroup: boolean;
- isParentGroupPlanning: boolean;
- isPlanning: boolean;
- isPlanningNode: boolean;
isWorkgroupOnlineOnNode: boolean;
item: any;
maxScore: number;
@@ -53,7 +48,6 @@ class NavItemController {
'AnnotationService',
'ConfigService',
'NotificationService',
- 'PlanningService',
'ProjectService',
'StudentStatusService',
'TeacherDataService',
@@ -68,7 +62,6 @@ class NavItemController {
private AnnotationService: AnnotationService,
private ConfigService: ConfigService,
private NotificationService: NotificationService,
- private PlanningService: PlanningService,
private ProjectService: ClassroomMonitorProjectService,
private StudentStatusService: StudentStatusService,
private TeacherDataService: TeacherDataService,
@@ -80,7 +73,6 @@ class NavItemController {
this.AnnotationService = AnnotationService;
this.ConfigService = ConfigService;
this.NotificationService = NotificationService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.StudentStatusService = StudentStatusService;
this.TeacherDataService = TeacherDataService;
@@ -105,26 +97,12 @@ class NavItemController {
this.maxScore = this.ProjectService.getMaxScoreForNode(this.nodeId);
this.workgroupsOnNodeData = [];
this.isWorkgroupOnlineOnNode = false;
- this.isPlanning = this.PlanningService.isPlanning(this.nodeId);
this.icon = this.ProjectService.getNodeIconByNodeId(this.nodeId);
this.parentGroupId = null;
var parentGroup = this.ProjectService.getParentGroup(this.nodeId);
if (parentGroup != null) {
this.parentGroupId = parentGroup.id;
}
- if (this.isPlanning) {
- /*
- * planning is enabled for this group so we will get the available
- * planning nodes that can be used
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.nodeId);
- } else if (this.isPlanningNode) {
- /* this is an available planning node for its parent group, so we
- * need to calculate the total number of times it has been added
- * to the project by all the workgroups in the current period
- */
- }
-
this.setWorkgroupsOnNodeData();
this.$onInit = () => {
@@ -260,64 +238,6 @@ class NavItemController {
}
}
- /**
- * Returns the max times a planning node can be added to the project (-1 is
- * is returned if there is no limit)
- * @param planningNodeId
- */
- getPlannindNodeMaxAllowed(planningNodeId) {
- let maxAddAllowed = -1; // by default, students can add as many instances as they want
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
- // get the maxAddAllowed value by looking up the planningNode in the project.
- if (planningGroupNode && planningGroupNode.availablePlanningNodes) {
- for (let a = 0; a < planningGroupNode.availablePlanningNodes.length; a++) {
- let availablePlanningNode = planningGroupNode.availablePlanningNodes[a];
- if (availablePlanningNode.nodeId === planningNodeId && availablePlanningNode.max != null) {
- maxAddAllowed = availablePlanningNode.max;
- }
- }
- }
-
- return maxAddAllowed;
- }
-
- /**
- * Returns the number of times a planning node has been added to the project
- * @param planningNodeId
- */
- getNumPlannindNodeInstances(planningNodeId) {
- let numPlanningNodesAdded = 0; // keep track of number of instances
- // otherwise, see how many times the planning node template has been used.
-
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
-
- // loop through the child ids in the planning group and see how many times they've been used
- if (planningGroupNode && planningGroupNode.ids) {
- for (let c = 0; c < planningGroupNode.ids.length; c++) {
- let childPlanningNodeId = planningGroupNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- if (
- childPlanningNode != null &&
- childPlanningNode.planningNodeTemplateId === planningNodeId
- ) {
- numPlanningNodesAdded++;
- }
- }
- }
-
- return numPlanningNodesAdded;
- }
-
/**
* Get the node title
* @param nodeId get the title for this node
@@ -442,8 +362,7 @@ const NavItem = {
bindings: {
nodeId: '<',
showPosition: '<',
- type: '<',
- isPlanningNode: '<'
+ type: '<'
},
templateUrl:
'/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html',
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
index 4b0dd37e21..2499cc23f2 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
@@ -3,6 +3,7 @@
import { ConfigService } from '../../../../services/configService';
import { ClassroomMonitorProjectService } from '../../../classroomMonitorProjectService';
import TeacherDataService from '../../../../services/teacherDataService';
+import { SessionService } from '../../../../services/sessionService';
class TopBarController {
$translate: any;
@@ -22,7 +23,8 @@ class TopBarController {
'$state',
'ConfigService',
'ProjectService',
- 'TeacherDataService'
+ 'TeacherDataService',
+ 'SessionService'
];
constructor(
@@ -31,7 +33,8 @@ class TopBarController {
private $state: any,
private ConfigService: ConfigService,
private ProjectService: ClassroomMonitorProjectService,
- private TeacherDataService: TeacherDataService
+ private TeacherDataService: TeacherDataService,
+ private SessionService: SessionService
) {
this.$translate = $filter('translate');
this.workgroupId = this.ConfigService.getWorkgroupId();
@@ -125,29 +128,33 @@ class TopBarController {
componentType,
category,
event,
- eventData
+ eventData,
+ null
);
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
}
logOut() {
- var context = 'ClassroomMonitor';
- var nodeId = null;
- var componentId = null;
- var componentType = null;
- var category = 'Navigation';
- var event = 'logOutButtonClicked';
- var eventData = {};
+ const context = 'ClassroomMonitor';
+ const category = 'Navigation';
+ const eventName = 'logOutButtonClicked';
+ const nodeId = null;
+ const componentId = null;
+ const componentType = null;
+ const data = {};
+ const projectId = null;
this.TeacherDataService.saveEvent(
context,
nodeId,
componentId,
componentType,
category,
- event,
- eventData
- );
- this.$rootScope.$broadcast('logOut');
+ eventName,
+ data,
+ projectId
+ ).then((result) => {
+ this.SessionService.logOut();
+ });
}
}
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
index 14edd99032..7e8197cae2 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
@@ -5,7 +5,7 @@ import NodeService from '../services/nodeService';
import NotebookService from '../services/notebookService';
import NotificationService from '../services/notificationService';
import TeacherDataService from '../services/teacherDataService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import * as angular from 'angular';
import { ClassroomMonitorProjectService } from './classroomMonitorProjectService';
@@ -141,11 +141,15 @@ class ClassroomMonitorController {
this.SessionService.closeWarningAndRenewSession();
},
() => {
- this.SessionService.forceLogOut();
+ this.logOut();
}
);
});
+ this.$scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('showRequestLogout', ev => {
const alert = $mdDialog
.confirm()
@@ -177,13 +181,14 @@ class ClassroomMonitorController {
this.themePath = this.ProjectService.getThemePath();
this.notifications = this.NotificationService.notifications;
- let context = 'ClassroomMonitor',
+ const context = 'ClassroomMonitor',
nodeId = null,
componentId = null,
componentType = null,
category = 'Navigation',
event = 'sessionStarted',
- data = {};
+ data = {},
+ projectId = null;
this.TeacherDataService.saveEvent(
context,
nodeId,
@@ -191,7 +196,8 @@ class ClassroomMonitorController {
componentType,
category,
event,
- data
+ data,
+ projectId
);
this.$window.onbeforeunload = () => {
@@ -251,6 +257,33 @@ class ClassroomMonitorController {
this.$mdToast.hide(this.connectionLostDisplay);
this.connectionLostShown = false;
}
+
+ logOut() {
+ this.saveEvent('logOut', 'Navigation').then(() => {
+ this.SessionService.logOut();
+ });
+ }
+
+ saveEvent(eventName, category): any {
+ const context = 'ClassroomMonitor';
+ const nodeId = null;
+ const componentId = null;
+ const componentType = null;
+ const data = {};
+ const projectId = null;
+ return this.TeacherDataService.saveEvent(
+ context,
+ nodeId,
+ componentId,
+ componentType,
+ category,
+ eventName,
+ data,
+ projectId
+ ).then((result) => {
+ return result;
+ });
+ }
}
export default ClassroomMonitorController;
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
index 2bcba094ae..f8c3502ff9 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
@@ -105,7 +105,6 @@
"notAssigned": "لم يتم تعيينها",
"notCompleted": "لم يتم الانتهاء منها",
"notVisited": "لم تتم زيارته",
- "noteThisActivityIncludesStudentPlanning": "ملاحظة: يتضمن هذا النشاط تخطيط الطالب",
"numberOfAssessmentItems_0": "0 عناصر تقييم العمل ",
"numberOfAssessmentItems_1": " 1 عنصر تقييم واحد ",
"numberOfStudentOnStep": "#عدد من الطلاب بالخطوة ",
@@ -184,4 +183,4 @@
"visited": "تمت الزيارة\n",
"workgroups": "مجموعات العمل\n",
"yes": "نعم"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
index f85b6747f7..9f4759eeb5 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
@@ -89,7 +89,6 @@
"noMatchesFound": "Δεν βρέθηκαν αντιστοιχήσεις",
"noNotes": "Η ομάδα δεν έχει ακόμα δημιουργήσει καθόλου σημειώσεις",
"notCompleted": "Μη συμπληρωμένο",
- "noteThisActivityIncludesStudentPlanning": "Σημείωση: Αυτή η δραστηριότητα περιλαμβάνει σχεδιασμό από τους μαθητές",
"notVisited": "Δεν έχει γίνει επίσκεψη",
"noWork": "Καμμία Δουλειά",
"numberOfAssessmentItems_0": "0 αντικείμενα αξιολόγησης",
@@ -166,4 +165,4 @@
"visited": "Έχει ήδη γίνει επίσκεψη",
"workgroups": "Ομάδες Εργασίας",
"yes": "Ναι"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
index 97f202f67d..aa014e5fec 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
@@ -145,7 +145,6 @@
"notAssigned": "Not Assigned",
"notCompleted": "Not Completed",
"notes": "Notes",
- "noteThisActivityIncludesStudentPlanning": "Note: This lesson includes student planning.",
"notVisited": "Not Visited",
"noWork": "No Work",
"numberOfAssessmentItems_0": "0 assessment items",
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
index 5922bc5e32..e846e524b7 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
@@ -42,7 +42,6 @@
"newWork": "新作品",
"newWorkCounter": "新作品数: {{count}}",
"noNotes": "学生还没有创建任何笔记",
- "noteThisActivityIncludesStudentPlanning": "注意：该活动包含学生计划。",
"notVisited": "未访问",
"noWork": "无作品",
"numberOfStudentOnStep": "# 在本步骤上的学生",
@@ -85,4 +84,4 @@
"unpauseStudentScreens": "解锁学生屏幕",
"visited": "已访问",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
index 49674ba128..6f7e1c66b3 100755
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
@@ -49,7 +49,6 @@
"newWorkCounter": "新作業數量: {{count}}",
"noMatchesFound": "找不到匹配的",
"noNotes": "學生還沒有建立任何筆記",
- "noteThisActivityIncludesStudentPlanning": "注意：此活動包含學生計劃。",
"notVisited": "未訪問",
"noWork": "無作業",
"numberOfStudentOnStep": "# 在本步驟上的學生",
@@ -100,4 +99,4 @@
"unpauseStudentScreens": "解鎖學生螢幕",
"visited": "已訪問",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/components/componentController.ts b/src/main/webapp/wise5/components/componentController.ts
index f9d0276316..ffb626ebf7 100644
--- a/src/main/webapp/wise5/components/componentController.ts
+++ b/src/main/webapp/wise5/components/componentController.ts
@@ -5,7 +5,7 @@ import { ConfigService } from "../services/configService";
import NodeService from "../services/nodeService";
import NotebookService from "../services/notebookService";
import { ProjectService } from "../services/projectService";
-import StudentAssetService from "../services/studentAssetService";
+import { StudentAssetService } from "../services/studentAssetService";
import { UtilService } from "../services/utilService";
import StudentDataService from "../services/studentDataService";
@@ -42,6 +42,7 @@ class ComponentController {
isSubmit: boolean;
saveMessage: any;
isStudentAttachmentEnabled: boolean;
+ isStudentAudioRecordingEnabled: boolean;
isPromptVisible: boolean;
isSaveButtonVisible: boolean;
isSubmitButtonVisible: boolean;
@@ -114,7 +115,7 @@ class ComponentController {
};
this.isStudentAttachmentEnabled = this.componentContent.isStudentAttachmentEnabled;
-
+ this.isStudentAudioRecordingEnabled = this.componentContent.isStudentAudioRecordingEnabled || false;
this.isPromptVisible = true;
this.isSaveButtonVisible = false;
this.isSubmitButtonVisible = false;
@@ -1234,10 +1235,12 @@ class ComponentController {
}
attachStudentAsset(studentAsset) {
- this.StudentAssetService.copyAssetForReference(studentAsset).then((copiedAsset) => {
+ return this.StudentAssetService.copyAssetForReference(studentAsset).then((copiedAsset) => {
const attachment = {
studentAssetId: copiedAsset.id,
- iconURL: copiedAsset.iconURL
+ iconURL: copiedAsset.iconURL,
+ url: copiedAsset.url,
+ type: copiedAsset.type
};
this.attachments.push(attachment);
this.studentDataChanged();
@@ -1289,6 +1292,18 @@ class ComponentController {
}
});
}
+
+ registerAudioRecordedListener() {
+ this.$scope.$on('audioRecorded', (event, {requester, audioFile}) => {
+ if (requester === `${this.nodeId}-${this.componentId}`) {
+ this.StudentAssetService.uploadAsset(audioFile).then((studentAsset) => {
+ this.attachStudentAsset(studentAsset).then(() => {
+ this.StudentAssetService.deleteAsset(studentAsset);
+ })
+ });
+ }
+ });
+ }
}
export default ComponentController;
diff --git a/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts b/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
index 3911d66dc7..a9aeaf34c4 100644
--- a/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
+++ b/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
@@ -1,7 +1,7 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
import { ConfigService } from '../../services/configService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
import ConceptMapNode from './conceptMapNode';
import ConceptMapLink from './conceptMapLink';
diff --git a/src/main/webapp/wise5/components/draw/drawService.ts b/src/main/webapp/wise5/components/draw/drawService.ts
index c423ef0307..b3cc89904a 100644
--- a/src/main/webapp/wise5/components/draw/drawService.ts
+++ b/src/main/webapp/wise5/components/draw/drawService.ts
@@ -2,7 +2,7 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class DrawService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/embedded/embeddedService.ts b/src/main/webapp/wise5/components/embedded/embeddedService.ts
index fffaf636b3..8ef7099bfd 100644
--- a/src/main/webapp/wise5/components/embedded/embeddedService.ts
+++ b/src/main/webapp/wise5/components/embedded/embeddedService.ts
@@ -1,7 +1,7 @@
import * as $ from 'jquery';
import * as html2canvas from 'html2canvas';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class EmbeddedService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/label/labelService.ts b/src/main/webapp/wise5/components/label/labelService.ts
index cb0398c3a2..b69ab0a659 100644
--- a/src/main/webapp/wise5/components/label/labelService.ts
+++ b/src/main/webapp/wise5/components/label/labelService.ts
@@ -1,6 +1,6 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class LabelService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/match/matchController.ts b/src/main/webapp/wise5/components/match/matchController.ts
index b5a634a8a0..f7f86373d1 100644
--- a/src/main/webapp/wise5/components/match/matchController.ts
+++ b/src/main/webapp/wise5/components/match/matchController.ts
@@ -22,6 +22,7 @@ class MatchController extends ComponentController {
isLatestComponentStateSubmit: boolean;
sourceBucket: any;
privateNotebookItems: any[];
+ autoScroll: any;
static $inject = [
'$filter',
@@ -79,6 +80,7 @@ class MatchController extends ComponentController {
this.dragulaService = dragulaService;
this.MatchService = MatchService;
this.$mdMedia = $mdMedia;
+ this.autoScroll = require('dom-autoscroller');
this.choices = [];
this.buckets = [];
@@ -219,6 +221,15 @@ class MatchController extends ComponentController {
this.disableDraggingIfNeeded(dragId);
const drake = this.dragulaService.find(this.$scope, dragId).drake;
this.showVisualIndicatorWhileDragging(drake);
+ this.autoScroll(
+ [document.querySelector('#content')], {
+ margin: 30,
+ pixels: 50,
+ scrollWhenOutside: true,
+ autoScroll: function() {
+ return this.down && drake.dragging;
+ }
+ });
}
registerStudentDataChangedOnDrop(dragId) {
diff --git a/src/main/webapp/wise5/components/openResponse/authoring.html b/src/main/webapp/wise5/components/openResponse/authoring.html
index df6fdce5d2..f80ef985f1 100644
--- a/src/main/webapp/wise5/components/openResponse/authoring.html
+++ b/src/main/webapp/wise5/components/openResponse/authoring.html
@@ -25,6 +25,13 @@ {{ ::'advancedAuthoringOptions' | translate }}
ng-change='openResponseController.authoringViewComponentChanged()'/>
+
+
+ {{ ::'openResponse.enableStudentAudioResponse' | translate }}
+
+
{{ ::'openResponse.enableCRater' | translate }}:
-
-
+
+ {{ ::'openResponse.previousVersions' | translate }}: {{nodeController.getRevisions().length - 1}}
-
+
-
+
![]()
-
cancel
+
+
+ mic {{ ::'openResponse.recordResponse' | translate }}
+
+
+ stop {{ ::'openResponse.stopRecording' | translate }}
+
+
+ {{ ::'openResponse.recording' | translate }} {{ ::'openResponse.recordingTimeLeft' | translate }} :{{ openResponseController.getAudioRecordingTimeLeft() }}
+
+
+
{
- if (result != null) {
- // get the CRater response
- const data = result.data;
+ (data: any) => {
+ /*
+ * annotations we put in the component state will be
+ * removed from the component state and saved separately
+ */
+ componentState.annotations = [];
+
+ // get the CRater score
+ let score = data.score;
+ let concepts = data.concepts;
+ let previousScore = null;
+ if (data.scores != null) {
+ const maxSoFarFunc = (accumulator, currentValue) => {
+ return Math.max(accumulator, currentValue.score);
+ };
+ score = data.scores.reduce(maxSoFarFunc, 0);
+ }
- if (data != null) {
- /*
- * annotations we put in the component state will be
- * removed from the component state and saved separately
- */
- componentState.annotations = [];
-
- // get the CRater score
- let score = data.score;
- let concepts = data.concepts;
- let previousScore = null;
- if (data.scores != null) {
- const maxSoFarFunc = (accumulator, currentValue) => {
- return Math.max(accumulator, currentValue.score);
- };
- score = data.scores.reduce(maxSoFarFunc, 0);
- }
+ if (score != null) {
+ const autoScoreAnnotationData: any = {
+ value: score,
+ maxAutoScore: this.ProjectService.getMaxScoreForComponent(
+ this.nodeId,
+ this.componentId
+ ),
+ concepts: concepts,
+ autoGrader: 'cRater'
+ };
+ if (data.scores != null) {
+ autoScoreAnnotationData.scores = data.scores;
+ }
- if (score != null) {
- const autoScoreAnnotationData: any = {
- value: score,
- maxAutoScore: this.ProjectService.getMaxScoreForComponent(
- this.nodeId,
- this.componentId
- ),
- concepts: concepts,
- autoGrader: 'cRater'
- };
- if (data.scores != null) {
- autoScoreAnnotationData.scores = data.scores;
- }
+ let autoScoreAnnotation = this.createAutoScoreAnnotation(autoScoreAnnotationData);
- let autoScoreAnnotation = this.createAutoScoreAnnotation(autoScoreAnnotationData);
+ let annotationGroupForScore = null;
- let annotationGroupForScore = null;
+ if (this.$scope.$parent.nodeController != null) {
+ // get the previous score and comment annotations
+ let latestAnnotations = this.$scope.$parent.nodeController.getLatestComponentAnnotations(
+ this.componentId
+ );
- if (this.$scope.$parent.nodeController != null) {
- // get the previous score and comment annotations
- let latestAnnotations = this.$scope.$parent.nodeController.getLatestComponentAnnotations(
- this.componentId
- );
+ if (
+ latestAnnotations != null &&
+ latestAnnotations.score != null &&
+ latestAnnotations.score.data != null
+ ) {
+ // get the previous score annotation value
+ previousScore = latestAnnotations.score.data.value;
+ }
- if (
- latestAnnotations != null &&
- latestAnnotations.score != null &&
- latestAnnotations.score.data != null
- ) {
- // get the previous score annotation value
- previousScore = latestAnnotations.score.data.value;
- }
+ if (
+ this.componentContent.enableGlobalAnnotations &&
+ this.componentContent.globalAnnotationSettings != null
+ ) {
+ let globalAnnotationMaxCount = 0;
+ if (
+ this.componentContent.globalAnnotationSettings.globalAnnotationMaxCount !=
+ null
+ ) {
+ globalAnnotationMaxCount = this.componentContent.globalAnnotationSettings
+ .globalAnnotationMaxCount;
+ }
+ // get the annotation properties for the score that the student got.
+ annotationGroupForScore = this.ProjectService.getGlobalAnnotationGroupByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+
+ // check if we need to apply this globalAnnotationSetting to this annotation: we don't need to if we've already reached the maxCount
+ if (annotationGroupForScore != null) {
+ let globalAnnotationGroupsByNodeIdAndComponentId = this.AnnotationService.getAllGlobalAnnotationGroups();
+ annotationGroupForScore.annotationGroupCreatedTime =
+ autoScoreAnnotation.clientSaveTime; // save annotation creation time
if (
- this.componentContent.enableGlobalAnnotations &&
- this.componentContent.globalAnnotationSettings != null
+ globalAnnotationGroupsByNodeIdAndComponentId.length >=
+ globalAnnotationMaxCount
) {
- let globalAnnotationMaxCount = 0;
- if (
- this.componentContent.globalAnnotationSettings.globalAnnotationMaxCount !=
- null
- ) {
- globalAnnotationMaxCount = this.componentContent.globalAnnotationSettings
- .globalAnnotationMaxCount;
- }
- // get the annotation properties for the score that the student got.
- annotationGroupForScore = this.ProjectService.getGlobalAnnotationGroupByScore(
- this.componentContent,
- previousScore,
- score
- );
-
- // check if we need to apply this globalAnnotationSetting to this annotation: we don't need to if we've already reached the maxCount
- if (annotationGroupForScore != null) {
- let globalAnnotationGroupsByNodeIdAndComponentId = this.AnnotationService.getAllGlobalAnnotationGroups();
- annotationGroupForScore.annotationGroupCreatedTime =
- autoScoreAnnotation.clientSaveTime; // save annotation creation time
-
- if (
- globalAnnotationGroupsByNodeIdAndComponentId.length >=
- globalAnnotationMaxCount
- ) {
- // we've already applied this annotation properties to maxCount annotations, so we don't need to apply it any more.
- annotationGroupForScore = null;
- }
- }
-
- if (
- annotationGroupForScore != null &&
- annotationGroupForScore.isGlobal &&
- annotationGroupForScore.unGlobalizeCriteria != null
- ) {
- // check if this annotation is global and what criteria needs to be met to un-globalize.
- annotationGroupForScore.unGlobalizeCriteria.map(unGlobalizeCriteria => {
- // if the un-globalize criteria is time-based (e.g. isVisitedAfter, isRevisedAfter, isVisitedAndRevisedAfter, etc), store the timestamp of this annotation in the criteria
- // so we can compare it when we check for criteria satisfaction.
- if (unGlobalizeCriteria.params != null) {
- unGlobalizeCriteria.params.criteriaCreatedTimestamp =
- autoScoreAnnotation.clientSaveTime; // save annotation creation time to criteria
- }
- });
- }
-
- if (annotationGroupForScore != null) {
- // copy over the annotation properties into the autoScoreAnnotation's data
- angular.merge(autoScoreAnnotation.data, annotationGroupForScore);
- }
+ // we've already applied this annotation properties to maxCount annotations, so we don't need to apply it any more.
+ annotationGroupForScore = null;
}
}
- componentState.annotations.push(autoScoreAnnotation);
-
- if (this.mode === 'authoring') {
- if (this.latestAnnotations == null) {
- this.latestAnnotations = {};
- }
+ if (
+ annotationGroupForScore != null &&
+ annotationGroupForScore.isGlobal &&
+ annotationGroupForScore.unGlobalizeCriteria != null
+ ) {
+ // check if this annotation is global and what criteria needs to be met to un-globalize.
+ annotationGroupForScore.unGlobalizeCriteria.map(unGlobalizeCriteria => {
+ // if the un-globalize criteria is time-based (e.g. isVisitedAfter, isRevisedAfter, isVisitedAndRevisedAfter, etc), store the timestamp of this annotation in the criteria
+ // so we can compare it when we check for criteria satisfaction.
+ if (unGlobalizeCriteria.params != null) {
+ unGlobalizeCriteria.params.criteriaCreatedTimestamp =
+ autoScoreAnnotation.clientSaveTime; // save annotation creation time to criteria
+ }
+ });
+ }
- /*
- * we are in the authoring view so we will set the
- * latest score annotation manually
- */
- this.latestAnnotations.score = autoScoreAnnotation;
+ if (annotationGroupForScore != null) {
+ // copy over the annotation properties into the autoScoreAnnotation's data
+ angular.merge(autoScoreAnnotation.data, annotationGroupForScore);
}
+ }
+ }
- let autoComment = null;
+ componentState.annotations.push(autoScoreAnnotation);
- // get the submit counter
- const submitCounter = this.submitCounter;
+ if (this.mode === 'authoring') {
+ if (this.latestAnnotations == null) {
+ this.latestAnnotations = {};
+ }
- if (
- this.componentContent.cRater.enableMultipleAttemptScoringRules &&
- submitCounter > 1
- ) {
- /*
- * this step has multiple attempt scoring rules and this is
- * a subsequent submit
- */
- // get the feedback based upon the previous score and current score
- autoComment = this.CRaterService.getMultipleAttemptCRaterFeedbackTextByScore(
- this.componentContent,
- previousScore,
- score
- );
- } else {
- // get the feedback text
- autoComment = this.CRaterService.getCRaterFeedbackTextByScore(
- this.componentContent,
- score
- );
- }
+ /*
+ * we are in the authoring view so we will set the
+ * latest score annotation manually
+ */
+ this.latestAnnotations.score = autoScoreAnnotation;
+ }
- if (autoComment != null) {
- // create the auto comment annotation
- const autoCommentAnnotationData: any = {};
- autoCommentAnnotationData.value = autoComment;
- autoCommentAnnotationData.concepts = concepts;
- autoCommentAnnotationData.autoGrader = 'cRater';
-
- const autoCommentAnnotation = this.createAutoCommentAnnotation(
- autoCommentAnnotationData
- );
-
- if (this.componentContent.enableGlobalAnnotations) {
- if (annotationGroupForScore != null) {
- // copy over the annotation properties into the autoCommentAnnotation's data
- angular.merge(autoCommentAnnotation.data, annotationGroupForScore);
- }
- }
- componentState.annotations.push(autoCommentAnnotation);
+ let autoComment = null;
- if (this.mode === 'authoring') {
- if (this.latestAnnotations == null) {
- this.latestAnnotations = {};
- }
+ // get the submit counter
+ const submitCounter = this.submitCounter;
- /*
- * we are in the authoring view so we will set the
- * latest comment annotation manually
- */
- this.latestAnnotations.comment = autoCommentAnnotation;
- }
- }
- if (
- this.componentContent.enableNotifications &&
- this.componentContent.notificationSettings &&
- this.componentContent.notificationSettings.notifications
- ) {
- const notificationForScore: any = this.ProjectService.getNotificationByScore(
- this.componentContent,
- previousScore,
- score
- );
- if (notificationForScore != null) {
- notificationForScore.score = score;
- notificationForScore.nodeId = this.nodeId;
- notificationForScore.componentId = this.componentId;
- this.NotificationService.sendNotificationForScore(notificationForScore);
- }
+ if (
+ this.componentContent.cRater.enableMultipleAttemptScoringRules &&
+ submitCounter > 1
+ ) {
+ /*
+ * this step has multiple attempt scoring rules and this is
+ * a subsequent submit
+ */
+ // get the feedback based upon the previous score and current score
+ autoComment = this.CRaterService.getMultipleAttemptCRaterFeedbackTextByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+ } else {
+ // get the feedback text
+ autoComment = this.CRaterService.getCRaterFeedbackTextByScore(
+ this.componentContent,
+ score
+ );
+ }
+
+ if (autoComment != null) {
+ // create the auto comment annotation
+ const autoCommentAnnotationData: any = {};
+ autoCommentAnnotationData.value = autoComment;
+ autoCommentAnnotationData.concepts = concepts;
+ autoCommentAnnotationData.autoGrader = 'cRater';
+
+ const autoCommentAnnotation = this.createAutoCommentAnnotation(
+ autoCommentAnnotationData
+ );
+
+ if (this.componentContent.enableGlobalAnnotations) {
+ if (annotationGroupForScore != null) {
+ // copy over the annotation properties into the autoCommentAnnotation's data
+ angular.merge(autoCommentAnnotation.data, annotationGroupForScore);
}
+ }
+ componentState.annotations.push(autoCommentAnnotation);
- // display global annotations dialog if needed
- if (
- this.componentContent.enableGlobalAnnotations &&
- annotationGroupForScore != null &&
- annotationGroupForScore.isGlobal &&
- annotationGroupForScore.isPopup
- ) {
- this.$scope.$emit('displayGlobalAnnotations');
+ if (this.mode === 'authoring') {
+ if (this.latestAnnotations == null) {
+ this.latestAnnotations = {};
}
+
+ /*
+ * we are in the authoring view so we will set the
+ * latest comment annotation manually
+ */
+ this.latestAnnotations.comment = autoCommentAnnotation;
+ }
+ }
+ if (
+ this.componentContent.enableNotifications &&
+ this.componentContent.notificationSettings &&
+ this.componentContent.notificationSettings.notifications
+ ) {
+ const notificationForScore: any = this.ProjectService.getNotificationByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+ if (notificationForScore != null) {
+ notificationForScore.score = score;
+ notificationForScore.nodeId = this.nodeId;
+ notificationForScore.componentId = this.componentId;
+ this.NotificationService.sendNotificationForScore(notificationForScore);
}
}
+
+ // display global annotations dialog if needed
+ if (
+ this.componentContent.enableGlobalAnnotations &&
+ annotationGroupForScore != null &&
+ annotationGroupForScore.isGlobal &&
+ annotationGroupForScore.isPopup
+ ) {
+ this.$scope.$emit('displayGlobalAnnotations');
+ }
}
/*
@@ -1035,6 +1036,63 @@ class OpenResponseController extends ComponentController {
const action = 'change';
this.createComponentStateAndBroadcast(action);
}
+
+ startRecordingAudio() {
+ if (this.hasAudioResponses()) {
+ if (confirm(this.$translate(`openResponse.confirmReplaceAudioResponse`))) {
+ this.removeAudioAttachments();
+ } else {
+ return;
+ }
+ }
+ this.AudioRecorderService.startRecording(`${this.nodeId}-${this.componentId}`);
+ this.startAudioCountdown();
+ this.isRecordingAudio = true;
+ }
+
+ startAudioCountdown() {
+ this.audioRecordingStartTime = new Date().getTime();
+ this.audioRecordingInterval = setInterval(() => {
+ if (this.getAudioRecordingTimeLeft() <= 0) {
+ this.stopRecordingAudio();
+ }
+ }, 500);
+ }
+
+ stopRecordingAudio() {
+ this.AudioRecorderService.stopRecording();
+ this.isRecordingAudio = false;
+ clearInterval(this.audioRecordingInterval);
+ }
+
+ getAudioRecordingTimeElapsed() {
+ const now = new Date().getTime();
+ return now - this.audioRecordingStartTime;
+ }
+
+ getAudioRecordingTimeLeft() {
+ return Math.floor((this.audioRecordingMaxTime - this.getAudioRecordingTimeElapsed()) / 1000);
+ }
+
+ hasAudioResponses() {
+ return this.attachments.filter(attachment => {
+ return attachment.type === 'audio';
+ }).length > 0;
+ }
+
+ removeAudioAttachment(attachment) {
+ if (confirm(this.$translate(`openResponse.confirmRemoveAudioResponse`))) {
+ this.removeAttachment(attachment);
+ }
+ }
+
+ removeAudioAttachments() {
+ this.attachments.forEach(attachment => {
+ if (attachment.type === 'audio') {
+ this.removeAttachment(attachment);
+ }
+ });
+ }
}
export default OpenResponseController;
diff --git a/src/main/webapp/wise5/components/openResponse/openResponseService.ts b/src/main/webapp/wise5/components/openResponse/openResponseService.ts
index 0a33b36467..361903aa6b 100644
--- a/src/main/webapp/wise5/components/openResponse/openResponseService.ts
+++ b/src/main/webapp/wise5/components/openResponse/openResponseService.ts
@@ -47,7 +47,7 @@ class OpenResponseService extends ComponentService {
let studentData = componentState.studentData;
if (studentData != null) {
- if (studentData.response) {
+ if (studentData.response || studentData.attachments.length > 0) {
// there is a response so the component is completed
result = true;
}
@@ -111,7 +111,8 @@ class OpenResponseService extends ComponentService {
hasResponse(componentState) {
const response = componentState.studentData.response;
- return response != null && response !== '';
+ const attachments = componentState.studentData.attachments;
+ return (response != null && response !== '') || attachments.length > 0;
}
}
diff --git a/src/main/webapp/wise5/components/table/tableService.ts b/src/main/webapp/wise5/components/table/tableService.ts
index 93c9ad0b09..f92fcd8b55 100644
--- a/src/main/webapp/wise5/components/table/tableService.ts
+++ b/src/main/webapp/wise5/components/table/tableService.ts
@@ -1,7 +1,7 @@
import * as angular from 'angular';
import * as html2canvas from 'html2canvas';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class TableService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/services/audioRecorderService.ts b/src/main/webapp/wise5/services/audioRecorderService.ts
new file mode 100644
index 0000000000..282900ff1a
--- /dev/null
+++ b/src/main/webapp/wise5/services/audioRecorderService.ts
@@ -0,0 +1,56 @@
+export class AudioRecorderService {
+
+ mediaRecorder: MediaRecorder;
+ requester: string;
+
+ static $inject = [
+ '$rootScope',
+ ];
+
+ constructor(private $rootScope: any) {
+ }
+
+ async init(constraints) {
+ try {
+ const stream = await navigator.mediaDevices.getUserMedia(constraints);
+ const options = {
+ mimeType: 'audio/webm'
+ };
+ try {
+ this.mediaRecorder = new MediaRecorder(stream, options);
+ this.mediaRecorder.ondataavailable = (event: any) => {
+ this.$rootScope.$broadcast('audioRecorded',
+ { requester: this.requester, audioFile: this.getAudioFile(event.data) });
+ }
+ this.mediaRecorder.start();
+ } catch (e) {
+ console.error('Exception while creating MediaRecorder:', e);
+ return;
+ }
+ } catch (e) {
+ console.error('navigator.getUserMedia error:', e);
+ }
+ }
+
+ getAudioFile(blob: Blob) {
+ const now = new Date().getTime();
+ const filename = encodeURIComponent(`audio_${now}.webm`);
+ return new File([blob], filename, {
+ lastModified: now,
+ });
+ }
+
+ startRecording(requester: string) {
+ this.requester = requester;
+ const constraints = {
+ audio: {
+ echoCancellation: {exact: true}
+ }
+ };
+ this.init(constraints);
+ }
+
+ stopRecording() {
+ this.mediaRecorder.stop();
+ }
+}
diff --git a/src/main/webapp/wise5/services/cRaterService.js b/src/main/webapp/wise5/services/cRaterService.ts
similarity index 80%
rename from src/main/webapp/wise5/services/cRaterService.js
rename to src/main/webapp/wise5/services/cRaterService.ts
index f00ebb7d7b..8ca189bbf0 100644
--- a/src/main/webapp/wise5/services/cRaterService.js
+++ b/src/main/webapp/wise5/services/cRaterService.ts
@@ -1,27 +1,35 @@
-class CRaterService {
- constructor($http, ConfigService) {
- this.$http = $http;
- this.ConfigService = ConfigService;
+'use strict';
+
+import { Injectable } from "@angular/core";
+import { HttpClient, HttpParams } from "@angular/common/http";
+import { ConfigService } from "./configService";
+
+@Injectable()
+export class CRaterService {
+ constructor(
+ protected http: HttpClient,
+ protected ConfigService: ConfigService
+ ) {
+
}
/**
* Make a CRater request to score student data
- * @param cRaterResponseId a randomly generated id used to keep track
- * of the request
+ * @param cRaterItemId
+ * @param cRaterResponseId a randomly generated id used to keep track of the request
* @param studentData the student data
* @returns a promise that returns the result of the CRater request
*/
- makeCRaterScoringRequest(cRaterItemId, cRaterResponseId, studentData) {
- const httpParams = {
- method: 'GET',
- url: this.ConfigService.getCRaterRequestURL() + '/score',
- params: {
- itemId: cRaterItemId,
- responseId: cRaterResponseId,
- studentData: studentData
- }
+ makeCRaterScoringRequest(cRaterItemId: string, cRaterResponseId: number, studentData: any) {
+ const url = this.ConfigService.getCRaterRequestURL() + '/score';
+ const params = new HttpParams()
+ .set('itemId', cRaterItemId)
+ .set('responseId', cRaterResponseId + '')
+ .set('studentData', studentData);
+ const options = {
+ params: params
};
- return this.$http(httpParams).then((response) => {
+ return this.http.get(url, options).toPromise().then((response) => {
return response;
});
}
@@ -30,7 +38,7 @@ class CRaterService {
* Get the CRater item type from the component
* @param component the component content
*/
- getCRaterItemType(component) {
+ getCRaterItemType(component: any) {
if (component != null && component.cRater != null) {
return component.cRater.itemType;
}
@@ -41,7 +49,7 @@ class CRaterService {
* Get the CRater item id from the component
* @param component the component content
*/
- getCRaterItemId(component) {
+ getCRaterItemId(component: any) {
if (component != null && component.cRater != null) {
return component.cRater.itemId;
}
@@ -53,7 +61,7 @@ class CRaterService {
* @param component the component content
* @returns when to perform the CRater scoring e.g. 'submit', 'save', 'change', 'exit'
*/
- getCRaterScoreOn(component) {
+ getCRaterScoreOn(component: any) {
if (component != null) {
/*
* CRater can be enabled in two ways
@@ -74,7 +82,7 @@ class CRaterService {
* Check if CRater is enabled for this component
* @param component the component content
*/
- isCRaterEnabled(component) {
+ isCRaterEnabled(component: any) {
if (component != null) {
// get the item type and item id
const cRaterItemType = this.getCRaterItemType(component);
@@ -91,7 +99,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on save
*/
- isCRaterScoreOnSave(component) {
+ isCRaterScoreOnSave(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -107,7 +115,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on submit
*/
- isCRaterScoreOnSubmit(component) {
+ isCRaterScoreOnSubmit(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -123,7 +131,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on change
*/
- isCRaterScoreOnChange(component) {
+ isCRaterScoreOnChange(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -139,7 +147,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on exit
*/
- isCRaterScoreOnExit(component) {
+ isCRaterScoreOnExit(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -156,7 +164,7 @@ class CRaterService {
* @param score the score
* @returns the scoring rule for the given score
*/
- getCRaterScoringRuleByScore(component, score) {
+ getCRaterScoringRuleByScore(component: any, score: any) {
if (component != null && score != null) {
const cRater = component.cRater;
if (cRater != null) {
@@ -186,7 +194,7 @@ class CRaterService {
* @param score the score we want feedback for
* @returns the feedback text for the given score
*/
- getCRaterFeedbackTextByScore(component, score) {
+ getCRaterFeedbackTextByScore(component: any, score: any) {
const scoringRule = this.getCRaterScoringRuleByScore(component, score);
if (scoringRule != null) {
return scoringRule.feedbackText;
@@ -201,8 +209,8 @@ class CRaterService {
* @param currentScore the score from the current submit
* @returns the feedback text for the given previous score and current score
*/
- getMultipleAttemptCRaterFeedbackTextByScore(component, previousScore,
- currentScore) {
+ getMultipleAttemptCRaterFeedbackTextByScore(component: any, previousScore: any,
+ currentScore: any) {
const scoringRule = this.getMultipleAttemptCRaterScoringRuleByScore(
component, previousScore, currentScore);
if (scoringRule != null) {
@@ -219,8 +227,8 @@ class CRaterService {
* @param currentScore the score from the current submit
* @returns the scoring rule for the given previous score and current score
*/
- getMultipleAttemptCRaterScoringRuleByScore(component, previousScore,
- currentScore) {
+ getMultipleAttemptCRaterScoringRuleByScore(component: any, previousScore: any,
+ currentScore: any) {
if (component != null && previousScore != null && currentScore != null) {
const cRater = component.cRater;
if (cRater != null) {
@@ -260,23 +268,14 @@ class CRaterService {
* @param itemId A string.
* @return A promise that returns whether the item id is valid.
*/
- makeCRaterVerifyRequest(itemId) {
- const httpParams = {
- method: 'GET',
- url: this.ConfigService.getCRaterRequestURL() + '/verify',
- params: {
- itemId: itemId
- }
- };
- return this.$http(httpParams).then((response) => {
- return response.data.isAvailable;
+ makeCRaterVerifyRequest(itemId: string) {
+ const url = this.ConfigService.getCRaterRequestURL() + '/verify';
+ const params = new HttpParams().set('itemId', itemId);
+ const options = {
+ params: params
+ };
+ return this.http.get(url, options).toPromise().then((response: any) => {
+ return response.isAvailable;
});
}
}
-
-CRaterService.$inject = [
- '$http',
- 'ConfigService'
-];
-
-export default CRaterService;
diff --git a/src/main/webapp/wise5/services/notificationService.js b/src/main/webapp/wise5/services/notificationService.js
index 9ad1fccad5..a4b4540834 100644
--- a/src/main/webapp/wise5/services/notificationService.js
+++ b/src/main/webapp/wise5/services/notificationService.js
@@ -69,6 +69,10 @@ class NotificationService {
retrieveNotifications() {
+ if (this.ConfigService.isPreview()) {
+ this.notifications = [];
+ return;
+ }
const config = {
method: 'GET',
url: this.ConfigService.getNotificationURL(),
diff --git a/src/main/webapp/wise5/services/planningService.js b/src/main/webapp/wise5/services/planningService.js
deleted file mode 100644
index 966c0ce8cd..0000000000
--- a/src/main/webapp/wise5/services/planningService.js
+++ /dev/null
@@ -1,127 +0,0 @@
-'use strict';
-
-class PlanningService {
- constructor(ProjectService) {
- this.ProjectService = ProjectService;
- };
-
- getPlanningNodes() {
- return this.ProjectService.project.planningNodes;
- };
-
- /**
- * Check if a node is a planning node
- * @param nodeId the node id
- * @returns whether the node is a planning node
- */
- isPlanning(nodeId) {
- const node = this.ProjectService.getNodeById(nodeId);
- return node != null && node.planning;
- }
-
- /**
- * Check if a node is a planning node instance
- * @param nodeId the node id
- * @returns whether the node is a planning node instance
- */
- isPlanningInstance(nodeId) {
- const node = this.ProjectService.getNodeById(nodeId);
- return node != null && node.planningNodeTemplateId;
- }
-
- /**
- * Get the available planning nodes for a given group
- * @param nodeId the node id of the group
- * @returns an array of planning node templates
- */
- getAvailablePlanningNodes(nodeId) {
- const availablePlanningNodesSoFar = [];
- const node = this.ProjectService.getNodeById(nodeId);
- if (node != null && node.availablePlanningNodes != null) {
- const availablePlanningNodes = node.availablePlanningNodes;
- for (let availablePlanningNode of availablePlanningNodes) {
- const availablePlanningNodeActual =
- this.ProjectService.getNodeById(availablePlanningNode.nodeId);
- if (availablePlanningNodeActual != null) {
- if (availablePlanningNode.max != null) {
- availablePlanningNodeActual.max = availablePlanningNode.max;
- }
- availablePlanningNodesSoFar.push(availablePlanningNodeActual);
- }
- }
- }
- return availablePlanningNodesSoFar;
- }
-
- /**
- * Create a planning node instance and add it to the project
- * @param nodeId the node id of the planning node template
- * @param nextAvailablePlanningNodeId the node id of the planning node instance
- */
- createPlanningNodeInstance(nodeId, nextAvailablePlanningNodeId) {
- const planningNodeInstance = this.ProjectService.copyNode(nodeId);
- planningNodeInstance.planningNodeTemplateId = nodeId;
- planningNodeInstance.id = nextAvailablePlanningNodeId;
- return planningNodeInstance;
- }
-
- /**
- * Add a planning node instance inside a group node
- * @param nodeIdToInsertInside the group id to insert into
- * @param planningNodeInstance the planning node instance to add
- */
- addPlanningNodeInstanceInside(nodeIdToInsertInside, planningNodeInstance) {
- const planningNodeInstanceNodeId = planningNodeInstance.id;
- this.ProjectService.setIdToNode(planningNodeInstanceNodeId, planningNodeInstance);
- this.ProjectService.addNode(planningNodeInstance);
- this.ProjectService.insertNodeInsideOnlyUpdateTransitions(planningNodeInstanceNodeId, nodeIdToInsertInside);
- this.ProjectService.insertNodeInsideInGroups(planningNodeInstanceNodeId, nodeIdToInsertInside);
- this.ProjectService.recalculatePositionsInGroup(nodeIdToInsertInside);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Add a planning node instance after a node
- * @param nodeIdToInsertAfter the node to insert after
- * @param planningNodeInstance the planning node instance to add
- */
- addPlanningNodeInstanceAfter(nodeIdToInsertAfter, planningNodeInstance) {
- const planningNodeInstanceNodeId = planningNodeInstance.id;
- this.ProjectService.setIdToNode(planningNodeInstanceNodeId, planningNodeInstance);
- this.ProjectService.addNode(planningNodeInstance);
- this.ProjectService.insertNodeAfterInTransitions(planningNodeInstance, nodeIdToInsertAfter);
- this.ProjectService.insertNodeAfterInGroups(planningNodeInstanceNodeId, nodeIdToInsertAfter);
- const parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
- this.ProjectService.recalculatePositionsInGroup(parentGroup.id);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Move a planning node instance inside a group
- * @param nodeIdToMove the node to move
- * @param nodeIdToInsertInside the group to move the node into
- */
- movePlanningNodeInstanceInside(nodeIdToMove, nodeIdToInsertInside) {
- this.ProjectService.moveNodesInside([nodeIdToMove], nodeIdToInsertInside);
- this.ProjectService.recalculatePositionsInGroup(nodeIdToInsertInside);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Move a planning node instance after a node
- * @param nodeIdToMove the node to move
- * @param nodeIdToInsertAfter the other node to move the node after
- */
- movePlanningNodeInstanceAfter(nodeIdToMove, nodeIdToInsertAfter) {
- this.ProjectService.moveNodesAfter([nodeIdToMove], nodeIdToInsertAfter);
- const parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
- this.ProjectService.recalculatePositionsInGroup(parentGroup.id);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-}
-
-PlanningService.$inject = [
- 'ProjectService'
-];
-
-export default PlanningService;
diff --git a/src/main/webapp/wise5/services/projectService.ts b/src/main/webapp/wise5/services/projectService.ts
index e24cc20d0e..3dcb42c00d 100644
--- a/src/main/webapp/wise5/services/projectService.ts
+++ b/src/main/webapp/wise5/services/projectService.ts
@@ -248,19 +248,11 @@ export class ProjectService {
}
}
- loadPlanningNodes(planningNodes) {
- for (const planningNode of planningNodes) {
- this.setIdToNode(planningNode.id, planningNode);
- // TODO: may need to add more function calls here to add the planning
- }
- }
-
parseProject() {
this.clearProjectFields();
this.instantiateDefaults();
this.metadata = this.project.metadata;
this.loadNodes(this.project.nodes);
- this.loadPlanningNodes(this.project.planningNodes);
this.loadInactiveNodes(this.project.inactiveNodes);
this.loadConstraints(this.project.constraints);
this.rootNode = this.getRootNode(this.project.nodes[0].id);
@@ -275,7 +267,6 @@ export class ProjectService {
instantiateDefaults() {
this.project.nodes = this.project.nodes ? this.project.nodes : [];
- this.project.planningNodes = this.project.planningNodes ? this.project.planningNodes : [];
this.project.inactiveNodes = this.project.inactiveNodes ? this.project.inactiveNodes : [];
this.project.constraints = this.project.constraints ? this.project.constraints : [];
}
@@ -1600,7 +1591,7 @@ export class ProjectService {
const consumedNodes = [];
for (const path of paths) {
if (path.includes(nodeId)) {
- const subPath = path.slice(0, path.indexOf(nodeId));
+ const subPath = path.splice(0, path.indexOf(nodeId));
for (const nodeIdInPath of subPath) {
if (!consumedNodes.includes(nodeIdInPath)) {
consumedNodes.push(nodeIdInPath);
@@ -2939,11 +2930,19 @@ export class ProjectService {
* ]
*/
for (let transitionCopy of transitionsCopy) {
- // insert a transition from the node we are removing
- transitions.splice(insertIndex, 0, transitionCopy);
- insertIndex++;
+ if (!this.isTransitionExist(transitions, transitionCopy)) {
+ const toNodeId = transitionCopy.to;
+ if (this.isApplicationNode(node.id) && this.isGroupNode(toNodeId) &&
+ this.hasGroupStartId(toNodeId)) {
+ this.addToTransition(node, this.getGroupStartId(toNodeId));
+ } else {
+ transitions.splice(insertIndex, 0, transitionCopy);
+ insertIndex++;
+ }
+ }
}
}
+ t--;
// check if the node we are moving is a group
if (this.isGroupNode(nodeId)) {
@@ -2961,6 +2960,15 @@ export class ProjectService {
}
}
+ if (transitions.length === 0 && parentIdOfNodeToRemove != 'group0' &&
+ parentIdOfNodeToRemove != this.getParentGroupId(node.id)) {
+ /*
+ * the from node no longer has any transitions so we will make it transition to the
+ * parent of the node we are removing
+ */
+ this.addToTransition(node, parentIdOfNodeToRemove);
+ }
+
if (this.isBranchPoint(nodeId)) {
/*
* the node we are deleting is a branch point so we to
@@ -2990,6 +2998,15 @@ export class ProjectService {
}
}
+ isTransitionExist(transitions: any[], transition: any) {
+ for (const tempTransition of transitions) {
+ if (tempTransition.from === transition.from && tempTransition.to === transition.to) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Remove the node id from all groups
* @param nodeId the node id to remove
@@ -3487,12 +3504,6 @@ export class ProjectService {
fromNodeTitle: fromNodeTitle,
toNodeTitle: toNodeTitle
});
- } else if (name === 'isPlanningActivityCompleted') {
- const nodeId = params.nodeId;
- if (nodeId != null) {
- const nodeTitle = this.getNodePositionAndTitleByNodeId(nodeId);
- message += this.upgrade.$injector.get('$filter')('translate')('completeNodeTitle', { nodeTitle: nodeTitle });
- }
} else if (name === 'wroteXNumberOfWords') {
const nodeId = params.nodeId;
if (nodeId != null) {
@@ -3587,6 +3598,11 @@ export class ProjectService {
return this.getNodeById(nodeId).startId;
}
+ hasGroupStartId(nodeId) {
+ const startId = this.getGroupStartId(nodeId);
+ return startId != null && startId != '';
+ }
+
/**
* Update the transitions so that the fromGroup points to the newToGroup
*
diff --git a/src/main/webapp/wise5/services/sessionService.js b/src/main/webapp/wise5/services/sessionService.js
deleted file mode 100644
index 4e4b92c30a..0000000000
--- a/src/main/webapp/wise5/services/sessionService.js
+++ /dev/null
@@ -1,144 +0,0 @@
-class SessionService {
- constructor($http, $location, $rootScope, ConfigService) {
- this.$http = $http;
- this.$location = $location;
- this.$rootScope = $rootScope;
- this.ConfigService = ConfigService;
- this.warningVisible = false;
- this.defaultForceLogoutAfterWarningInterval = this.convertMinutesToSeconds(5);
- const intervals = this.calculateIntervals(this.ConfigService.getConfigParam('sessionTimeout'));
- this.showWarningInterval = intervals.showWarningInterval;
- this.forceLogoutAfterWarningInterval = intervals.forceLogoutAfterWarningInterval;
- this.checkMouseEventInterval = this.convertMinutesToMilliseconds(1);
- this.updateLastActivityTimestamp();
- this.initializeListeners();
- this.initializeSession();
- }
-
- calculateIntervals(sessionTimeout) {
- const forceLogoutAfterWarningInterval = Math.min(
- sessionTimeout * 0.1,
- this.defaultForceLogoutAfterWarningInterval
- );
- const showWarningInterval = sessionTimeout - forceLogoutAfterWarningInterval;
- return {
- showWarningInterval: showWarningInterval,
- forceLogoutAfterWarningInterval: forceLogoutAfterWarningInterval
- };
- }
-
- initializeListeners() {
- this.$rootScope.$on('goHome', () => {
- this.goHome();
- });
-
- this.$rootScope.$on('logOut', () => {
- this.logOut();
- });
- }
-
- goHome() {
- this.$rootScope.$broadcast('exit');
- this.$location.url(this.ConfigService.getConfigParam('userType'));
- }
-
- logOut() {
- window.location.href = this.ConfigService.getSessionLogOutURL();
- }
-
- initializeSession() {
- if (!this.ConfigService.isPreview()) {
- this.startCheckMouseEvent();
- }
- }
-
- startCheckMouseEvent() {
- setInterval(() => {
- this.checkMouseEvent();
- }, this.checkMouseEventInterval);
- }
-
- convertMinutesToSeconds(minutes) {
- return minutes * 60;
- }
-
- convertMinutesToMilliseconds(minutes) {
- return minutes * 60 * 1000;
- }
-
- /**
- * Note: This does not get called when the warning popup is being shown.
- */
- mouseMoved() {
- this.updateLastActivityTimestamp();
- }
-
- updateLastActivityTimestamp() {
- this.lastActivityTimestamp = new Date();
- }
-
- checkMouseEvent() {
- if (this.isActiveWithinLastMinute()) {
- this.renewSession();
- } else if (this.isInactiveLongEnoughToForceLogout()) {
- this.forceLogOut();
- } else if (this.isInactiveLongEnoughToWarn() && !this.isShowingWarning()) {
- this.showWarning();
- }
- }
-
- isActiveWithinLastMinute() {
- return new Date() - this.lastActivityTimestamp < this.convertMinutesToMilliseconds(1);
- }
-
- isInactiveLongEnoughToForceLogout() {
- return (
- this.getInactiveTimeInSeconds() >=
- this.showWarningInterval + this.forceLogoutAfterWarningInterval
- );
- }
-
- isInactiveLongEnoughToWarn() {
- return this.getInactiveTimeInSeconds() >= this.showWarningInterval;
- }
-
- isShowingWarning() {
- return this.warningVisible;
- }
-
- getInactiveTimeInSeconds() {
- return Math.floor(this.getInactiveTimeInMilliseconds() / 1000);
- }
-
- getInactiveTimeInMilliseconds() {
- return new Date() - this.lastActivityTimestamp;
- }
-
- forceLogOut() {
- this.$rootScope.$broadcast('logOut');
- }
-
- showWarning() {
- this.warningVisible = true;
- this.$rootScope.$broadcast('showSessionWarning');
- }
-
- closeWarningAndRenewSession() {
- this.warningVisible = false;
- this.updateLastActivityTimestamp();
- this.renewSession();
- }
-
- renewSession() {
- const renewSessionURL = this.ConfigService.getConfigParam('renewSessionURL');
- this.$http.get(renewSessionURL).then(result => {
- if (result.data === 'false') {
- this.logOut();
- }
- });
- }
-}
-
-SessionService.$inject = ['$http', '$location', '$rootScope', 'ConfigService'];
-
-export default SessionService;
diff --git a/src/main/webapp/wise5/services/sessionService.ts b/src/main/webapp/wise5/services/sessionService.ts
new file mode 100644
index 0000000000..9ae2d95418
--- /dev/null
+++ b/src/main/webapp/wise5/services/sessionService.ts
@@ -0,0 +1,154 @@
+'use strict';
+
+import { Injectable } from '@angular/core';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { HttpClient } from '@angular/common/http';
+import { ConfigService } from "./configService";
+
+@Injectable()
+export class SessionService {
+ private warningVisible: boolean = false;
+ private defaultForceLogoutAfterWarningInterval: number = this.convertMinutesToSeconds(5);
+ private forceLogoutAfterWarningInterval: number;
+ private showWarningInterval: number;
+ private checkMouseEventInterval: number;
+ private lastActivityTimestamp: number;
+
+ constructor(
+ protected upgrade: UpgradeModule,
+ protected http: HttpClient,
+ protected ConfigService: ConfigService
+ ) {
+ const intervals: any =
+ this.calculateIntervals(this.ConfigService.getConfigParam('sessionTimeout'));
+ this.showWarningInterval = intervals.showWarningInterval;
+ this.forceLogoutAfterWarningInterval = intervals.forceLogoutAfterWarningInterval;
+ this.checkMouseEventInterval = this.convertMinutesToMilliseconds(1);
+ this.updateLastActivityTimestamp();
+ this.initializeSession();
+ }
+
+ calculateIntervals(sessionTimeout): any {
+ const forceLogoutAfterWarningInterval: number = Math.min(
+ sessionTimeout * 0.1,
+ this.defaultForceLogoutAfterWarningInterval
+ );
+ const showWarningInterval: number = sessionTimeout - forceLogoutAfterWarningInterval;
+ return {
+ showWarningInterval: showWarningInterval,
+ forceLogoutAfterWarningInterval: forceLogoutAfterWarningInterval
+ };
+ }
+
+ goHome() {
+ this.upgrade.$injector.get('$rootScope').$broadcast('exit');
+ this.upgrade.$injector.get('$location').url(
+ this.ConfigService.getConfigParam('userType')
+ );
+ }
+
+ logOut() {
+ window.location.href = this.ConfigService.getSessionLogOutURL();
+ }
+
+ initializeSession() {
+ if (!this.ConfigService.isPreview()) {
+ this.startCheckMouseEvent();
+ }
+ }
+
+ startCheckMouseEvent() {
+ setInterval(() => {
+ this.checkMouseEvent();
+ }, this.checkMouseEventInterval);
+ }
+
+ convertMinutesToSeconds(minutes): number {
+ return minutes * 60;
+ }
+
+ convertMinutesToMilliseconds(minutes): number {
+ return minutes * 60 * 1000;
+ }
+
+ /**
+ * Note: This does not get called when the warning popup is being shown.
+ */
+ mouseMoved() {
+ this.updateLastActivityTimestamp();
+ }
+
+ updateLastActivityTimestamp() {
+ this.lastActivityTimestamp = new Date().getTime();
+ }
+
+ checkMouseEvent() {
+ if (this.isActiveWithinLastMinute()) {
+ this.renewSession();
+ } else {
+ this.checkForLogout();
+ }
+ }
+
+ checkForLogout() {
+ if (this.isInactiveLongEnoughToForceLogout()) {
+ this.forceLogOut();
+ } else if (this.isInactiveLongEnoughToWarn() && !this.isShowingWarning()) {
+ this.showWarning();
+ }
+ }
+
+ isActiveWithinLastMinute(): boolean {
+ return (
+ new Date().getTime() - this.lastActivityTimestamp <
+ this.convertMinutesToMilliseconds(1)
+ );
+ }
+
+ isInactiveLongEnoughToForceLogout(): boolean {
+ return (
+ this.getInactiveTimeInSeconds() >=
+ this.showWarningInterval + this.forceLogoutAfterWarningInterval
+ );
+ }
+
+ isInactiveLongEnoughToWarn(): boolean {
+ return this.getInactiveTimeInSeconds() >= this.showWarningInterval;
+ }
+
+ isShowingWarning(): boolean {
+ return this.warningVisible;
+ }
+
+ getInactiveTimeInSeconds(): number {
+ return Math.floor(this.getInactiveTimeInMilliseconds() / 1000);
+ }
+
+ getInactiveTimeInMilliseconds(): number {
+ return new Date().getTime() - this.lastActivityTimestamp;
+ }
+
+ forceLogOut() {
+ this.upgrade.$injector.get('$rootScope').$broadcast('logOut');
+ }
+
+ showWarning() {
+ this.warningVisible = true;
+ this.upgrade.$injector.get('$rootScope').$broadcast('showSessionWarning');
+ }
+
+ closeWarningAndRenewSession() {
+ this.warningVisible = false;
+ this.updateLastActivityTimestamp();
+ this.renewSession();
+ }
+
+ renewSession() {
+ const renewSessionURL = this.ConfigService.getConfigParam('renewSessionURL');
+ this.http.get(renewSessionURL).toPromise().then(result => {
+ if (result === 'false') {
+ this.logOut();
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/main/webapp/wise5/services/studentAssetService.js b/src/main/webapp/wise5/services/studentAssetService.js
deleted file mode 100644
index 10d9911808..0000000000
--- a/src/main/webapp/wise5/services/studentAssetService.js
+++ /dev/null
@@ -1,276 +0,0 @@
-'use strict';
-
-class StudentAssetService {
- constructor(
- $filter,
- $http,
- $q,
- Upload,
- $rootScope,
- ConfigService) {
- this.$filter = $filter;
- this.$http = $http;
- this.$q = $q;
- this.Upload = Upload;
- this.$rootScope = $rootScope;
- this.ConfigService = ConfigService;
- this.$translate = this.$filter('translate');
- this.allAssets = []; // keep track of student's assets
- }
-
- getAssetById(assetId) {
- for (let asset of this.allAssets) {
- if (asset.id === assetId) {
- return asset;
- }
- }
- return null;
- };
-
- retrieveAssets() {
- if (this.ConfigService.isPreview()) {
- // if we're in preview, don't make any request to the server but pretend we did
- this.allAssets = [];
- let deferred = this.$q.defer();
- deferred.resolve(this.allAssets);
- return deferred.promise;
- } else {
- let config = {
- method: "GET",
- url: this.ConfigService.getStudentAssetsURL(),
- params: {
- workgroupId: this.ConfigService.getWorkgroupId()
- }
- };
- return this.$http(config).then((response) => {
- // loop through the assets and make them into JSON object with more details
- let result = [];
- let assets = response.data;
- let studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- for (let asset of assets) {
- if (!asset.isReferenced && asset.serverDeleteTime == null && asset.fileName !== '.DS_Store') {
- asset.url = studentUploadsBaseURL + asset.filePath;
- if (this.isImage(asset)) {
- asset.type = 'image';
- asset.iconURL = asset.url;
- } else if (this.isAudio(asset)) {
- asset.type = 'audio';
- asset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- asset.type = 'file';
- asset.iconURL = 'wise5/vle/notebook/file.png';
- }
- result.push(asset);
- }
- }
- this.allAssets = result;
- return result;
- });
- }
- };
-
- getAssetContent(asset) {
- const assetContentURL = asset.url;
-
- // retrieve the csv file and parse it
- const config = {};
- config.method = 'GET';
- config.url = assetContentURL;
- return this.$http(config).then((response) => {
- return response.data;
- });
- };
-
- isImage(asset) {
- const imageFileExtensions = ['png', 'jpg', 'jpeg', 'gif'];
- if (asset != null) {
- const assetURL = asset.url;
- if (assetURL != null && assetURL.lastIndexOf('.') !== -1) {
- const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
- if (imageFileExtensions.indexOf(assetExtension.toLowerCase()) != -1) {
- return true;
- }
- }
- }
- return false;
- };
-
- isAudio(asset) {
- const imageFileExtensions = ['wav', 'mp3', 'ogg', 'm4a', 'm4p', 'raw', 'aiff'];
- if (asset != null) {
- const assetURL = asset.url;
- if (assetURL != null && assetURL.lastIndexOf('.') != -1) {
- const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
- if (imageFileExtensions.indexOf(assetExtension.toLowerCase()) != -1) {
- return true;
- }
- }
- }
- return false;
- };
-
- uploadAsset(file) {
- if (this.ConfigService.isPreview()) {
- return this.$q((resolve, reject) => {
- const reader = new FileReader();
-
- // Closure to capture the file information.
- reader.onload = ( (theFile) => {
- return (e) => {
- let fileSrc = e.target.result;
- let fileName = theFile.name;
-
- let asset = {};
- asset.file = file;
- asset.url = fileSrc;
- // assume this is an image for now. in the future, support audio and other file formats.
- asset.type = 'image';
- asset.iconURL = asset.url;
-
- this.allAssets.push(asset);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- return resolve(asset);
- };
- })(file);
-
- // Read in the image file as a data URL.
- reader.readAsDataURL(file);
- });
- } else {
- const studentAssetsURL = this.ConfigService.getStudentAssetsURL();
- const deferred = this.$q.defer();
-
- this.Upload.upload({
- url: studentAssetsURL,
- fields: {
- 'runId': this.ConfigService.getRunId(),
- 'workgroupId': this.ConfigService.getWorkgroupId(),
- 'periodId': this.ConfigService.getPeriodId(),
- 'clientSaveTime': Date.parse(new Date())
- },
- file: file
- }).success((asset, status, headers, config) => {
- if (asset === "error") {
- alert(this.$translate('THERE_WAS_AN_ERROR_UPLOADING'));
- } else {
- const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- asset.url = studentUploadsBaseURL + asset.filePath;
- if (this.isImage(asset)) {
- asset.type = 'image';
- asset.iconURL = asset.url;
- } else if (this.isAudio(asset)) {
- asset.type = 'audio';
- asset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- asset.type = 'file';
- asset.iconURL = 'wise5/vle/notebook/file.png';
- }
- this.allAssets.push(asset);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- deferred.resolve(asset);
- }
- }).error((asset, status, headers, config) => {
- alert(this.$translate('THERE_WAS_AN_ERROR_UPLOADING_YOU_MIGHT_HAVE_REACHED_LIMIT'));
- });
-
- return deferred.promise;
- }
- };
-
- uploadAssets(files) {
- const studentAssetsURL = this.ConfigService.getStudentAssetsURL();
- const promises = files.map((file) => {
- return this.Upload.upload({
- url: studentAssetsURL,
- fields: {
- 'runId': this.ConfigService.getRunId(),
- 'workgroupId': this.ConfigService.getWorkgroupId(),
- 'periodId': this.ConfigService.getPeriodId(),
- 'clientSaveTime': Date.parse(new Date())
- },
- file: file
- }).progress((evt) => {
- const progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
- //console.log('progress: ' + progressPercentage + '% ' + evt.config.file.name);
- }).success((data, status, headers, config) => {
- //console.log('file ' + config.file.name + 'uploaded. Response: ' + JSON.stringify(data));
- });
- });
- return this.$q.all(promises);
- };
-
- // given asset, makes a copy of it so steps can use for reference. Returns newly-copied asset.
- copyAssetForReference(studentAsset) {
- if (this.ConfigService.isPreview()) {
- return this.$q((resolve, reject) => {
- return resolve(studentAsset);
- });
- } else {
- const config = {};
- config.method = 'POST';
- config.url = this.ConfigService.getStudentAssetsURL() + '/copy';
- config.headers = {'Content-Type': 'application/x-www-form-urlencoded'};
- const params = {};
- params.studentAssetId = studentAsset.id;
- params.workgroupId = this.ConfigService.getWorkgroupId();
- params.periodId = this.ConfigService.getPeriodId();
- params.clientSaveTime = Date.parse(new Date());
-
- config.data = $.param(params);
-
- return this.$http(config).then((result) => {
- const copiedAsset = result.data;
- if (copiedAsset != null) {
- const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- if (copiedAsset.isReferenced && copiedAsset.fileName !== '.DS_Store') {
- copiedAsset.url = studentUploadsBaseURL + copiedAsset.filePath;
- if (this.isImage(copiedAsset)) {
- copiedAsset.type = 'image';
- copiedAsset.iconURL = copiedAsset.url;
- } else if (this.isAudio(copiedAsset)) {
- copiedAsset.type = 'audio';
- copiedAsset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- copiedAsset.type = 'file';
- copiedAsset.iconURL = 'wise5/vle/notebook/file.png';
- }
- //this.$rootScope.$broadcast('studentAssetsUpdated');
- return copiedAsset;
- }
- }
- return null;
- });
- }
- };
-
- deleteAsset(studentAsset) {
- const config = {};
- config.method = 'POST';
- config.url = this.ConfigService.getStudentAssetsURL() + '/remove';
- config.headers = {'Content-Type': 'application/x-www-form-urlencoded'};
- const params = {};
- params.studentAssetId = studentAsset.id;
- params.workgroupId = this.ConfigService.getWorkgroupId();
- params.periodId = this.ConfigService.getPeriodId();
- params.clientDeleteTime = Date.parse(new Date());
- config.data = $.param(params);
-
- return this.$http(config).then((result) => {
- //const deletedAsset = result.data;
- // also remove from local copy of all assets
- this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- return studentAsset;
- });
- };
-}
-
-StudentAssetService.$inject = [
- '$filter',
- '$http',
- '$q',
- 'Upload',
- '$rootScope',
- 'ConfigService'];
-
-export default StudentAssetService;
diff --git a/src/main/webapp/wise5/services/studentAssetService.ts b/src/main/webapp/wise5/services/studentAssetService.ts
new file mode 100644
index 0000000000..2326c6a700
--- /dev/null
+++ b/src/main/webapp/wise5/services/studentAssetService.ts
@@ -0,0 +1,231 @@
+'use strict';
+
+import { Injectable } from '@angular/core';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { ConfigService } from './configService';
+
+@Injectable()
+export class StudentAssetService {
+ allAssets = [];
+ imageFileExtensions = ['png', 'jpg', 'jpeg', 'gif'];
+ audioFileExtensions = ['wav', 'mp3', 'ogg', 'm4a', 'm4p', 'raw', 'aiff', 'webm'];
+
+ constructor(private upgrade: UpgradeModule, private http: HttpClient,
+ private ConfigService: ConfigService) {
+ }
+
+ getAssetById(assetId) {
+ for (const asset of this.allAssets) {
+ if (asset.id === assetId) {
+ return asset;
+ }
+ }
+ return null;
+ }
+
+ retrieveAssets() {
+ if (this.ConfigService.isPreview()) {
+ this.allAssets = [];
+ const deferred = this.upgrade.$injector.get('$q').defer();
+ deferred.resolve(this.allAssets);
+ return deferred.promise;
+ } else {
+ const options = {
+ params: new HttpParams().set("workgroupId", this.ConfigService.getWorkgroupId())
+ };
+ return this.http.get(this.ConfigService.getStudentAssetsURL(), options)
+ .toPromise().then((assets: any) => {
+ // loop through the assets and make them into JSON object with more details
+ let result = [];
+ let studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ for (const asset of assets) {
+ if (!asset.isReferenced && asset.serverDeleteTime == null &&
+ asset.fileName !== '.DS_Store') {
+ asset.url = studentUploadsBaseURL + asset.filePath;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/vle/notebook/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/vle/notebook/file.png';
+ }
+ result.push(asset);
+ }
+ }
+ this.allAssets = result;
+ return result;
+ });
+ }
+ }
+
+ getAssetContent(asset) {
+ return this.http.get(asset.url).toPromise().then(response => {
+ return response;
+ });
+ }
+
+ hasSuffix(assetURL, suffixes) {
+ const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
+ return suffixes.includes(assetExtension.toLowerCase());
+ }
+
+ isImage(asset) {
+ return this.hasSuffix(this.getFileNameFromAsset(asset), this.imageFileExtensions);
+ }
+
+ isAudio(asset) {
+ return this.hasSuffix(this.getFileNameFromAsset(asset), this.audioFileExtensions);
+ }
+
+ getFileNameFromAsset(asset) {
+ if (this.ConfigService.isPreview()) {
+ return asset.file.name;
+ } else {
+ return asset.fileName;
+ }
+ }
+
+ uploadAsset(file) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = (theFile => {
+ return e => {
+ let fileSrc = e.target.result;
+ let fileName = theFile.name;
+
+ let asset: any = {};
+ asset.file = file;
+ asset.url = fileSrc;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/themes/default/images/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/themes/default/images/file.png';
+ }
+ this.allAssets.push(asset);
+ return resolve(asset);
+ };
+ })(file);
+ reader.readAsDataURL(file);
+ });
+ } else {
+ const deferred = this.upgrade.$injector.get('$q').defer();
+ this.upgrade.$injector.get('Upload').upload({
+ url: this.ConfigService.getStudentAssetsURL(),
+ fields: {
+ runId: this.ConfigService.getRunId(),
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ },
+ file: file
+ })
+ .success((asset, status, headers, config) => {
+ if (asset === 'error') {
+ alert(this.upgrade.$injector.get('$filter')('translate')('THERE_WAS_AN_ERROR_UPLOADING'));
+ } else {
+ const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ asset.url = studentUploadsBaseURL + asset.filePath;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/themes/default/images/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/themes/default/images/file.png';
+ }
+ this.allAssets.push(asset);
+ deferred.resolve(asset);
+ }
+ })
+ .error((asset, status, headers, config) => {
+ alert(this.upgrade.$injector.get('$filter')('translate')('THERE_WAS_AN_ERROR_UPLOADING_YOU_MIGHT_HAVE_REACHED_LIMIT'));
+ });
+ return deferred.promise;
+ }
+ }
+
+ uploadAssets(files) {
+ const promises = files.map(file => {
+ return this.upgrade.$injector.get('Upload').upload({
+ url: this.ConfigService.getStudentAssetsURL(),
+ fields: {
+ runId: this.ConfigService.getRunId(),
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ },
+ file: file
+ })
+ });
+ return this.upgrade.$injector.get('$q').all(promises);
+ }
+
+ // given asset, makes a copy of it so steps can use for reference. Returns newly-copied asset.
+ copyAssetForReference(studentAsset) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ return resolve(studentAsset);
+ });
+ } else {
+ return this.http.post(`${this.ConfigService.getStudentAssetsURL()}/copy`,
+ {
+ studentAssetId: studentAsset.id,
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ })
+ .toPromise().then((copiedAsset: any) => {
+ if (copiedAsset != null) {
+ const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ if (copiedAsset.isReferenced && copiedAsset.fileName !== '.DS_Store') {
+ copiedAsset.url = studentUploadsBaseURL + copiedAsset.filePath;
+ if (this.isImage(copiedAsset)) {
+ copiedAsset.type = 'image';
+ copiedAsset.iconURL = copiedAsset.url;
+ } else if (this.isAudio(copiedAsset)) {
+ copiedAsset.type = 'audio';
+ copiedAsset.iconURL = 'wise5/vle/notebook/audio.png';
+ } else {
+ copiedAsset.type = 'file';
+ copiedAsset.iconURL = 'wise5/vle/notebook/file.png';
+ }
+ return copiedAsset;
+ }
+ }
+ return null;
+ });
+ }
+ }
+
+ deleteAsset(studentAsset) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
+ return resolve(studentAsset);
+ });
+ } else {
+ return this.http.post(`${this.ConfigService.getStudentAssetsURL()}/delete`,
+ {
+ studentAssetId: studentAsset.id,
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientDeleteTime: Date.parse(new Date().toString()),
+ }).toPromise().then(() => {
+ this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
+ return studentAsset;
+ });
+ }
+ }
+}
diff --git a/src/main/webapp/wise5/services/studentDataService.js b/src/main/webapp/wise5/services/studentDataService.js
index 0fd30fd344..5bafc0ec5d 100644
--- a/src/main/webapp/wise5/services/studentDataService.js
+++ b/src/main/webapp/wise5/services/studentDataService.js
@@ -9,7 +9,6 @@ class StudentDataService {
$rootScope,
AnnotationService,
ConfigService,
- PlanningService,
ProjectService,
UtilService
) {
@@ -20,7 +19,6 @@ class StudentDataService {
this.$rootScope = $rootScope;
this.AnnotationService = AnnotationService;
this.ConfigService = ConfigService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.UtilService = UtilService;
this.$translate = this.$filter('translate');
@@ -37,8 +35,6 @@ class StudentDataService {
this.runStatus = null;
this.maxScore = null;
- this.maxPlanningNodeNumber = 0;
-
/*
* A counter to keep track of how many saveToServer requests we have
* made that we haven't received a response for yet. When this value
@@ -814,7 +810,7 @@ class StudentDataService {
return;
}
const context = 'VLE';
- this.saveEvent(context, nodeId, componentId, componentType, category, event, data);
+ return this.saveEvent(context, nodeId, componentId, componentType, category, event, data);
}
saveEvent(context, nodeId, componentId, componentType, category, event, data) {
@@ -831,7 +827,7 @@ class StudentDataService {
events.push(newEvent);
const componentStates = undefined;
const annotations = undefined;
- this.saveToServer(componentStates, events, annotations);
+ return this.saveToServer(componentStates, events, annotations);
}
createNewEvent(nodeId, componentId, context, componentType, category, event, data) {
@@ -1661,7 +1657,6 @@ StudentDataService.$inject = [
'$rootScope',
'AnnotationService',
'ConfigService',
- 'PlanningService',
'ProjectService',
'UtilService'
];
diff --git a/src/main/webapp/wise5/test-unit/services/sessionService.spec.js b/src/main/webapp/wise5/test-unit/services/sessionService.spec.js
deleted file mode 100644
index 3d6a72a3b3..0000000000
--- a/src/main/webapp/wise5/test-unit/services/sessionService.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import vleModule from '../../vle/vle';
-
-let SessionService;
-
-describe('SessionService', () => {
- beforeEach(angular.mock.module(vleModule.name));
-
- beforeEach(inject(_SessionService_ => {
- SessionService = _SessionService_;
- }));
-
- describe('calculateIntervals()', () => {
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs10Minutes();
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs30Minutes();
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs60Minutes();
- });
-});
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs10Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 10 minutes', () => {
- const sessionTimeout = 600;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(540);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(60);
- });
-}
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs30Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 30 minutes', () => {
- const sessionTimeout = 1800;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(1620);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(180);
- });
-}
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs60Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 60 minutes', () => {
- const sessionTimeout = 3600;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(3300);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(300);
- });
-}
diff --git a/src/main/webapp/wise5/themes/default/navigation/navigation.html b/src/main/webapp/wise5/themes/default/navigation/navigation.html
index 34c0a5b825..a0b085f580 100644
--- a/src/main/webapp/wise5/themes/default/navigation/navigation.html
+++ b/src/main/webapp/wise5/themes/default/navigation/navigation.html
@@ -1,4 +1,3 @@
-
@@ -11,7 +10,7 @@
{{vleController.totalSco
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html b/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
deleted file mode 100644
index 43acdf6947..0000000000
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
- ![{{navitemCtrl.nodeStatuses[item.id].icon.imgAlt}}]()
-
- {{navitemCtrl.nodeStatuses[item.id].icon.fontName}}
-
-
- {{ navitemCtrl.getNodeTitle(item.id) }} (Used: {{ navitemCtrl.getNumPlannindNodeInstances(item.id) }}, Available: {{ navitemCtrl.getPlannindNodeMaxAllowed(item.id)-navitemCtrl.getNumPlannindNodeInstances(item.id) }})
- {{ navitemCtrl.getNodeDescription(item.id) }}
-
-
-
-
-
- {{ 'CANCEL' | translate }}
-
-
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
index 4114c72383..bb882b0686 100644
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
+++ b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
@@ -11,17 +11,8 @@
remove
-
-
- {{ ::'planningMode' | translate }}: {{ navitemCtrl.planningMode ? (::'on' | translate) : (::'off' | translate) }}
-
-
-
+
-
-
- add_circle
- {{ ::'addItem' | translate }}
-
-
@@ -57,17 +40,10 @@
+ aria-label="Go to {{::navitemCtrl.nodeTitle}}"
+ ng-class="{'nav-item--list--group':navitemCtrl.isGroup}">
{{ ::navitemCtrl.nodeTitle }} lock
- delete
- reorder
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
index b08297f592..2ba717b9d7 100644
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
+++ b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
@@ -7,24 +7,20 @@ class NavItemController {
$element,
dragulaService,
NodeService,
- PlanningService,
ProjectService,
StudentDataService,
$mdDialog) {
-
this.$filter = $filter;
this.$rootScope = $rootScope;
this.$scope = $scope;
this.$element = $element;
this.dragulaService = dragulaService;
this.NodeService = NodeService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.StudentDataService = StudentDataService;
this.$mdDialog = $mdDialog;
this.$translate = this.$filter('translate');
this.autoScroll = require('dom-autoscroller');
-
this.expanded = false;
}
@@ -38,64 +34,12 @@ class NavItemController {
this.currentNode = this.StudentDataService.currentNode;
this.previousNode = null;
this.isCurrentNode = (this.currentNode.id === this.nodeId);
-
- // whether this node is a planning node
- this.isPlanning = this.PlanningService.isPlanning(this.nodeId);
-
- // the array of nodes used for drag/drop planning sorting
- this.availablePlanningNodes = [];
-
- // whether the node is a planning node instance
this.node = this.ProjectService.getNodeById(this.nodeId);
- this.isPlanningInstance = this.PlanningService.isPlanningInstance(this.nodeId);
-
this.parentGroupId = null;
-
- /*
- * whether planning mode is on or off which determines if students
- * can edit planning related aspects of the project such as adding,
- * moving, or deleting planning steps.
- */
- this.planningMode = false;
-
var parentGroup = this.ProjectService.getParentGroup(this.nodeId);
if (parentGroup != null) {
this.parentGroupId = parentGroup.id;
- this.isParentGroupPlanning = this.PlanningService.isPlanning(this.parentGroupId);
- }
-
- if (this.isPlanning) {
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.nodeId);
- }
-
- if (this.isParentGroupPlanning) {
-
- if (parentGroup.planningMode) {
- // the parent is currently in planning mode
- this.planningMode = true;
- }
-
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.parentGroupId);
-
- this.$scope.$watch(
- () => {
- // watch the position of this node
- return this.ProjectService.nodeIdToNumber[this.nodeId];
- },
- (value) => {
- // the position has changed for this node so we will update it in the UI
- this.nodeTitle = this.showPosition ? (this.ProjectService.nodeIdToNumber[this.nodeId] + ': ' + this.item.title) : this.item.title;
- }
- );
}
this.$scope.$watch(
@@ -149,60 +93,6 @@ class NavItemController {
this.$scope.$parent.itemExpanded = value;
}
);
-
- // a group node has turned on or off planning mode
- this.$rootScope.$on('togglePlanningMode', (event, args) => {
-
- // get the group node that has had its planning node changed
- let planningModeClickedNodeId = args.nodeId;
- let planningMode = args.planningMode;
-
- // get this node's parent group
- let parentGroup = this.ProjectService.getParentGroup(this.nodeId);
- let parentGroupId = null;
-
- if (parentGroup != null) {
- parentGroupId = parentGroup.id;
- }
-
- if (parentGroupId == planningModeClickedNodeId) {
- // the parent of this node has changed their planning mode
- this.planningMode = planningMode;
- }
- });
-
- let dragId = 'planning_' + this.nodeId ;
- // handle item drop events
- let dropEvent = dragId + '.drop-model';
- this.$scope.$on(dropEvent, (el, target, source) => {
- let nodeChangedId = target.data().nodeid;
- this.planningNodeItemsChanged(nodeChangedId);
- });
-
- this.dragulaService.options(this.$scope, dragId, {
- moves: (el, source, handle, sibling) => {
- if (!this.planningMode) {
- return false;
- }
-
- let nodeId = el.getAttribute('data-nodeid');
- return this.PlanningService.isPlanningInstance(nodeId);
- }
- });
-
- let drake = this.dragulaService.find(this.$scope, dragId).drake;
-
- // support scroll while dragging
- let scroll = this.autoScroll(
- [document.querySelector('#content')], {
- margin: 30,
- pixels: 50,
- scrollWhenOutside: true,
- autoScroll: function() {
- // Only scroll when the pointer is down, and there is a child being dragged
- return this.down && drake.dragging;
- }
- });
}
getTemplateUrl(){
@@ -232,259 +122,10 @@ class NavItemController {
}
}
} else {
- if (this.StudentDataService.planningMode) {
- // Don't allow students to enter planning steps while in planning mode
- this.$mdDialog.show(
- this.$mdDialog.alert()
- .title(this.$translate('itemLocked'))
- .textContent(this.$translate('planningModeStepsUnVisitable'))
- .ariaLabel(this.$translate('itemLocked'))
- .ok(this.$translate('ok'))
- .targetEvent(event)
- );
- } else {
- this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
- }
- }
- };
-
- /**
- * Save an event when planning node is added
- * @param planningNodeAdded
- */
- savePlanningNodeAddedEvent(planningNodeAdded) {
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeAdded";
- let eventData = {
- nodeIdAdded: planningNodeAdded.id,
- planningNodeTemplateId: planningNodeAdded.planningNodeTemplateId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- };
-
- /**
- * Returns the max times a planning node can be added to the project (-1 is
- * is returned if there is no limit)
- * @param planningNodeId
- */
- getPlannindNodeMaxAllowed(planningNodeId) {
- let maxAddAllowed = -1; // by default, students can add as many instances as they want
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
- // get the maxAddAllowed value by looking up the planningNode in the project.
- if (planningGroupNode && planningGroupNode.availablePlanningNodes) {
- for (let a = 0; a < planningGroupNode.availablePlanningNodes.length; a++) {
- let availablePlanningNode = planningGroupNode.availablePlanningNodes[a];
- if (availablePlanningNode.nodeId === planningNodeId && availablePlanningNode.max != null) {
- maxAddAllowed = availablePlanningNode.max;
- }
- }
- }
-
- return maxAddAllowed;
- };
-
- /**
- * Returns the number of times a planning node has been added to the project
- * @param planningNodeId
- */
- getNumPlannindNodeInstances(planningNodeId) {
- let numPlanningNodesAdded = 0; // keep track of number of instances
- // otherwise, see how many times the planning node template has been used.
-
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
-
- // loop through the child ids in the planning group and see how many times they've been used
- if (planningGroupNode && planningGroupNode.ids) {
- for (let c = 0; c < planningGroupNode.ids.length; c++) {
- let childPlanningNodeId = planningGroupNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- if (childPlanningNode != null && childPlanningNode.planningNodeTemplateId === planningNodeId) {
- numPlanningNodesAdded++;
- }
- }
- }
-
- return numPlanningNodesAdded;
- };
-
- /**
- * Returns true iff this student can add the specified planning node.
- * Limits include reaching the max allowed count
- * @param planningNodeId
- */
- canAddPlanningNode(planningNodeId) {
- let maxAddAllowed = this.getPlannindNodeMaxAllowed(planningNodeId);
-
- // if maxAddAllowed was not found or is set to 0, it means students can add as many as they want
- if (maxAddAllowed < 1) {
- return true;
- }
-
- let numPlanningNodesAdded = this.getNumPlannindNodeInstances(planningNodeId);
-
- return numPlanningNodesAdded < maxAddAllowed;
- };
-
- /**
- * Create a planning node instance and add it to the project
- * @param groupId the group the new planning node instance will be added to
- * @param templateNodeId the node id of the planning node template
- * @returns the planning node instance
- */
- addPlanningNodeInstanceInside(nodeIdToInsertInside, templateNodeId) {
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // add the planning node instance inside
- this.PlanningService.addPlanningNodeInstanceInside(nodeIdToInsertInside, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
-
- /**
- * Open the planning mode select dialog to choose a planning node template
- * to create a new planning instance
- * @param event the trigger event
- * @param targetNodeId the node to insert the new planning instance after or inside
- * @param insertInside boolean whether to insert the new planning instance
- * inside the target node (optional; default is after)
- */
- addPlanningInstance(event, targetNodeId, insertInside) {
- // show dialog with list of planning nodes user can add to current group
-
- let choosePlanningItemTemplateUrl = this.ProjectService.getThemePath() + '/themeComponents/navItem/choosePlanningItem.html';
- let navitemCtrl = this;
-
- this.$mdDialog.show({
- parent: angular.element(document.body),
- locals: {
- targetNodeId: targetNodeId,
- insertInside: insertInside,
- navitemCtrl: navitemCtrl,
- },
- templateUrl: choosePlanningItemTemplateUrl,
- targetEvent: event,
- controller: ChoosePlanningItemController
- });
-
- function ChoosePlanningItemController($scope, $mdDialog, targetNodeId, insertInside, navitemCtrl) {
- $scope.navitemCtrl = navitemCtrl;
- $scope.targetNodeId = targetNodeId;
- $scope.insertInside = insertInside;
-
- $scope.addSelectedPlanningInstance = (templateNodeId) => {
- if ($scope.insertInside) {
- $scope.navitemCtrl.addPlanningNodeInstanceInside($scope.targetNodeId, templateNodeId);
- } else {
- $scope.navitemCtrl.addPlanningNodeInstanceAfter($scope.targetNodeId, templateNodeId);
- }
-
- $mdDialog.hide();
- };
-
- $scope.close = () => {
- $mdDialog.hide();
- };
+ this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
}
- ChoosePlanningItemController.$inject = ["$scope", "$mdDialog", "targetNodeId", "insertInside", "navitemCtrl"];
};
- /**
- * Create a planning node instance and add it to the project after the specified nodeId
- * @param groupId the group the new planning node instance will be added to
- * @param nodeId the node id of the planning node template
- */
- addPlanningNodeInstanceAfter(nodeIdToInsertAfter, templateNodeId) {
-
- var parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
-
- if (parentGroup != null) {
- var parentGroupId = parentGroup.id;
-
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // insert planning node instance after
- this.PlanningService.addPlanningNodeInstanceAfter(nodeIdToInsertAfter, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
- }
-
- /**
- * Remove the planning node instance
- * @param planningNodeInstanceNodeId the planning node instance to remove
- * @param event the event that triggered the function call
- */
- removePlanningNodeInstance(planningNodeInstanceNodeId, event) {
- let confirm = this.$mdDialog.confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('areYouSureYouWantToDeleteThisItem'))
- .textContent(this.$translate('noteAnyWorkYouHaveDoneOnThisItemWillBeLost'))
- .ariaLabel(this.$translate('deleteItemFromProject'))
- .targetEvent(event)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(confirm).then(() => {
- // delete the node from the project
- this.ProjectService.deleteNode(planningNodeInstanceNodeId);
-
- // perform any necessary updating
- this.planningNodeChanged(this.parentGroupId);
-
- // Save remove planning node event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeRemoved";
- let eventData = {
- nodeIdRemoved: planningNodeInstanceNodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- }, () => {});
- }
-
/**
* Get the node title
* @param nodeId get the title for this node
@@ -493,11 +134,9 @@ class NavItemController {
getNodeTitle(nodeId) {
var node = this.ProjectService.idToNode[nodeId];
var title = null;
-
if (node != null) {
title = node.title;
}
-
return title;
}
@@ -516,126 +155,6 @@ class NavItemController {
return description;
}
-
- /**
- * Move the planning node. If the other node is a group node, we will
- * insert this node as the first node in the group. If the other node is
- * a step node, we will insert this node after the other node.
- * @param otherNodeId the other node we will move this node inside or after
- */
- movePlanningNode(nodeIdToMove, nodeIdToMoveAfter) {
-
- /*
- * check that this node is not the same as the other node.
- * if they are the same we don't need to do anything.
- */
- if (nodeIdToMove != nodeIdToMoveAfter) {
- if (this.ProjectService.isGroupNode(nodeIdToMoveAfter)) {
- this.PlanningService.movePlanningNodeInstanceInside(nodeIdToMove, nodeIdToMoveAfter);
- } else {
- this.PlanningService.movePlanningNodeInstanceAfter(nodeIdToMove, nodeIdToMoveAfter);
- }
- }
-
- // perform any necessary updating
- this.planningNodeChanged();
- }
-
- /**
- * Something related to planning has changed in the project. This
- * means a planning node was added, moved, or deleted.
- * @param param planningNodeId planning node id
- */
- planningNodeChanged(planningNodeId) {
- this.savePlanningNodeChanges(planningNodeId);
-
- this.$rootScope.$broadcast('planningNodeChanged');
- }
-
- /**
- * Save the changed nodes in NodeState
- * @param param planningNodeId planning node id
- **/
- savePlanningNodeChanges(planningNodeId) {
- let nodeState = this.NodeService.createNewNodeState();
- let nodeId = planningNodeId ? planningNodeId : this.nodeId;
- nodeState.nodeId = nodeId;
- nodeState.isAutoSave = false;
- nodeState.isSubmit = false;
-
- var studentData = {};
- studentData.nodeId = nodeId;
- studentData.nodes = [];
- let planningNode = this.ProjectService.getNodeById(nodeId);
- studentData.nodes.push(planningNode); // add the planning node (group)
- // loop through the child ids in the planning group and save them also
- if (planningNode.ids != null) {
- for (let c = 0; c < planningNode.ids.length; c++) {
- let childPlanningNodeId = planningNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- studentData.nodes.push(childPlanningNode);
- }
- }
-
- nodeState.studentData = studentData;
- var nodeStates = [];
- nodeStates.push(nodeState);
- this.StudentDataService.saveNodeStates(nodeStates);
- }
-
- /**
- * Toggle the planning mode on and off. Notify child nodes that
- * the planning mode has changed so they can act accordingly.
- */
- togglePlanningMode() {
- /*if (this.StudentDataService.planningMode && !this.item.planningMode) {
- // Don't allow multiple concurrent planning modes.
- this.$translate('planningModeOnlyOnePlanningModeAllowed').then((planningModeOnlyOnePlanningModeAllowed) => {
- alert(planningModeOnlyOnePlanningModeAllowed);
- });
-
- return;
- }*/
-
- // toggle the planning mode
- //this.planningMode = !this.planningMode;
- this.item.planningMode = this.planningMode;
-
- // also toggle StudentDataService planning mode. This will be used to constrain the entire project when in planning mode.
- this.StudentDataService.planningMode = this.planningMode;
-
- // Save planning mode on/off event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = this.planningMode ? "planningModeOn" : "planningModeOff";
- let eventData = {
- nodeId: this.nodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
-
- // notify the child nodes that the planning mode of this group node has changed
- this.$rootScope.$broadcast('togglePlanningMode', { nodeId: this.nodeId, planningMode: this.planningMode });
- }
-
- /**
- * The planning node's items array has changed
- * @param newValue the new value of the planning node's items array
- * @param oldValue the old value of the planning node's items array
- */
- planningNodeItemsChanged(nodeChangedId) {
- let index = this.item.ids.indexOf(nodeChangedId);
- let nodeIdAddedAfter = this.item.ids[index-1];
-
- if (nodeIdAddedAfter) {
- // the node was moved after another node in the group
- this.movePlanningNode(nodeChangedId, nodeIdAddedAfter);
- } else {
- // the node was moved to the beginning of the group
- this.movePlanningNode(nodeChangedId, this.nodeId);
- }
- };
}
NavItemController.$inject = [
@@ -645,7 +164,6 @@ NavItemController.$inject = [
'$element',
'dragulaService',
'NodeService',
- 'PlanningService',
'ProjectService',
'StudentDataService',
'$mdDialog'
diff --git a/src/main/webapp/wise5/themes/default/themeController.js b/src/main/webapp/wise5/themes/default/themeController.js
index bcb229c9f0..4e08079914 100644
--- a/src/main/webapp/wise5/themes/default/themeController.js
+++ b/src/main/webapp/wise5/themes/default/themeController.js
@@ -52,7 +52,6 @@ class ThemeController {
this.notebookConfig = this.NotebookService.getNotebookConfig();
this.notebookFilter = '';
this.currentNode = this.StudentDataService.getCurrentNode();
- this.planningMode = false;
// set current notebook type filter to first enabled type
if (this.notebookConfig.enabled) {
@@ -130,29 +129,6 @@ class ThemeController {
);
});
- // alert user when inactive for a long time
- this.$scope.$on('showSessionWarning', ev => {
- let alert = this.$mdDialog
- .confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('sessionTimeout'))
- .textContent(this.$translate('autoLogoutMessage'))
- .ariaLabel(this.$translate('sessionTimeout'))
- .targetEvent(ev)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(alert).then(
- () => {
- this.SessionService.closeWarningAndRenewSession();
- alert = undefined;
- },
- () => {
- this.SessionService.forceLogOut();
- }
- );
- });
-
// alert user when inactive for a long time
this.$scope.$on('showRequestLogout', ev => {
let alert = this.$mdDialog
@@ -251,11 +227,6 @@ class ThemeController {
StudentAssetDialogController.$inject = ['$scope', '$mdDialog', 'componentController'];
});
- // a group node has turned on or off planning mode
- this.$scope.$on('togglePlanningMode', (event, args) => {
- this.planningMode = args.planningMode;
- });
-
// handle request for notification dismiss codes
this.$scope.$on('viewCurrentAmbientNotification', (event, args) => {
let notification = args.notification;
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_ar.json b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
index b84ce03a23..1102cbde38 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
@@ -68,9 +68,6 @@
"on": "تشغيل",
"onlyAvailableInPreviewMode": "غير مُتاح إلا في وضع المعاينة",
"openAccountMenu": "فتح قائمة الحساب",
- "planningMode": "وضع التخطيط",
- "planningModeOnlyOnePlanningModeAllowed": "لا يُمكنك العمل إلا على نشاط تخطيط واحد فقط في المرة الواحدة. أوقف تشغيل وضع التخطيط في نشاط التخطيط الحالي قبل العمل على هذا. ",
- "planningModeStepsUnVisitable": "غير مسموح لك بعرض العناصر أثناء وضع التخطيط. يُرجى إيقاف تشغيل وضع التخطيط والمحاولة مرة أخرى.",
"previousItem": "العنصر السابق",
"projectCompletion": "إتمام المشروع\n",
"projectItemSelect": "تحديد عنصر المشروع",
@@ -110,4 +107,4 @@
"writeXNumberOfWordsOnNodeTitle": "اكتب {{requiredNumberOfWords}} كلمة على {{nodeTitle}}",
"yes": "نعم",
"yourTeacherHasPausedAllTheScreensInTheClass": "لقد أوقف المُعلم جميع الشاشات مؤقتًا في الفصل."
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_el.json b/src/main/webapp/wise5/vle/i18n/i18n_el.json
index 5d7e3f2190..1fcae12494 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_el.json
@@ -63,9 +63,6 @@
"onlyAvailableInPreviewMode": "Διαθέσιμο μόνο για Προεπισκόπηση",
"off": "OFF",
"openAccountMenu": "Άνοιγμα μενού λογαριασμού",
- "planningMode": "Λειτουργία Σχεδιασμού",
- "planningModeOnlyOnePlanningModeAllowed": "Μπορείτε να εργαστείτε μόνο σε μία Δραστηριότητα Σχεδιασμού κάθε φορά. Απενεργοποιήστε τη Λειτουργία Σχεδιασμού στην τρέχουσα Δραστηριότητα Σχεδιασμού προκειμένου να εργαστείτε στη νέα.",
- "planningModeStepsUnVisitable": "Δεν επιτρέπεται να δείτε αντικείμενα όσο είστε σε Λειτουργία Σχεδιασμού. Παρακαλώ απενεργοποιήστε τη Λειτουργία Σχεδιασμού και προσπαθήστε ξανά. ",
"previousItem": "Προηγούμενο Στοιχείο",
"projectCompletion": "Ολοκλήρωση ενότητας",
"projectItemSelect": "Επιλογή αντικειμένου ενότητας",
@@ -101,4 +98,4 @@
"visitNodeTitle": "Επίσκεψη στο \"{{nodeTitle}}\"",
"yes": "Ναι",
"yourTeacherHasPausedAllTheScreensInTheClass": "Ο εκπαιδευτικός έχει σταματήσει όλες τις οθόνες της αίθουσας"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_en.json b/src/main/webapp/wise5/vle/i18n/i18n_en.json
index 4753aa5695..2f4ba01f51 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_en.json
@@ -72,9 +72,6 @@
"onlyAvailableInPreviewMode": "Only Available in Preview Mode",
"off": "OFF",
"openAccountMenu": "Open account menu",
- "planningMode": "Planning Mode",
- "planningModeOnlyOnePlanningModeAllowed": "You can only work on one Planning Activity at a time. Turn off Planning Mode on the existing Planning Activity before working on this one.",
- "planningModeStepsUnVisitable": "You are not allowed to view items while in Planning Mode. Please turn off Planning Mode and try again.",
"previousItem": "Previous Item",
"projectCompletion": "Unit Completion",
"projectItemSelect": "Unit item select",
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
index 4f234c738d..f61233f6a8 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
@@ -57,9 +57,6 @@
"on": "打开",
"off": "关闭",
"openAccountMenu": "打开账号菜单",
- "planningMode": "规划模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能规划一个活动，在规划这个活动前关闭正在规划的活动。",
- "planningModeStepsUnVisitable": "不允许在规划模式下显示条目。请关闭规划模式并重试。",
"previousItem": "上一条",
"projectCompletion": "项目完成度",
"projectItemSelect": "项目条目选择",
@@ -90,4 +87,4 @@
"viewNote": "显示 {{noteLabel}}",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老师已经暂停了班里的所有屏幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
index 12d72e9cd4..f55d716fc3 100755
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
@@ -62,9 +62,6 @@
"onlyAvailableInPreviewMode": "僅在預覽模式下可以使用",
"off": "關閉",
"openAccountMenu": "打開帳號清單",
- "planningMode": "規劃模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能規劃一個活動，在規劃這個活動前關閉正在規劃的活動。",
- "planningModeStepsUnVisitable": "不允許在規劃模式下顯示項目。請關閉規劃模式並重試。",
"previousItem": "上一個項目",
"projectCompletion": "專題完成度",
"projectItemSelect": "專題項目選擇",
@@ -99,4 +96,4 @@
"visitNodeTitle": "訪問“{{nodeTitle}}”",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老師已經暫停了班上的所有螢幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/preview.ts b/src/main/webapp/wise5/vle/preview.ts
index a390379f94..4d8424866d 100644
--- a/src/main/webapp/wise5/vle/preview.ts
+++ b/src/main/webapp/wise5/vle/preview.ts
@@ -1,428 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js'
-import '../themes/default/theme';
-
-export default angular
- .module('preview', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('preview').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/preview',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.preview', {
- url: '/unit/:projectId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.preview.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: "",
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- }
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('preview');
diff --git a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
index e32313e024..d4742d14b1 100644
--- a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
+++ b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
@@ -1,7 +1,7 @@
'use strict';
import { ConfigService } from '../../services/configService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class StudentAssetController {
$translate: any;
diff --git a/src/main/webapp/wise5/vle/vle.ts b/src/main/webapp/wise5/vle/vle.ts
index e221496be2..c535bd9d43 100644
--- a/src/main/webapp/wise5/vle/vle.ts
+++ b/src/main/webapp/wise5/vle/vle.ts
@@ -1,429 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js';
-import '../themes/default/theme';
-
-export default angular
- .module('vle', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('vle').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/student',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.run', {
- url: '/unit/:runId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- notifications: [
- 'NotificationService',
- 'studentData',
- 'config',
- 'project',
- (NotificationService, studentData, config, project) => {
- return NotificationService.retrieveNotifications();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.run.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: ""
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('vle');
diff --git a/src/main/webapp/wise5/vle/vleController.ts b/src/main/webapp/wise5/vle/vleController.ts
index eb7df02bdd..e0022a4d77 100644
--- a/src/main/webapp/wise5/vle/vleController.ts
+++ b/src/main/webapp/wise5/vle/vleController.ts
@@ -5,7 +5,7 @@ import { ConfigService } from '../services/configService';
import NotificationService from '../services/notificationService';
import NotebookService from '../services/notebookService';
import { VLEProjectService } from './vleProjectService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import StudentDataService from '../services/studentDataService';
import * as angular from 'angular';
import * as $ from 'jquery';
@@ -119,6 +119,29 @@ class VLEController {
});
}
+ this.$scope.$on('showSessionWarning', () => {
+ const confirm = $mdDialog
+ .confirm()
+ .parent(angular.element(document.body))
+ .title(this.$translate('SESSION_TIMEOUT'))
+ .content(this.$translate('SESSION_TIMEOUT_MESSAGE'))
+ .ariaLabel(this.$translate('SESSION_TIMEOUT'))
+ .ok(this.$translate('YES'))
+ .cancel(this.$translate('NO'));
+ $mdDialog.show(confirm).then(
+ () => {
+ this.SessionService.closeWarningAndRenewSession();
+ },
+ () => {
+ this.logOut();
+ }
+ );
+ });
+
+ this.$scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('currentNodeChanged', (event, args) => {
let previousNode = args.previousNode;
let currentNode = this.StudentDataService.getCurrentNode();
@@ -368,16 +391,15 @@ class VLEController {
event,
eventData
);
-
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
}
- logOut() {
+ logOut(eventName = 'logOut') {
const nodeId = null;
const componentId = null;
const componentType = null;
const category = 'Navigation';
- const event = 'logOutButtonClicked';
+ const event = eventName;
const eventData = {};
this.StudentDataService.saveVLEEvent(
nodeId,
@@ -386,9 +408,9 @@ class VLEController {
category,
event,
eventData
- );
-
- this.$rootScope.$broadcast('logOut');
+ ).then(() => {
+ this.SessionService.logOut();
+ });
}
loadRoot() {
diff --git a/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
new file mode 100644
index 0000000000..aa4bb05a5e
--- /dev/null
+++ b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
@@ -0,0 +1,426 @@
+import '../lib/jquery/jquery-global';
+import '../lib/bootstrap/js/bootstrap.min'
+import AchievementService from '../services/achievementService';
+import * as angular from 'angular';
+import { downgradeInjectable } from '@angular/upgrade/static';
+import * as angularDragula from 'angular-dragula';
+import 'ng-file-upload';
+import 'angular-material';
+import 'angular-moment';
+import 'ng-onload';
+import 'angular-sanitize';
+import 'ng-stomp';
+import 'angular-toarrayfilter';
+import 'angular-translate';
+import 'angular-translate-loader-partial';
+import 'angular-ui-router';
+import 'angular-ui-scrollpoint';
+import '../components/animation/animationComponentModule';
+import AnnotationService from '../services/annotationService';
+import '../components/audioOscillator/audioOscillatorComponentModule';
+import { AudioRecorderService } from '../services/audioRecorderService';
+import * as canvg from 'canvg';
+import '../components/conceptMap/conceptMapComponentModule';
+import { ConfigService } from '../services/configService';
+import { CRaterService } from '../services/cRaterService';
+import '../directives/components';
+import ComponentService from '../components/componentService';
+import '../components/discussion/discussionComponentModule';
+import '../components/draw/drawComponentModule';
+import '../components/embedded/embeddedComponentModule';
+import * as fabric from 'fabric';
+window['fabric'] = fabric.fabric
+import Filters from '../filters/filters';
+import '../lib/highcharts/highcharts-ng';
+import * as Highcharts from '../lib/highcharts/highcharts.src';
+import '../lib/draggable-points/draggable-points';
+import * as HighchartsExporting from '../lib/highcharts-exporting@4.2.1';
+import * as covariance from 'compute-covariance';
+window['Highcharts'] = Highcharts;
+window['HighchartsExporting'] = HighchartsExporting;
+window['covariance'] = covariance;
+import '../components/graph/graphComponentModule';
+import * as hopscotch from 'hopscotch';
+window['hopscotch'] = hopscotch;
+import '../components/html/htmlComponentModule';
+import HttpInterceptor from '../services/httpInterceptor';
+import '../components/label/labelComponentModule';
+import '../components/match/matchComponentModule';
+import '../components/multipleChoice/multipleChoiceComponentModule';
+import NavigationController from './navigation/navigationController';
+import NodeController from './node/nodeController';
+import NodeService from '../services/nodeService';
+import NotebookService from '../services/notebookService';
+import NotificationService from '../services/notificationService';
+import '../components/openResponse/openResponseComponentModule';
+import '../components/outsideURL/outsideURLComponentModule';
+import { SessionService } from '../services/sessionService';
+import './studentAsset/studentAsset';
+import { StudentAssetService } from '../services/studentAssetService';
+import StudentDataService from '../services/studentDataService';
+import StudentStatusService from '../services/studentStatusService';
+import StudentWebSocketService from '../services/studentWebSocketService';
+import '../components/summary/summaryComponentModule';
+import '../components/table/tableComponentModule';
+import { UtilService } from '../services/utilService';
+import VLEController from './vleController';
+import { VLEProjectService } from './vleProjectService';
+import * as moment from 'moment';
+import * as SockJS from 'sockjs-client';
+import * as StompJS from '@stomp/stompjs';
+window['SockJS'] = SockJS;
+window['Stomp'] = StompJS.Stomp;
+import '../lib/summernote/dist/summernote.min';
+import '../lib/angular-summernote/dist/angular-summernote.min';
+import '../lib/summernoteExtensions/summernote-ext-addNote.js';
+import '../lib/summernoteExtensions/summernote-ext-print.js';
+import '../themes/default/theme';
+
+export function createModule(type = 'preview') {
+ return angular.module(type, [
+ angularDragula(angular),
+ 'angularMoment',
+ 'angular-toArrayFilter',
+ 'animationComponentModule',
+ 'audioOscillatorComponentModule',
+ 'components',
+ 'conceptMapComponentModule',
+ 'discussionComponentModule',
+ 'drawComponentModule',
+ 'embeddedComponentModule',
+ 'filters',
+ 'graphComponentModule',
+ 'highcharts-ng',
+ 'htmlComponentModule',
+ 'labelComponentModule',
+ 'matchComponentModule',
+ 'multipleChoiceComponentModule',
+ 'ngAria',
+ 'ngFileUpload',
+ 'ngMaterial',
+ 'ngOnload',
+ 'ngSanitize',
+ 'ngStomp',
+ 'openResponseComponentModule',
+ 'outsideURLComponentModule',
+ 'pascalprecht.translate',
+ 'studentAsset',
+ 'summaryComponentModule',
+ 'summernote',
+ 'tableComponentModule',
+ 'theme',
+ 'ui.router',
+ 'ui.scrollpoint'
+ ])
+ .service('AchievementService', AchievementService)
+ .service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
+ .factory('ConfigService', downgradeInjectable(ConfigService))
+ .service('ComponentService', ComponentService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
+ .service('HttpInterceptor', HttpInterceptor)
+ .service('NodeService', NodeService)
+ .service('NotebookService', NotebookService)
+ .service('NotificationService', NotificationService)
+ .factory('ProjectService', downgradeInjectable(VLEProjectService))
+ .factory('SessionService', downgradeInjectable(SessionService))
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
+ .service('StudentDataService', StudentDataService)
+ .service('StudentStatusService', StudentStatusService)
+ .service('StudentWebSocketService', StudentWebSocketService)
+ .factory('UtilService', downgradeInjectable(UtilService))
+ .controller('NavigationController', NavigationController)
+ .controller('NodeController', NodeController)
+ .controller('VLEController', VLEController)
+ .filter('Filters', Filters)
+ .config([
+ '$stateProvider',
+ '$translateProvider',
+ '$translatePartialLoaderProvider',
+ '$controllerProvider',
+ '$locationProvider',
+ '$mdThemingProvider',
+ '$httpProvider',
+ (
+ $stateProvider,
+ $translateProvider,
+ $translatePartialLoaderProvider,
+ $controllerProvider,
+ $locationProvider,
+ $mdThemingProvider,
+ $httpProvider
+ ) => {
+ angular.module(type).$controllerProvider = $controllerProvider;
+ $locationProvider.html5Mode(true);
+ $stateProvider
+ .state('root', {
+ url: type === 'preview' ? '/preview' : '/student',
+ abstract: true,
+ resolve: {
+ config: [
+ 'ConfigService',
+ ConfigService => {
+ return ConfigService.retrieveConfig(`/config/vle`);
+ }
+ ]
+ },
+ templateProvider: [
+ '$http',
+ 'ProjectService',
+ ($http, ProjectService) => {
+ let themePath = ProjectService.getThemePath();
+ return $http.get(themePath + '/vle.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'VLEController',
+ controllerAs: 'vleController'
+ })
+ .state(type === 'preview' ? 'root.preview' : 'root.run', {
+ url: type === 'preview' ? '/unit/:projectId' : '/unit/:runId',
+ resolve: {
+ config: [
+ 'ConfigService',
+ '$stateParams',
+ (ConfigService, $stateParams) => {
+ if (type === 'preview') {
+ return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
+ } else {
+ return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
+ }
+ }
+ ],
+ project: [
+ 'ProjectService',
+ 'config',
+ (ProjectService, config) => {
+ return ProjectService.retrieveProject();
+ }
+ ],
+ studentData: [
+ 'StudentDataService',
+ 'config',
+ 'project',
+ (StudentDataService, config, project) => {
+ return StudentDataService.retrieveStudentData();
+ }
+ ],
+ notebook: [
+ 'NotebookService',
+ 'ConfigService',
+ 'StudentAssetService',
+ 'studentData',
+ 'config',
+ 'project',
+ (
+ NotebookService,
+ ConfigService,
+ StudentAssetService,
+ studentData,
+ config,
+ project
+ ) => {
+ return StudentAssetService.retrieveAssets().then(studentAssets => {
+ return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
+ notebook => {
+ return notebook;
+ }
+ );
+ });
+ }
+ ],
+ achievements: [
+ 'AchievementService',
+ 'studentData',
+ 'config',
+ 'project',
+ (AchievementService, studentData, config, project) => {
+ return AchievementService.retrieveStudentAchievements();
+ }
+ ],
+ notifications: [
+ 'NotificationService',
+ 'studentData',
+ 'config',
+ 'project',
+ (NotificationService, studentData, config, project) => {
+ return NotificationService.retrieveNotifications();
+ }
+ ],
+ runStatus: [
+ 'StudentDataService',
+ 'config',
+ (StudentDataService, config) => {
+ return StudentDataService.retrieveRunStatus();
+ }
+ ],
+ webSocket: [
+ 'StudentWebSocketService',
+ 'ConfigService',
+ 'config',
+ 'project',
+ (StudentWebSocketService, ConfigService, config, project) => {
+ if (!ConfigService.isPreview()) {
+ return StudentWebSocketService.initialize();
+ }
+ }
+ ],
+ language: [
+ '$translate',
+ 'ConfigService',
+ 'config',
+ ($translate, ConfigService, config) => {
+ let locale = ConfigService.getLocale(); // defaults to "en"
+ $translate.use(locale);
+ }
+ ]
+ },
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ]
+ }
+ }
+ })
+ .state(type === 'preview' ? 'root.preview.node' : 'root.run.node', {
+ url: '/:nodeId',
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'NodeController',
+ controllerAs: 'nodeController'
+ }
+ }
+ })
+ .state("sink", {
+ url: "/*path",
+ template: ""
+ });
+
+ $httpProvider.interceptors.push('HttpInterceptor');
+
+ // Set up Translations
+ $translatePartialLoaderProvider.addPart('i18n');
+ $translatePartialLoaderProvider.addPart('vle/i18n');
+ $translateProvider
+ .useLoader('$translatePartialLoader', {
+ urlTemplate: '/wise5/{part}/i18n_{lang}.json'
+ })
+ .fallbackLanguage(['en'])
+ .registerAvailableLanguageKeys(
+ ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
+ {
+ en_US: 'en',
+ en_UK: 'en'
+ }
+ )
+ .determinePreferredLanguage()
+ .useSanitizeValueStrategy('sanitizeParameters', 'escape');
+
+ // ngMaterial default theme configuration
+ // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
+ $mdThemingProvider.definePalette('primary', {
+ '50': 'e1f0f4',
+ '100': 'b8dbe4',
+ '200': '8ec6d4',
+ '300': '5faec2',
+ '400': '3d9db5',
+ '500': '1c8ca8',
+ '600': '197f98',
+ '700': '167188',
+ '800': '136377',
+ '900': '0e4957',
+ A100: 'abf3ff',
+ A200: '66e2ff',
+ A400: '17bee5',
+ A700: '00A1C6',
+ contrastDefaultColor: 'light', // whether, by default, text (contrast)
+ // on this palette should be dark or light
+ contrastDarkColors: [
+ '50',
+ '100', //hues which contrast should be 'dark' by default
+ '200',
+ '300',
+ 'A100'
+ ],
+ contrastLightColors: undefined // could also specify this if default was 'dark'
+ });
+
+ $mdThemingProvider.definePalette('accent', {
+ '50': 'fde9e6',
+ '100': 'fbcbc4',
+ '200': 'f8aca1',
+ '300': 'f4897b',
+ '400': 'f2705f',
+ '500': 'f05843',
+ '600': 'da503c',
+ '700': 'c34736',
+ '800': 'aa3e2f',
+ '900': '7d2e23',
+ A100: 'ff897d',
+ A200: 'ff7061',
+ A400: 'ff3829',
+ A700: 'cc1705',
+ contrastDefaultColor: 'light',
+ contrastDarkColors: ['50', '100', '200', '300', 'A100'],
+ contrastLightColors: undefined
+ });
+
+ $mdThemingProvider
+ .theme('default')
+ .primaryPalette('primary')
+ .accentPalette('accent', {
+ default: '500'
+ })
+ .warnPalette('red', {
+ default: '800'
+ });
+
+ let lightMap = $mdThemingProvider.extendPalette('grey', {
+ A100: 'ffffff'
+ });
+ $mdThemingProvider.definePalette('light', lightMap);
+
+ $mdThemingProvider
+ .theme('light')
+ .primaryPalette('light', {
+ default: 'A100'
+ })
+ .accentPalette('primary');
+
+ $mdThemingProvider.setDefaultTheme('default');
+ $mdThemingProvider.enableBrowserColor();
+
+ // moment.js default overrides
+ // TODO: add i18n support
+ moment.updateLocale('en', {
+ calendar: {
+ lastDay: '[Yesterday at] LT',
+ sameDay: '[Today at] LT',
+ nextDay: '[Tomorrow at] LT',
+ lastWeek: '[last] dddd [at] LT',
+ nextWeek: 'dddd [at] LT',
+ sameElse: 'll'
+ }
+ });
+ }
+ ]);
+}
diff --git a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
index 2a8555ad60..6a8c3c4a5c 100644
--- a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
+++ b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
@@ -92,7 +92,7 @@ public void setUp() throws Exception {
@Test
public void getStudentWorkListByParams_WithRunThatHasNoStudentWork_ShouldReturnNoStudentWork() {
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(0, studentWorkList.size());
}
@@ -102,7 +102,7 @@ public void getStudentWorkListByParams_WithRunThatHasStudentWork_ShouldReturnStu
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(3, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -115,7 +115,7 @@ public void getStudentWorkListByParams_ByWorkgroup_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- workgroup1, null, null, null, null, null, null, null);
+ workgroup1, null, null, null, null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -127,24 +127,12 @@ public void getStudentWorkListByParams_ByNodeId_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, "node1", null, null, null, null);
+ null, null, null, "node1", null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
}
- @Test
- public void getStudentWorkListByParams_OnlyLatest_ShouldReturnStudentWork() {
- createStudentWork(workgroup1, "node1", "studentWork1");
- createStudentWork(workgroup1, "node2", "studentWork2");
- createStudentWork(workgroup2, "node1", "studentWork3");
- List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, true);
- assertEquals(2, studentWorkList.size());
- assertEquals("studentWork2", studentWorkList.get(0).getStudentData());
- assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
- }
-
private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String studentData) {
StudentWork studentWork = new StudentWork();
Calendar now = Calendar.getInstance();
@@ -161,4 +149,4 @@ private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String
studentWorkDao.save(studentWork);
return studentWork;
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
new file mode 100644
index 0000000000..a45620bee3
--- /dev/null
+++ b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
@@ -0,0 +1,87 @@
+package org.wise.portal.service.vle.wise5.impl;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.easymock.EasyMockRunner;
+import org.easymock.Mock;
+import org.easymock.TestSubject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wise.portal.dao.work.StudentWorkDao;
+import org.wise.portal.domain.workgroup.Workgroup;
+import org.wise.portal.domain.workgroup.impl.WorkgroupImpl;
+import org.wise.portal.service.vle.wise5.VLEService;
+import org.wise.vle.domain.work.StudentWork;
+
+/**
+ * @author Hiroki Terashima
+ */
+@RunWith(EasyMockRunner.class)
+public class VLEServiceImplTest {
+
+ @TestSubject
+ private VLEService vleService = new VLEServiceImpl();
+
+ @Mock
+ private StudentWorkDao studentWorkDao;
+
+ private List allStudentWork;
+
+ private StudentWork studentWork1, studentWork2, studentWork3;
+
+ private Workgroup workgroup1, workgroup2;
+
+ @Before
+ public void setup() {
+ workgroup1 = createWorkgroup(1L);
+ workgroup2 = createWorkgroup(2L);
+ studentWork1 = createStudentWork(workgroup1, new Timestamp(1));
+ studentWork2 = createStudentWork(workgroup2, new Timestamp(2));
+ studentWork3 = createStudentWork(workgroup1, new Timestamp(3));
+ allStudentWork = new ArrayList(Arrays.asList(studentWork1, studentWork2,
+ studentWork3));
+ }
+
+ private StudentWork createStudentWork(Workgroup workgroup, Timestamp serverSaveTime) {
+ StudentWork studentWork = new StudentWork();
+ studentWork.setWorkgroup(workgroup);
+ studentWork.setServerSaveTime(serverSaveTime);
+ return studentWork;
+ }
+
+ private Workgroup createWorkgroup(long id) {
+ Workgroup workgroup = new WorkgroupImpl();
+ workgroup.setId(id);
+ return workgroup;
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyTrue_ReturnFilteredList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, true);
+ assertEquals(2, studentWorkList.size());
+ assertEquals(studentWork3, studentWorkList.get(0));
+ assertEquals(studentWork2, studentWorkList.get(1));
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyFalse_ReturnAllList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, false);
+ assertEquals(3, studentWorkList.size());
+ }
+}
This is a step where authors can enter their own html. Authors can also embed images and videos.
\n
This is a step where students enter text.
" - } - ] - }, - { - "id": "node3", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node4" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null - }, - "title": "Open Response Step Auto Graded", - "components": [ - { - "id": "0sef5ya2wj", - "type": "OpenResponse", - "prompt": "This is an auto-graded step that will give the student an automated score and automated text feedback. (Note: the auto graded functionality only works in a run and does not work when simply previewing the project)
\nExplain how the sun helps animals survive.
" - } - ] - }, - { - "id": "node4", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node5" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null - }, - "title": "Note Step", - "components": [ - { - "id": "9rfz8yh32s", - "type": "OpenResponse", - "prompt": "This is similar to an open response step but the text entry area opens in a popup so that students can still see the content from the previous step.
" - } - ] - }, - { - "id": "node5", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node6" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null - }, - "title": "Multiple Choice Step Single Answer", - "components": [ - { - "id": "09hahe7wsm", - "type": "MultipleChoice", - "prompt": "This is a multiple choice step where the student is allowed to choose one choice.
\nWho lives in a pineapple under the sea?
", - "choices": [ - { - "id": "y6rvd7eziz", - "text": "Spongebob", - "feedback": "Great Job!", - "isCorrect": true - }, - { - "id": "ti5rd0es02", - "text": "Patrick", - "feedback": "Patrick doesn't live in a pineapple, he lives under a rock", - "isCorrect": false - }, - { - "id": "gb0cnkaiem", - "text": "Squidward", - "feedback": "Squidward doesn't live in a pineapple, he lives in an Easter island head", - "isCorrect": false - } + { + "id": "group0", + "type": "group", + "title": "Master", + "startId": "group1", + "ids": [ + "group1", + "group2", + "group3", + "group4" ], - "showSaveButton": false, - "showSubmitButton": true, - "choiceType": "radio" - } - ] - }, - { - "id": "node6", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node7" + "transitionLogic": { + "transitions": [ + { + "to": "group1" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Multiple Choice Step Multiple Answer", - "components": [ - { - "id": "ajsdwjugeb", - "type": "MultipleChoice", - "prompt": "This is a multiple choice step where the student is allowed to choose multiple choices.
\nWhich of these are Ninja Turtles?
", - "choices": [ - { - "id": "ofjky47v57", - "text": "Leonardo", - "feedback": "Great Job you know your Ninja Turtles", - "isCorrect": true - }, - { - "id": "dvsbhlfemx", - "text": "Donatello", - "feedback": "Great Job you know your Ninja Turtles", - "isCorrect": true - }, - { - "id": "i8et2px6m3", - "text": "Michelangelo", - "feedback": "Great Job you know your Ninja Turtles", - "isCorrect": true - }, - { - "id": "60gxmv4c76", - "text": "Raphael", - "feedback": "Great Job you know your Ninja Turtles", - "isCorrect": true - }, - { - "id": "2oxfbn09lk", - "text": "Squirtle", - "feedback": "Squirtle is a Pokemon", - "isCorrect": false - } + { + "id": "group1", + "type": "group", + "title": "Example Steps", + "startId": "node1", + "ids": [ + "node1", + "node2", + "node3", + "node4", + "node5", + "node6", + "node7", + "node8", + "node9", + "node10", + "node11", + "node12", + "node13", + "node14", + "node15", + "node16", + "node17", + "node18", + "node19" ], - "showSaveButton": false, - "showSubmitButton": true, - "choiceType": "checkbox" - } - ] - }, - { - "id": "node7", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node8" + "transitionLogic": { + "transitions": [ + { + "to": "group2" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Challenge Question Step", - "components": [ - { - "id": "ms0ene7xrh", - "type": "MultipleChoice", - "prompt": "This is a multiple choice step that the student must answer correctly before they can move forward in the project. If the student gets the question wrong, they must go back to Step 1.1 in order to attempt the step again. This type of step is used to get students to review content when they get the question wrong.
\nBulbasaur is what type of Pokemon?
", - "choices": [ - { - "id": "0wxjeaix4n", - "text": "Grass/Poison", - "feedback": "Correct", - "isCorrect": true - }, - { - "id": "bwl0aqj90i", - "text": "Fire", - "feedback": "Sorry, Bulbasaur is not a fire type Pokemon.", - "isCorrect": false - }, - { - "id": "9yyn6ng60p", - "text": "Water", - "feedback": "Sorry, Bulbasaur is not a water type Pokemon.", - "isCorrect": false - } - ], + { + "id": "node1", + "type": "node", "showSaveButton": false, - "showSubmitButton": true, - "choiceType": "radio" - } - ] - }, - { - "id": "node8", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node9" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node2" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "HTML Step", + "components": [ + { + "id": "zh4h1urdys", + "type": "HTML", + "html": "\n\nThis is a step where authors can enter their own html. Authors can also embed images and videos.
\n
This is a step where students must drag and drop choices into the appropriate bucket.
\nMatch the controllers with the appropriate console. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
", - "choices": [ - { - "id": "w2jmubyq0i", - "value": "",
- "type": "choice"
- },
- {
- "id": "zxi4ncxv0x",
- "value": "",
- "type": "choice"
- }
- ],
- "buckets": [
- {
- "id": "rrisawrk19",
- "value": "Playstation 4",
- "type": "bucket"
- },
- {
- "id": "b04777i4m1",
- "value": "Xbox One",
- "type": "bucket"
- }
- ],
- "feedback": [
- {
- "bucketId": "rrisawrk19",
- "choices": [
- {
- "choiceId": "w2jmubyq0i",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zxi4ncxv0x",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- },
- {
- "bucketId": "b04777i4m1",
- "choices": [
- {
- "choiceId": "w2jmubyq0i",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zxi4ncxv0x",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- }
- ],
- "showSaveButton": false,
- "showSubmitButton": true,
- "ordered": false
- }
- ]
- },
- {
- "id": "node9",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node10"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node2",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node3"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Open Response Step",
+ "components": [
+ {
+ "id": "7edwu1p29b",
+ "type": "OpenResponse",
+ "prompt": "This is a step where students enter text.
" + } + ] }, - "title": "Match Sequence Step Ordered", - "components": [ - { - "id": "8h4fxsg2wi", - "type": "Match", - "prompt": "Authors can require the choices to be placed in a specific order within a bucket. Place the Playstation console images into the Playstation History bucket in the order of oldest to newest. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
", - "choices": [ - { - "id": "87b5i860r9", - "value": "",
- "type": "choice"
- },
- {
- "id": "zy2uvk0i2k",
- "value": "",
- "type": "choice"
- },
- {
- "id": "py0oik2bdx",
- "value": "",
- "type": "choice"
- },
- {
- "id": "cxi69s3hqo",
- "value": "",
- "type": "choice"
- },
- {
- "id": "kg0daqbcg4",
- "value": "Xbone",
- "type": "choice"
- },
- {
- "id": "1gfvbimpj3",
- "value": "Xbox 360",
- "type": "choice"
- },
- {
- "id": "sxfctzt39y",
- "value": "Xbox 1",
- "type": "choice"
- }
- ],
- "buckets": [
- {
- "id": "pf7ym43t9m",
- "value": "Playstation History",
- "type": "bucket"
- },
- {
- "id": "btvrrgacyr",
- "value": "Xbox History",
- "type": "bucket"
- }
- ],
- "feedback": [
- {
- "bucketId": "pf7ym43t9m",
- "choices": [
- {
- "choiceId": "87b5i860r9",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 1,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zy2uvk0i2k",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 2,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "py0oik2bdx",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 3,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "cxi69s3hqo",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 4,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "kg0daqbcg4",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "1gfvbimpj3",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "sxfctzt39y",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- }
- ]
- },
- {
- "bucketId": "btvrrgacyr",
- "choices": [
- {
- "choiceId": "87b5i860r9",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "zy2uvk0i2k",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "py0oik2bdx",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "cxi69s3hqo",
- "feedback": "Incorrect",
- "isCorrect": false,
- "position": null,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "kg0daqbcg4",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 3,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "1gfvbimpj3",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 2,
- "incorrectPositionFeedback": null
- },
- {
- "choiceId": "sxfctzt39y",
- "feedback": "Correct.",
- "isCorrect": true,
- "position": 1,
- "incorrectPositionFeedback": null
- }
- ]
- }
- ],
- "showSaveButton": false,
- "showSubmitButton": true,
- "ordered": true
- }
- ]
- },
- {
- "id": "node10",
- "type": "node",
- "showSaveButton": true,
- "showSubmitButton": false,
- "constraints": [],
- "transitionLogic": {
- "transitions": [
- {
- "to": "node11"
- }
- ],
- "howToChooseAmongAvailablePaths": null,
- "whenToChoosePath": null,
- "canChangePath": null,
- "maxPathsVisitable": null
+ {
+ "id": "node3",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node4"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Open Response Step Auto Graded",
+ "components": [
+ {
+ "id": "0sef5ya2wj",
+ "type": "OpenResponse",
+ "prompt": "This is an auto-graded step that will give the student an automated score and automated text feedback. (Note: the auto graded functionality only works in a run and does not work when simply previewing the project)
\nExplain how the sun helps animals survive.
" + } + ] }, - "title": "Questionnaire Step", - "components": [ - { - "id": "m97kyu4d4v", - "type": "HTML", - "html": "This is a step where students must answer a series of questions that are either text or mulitple choice questions. This step is set up so that the student must answer all the questions before they can move to any other step. Once the student submits their answer, they can no longer change their answer. These restrictions can be turned on or off for this step type.
" - }, - { - "id": "yhrumlct2t", - "prompt": "What is your favorite type of food?", - "type": "OpenResponse" - }, - { - "id": "2upmb3om1q", - "prompt": "What is your favorite type of chocolate?", - "type": "MultipleChoice", - "choiceType": "radio", - "choices": [ - { - "id": "cri2anfnxg", - "text": "White", - "feedback": "" - }, - { - "id": "fzroe37gyx", - "text": "Dark", - "feedback": "" - }, - { - "id": "di49m0lc72", - "text": "Milk", - "feedback": "" - } - ], - "correctChoice": "fzroe37gyx" - }, - { - "id": "srof14u22x", - "prompt": "What is your favorite movie?", - "type": "OpenResponse" - }, - { - "id": "cjv5kq5290", - "prompt": "Edit prompt here", - "type": "MultipleChoice", - "choiceType": "checkbox", - "choices": [ - { - "id": "y1cdkafo2u", - "text": [ - "Enter choice text here" + { + "id": "node4", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node5" + } ], - "feedback": "" - }, - { - "id": "lcnhnc2myc", - "text": [ - "Enter choice text here" + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Note Step", + "components": [ + { + "id": "9rfz8yh32s", + "type": "OpenResponse", + "prompt": "This is similar to an open response step but the text entry area opens in a popup so that students can still see the content from the previous step.
" + } + ] + }, + { + "id": "node5", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node6" + } ], - "feedback": "" - } + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Multiple Choice Step Single Answer", + "components": [ + { + "id": "09hahe7wsm", + "type": "MultipleChoice", + "prompt": "This is a multiple choice step where the student is allowed to choose one choice.
\nWho lives in a pineapple under the sea?
", + "choices": [ + { + "id": "y6rvd7eziz", + "text": "Spongebob", + "feedback": "Great Job!", + "isCorrect": true + }, + { + "id": "ti5rd0es02", + "text": "Patrick", + "feedback": "Patrick doesn't live in a pineapple, he lives under a rock", + "isCorrect": false + }, + { + "id": "gb0cnkaiem", + "text": "Squidward", + "feedback": "Squidward doesn't live in a pineapple, he lives in an Easter island head", + "isCorrect": false + } + ], + "showSaveButton": false, + "showSubmitButton": true, + "choiceType": "radio" + } ] - } - ] - }, - { - "id": "node11", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node12" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Draw Step", - "components": [ - { - "id": "9qwqc5uslq", - "type": "Draw", - "prompt": "This is a draw step where the student can draw a diagram.
", - "stamps": { - "Stamps": [] - } - } - ] - }, - { - "id": "node12", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node13" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node6", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node7" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Multiple Choice Step Multiple Answer", + "components": [ + { + "id": "ajsdwjugeb", + "type": "MultipleChoice", + "prompt": "This is a multiple choice step where the student is allowed to choose multiple choices.
\nWhich of these are Ninja Turtles?
", + "choices": [ + { + "id": "ofjky47v57", + "text": "Leonardo", + "feedback": "Great Job you know your Ninja Turtles", + "isCorrect": true + }, + { + "id": "dvsbhlfemx", + "text": "Donatello", + "feedback": "Great Job you know your Ninja Turtles", + "isCorrect": true + }, + { + "id": "i8et2px6m3", + "text": "Michelangelo", + "feedback": "Great Job you know your Ninja Turtles", + "isCorrect": true + }, + { + "id": "60gxmv4c76", + "text": "Raphael", + "feedback": "Great Job you know your Ninja Turtles", + "isCorrect": true + }, + { + "id": "2oxfbn09lk", + "text": "Squirtle", + "feedback": "Squirtle is a Pokemon", + "isCorrect": false + } + ], + "showSaveButton": false, + "showSubmitButton": true, + "choiceType": "checkbox" + } + ] }, - "title": "Draw Step Auto Graded", - "components": [ - { - "id": "nvjkidstry", - "type": "Draw", - "prompt": "This is an auto graded draw step. Click the 'Submit' button to have your drawing auto graded.
\n\n
(1) Use stamps to create TWO methane molecules (CH4).
\n(2) Create EXACTLY the number of oxygen molecules (O2) needed to react with your TWO methane molecules.
\n(3) Create a new frame.
\n(4) REARRANGE the atoms in the 2nd frame to make carbon dioxide (CO2) and water (H2O) molecules. Show clearly which atoms belong to which molecules.
", - "stamps": { - "Stamps": [ - "carbon.png", - "oxygen.png", - "hydrogen.png" - ] - } - } - ] - }, - { - "id": "node13", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node14" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node7", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node8" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Challenge Question Step", + "components": [ + { + "id": "ms0ene7xrh", + "type": "MultipleChoice", + "prompt": "This is a multiple choice step that the student must answer correctly before they can move forward in the project. If the student gets the question wrong, they must go back to Step 1.1 in order to attempt the step again. This type of step is used to get students to review content when they get the question wrong.
\nBulbasaur is what type of Pokemon?
", + "choices": [ + { + "id": "0wxjeaix4n", + "text": "Grass/Poison", + "feedback": "Correct", + "isCorrect": true + }, + { + "id": "bwl0aqj90i", + "text": "Fire", + "feedback": "Sorry, Bulbasaur is not a fire type Pokemon.", + "isCorrect": false + }, + { + "id": "9yyn6ng60p", + "text": "Water", + "feedback": "Sorry, Bulbasaur is not a water type Pokemon.", + "isCorrect": false + } + ], + "showSaveButton": false, + "showSubmitButton": true, + "choiceType": "radio" + } + ] }, - "title": "Brainstorm Step", - "components": [ - { - "id": "dnz279bdvc", - "type": "Discussion", - "prompt": "This is a forum discussion type of step where students can post their response and then see their classmates' responses. (Note: the brainstorm step only works in a run and does not work when simply previewing the project)
", - "showSaveButton": false, - "showSubmitButton": true, - "gateClassmateResponses": false - } - ] - }, - { - "id": "node14", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node15" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node8", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node9" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Match Sequence Step", + "components": [ + { + "id": "ja98ry0n0e", + "type": "Match", + "prompt": "This is a step where students must drag and drop choices into the appropriate bucket.
\nMatch the controllers with the appropriate console. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
", + "choices": [ + { + "id": "w2jmubyq0i", + "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "zxi4ncxv0x",
+ "value": "",
+ "type": "choice"
+ }
+ ],
+ "buckets": [
+ {
+ "id": "rrisawrk19",
+ "value": "Playstation 4",
+ "type": "bucket"
+ },
+ {
+ "id": "b04777i4m1",
+ "value": "Xbox One",
+ "type": "bucket"
+ }
+ ],
+ "feedback": [
+ {
+ "bucketId": "rrisawrk19",
+ "choices": [
+ {
+ "choiceId": "w2jmubyq0i",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zxi4ncxv0x",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ },
+ {
+ "bucketId": "b04777i4m1",
+ "choices": [
+ {
+ "choiceId": "w2jmubyq0i",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zxi4ncxv0x",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "ordered": false
+ }
+ ]
},
- "title": "Table Step",
- "components": [
- {
- "id": "y45mn2k7yl",
- "type": "Table",
- "prompt": "This is a table step where students fill out a table. You can make certain cells editable and other cells uneditable so the student can't change them. You can also allow the student to add/delete columns as well as add/delete rows.",
- "globalCellSize": 10,
- "tableData": [
- [
- {
- "text": "Object",
- "editable": false,
- "size": null
- },
+ {
+ "id": "node9",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node10"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Match Sequence Step Ordered",
+ "components": [
{
- "text": "Count",
- "editable": false,
- "size": null
+ "id": "8h4fxsg2wi",
+ "type": "Match",
+ "prompt": "Authors can require the choices to be placed in a specific order within a bucket. Place the Playstation console images into the Playstation History bucket in the order of oldest to newest. Then click the 'Submit Answer' button at the bottom of the page to check your answer.
", + "choices": [ + { + "id": "87b5i860r9", + "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "zy2uvk0i2k",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "py0oik2bdx",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "cxi69s3hqo",
+ "value": "",
+ "type": "choice"
+ },
+ {
+ "id": "kg0daqbcg4",
+ "value": "Xbone",
+ "type": "choice"
+ },
+ {
+ "id": "1gfvbimpj3",
+ "value": "Xbox 360",
+ "type": "choice"
+ },
+ {
+ "id": "sxfctzt39y",
+ "value": "Xbox 1",
+ "type": "choice"
+ }
+ ],
+ "buckets": [
+ {
+ "id": "pf7ym43t9m",
+ "value": "Playstation History",
+ "type": "bucket"
+ },
+ {
+ "id": "btvrrgacyr",
+ "value": "Xbox History",
+ "type": "bucket"
+ }
+ ],
+ "feedback": [
+ {
+ "bucketId": "pf7ym43t9m",
+ "choices": [
+ {
+ "choiceId": "87b5i860r9",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 1,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zy2uvk0i2k",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 2,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "py0oik2bdx",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 3,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "cxi69s3hqo",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 4,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "kg0daqbcg4",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "1gfvbimpj3",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "sxfctzt39y",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ },
+ {
+ "bucketId": "btvrrgacyr",
+ "choices": [
+ {
+ "choiceId": "87b5i860r9",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "zy2uvk0i2k",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "py0oik2bdx",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "cxi69s3hqo",
+ "feedback": "Incorrect",
+ "isCorrect": false,
+ "position": null,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "kg0daqbcg4",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 3,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "1gfvbimpj3",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 2,
+ "incorrectPositionFeedback": null
+ },
+ {
+ "choiceId": "sxfctzt39y",
+ "feedback": "Correct.",
+ "isCorrect": true,
+ "position": 1,
+ "incorrectPositionFeedback": null
+ }
+ ]
+ }
+ ],
+ "showSaveButton": false,
+ "showSubmitButton": true,
+ "ordered": true
}
- ],
- [
+ ]
+ },
+ {
+ "id": "node10",
+ "type": "node",
+ "showSaveButton": true,
+ "showSubmitButton": false,
+ "constraints": [],
+ "transitionLogic": {
+ "transitions": [
+ {
+ "to": "node11"
+ }
+ ],
+ "howToChooseAmongAvailablePaths": null,
+ "whenToChoosePath": null,
+ "canChangePath": null,
+ "maxPathsVisitable": null
+ },
+ "title": "Questionnaire Step",
+ "components": [
{
- "text": "Computers",
- "editable": true,
- "size": null
+ "id": "m97kyu4d4v",
+ "type": "HTML",
+ "html": "This is a step where students must answer a series of questions that are either text or mulitple choice questions. This step is set up so that the student must answer all the questions before they can move to any other step. Once the student submits their answer, they can no longer change their answer. These restrictions can be turned on or off for this step type.
" }, { - "text": "", - "editable": true, - "size": null - } - ], - [ - { - "text": "Phones", - "editable": true, - "size": null + "id": "yhrumlct2t", + "prompt": "What is your favorite type of food?", + "type": "OpenResponse" }, { - "text": "", - "editable": true, - "size": null - } - ], - [ + "id": "2upmb3om1q", + "prompt": "What is your favorite type of chocolate?", + "type": "MultipleChoice", + "choiceType": "radio", + "choices": [ + { + "id": "cri2anfnxg", + "text": "White", + "feedback": "" + }, + { + "id": "fzroe37gyx", + "text": "Dark", + "feedback": "" + }, + { + "id": "di49m0lc72", + "text": "Milk", + "feedback": "" + } + ], + "correctChoice": "fzroe37gyx" + }, { - "text": "", - "editable": true, - "size": null + "id": "srof14u22x", + "prompt": "What is your favorite movie?", + "type": "OpenResponse" }, { - "text": "", - "editable": true, - "size": null + "id": "cjv5kq5290", + "prompt": "Edit prompt here", + "type": "MultipleChoice", + "choiceType": "checkbox", + "choices": [ + { + "id": "y1cdkafo2u", + "text": [ + "Enter choice text here" + ], + "feedback": "" + }, + { + "id": "lcnhnc2myc", + "text": [ + "Enter choice text here" + ], + "feedback": "" + } + ] } - ] ] - }, - { - "id": "d9ioo01pa1", - "type": "OpenResponse", - "prompt": "" - } - ] - }, - { - "id": "node15", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node16" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Table Step Line Graph", - "components": [ - { - "id": "wtw3q7peip", - "type": "Table", - "prompt": "The table step can be authored to allow the student to graph the table data. Here is an example of using the table data to create a line graph. I have authored the step to pre-populate the table data so all you need to do is click \"Make Graph\".", - "globalCellSize": 10, - "tableData": [ - [ - { - "text": "x", - "editable": false, - "size": null - }, + { + "id": "node11", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node12" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Draw Step", + "components": [ { - "text": "y", - "editable": false, - "size": null + "id": "9qwqc5uslq", + "type": "Draw", + "prompt": "This is a draw step where the student can draw a diagram.
", + "stamps": { + "Stamps": [] + } } - ], - [ + ] + }, + { + "id": "node12", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node13" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Draw Step Auto Graded", + "components": [ { - "text": "0", - "editable": true, - "size": null - }, + "id": "nvjkidstry", + "type": "Draw", + "prompt": "This is an auto graded draw step. Click the 'Submit' button to have your drawing auto graded.
\n\n
(1) Use stamps to create TWO methane molecules (CH4).
\n(2) Create EXACTLY the number of oxygen molecules (O2) needed to react with your TWO methane molecules.
\n(3) Create a new frame.
\n(4) REARRANGE the atoms in the 2nd frame to make carbon dioxide (CO2) and water (H2O) molecules. Show clearly which atoms belong to which molecules.
", + "stamps": { + "Stamps": [ + "carbon.png", + "oxygen.png", + "hydrogen.png" + ] + } + } + ] + }, + { + "id": "node13", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node14" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Brainstorm Step", + "components": [ { - "text": "0", - "editable": true, - "size": null + "id": "dnz279bdvc", + "type": "Discussion", + "prompt": "This is a forum discussion type of step where students can post their response and then see their classmates' responses. (Note: the brainstorm step only works in a run and does not work when simply previewing the project)
", + "showSaveButton": false, + "showSubmitButton": true, + "gateClassmateResponses": false } - ], - [ + ] + }, + { + "id": "node14", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node15" + }, + { + "to": "node16" + }, + { + "to": "node17" + } + ], + "howToChooseAmongAvailablePaths": "workgroupId", + "whenToChoosePath": "enterNode", + "canChangePath": false, + "maxPathsVisitable": 1 + }, + "title": "Table Step", + "components": [ { - "text": "1", - "editable": true, - "size": null + "id": "y45mn2k7yl", + "type": "Table", + "prompt": "This is a table step where students fill out a table. You can make certain cells editable and other cells uneditable so the student can't change them. You can also allow the student to add/delete columns as well as add/delete rows.", + "globalCellSize": 10, + "tableData": [ + [ + { + "text": "Object", + "editable": false, + "size": null + }, + { + "text": "Count", + "editable": false, + "size": null + } + ], + [ + { + "text": "Computers", + "editable": true, + "size": null + }, + { + "text": "", + "editable": true, + "size": null + } + ], + [ + { + "text": "Phones", + "editable": true, + "size": null + }, + { + "text": "", + "editable": true, + "size": null + } + ], + [ + { + "text": "", + "editable": true, + "size": null + }, + { + "text": "", + "editable": true, + "size": null + } + ] + ], + "showAddToNotebookButton": true }, { - "text": "1", - "editable": true, - "size": null + "id": "d9ioo01pa1", + "type": "OpenResponse", + "prompt": "", + "showAddToNotebookButton": true } - ], - [ + ] + }, + { + "id": "node15", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [ { - "text": "2", - "editable": true, - "size": null + "id": "node15Constraint1", + "action": "makeThisNodeNotVisible", + "targetId": "node15", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node15" + } + } + ] }, { - "text": "2", - "editable": true, - "size": null + "id": "node15Constraint2", + "action": "makeThisNodeNotVisitable", + "targetId": "node15", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node15" + } + } + ] } - ], - [ + ], + "transitionLogic": { + "transitions": [ + { + "to": "node18" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Table Step Line Graph", + "components": [ { - "text": "3", - "editable": true, - "size": null + "id": "wtw3q7peip", + "type": "Table", + "prompt": "The table step can be authored to allow the student to graph the table data. Here is an example of using the table data to create a line graph. I have authored the step to pre-populate the table data so all you need to do is click \"Make Graph\".", + "globalCellSize": 10, + "tableData": [ + [ + { + "text": "x", + "editable": false, + "size": null + }, + { + "text": "y", + "editable": false, + "size": null + } + ], + [ + { + "text": "0", + "editable": true, + "size": null + }, + { + "text": "0", + "editable": true, + "size": null + } + ], + [ + { + "text": "1", + "editable": true, + "size": null + }, + { + "text": "1", + "editable": true, + "size": null + } + ], + [ + { + "text": "2", + "editable": true, + "size": null + }, + { + "text": "2", + "editable": true, + "size": null + } + ], + [ + { + "text": "3", + "editable": true, + "size": null + }, + { + "text": "6", + "editable": true, + "size": null + } + ], + [ + { + "text": "7", + "editable": true, + "size": null + }, + { + "text": "4", + "editable": true, + "size": null + } + ], + [ + { + "text": "10", + "editable": true, + "size": null + }, + { + "text": "4", + "editable": true, + "size": null + } + ] + ] }, { - "text": "6", - "editable": true, - "size": null + "id": "r2t378mp23", + "type": "OpenResponse", + "prompt": "" } - ], - [ + ] + }, + { + "id": "node16", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [ { - "text": "7", - "editable": true, - "size": null + "id": "node16Constraint1", + "action": "makeThisNodeNotVisible", + "targetId": "node16", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node16" + } + } + ] }, { - "text": "4", - "editable": true, - "size": null + "id": "node16Constraint2", + "action": "makeThisNodeNotVisitable", + "targetId": "node16", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node16" + } + } + ] } - ], - [ + ], + "transitionLogic": { + "transitions": [ + { + "to": "node18" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Table Step Bar Graph", + "components": [ { - "text": "10", - "editable": true, - "size": null + "id": "xxcdra15fe", + "type": "Table", + "prompt": "Here is an example of a bar graph.", + "globalCellSize": 10, + "tableData": [ + [ + { + "text": "Color", + "editable": false, + "size": null + }, + { + "text": "Count", + "editable": false, + "size": null + } + ], + [ + { + "text": "Blue", + "editable": true, + "size": null + }, + { + "text": "4", + "editable": true, + "size": null + } + ], + [ + { + "text": "Red", + "editable": true, + "size": null + }, + { + "text": "2", + "editable": true, + "size": null + } + ], + [ + { + "text": "Green", + "editable": true, + "size": null + }, + { + "text": "3", + "editable": true, + "size": null + } + ] + ] }, { - "text": "4", - "editable": true, - "size": null + "id": "cxwpukq3n5", + "type": "OpenResponse", + "prompt": "" } - ] ] - }, - { - "id": "r2t378mp23", - "type": "OpenResponse", - "prompt": "" - } - ] - }, - { - "id": "node16", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node17" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Table Step Bar Graph", - "components": [ - { - "id": "xxcdra15fe", - "type": "Table", - "prompt": "Here is an example of a bar graph.", - "globalCellSize": 10, - "tableData": [ - [ - { - "text": "Color", - "editable": false, - "size": null - }, - { - "text": "Count", - "editable": false, - "size": null - } - ], - [ + { + "id": "node17", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [ { - "text": "Blue", - "editable": true, - "size": null + "id": "node17Constraint1", + "action": "makeThisNodeNotVisible", + "targetId": "node17", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node17" + } + } + ] }, { - "text": "4", - "editable": true, - "size": null + "id": "node17Constraint2", + "action": "makeThisNodeNotVisitable", + "targetId": "node17", + "removalConditional": "all", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "fromNodeId": "node14", + "toNodeId": "node17" + } + } + ] } - ], - [ + ], + "transitionLogic": { + "transitions": [ + { + "to": "node18" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Table Step Pie Graph", + "components": [ { - "text": "Red", - "editable": true, - "size": null + "id": "ejryyaaf8n", + "type": "Table", + "prompt": "Here is an example of a pie graph.", + "globalCellSize": 10, + "tableData": [ + [ + { + "text": "Topping", + "editable": false, + "size": null + }, + { + "text": "Slices", + "editable": false, + "size": null + } + ], + [ + { + "text": "Pepperoni", + "editable": true, + "size": null + }, + { + "text": "4", + "editable": true, + "size": null + } + ], + [ + { + "text": "Mushroom", + "editable": true, + "size": null + }, + { + "text": "4", + "editable": true, + "size": null + } + ], + [ + { + "text": "Bell Pepper", + "editable": true, + "size": null + }, + { + "text": "2", + "editable": true, + "size": null + } + ] + ] }, { - "text": "2", - "editable": true, - "size": null + "id": "f1qmd09sw8", + "type": "OpenResponse", + "prompt": "" } - ], - [ + ] + }, + { + "id": "node18", + "type": "node", + "showSaveButton": true, + "showSubmitButton": true, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node19" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Outside Url Step", + "components": [ { - "text": "Green", - "editable": true, - "size": null - }, + "id": "u48j0eqq2t", + "type": "OutsideURL", + "url": "http://www.berkeley.edu/" + } + ] + }, + { + "id": "node19", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node20" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Label Step", + "components": [ { - "text": "3", - "editable": true, - "size": null + "id": "x4twq80e2n", + "prompt": "Label the picture.", + "type": "Label", + "backgroundImage": "ballon cars and skateboarder.png", + "canCreateLabels": true, + "canDeleteLabels": true, + "width": 800, + "height": 600, + "labels": [ + { + "pointX": 25, + "pointY": 200, + "textX": 100, + "textY": -25, + "text": "more potential energy", + "color": "blue" + }, + { + "pointX": 25, + "pointY": 250, + "textX": 100, + "textY": -25, + "text": "more potential energy", + "color": "blue" + }, + { + "pointX": 25, + "pointY": 300, + "textX": 100, + "textY": -25, + "text": "more kinetic energy", + "color": "green" + }, + { + "pointX": 25, + "pointY": 350, + "textX": 100, + "textY": -25, + "text": "more kinetic energy", + "color": "green" + } + ] } - ] ] - }, - { - "id": "cxwpukq3n5", - "type": "OpenResponse", - "prompt": "" - } - ] - }, - { - "id": "node17", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node18" + }, + { + "id": "group2", + "type": "group", + "title": "Example Features", + "startId": "node20", + "ids": [ + "node20", + "node21", + "node22", + "node23", + "node24", + "node25", + "node26", + "node27", + "node28", + "node29", + "node30", + "node31", + "node32", + "node33", + "node34" + ], + "transitionLogic": { + "transitions": [ + { + "to": "group3" + } + ] } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Table Step Pie Graph", - "components": [ - { - "id": "ejryyaaf8n", - "type": "Table", - "prompt": "Here is an example of a pie graph.", - "globalCellSize": 10, - "tableData": [ - [ - { - "text": "Topping", - "editable": false, - "size": null - }, + { + "id": "node20", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node21" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Show Previous Work 1", + "components": [ { - "text": "Slices", - "editable": false, - "size": null + "id": "onwwrjuqu1", + "type": "OpenResponse", + "prompt": "The work you enter for this step will be displayed at the top of the next step.
" } - ], - [ - { - "text": "Pepperoni", - "editable": true, - "size": null - }, + ] + }, + { + "id": "node21", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node22" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Show Previous Work 2", + "components": [ { - "text": "4", - "editable": true, - "size": null + "id": "8n06hm4kaq", + "type": "OpenResponse", + "prompt": "You should see your work from the previous step at the top of this step. The previous step and this step do not need to be the same type of step.
" } - ], - [ + ] + }, + { + "id": "node22", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node23" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Import Work 1", + "components": [ { - "text": "Mushroom", - "editable": true, - "size": null - }, + "id": "we8ry95yqa", + "type": "OpenResponse", + "prompt": "The work from this step will be imported into the next step.
" + } + ] + }, + { + "id": "node23", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node24" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Import Work 2", + "components": [ { - "text": "4", - "editable": true, - "size": null + "id": "d6sa31zcw8", + "type": "OpenResponse", + "prompt": "Your work from the previous step should be entered into the text area below. This feature works best if the previous step and this step are the same type of step.
" } - ], - [ + ] + }, + { + "id": "node24", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node25" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Must Complete Before Advancing", + "components": [ { - "text": "Bell Pepper", - "editable": true, - "size": null - }, + "id": "5o5x8tujpg", + "type": "OpenResponse", + "prompt": "Authors can create constraints to control student navigation. For these constraint examples, I will be using open response steps but the constraints can be used with other step types as well. This step has been authored so that the student must complete the step before they can move forward. They are allowed to move backwards though.
" + } + ] + }, + { + "id": "node25", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node26" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Must Complete Before Exiting", + "components": [ { - "text": "2", - "editable": true, - "size": null + "id": "ade7umyd5r", + "type": "OpenResponse", + "prompt": "This step has been authored so that the student can't leave the step until they have completed it.
" } - ] ] - }, - { - "id": "f1qmd09sw8", - "type": "OpenResponse", - "prompt": "" - } - ] - }, - { - "id": "node18", - "type": "node", - "showSaveButton": true, - "showSubmitButton": true, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node19" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Outside Url Step", - "components": [ - { - "id": "u48j0eqq2t", - "type": "OutsideURL", - "url": "http://www.berkeley.edu/" - } - ] - }, - { - "id": "node19", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node20" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node26", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node27" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Must Complete Previous Step 1", + "components": [ + { + "id": "3dvneo5lv3", + "type": "OpenResponse", + "prompt": "Do not enter any work for this step. Try to move to the next step \"Must Complete Previous Step 2\", you should not be able to. Try to move to the step after the next step \"Must Complete Previous Step 3\", you should be able to. This feature is used to make the student complete a specific step before they can work on another specific step. Now enter some work for this step and click save. You should then be able to move to the next step.
" + } + ] }, - "title": "Label Step", - "components": [ - { - "id": "x4twq80e2n", - "prompt": "Label the picture.", - "type": "Label", - "backgroundImage": "ballon cars and skateboarder.png", - "canCreateLabels": true, - "canDeleteLabels": true, - "width": 800, - "height": 600, - "labels": [ - { - "pointX": 25, - "pointY": 200, - "textX": 100, - "textY": -25, - "text": "more potential energy", - "color": "blue" - }, - { - "pointX": 25, - "pointY": 250, - "textX": 100, - "textY": -25, - "text": "more potential energy", - "color": "blue" - }, - { - "pointX": 25, - "pointY": 300, - "textX": 100, - "textY": -25, - "text": "more kinetic energy", - "color": "green" - }, - { - "pointX": 25, - "pointY": 350, - "textX": 100, - "textY": -25, - "text": "more kinetic energy", - "color": "green" - } + { + "id": "node27", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node28" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Must Complete Previous Step 2", + "components": [ + { + "id": "b7zhe3k6m3", + "type": "OpenResponse", + "prompt": "Good job, you completed \"Must Complete Previous Step 1\".
" + } ] - } - ] - }, - { - "id": "group2", - "type": "group", - "title": "Example Features", - "startId": "node20", - "ids": [ - "node20", - "node21", - "node22", - "node23", - "node24", - "node25", - "node26", - "node27", - "node28", - "node29", - "node30", - "node31", - "node32", - "node33", - "node34" - ] - }, - { - "id": "node20", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node21" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "Show Previous Work 1", - "components": [ - { - "id": "onwwrjuqu1", - "type": "OpenResponse", - "prompt": "The work you enter for this step will be displayed at the top of the next step.
" - } - ] - }, - { - "id": "node21", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node22" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node28", + "type": "node", + "showSaveButton": false, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node29" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Must Complete Previous Step 3", + "components": [ + { + "id": "dsre8jvudw", + "type": "HTML", + "html": "\n\nNow go back to \"Must Complete Previous Step 1\".
\n
You should see your work from the previous step at the top of this step. The previous step and this step do not need to be the same type of step.
" - } - ] - }, - { - "id": "node22", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node23" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node29", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node30" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Aggregate Step 1", + "components": [ + { + "id": "qo7zqlxoa1", + "type": "MultipleChoice", + "prompt": "The answers for this step will be aggregated for the whole class and displayed in the next step. (Note: the aggregating of class data only works in a run and does not work when simply previewing the project). The answer for this step will also determine which branch path you are assigned to in the Branching Point step.
\nWhat is your favorite type of chocolate?
", + "choices": [ + { + "id": "isqtxst8ah", + "text": "Dark", + "feedback": "Thanks for submitting your answer", + "isCorrect": false + }, + { + "id": "araznpws0b", + "text": "Milk", + "feedback": "Thanks for submitting your answer", + "isCorrect": false + }, + { + "id": "fot1t36pcm", + "text": "White", + "feedback": "Thanks for submitting your answer", + "isCorrect": false + } + ], + "showSaveButton": false, + "showSubmitButton": false, + "choiceType": "radio" + } + ] }, - "title": "Import Work 1", - "components": [ - { - "id": "we8ry95yqa", - "type": "OpenResponse", - "prompt": "The work from this step will be imported into the next step.
" - } - ] - }, - { - "id": "node23", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node24" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node30", + "type": "node", + "showSaveButton": true, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node31" + }, + { + "to": "node32" + }, + { + "to": "node33" + } + ], + "howToChooseAmongAvailablePaths": "criteriaMapping", + "whenToChoosePath": "enterNode", + "canChangePath": false, + "maxPathsVisitable": 1 + }, + "title": "Aggregate Step 2", + "components": [ + { + "id": "9ppjsfsmzb", + "type": "OpenResponse", + "prompt": "You should see a pie graph with the aggregate student data for the class above.
" + } + ] }, - "title": "Import Work 2", - "components": [ - { - "id": "d6sa31zcw8", - "type": "OpenResponse", - "prompt": "Your work from the previous step should be entered into the text area below. This feature works best if the previous step and this step are the same type of step.
" - } - ] - }, - { - "id": "node24", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node25" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node31", + "type": "node", + "showSaveButton": false, + "showSubmitButton": false, + "constraints": [ + { + "id": "constraint0", + "action": "makeThisNodeNotVisible", + "targetId": "node31", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node31" + } + ] + }, + { + "id": "constraint1", + "action": "makeThisNodeNotVisitable", + "targetId": "node31", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node31" + } + ] + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node34" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "You chose dark chocolate", + "components": [ + { + "id": "usk4gr3mq1", + "type": "HTML", + "html": "\n\nYou chose \"Dark\" in the multiple choice step. Enjoy your dark chocolate!
\n
Authors can create constraints to control student navigation. For these constraint examples, I will be using open response steps but the constraints can be used with other step types as well. This step has been authored so that the student must complete the step before they can move forward. They are allowed to move backwards though.
" - } - ] - }, - { - "id": "node25", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node26" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node32", + "type": "node", + "showSaveButton": false, + "showSubmitButton": false, + "constraints": [ + { + "id": "constraint2", + "action": "makeThisNodeNotVisible", + "targetId": "node32", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node32" + } + ] + }, + { + "id": "constraint3", + "action": "makeThisNodeNotVisitable", + "targetId": "node32", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node32" + } + ] + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node34" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "You chose milk chocolate", + "components": [ + { + "id": "6b4xu5mk8y", + "type": "HTML", + "html": "\n\nYou chose \"Milk\" in the multiple choice step. Enjoy your milk chocolate!
\n
This step has been authored so that the student can't leave the step until they have completed it.
" - } - ] - }, - { - "id": "node26", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node27" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node33", + "type": "node", + "showSaveButton": false, + "showSubmitButton": false, + "constraints": [ + { + "id": "constraint4", + "action": "makeThisNodeNotVisible", + "targetId": "node33", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node33" + } + ] + }, + { + "id": "constraint5", + "action": "makeThisNodeNotVisitable", + "targetId": "node33", + "removalCriteria": [ + { + "functionName": "branchPathTaken", + "fromNodeId": "node30", + "toNodeId": "node33" + } + ] + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node34" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "You chose white chocolate", + "components": [ + { + "id": "ycqqha8xn2", + "type": "HTML", + "html": "\n\nYou chose \"White\" in the multiple choice step. Enjoy your white chocolate!
\n
Do not enter any work for this step. Try to move to the next step \"Must Complete Previous Step 2\", you should not be able to. Try to move to the step after the next step \"Must Complete Previous Step 3\", you should be able to. This feature is used to make the student complete a specific step before they can work on another specific step. Now enter some work for this step and click save. You should then be able to move to the next step.
" - } - ] - }, - { - "id": "node27", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node28" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "node34", + "type": "node", + "showSaveButton": false, + "showSubmitButton": false, + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node790" + } + ], + "howToChooseAmongAvailablePaths": null, + "whenToChoosePath": null, + "canChangePath": null, + "maxPathsVisitable": null + }, + "title": "Merge point", + "components": [ + { + "id": "xabcha8d4g", + "type": "HTML", + "html": "\n\nLet us Merge!
\n\n", + "showAddToNotebookButton": true + } + ] }, - "title": "Must Complete Previous Step 2", - "components": [ - { - "id": "b7zhe3k6m3", - "type": "OpenResponse", - "prompt": "Good job, you completed \"Must Complete Previous Step 1\".
" - } - ] - }, - { - "id": "node28", - "type": "node", - "showSaveButton": false, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node29" - } - ], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null + { + "id": "group3", + "type": "group", + "title": "Third Lesson", + "startId": "node790", + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "group4" + } + ] + }, + "ids": [ + "node790", + "node791" + ] }, - "title": "Must Complete Previous Step 3", - "components": [ - { - "id": "dsre8jvudw", - "type": "HTML", - "html": "\n\nNow go back to \"Must Complete Previous Step 1\".
\n
The answers for this step will be aggregated for the whole class and displayed in the next step. (Note: the aggregating of class data only works in a run and does not work when simply previewing the project). The answer for this step will also determine which branch path you are assigned to in the Branching Point step.
\nWhat is your favorite type of chocolate?
", - "choices": [ - { - "id": "isqtxst8ah", - "text": "Dark", - "feedback": "Thanks for submitting your answer", - "isCorrect": false - }, - { - "id": "araznpws0b", - "text": "Milk", - "feedback": "Thanks for submitting your answer", - "isCorrect": false - }, - { - "id": "fot1t36pcm", - "text": "White", - "feedback": "Thanks for submitting your answer", - "isCorrect": false - } - ], + { + "id": "node791", + "title": "Third Lesson Step 2", + "type": "node", + "constraints": [], + "transitionLogic": { + "transitions": [ + { + "to": "node792" + } + ] + }, "showSaveButton": false, "showSubmitButton": false, - "choiceType": "radio" - } - ] - }, - { - "id": "node30", - "type": "node", - "showSaveButton": true, - "showSubmitButton": false, - "constraints": [], - "transitionLogic": { - "transitions": [ - { - "to": "node31" + "components": [] + }, + { + "components": [ + { + "showAddToNotebookButton": true, + "showSubmitButton": false, + "showSaveButton": false, + "html": "What do you want students to explore?
1. Outline and provide a brief description of the topics students can choose from for the Jigsaw activity here. You can add images and links using the tools above.
2. Edit the each jigsaw multiple-choice option below.
3. Do not add or remove any of the pre-populated choices, as this will break the branching logic that is built into the lesson. You only need to edit the Prompts you want students to choose from. If you would like to change the number of topics in the Jigsaw, let the WISE staff know and we can help.
", + "id": "nhbnnln5mm", + "type": "HTML", + "prompt": "" + }, + { + "choiceType": "radio", + "showAddToNotebookButton": true, + "showSubmitButton": true, + "showSaveButton": false, + "id": "0w3e2kgerw", + "type": "MultipleChoice", + "choices": [ + { + "feedback": "", + "id": "4z4f8xiqsj", + "text": "Edit this to be branch 1 choice", + "isCorrect": false + }, + { + "feedback": "", + "id": "2824d0tdlr", + "text": "Edit this to be branch 2 choice", + "isCorrect": false + } + ], + "prompt": "Add your prompt here. Then, edit the student choices below. Each choice will open a new branch.", + "showFeedback": false, + "maxSubmitCount": 1 + } + ], + "transitionLogic": { + "whenToChoosePath": "studentDataChanged", + "maxPathsVisitable": 1, + "howToChooseAmongAvailablePaths": "random", + "canChangePath": false, + "transitions": [ + { + "criteria": [ + { + "name": "choiceChosen", + "params": { + "componentId": "0w3e2kgerw", + "choiceIds": [ + "4z4f8xiqsj" + ], + "nodeId": "node792" + } + } + ], + "to": "node793" + }, + { + "criteria": [ + { + "name": "choiceChosen", + "params": { + "componentId": "0w3e2kgerw", + "choiceIds": [ + "2824d0tdlr" + ], + "nodeId": "node792" + } + } + ], + "to": "node795" + } + ] }, - { - "to": "node32" + "showSubmitButton": false, + "showSaveButton": false, + "id": "node792", + "title": "Pick your topic", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI elicit ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-elicit.svg" + } }, - { - "to": "node33" - } - ], - "howToChooseAmongAvailablePaths": "criteriaMapping", - "whenToChoosePath": "enterNode", - "canChangePath": false, - "maxPathsVisitable": 1 + "constraints": [] }, - "title": "Aggregate Step 2", - "components": [ - { - "id": "9ppjsfsmzb", - "type": "OpenResponse", - "prompt": "You should see a pie graph with the aggregate student data for the class above.
" - } - ] - }, - { - "id": "node31", - "type": "node", - "showSaveButton": false, - "showSubmitButton": false, - "constraints": [ - { - "id": "constraint0", - "action": "makeThisNodeNotVisible", - "targetId": "node31", - "removalCriteria": [ - { - "functionName": "branchPathTaken", - "fromNodeId": "node30", - "toNodeId": "node31" - } - ] - }, - { - "id": "constraint1", - "action": "makeThisNodeNotVisitable", - "targetId": "node31", - "removalCriteria": [ - { - "functionName": "branchPathTaken", - "fromNodeId": "node30", - "toNodeId": "node31" - } + { + "components": [ + { + "showAddToNotebookButton": true, + "showSubmitButton": false, + "showSaveButton": false, + "html": "Topic A
1. Edit this to introduce the content for Topic A.
2. Choose a web-based resource for students to review in the step below about the topic. If you don't want to use a resource, delete the component. You can add a different type of component if you'd like by clicking the + above and choosing the type of you want to add. Then edit that one.
3. Edit the open response prompt at the end of this sequence to prompt student reflection on the ideas you presented.
4. Delete this text once you are done.
", + "id": "if7yrkajl3", + "type": "HTML", + "prompt": "" + }, + { + "showAddToNotebookButton": true, + "showSubmitButton": false, + "showSaveButton": false, + "id": "vznhagylsn", + "type": "OutsideURL", + "prompt": "", + "url": "", + "height": 600 + }, + { + "showAddToNotebookButton": true, + "starterSentence": null, + "showSubmitButton": false, + "showSaveButton": false, + "id": "4t2qx4mwi6", + "type": "OpenResponse", + "prompt": "[EDIT REFLECTION PROMPT HERE] What did you notice about...? What did you learn about...? Record at least two observations about...", + "isStudentAttachmentEnabled": false + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node794" + } + ] + }, + "showSubmitButton": false, + "showSaveButton": true, + "id": "node793", + "title": "Topic A", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI discover ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg" + } + }, + "constraints": [ + { + "removalConditional": "all", + "targetId": "node793", + "action": "makeThisNodeNotVisible", + "id": "node793Constraint1", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node793", + "fromNodeId": "node792" + } + } + ] + }, + { + "removalConditional": "all", + "targetId": "node793", + "action": "makeThisNodeNotVisitable", + "id": "node793Constraint2", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node793", + "fromNodeId": "node792" + } + } + ] + } ] - } - ], - "transitionLogic": { - "transitions": [{ - "to": "node34" - }], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "You chose dark chocolate", - "components": [ - { - "id": "usk4gr3mq1", - "type": "HTML", - "html": "\n\nYou chose \"Dark\" in the multiple choice step. Enjoy your dark chocolate!
\n
Discuss what you learned about your Selected Topic A
1. For this step in the Jigsaw, you can choose to have students who chose the same topic discuss what they learned in pairs or small groups in the classroom (offline) or in an online discussion. This will help them synthesize what they have learned before sharing with students who chose another topic.
2. If you would like to use the online discussion, edit the Discussion component below that asks students to post what they've learned and comment on their peer's ideas. Feel free to edit the 'Prompt' text to better suit your needs.
3. If you would like students to work offline, add instructions here to help facilitate that process. Then delete the Discussion component below.
4. Customize the prompt for the Open Response component at the bottom of this step to prompt reflection what they learned about their topic - before they meet with students who studied the other topic.
5. Delete this text once you are done.
", + "id": "qh56u3lupz", + "type": "HTML", + "prompt": "" + }, + { + "showAddToNotebookButton": false, + "starterSentence": null, + "showSubmitButton": false, + "connectedComponents": [ + { + "componentId": "4t2qx4mwi6", + "type": "showWork", + "nodeId": "node793" + } + ], + "showSaveButton": false, + "id": "e6zkfriesm", + "type": "OpenResponse", + "prompt": "Here is what you learned in the previous step:", + "isStudentAttachmentEnabled": false + }, + { + "showAddToNotebookButton": true, + "gateClassmateResponses": true, + "showSubmitButton": false, + "showSaveButton": false, + "id": "t84sg6f05k", + "type": "Discussion", + "prompt": "[Customize instructions]Share what you've learned with the other members of Team [Enter topic #1 here].
Read the ideas from your teammates and comment on at least one.
When you're finished, answer the question at the bottom of the page.
", + "isStudentAttachmentEnabled": true + }, + { + "showAddToNotebookButton": true, + "starterSentence": null, + "showSubmitButton": false, + "showSaveButton": false, + "id": "hylmcrchzv", + "type": "OpenResponse", + "prompt": "[Customize reflection prompt] After meeting with another team [OR] reviewing your teammates' ideas, how have your ideas about XXXX changed? Make sure you mention...", + "isStudentAttachmentEnabled": false + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node797" + } + ] + }, + "showSubmitButton": false, + "showSaveButton": true, + "id": "node794", + "title": "Discuss what you learned about Topic A", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI discover ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg" + } + }, + "constraints": [ + { + "removalConditional": "all", + "targetId": "node794", + "action": "makeThisNodeNotVisible", + "id": "node794Constraint1", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node793", + "fromNodeId": "node792" + } + } + ] + }, + { + "removalConditional": "all", + "targetId": "node794", + "action": "makeThisNodeNotVisitable", + "id": "node794Constraint2", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node793", + "fromNodeId": "node792" + } + } + ] + } ] - } - ], - "transitionLogic": { - "transitions": [{ - "to": "node34" - }], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "You chose milk chocolate", - "components": [ - { - "id": "6b4xu5mk8y", - "type": "HTML", - "html": "\n\nYou chose \"Milk\" in the multiple choice step. Enjoy your milk chocolate!
\n
Topic B
1. Edit this to introduce the content for Topic B.
2. Choose a web-based resource for students to review in the step below about the topic. If you don't want to use a resource, delete the component. You can add a different type of component if you'd like by clicking the + above and choosing the type of you want to add. Then edit that one.
3. Edit the open response prompt at the end of this sequence to prompt student reflection on the ideas you presented.
4. Delete this text once you are done.
", + "id": "k208vvl7g6", + "type": "HTML", + "prompt": "" + }, + { + "showAddToNotebookButton": true, + "showSubmitButton": false, + "showSaveButton": false, + "id": "4gx3373z38", + "type": "OutsideURL", + "prompt": "", + "url": "", + "height": 600 + }, + { + "showAddToNotebookButton": true, + "starterSentence": null, + "showSubmitButton": false, + "showSaveButton": false, + "id": "kd43661ip3", + "type": "OpenResponse", + "prompt": "[EDIT REFLECTION PROMPT HERE] What did you notice about...? What did you learn about...? Record at least two observations about...", + "isStudentAttachmentEnabled": false + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node796" + } + ] + }, + "showSubmitButton": false, + "showSaveButton": true, + "id": "node795", + "title": "Topic B", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI discover ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg" + } + }, + "constraints": [ + { + "removalConditional": "all", + "targetId": "node795", + "action": "makeThisNodeNotVisible", + "id": "node795Constraint1", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node795", + "fromNodeId": "node792" + } + } + ] + }, + { + "removalConditional": "all", + "targetId": "node795", + "action": "makeThisNodeNotVisitable", + "id": "node795Constraint2", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node795", + "fromNodeId": "node792" + } + } + ] + } ] - }, - { - "id": "constraint5", - "action": "makeThisNodeNotVisitable", - "targetId": "node33", - "removalCriteria": [ - { - "functionName": "branchPathTaken", - "fromNodeId": "node30", - "toNodeId": "node33" - } + }, + { + "components": [ + { + "showAddToNotebookButton": true, + "showSubmitButton": false, + "showSaveButton": false, + "html": "Discuss what you learned about your Selected Topic B
1. For this step in the Jigsaw, you can choose to have students who chose the same topic discuss what they learned in pairs or small groups in the classroom (offline) or in an online discussion. This will help them synthesize what they have learned before sharing with students who chose another topic.
2. If you would like to use the online discussion, edit the Discussion component below that asks students to post what they've learned and comment on their peer's ideas. Feel free to edit the 'Prompt' text to better suit your needs.
3. If you would like students to work offline, add instructions here to help facilitate that process. Then delete the Discussion component below.
4. Customize the prompt for the Open Response component at the bottom of this step to prompt reflection what they learned about their topic - before they meet with students who studied the other topic.
5. Delete this text once you are done.
", + "id": "euc2uab7br", + "type": "HTML", + "prompt": "" + }, + { + "showAddToNotebookButton": false, + "starterSentence": null, + "showSubmitButton": false, + "connectedComponents": [ + { + "componentId": "4t2qx4mwi6", + "type": "showWork", + "nodeId": "node793" + } + ], + "showSaveButton": false, + "id": "4ds7yjc84z", + "type": "OpenResponse", + "prompt": "Here is what you learned in the previous step:", + "isStudentAttachmentEnabled": false + }, + { + "showAddToNotebookButton": true, + "gateClassmateResponses": true, + "showSubmitButton": false, + "showSaveButton": false, + "id": "pf7msod64f", + "type": "Discussion", + "prompt": "[Customize instructions]Share what you've learned with the other members of Team XXXX.
Read the ideas from your teammates and comment on at least one.
When you're finished, answer the question at the bottom of the page.
", + "isStudentAttachmentEnabled": true + }, + { + "showAddToNotebookButton": true, + "starterSentence": null, + "showSubmitButton": false, + "showSaveButton": false, + "id": "c10pptolm8", + "type": "OpenResponse", + "prompt": "[Customize reflection prompt] After meeting with another team [OR] reviewing your teammates' ideas, how have your ideas about XXXX changed? Make sure you mention...", + "isStudentAttachmentEnabled": false + } + ], + "transitionLogic": { + "transitions": [ + { + "to": "node797" + } + ] + }, + "showSubmitButton": false, + "showSaveButton": true, + "id": "node796", + "title": "Discuss what you learned about Topic B", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI discover ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-add.svg" + } + }, + "constraints": [ + { + "removalConditional": "all", + "targetId": "node796", + "action": "makeThisNodeNotVisible", + "id": "node796Constraint1", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node795", + "fromNodeId": "node792" + } + } + ] + }, + { + "removalConditional": "all", + "targetId": "node796", + "action": "makeThisNodeNotVisitable", + "id": "node796Constraint2", + "removalCriteria": [ + { + "name": "branchPathTaken", + "params": { + "toNodeId": "node795", + "fromNodeId": "node792" + } + } + ] + } ] - } - ], - "transitionLogic": { - "transitions": [ { - "to": "node34" - }], - "howToChooseAmongAvailablePaths": null, - "whenToChoosePath": null, - "canChangePath": null, - "maxPathsVisitable": null }, - "title": "You chose white chocolate", - "components": [ - { - "id": "ycqqha8xn2", - "type": "HTML", - "html": "\n\nYou chose \"White\" in the multiple choice step. Enjoy your white chocolate!
\n
Jigsaw Time!
Make connections between Topic A and Topic B
Group students from Branch A with those in Branch B.
1. Customize the instructions above to help students form a group with someone who studied the other topic. You can have stations, for example, and tell students that 2 who studied Topic A and 2 who studied Topic B should go to each station.
2. Edit the text above to add more specific instructions about the sharing process.
3. Delete this help text when you're finished.
Let us Merge!
\n\n" - } - ] - } + { + "components": [ + { + "showAddToNotebookButton": true, + "starterSentence": "I learned from the other team:\n1.\n2.", + "showSubmitButton": false, + "showSaveButton": false, + "id": "blvba48xfw", + "type": "OpenResponse", + "prompt": "[Customize this reflection prompt] You had a chance to talk with a [classmate/group] who had learned about a different [topic/question]. Record two things you learned from talking with a [classmate/group] on the other team.", + "isStudentAttachmentEnabled": false + }, + { + "showAddToNotebookButton": true, + "starterSentence": null, + "showSubmitButton": false, + "showSaveButton": false, + "id": "d84m1j8aao", + "type": "OpenResponse", + "prompt": "[Customize prompt] How does what you learned from the other team connect to the topic you investigated? Does it change or add to your understanding?", + "isStudentAttachmentEnabled": false + } + ], + "transitionLogic": { + "transitions": [] + }, + "showSubmitButton": false, + "showSaveButton": true, + "id": "node798", + "title": "What did you learn from your classmates?", + "type": "node", + "icons": { + "default": { + "imgAlt": "KI connect ideas", + "type": "img", + "imgSrc": "wise5/themes/default/nodeIcons/ki-color-connect.svg" + } + }, + "constraints": [] + }, + { + "startId": "node792", + "transitionLogic": { + "transitions": [] + }, + "ids": [ + "node792", + "node793", + "node794", + "node795", + "node796", + "node797", + "node798" + ], + "icons": { + "default": { + "color": "#2196F3", + "type": "font", + "fontSet": "material-icons", + "fontName": "info" + } + }, + "id": "group4", + "type": "group", + "title": "Jigsaw", + "constraints": [] + } ], "spaces": [ - { - "id": "sharePictures", - "name": "Public", - "isPublic": true, - "isShowInNotebook": false - } + { + "id": "sharePictures", + "name": "Public", + "isPublic": true, + "isShowInNotebook": false + } ], "constraints": [], "startGroupId": "group0", "startNodeId": "node1", "navigationMode": "guided", "layout": { - "template": "starmap|leftNav|rightNav", - "studentIsOnGroupNode": "layout3", - "studentIsOnApplicationNode": "layout4" + "template": "starmap|leftNav|rightNav", + "studentIsOnGroupNode": "layout3", + "studentIsOnApplicationNode": "layout4" }, "metadata": { - "title": "Demo Project" + "title": "Demo Project", + "authors": [ + { + "firstName": "g", + "lastName": "k", + "id": 3, + "username": "gk" + } + ] }, "inactiveNodes": [ - { - "id": "node789", - "title": "inactive node", - "type": "node", - "constraints": [], - "transitionLogic": { - "transitions": [] - }, - "showSaveButton": false, - "showSubmitButton": false, - "components": [], - "checked": false - } + { + "id": "node789", + "title": "inactive node", + "type": "node", + "constraints": [], + "transitionLogic": { + "transitions": [] + }, + "showSaveButton": false, + "showSubmitButton": false, + "components": [] + } ], "theme": "MyCustomTheme" -} +} \ No newline at end of file diff --git a/src/main/webapp/site/src/app/services/sessionService.spec.ts b/src/main/webapp/site/src/app/services/sessionService.spec.ts new file mode 100644 index 0000000000..305576a073 --- /dev/null +++ b/src/main/webapp/site/src/app/services/sessionService.spec.ts @@ -0,0 +1,143 @@ +import { TestBed, tick, fakeAsync } from '@angular/core/testing'; +import { SessionService } from '../../../../wise5/services/sessionService'; +import { UpgradeModule } from '@angular/upgrade/static'; +import ConfigService from '../../../../wise5/services/configService'; +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +let service: SessionService; +let configService: ConfigService; +let http: HttpTestingController; +const renewSessionURL = '/wise/session/renew'; + +describe('SessionService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ HttpClientTestingModule, UpgradeModule ], + providers: [ ConfigService, SessionService ] + }); + http = TestBed.get(HttpTestingController); + configService = TestBed.get(ConfigService); + service = TestBed.get(SessionService); + }); + + calculateIntervals(); + initializeSession(); + mouseMoved(); + checkMouseevent(); + checkForLogout(); + renewSession(); +}); + +function calculateIntervals() { + describe('calculateIntervals()', () => { + it('should calculate the warn and logout intervals when session timeout is 10 minutes', () => { + const sessionTimeout = 600; + const intervals = service.calculateIntervals(sessionTimeout); + expect(intervals.showWarningInterval).toEqual(540); + expect(intervals.forceLogoutAfterWarningInterval).toEqual(60); + }); + + it('should calculate the warn and logout intervals when session timeout is 30 minutes', () => { + const sessionTimeout = 1800; + const intervals = service.calculateIntervals(sessionTimeout); + expect(intervals.showWarningInterval).toEqual(1620); + expect(intervals.forceLogoutAfterWarningInterval).toEqual(180); + }); + + it('should calculate the warn and logout intervals when session timeout is 60 minutes', () => { + const sessionTimeout = 3600; + const intervals = service.calculateIntervals(sessionTimeout); + expect(intervals.showWarningInterval).toEqual(3300); + expect(intervals.forceLogoutAfterWarningInterval).toEqual(300); + }); + }); +} + +function initializeSession() { + describe('initializeSession()', () => { + it('should start check mouse event if not in preview mode', () => { + spyOn(configService, 'isPreview').and.returnValue(false); + const startCheckMouseEventSpy = spyOn(service, 'startCheckMouseEvent'); + service.initializeSession(); + expect(startCheckMouseEventSpy).toHaveBeenCalled(); + }); + }); +} + +function mouseMoved() { + describe('mouseMoved()', () => { + it('should set last activity timestamp when mouse is moved', () => { + service.mouseMoved(); + const renewSessionSpy = spyOn(service, 'renewSession'); + service.checkMouseEvent(); + expect(renewSessionSpy).toHaveBeenCalled(); + }); + }); +} + +function checkMouseevent() { + describe('checkMouseEvent()', () => { + it('should renew session if user has been active within last minute', () => { + spyOn(service, 'isActiveWithinLastMinute').and.returnValue(true); + const renewSessionSpy = spyOn(service, 'renewSession'); + service.checkMouseEvent(); + expect(renewSessionSpy).toHaveBeenCalled(); + }); + + it('should check for logout if user has not been active within last minute', () => { + spyOn(service, 'isActiveWithinLastMinute').and.returnValue(false); + const checkForLogoutSpy = spyOn(service, 'checkForLogout'); + service.checkMouseEvent(); + expect(checkForLogoutSpy).toHaveBeenCalled(); + }); + }); +} + +function checkForLogout() { + describe('checkForLogout()', () => { + it('should force logout when user is inactive for long enough', () => { + spyOn(service, 'isInactiveLongEnoughToForceLogout').and.returnValue(true); + const forceLogOutSpy = spyOn(service, 'forceLogOut'); + service.checkForLogout(); + expect(forceLogOutSpy).toHaveBeenCalled(); + }); + + it('should show warning when user is inactive for long enough to warn and warning is not showing', () => { + spyOn(service, 'isInactiveLongEnoughToForceLogout').and.returnValue(false); + spyOn(service, 'isInactiveLongEnoughToWarn').and.returnValue(true); + spyOn(service, 'isShowingWarning').and.returnValue(false); + const showWarningSpy = spyOn(service, 'showWarning'); + service.checkForLogout(); + expect(showWarningSpy).toHaveBeenCalled(); + }); + }); +} + +function renewSession() { + describe('renewSession()', () => { + it('should renew the session', fakeAsync( + () => { + spyOn(configService, 'getConfigParam') + .withArgs('renewSessionURL').and.returnValue(renewSessionURL); + const logOutSpy = spyOn(service, 'logOut') + service.renewSession(); + expect(configService.getConfigParam).toHaveBeenCalledWith('renewSessionURL'); + http.expectOne(renewSessionURL).flush('true'); + tick(); + expect(logOutSpy).not.toHaveBeenCalled(); + }) + ); + + it('should log the user out when renew session fails', fakeAsync( + () => { + spyOn(configService, 'getConfigParam') + .withArgs('renewSessionURL').and.returnValue(renewSessionURL); + const logOutSpy = spyOn(service, 'logOut'); + service.renewSession(); + expect(configService.getConfigParam).toHaveBeenCalledWith('renewSessionURL'); + http.expectOne(renewSessionURL).flush('false'); + tick(); + expect(logOutSpy).toHaveBeenCalled(); + }) + ); + }); +} \ No newline at end of file diff --git a/src/main/webapp/site/src/app/services/studentAssetService.spec.ts b/src/main/webapp/site/src/app/services/studentAssetService.spec.ts new file mode 100644 index 0000000000..275c5b9156 --- /dev/null +++ b/src/main/webapp/site/src/app/services/studentAssetService.spec.ts @@ -0,0 +1,80 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { UpgradeModule } from '@angular/upgrade/static'; +import { StudentAssetService } from '../../../../wise5/services/studentAssetService'; +import { ConfigService } from '../../../../wise5/services/configService'; + +let configService: ConfigService; +let service: StudentAssetService; +let http: HttpTestingController; +const studentAssetURL = '/student/asset/123'; +const workgroupId = 1; +const periodId = 256; +let asset1, asset2; + +describe('StudentAssetService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ HttpClientTestingModule, UpgradeModule ], + providers: [ StudentAssetService, ConfigService ] + }); + http = TestBed.get(HttpTestingController); + service = TestBed.get(StudentAssetService); + configService = TestBed.get(ConfigService); + }); + initialize(); + retrieveAssets(); + deleteAsset(); +}); + +function initialize() { + asset1 = {id:1, fileName:'wise.png', url:'/curriculum/1/wise.png'}; + asset2 = {id:2, fileName:'wiser.png', url:'/curriculum/1/wiser.png'}; +} + +function retrieveAssets() { + describe('retrieveAssets', () => { + beforeEach(() => { + spyOn(configService, 'getWorkgroupId').and.returnValue(workgroupId); + spyOn(configService, 'getConfigParam').withArgs('mode').and + .returnValue('studentRun').withArgs('studentAssetsURL').and + .returnValue(studentAssetURL); + }); + retrieveAssets_StudentMode_FetchAssetsAndSetAttributes(); + }); +} + +function deleteAsset() { + describe('deleteAsset', () => { + beforeEach(() => { + spyOn(configService, 'getWorkgroupId').and.returnValue(workgroupId); + spyOn(configService, 'getPeriodId').and.returnValue(periodId); + spyOn(configService, 'getConfigParam').withArgs('mode').and + .returnValue('studentRun').withArgs('studentAssetsURL').and + .returnValue(studentAssetURL); + }); + deleteAsset_StudentMode_DeleteAsset(); + }); +} + +function retrieveAssets_StudentMode_FetchAssetsAndSetAttributes() { + it('should fetch assets and set attributes', () => { + service.retrieveAssets().then((response) => { + expect(response.length).toEqual(1); + expect(response[0].type).toEqual('image'); + }); + http.expectOne(`${studentAssetURL}?workgroupId=${workgroupId}`).flush([asset1]); + }); +} + +function deleteAsset_StudentMode_DeleteAsset() { + it('should delete', () => { + service.allAssets = [asset2]; + expect(service.allAssets.length).toEqual(1); + service.deleteAsset(asset2); + const req = http.expectOne(`${studentAssetURL}/delete`); + expect(req.request.method).toEqual('POST'); + expect(req.request.body.studentAssetId).toEqual(2); + expect(req.request.body.clientDeleteTime).toBeDefined(); + }); +} diff --git a/src/main/webapp/site/src/app/student/student-angular-js-module.ts b/src/main/webapp/site/src/app/student/student-angular-js-module.ts index e5ed81c166..a9d0ff95ae 100644 --- a/src/main/webapp/site/src/app/student/student-angular-js-module.ts +++ b/src/main/webapp/site/src/app/student/student-angular-js-module.ts @@ -9,6 +9,9 @@ import { UtilService } from '../../../../wise5/services/utilService'; import { ConfigService } from '../../../../wise5/services/configService'; import { ProjectService } from '../../../../wise5/services/projectService'; import { VLEProjectService } from '../../../../wise5/vle/vleProjectService'; +import { CRaterService } from '../../../../wise5/services/cRaterService'; +import { SessionService } from '../../../../wise5/services/sessionService'; +import { StudentAssetService } from '../../../../wise5/services/studentAssetService'; @Component({template: ``}) export class EmptyComponent {} @@ -26,7 +29,10 @@ export class EmptyComponent {} providers: [ UtilService, ConfigService, + CRaterService, ProjectService, + SessionService, + StudentAssetService, VLEProjectService ] }) diff --git a/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts b/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts index b919b49385..6614d07a7c 100644 --- a/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts +++ b/src/main/webapp/site/src/app/teacher/teacher-angular-js-module.ts @@ -11,6 +11,9 @@ import { ProjectService } from '../../../../wise5/services/projectService'; import { AuthoringToolProjectService } from '../../../../wise5/authoringTool/authoringToolProjectService'; import { ClassroomMonitorProjectService } from '../../../../wise5/classroomMonitor/classroomMonitorProjectService'; import { MilestoneReportDataComponent } from './milestone/milestone-report-data/milestone-report-data.component'; +import { CRaterService } from '../../../../wise5/services/cRaterService'; +import { SessionService } from '../../../../wise5/services/sessionService'; +import { StudentAssetService } from '../../../../wise5/services/studentAssetService'; @Component({template: ``}) export class EmptyComponent {} @@ -29,9 +32,12 @@ export class EmptyComponent {} providers: [ UtilService, ConfigService, + CRaterService, ProjectService, AuthoringToolProjectService, - ClassroomMonitorProjectService + ClassroomMonitorProjectService, + SessionService, + StudentAssetService ], entryComponents: [ MilestoneReportDataComponent diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg new file mode 100644 index 0000000000..2cedda0f78 Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.jpg differ diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp new file mode 100644 index 0000000000..a5a2d6aa32 Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-1200w.webp differ diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg new file mode 100644 index 0000000000..5c3d877c93 Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.jpg differ diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp new file mode 100644 index 0000000000..833f29799c Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-600w.webp differ diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg new file mode 100644 index 0000000000..b25ab601c3 Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.jpg differ diff --git a/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp new file mode 100644 index 0000000000..992079addb Binary files /dev/null and b/src/main/webapp/site/src/assets/img/wise-students-hero-900w.webp differ diff --git a/src/main/webapp/site/src/tsconfig.app.json b/src/main/webapp/site/src/tsconfig.app.json index 07a5190538..bccd35bea8 100644 --- a/src/main/webapp/site/src/tsconfig.app.json +++ b/src/main/webapp/site/src/tsconfig.app.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "../out-tsc/app", "baseUrl": "./", - "types": ["jquery"], + "types": ["jquery", "node", "dom-mediacapture-record"], "paths": { "moment": ["../node_modules/moment/min/moment.min.js"] } diff --git a/src/main/webapp/site/src/tsconfig.spec.json b/src/main/webapp/site/src/tsconfig.spec.json index c771b489b4..3274c7f3b3 100644 --- a/src/main/webapp/site/src/tsconfig.spec.json +++ b/src/main/webapp/site/src/tsconfig.spec.json @@ -6,7 +6,8 @@ "types": [ "jasmine", "jquery", - "node" + "node", + "dom-mediacapture-record" ] }, "files": [ diff --git a/src/main/webapp/wise5/authoringTool/authoringTool.ts b/src/main/webapp/wise5/authoringTool/authoringTool.ts index be7787be55..80f21c6d09 100644 --- a/src/main/webapp/wise5/authoringTool/authoringTool.ts +++ b/src/main/webapp/wise5/authoringTool/authoringTool.ts @@ -24,7 +24,7 @@ import { AuthoringToolProjectService } from './authoringToolProjectService'; import AuthorNotebookController from './notebook/authorNotebookController'; import '../components/conceptMap/conceptMapAuthoringComponentModule'; import { ConfigService } from '../services/configService'; -import CRaterService from '../services/cRaterService'; +import { CRaterService } from '../services/cRaterService'; import '../directives/components'; import ComponentService from '../components/componentService'; import '../components/discussion/discussionAuthoringComponentModule'; @@ -56,16 +56,15 @@ import ProjectAssetController from './asset/projectAssetController'; import ProjectAssetService from '../services/projectAssetService'; import ProjectController from './project/projectController'; import ProjectInfoController from './info/projectInfoController'; -import PlanningService from '../services/planningService'; import RubricAuthoringController from './rubric/rubricAuthoringController'; -import SessionService from '../services/sessionService'; +import { SessionService } from '../services/sessionService'; import * as SockJS from 'sockjs-client'; import * as StompJS from '@stomp/stompjs'; window['SockJS'] = SockJS; window['Stomp'] = StompJS.Stomp; import SpaceService from '../services/spaceService'; import './structure/structureAuthoringModule'; -import StudentAssetService from '../services/studentAssetService'; +import { StudentAssetService } from '../services/studentAssetService'; import StudentDataService from '../services/studentDataService'; import StudentStatusService from '../services/studentStatusService'; import StudentWebSocketService from '../services/studentWebSocketService'; @@ -76,6 +75,7 @@ import TeacherWebSocketService from '../services/teacherWebSocketService'; import { UtilService } from '../services/utilService'; import WISELinkAuthoringController from './wiseLink/wiseLinkAuthoringController'; import * as moment from 'moment'; +import { AudioRecorderService } from '../services/audioRecorderService'; const authoringModule = angular .module('authoring', [ @@ -114,18 +114,18 @@ const authoringModule = angular 'ui.router' ]) .service('AnnotationService', AnnotationService) + .service('AudioRecorderService', AudioRecorderService) .service('ComponentService', ComponentService) .factory('ConfigService', downgradeInjectable(ConfigService)) - .service('CRaterService', CRaterService) + .factory('CRaterService', downgradeInjectable(CRaterService)) .service('NodeService', NodeService) .service('NotebookService', NotebookService) .service('NotificationService', NotificationService) - .service('PlanningService', PlanningService) .factory('ProjectService', downgradeInjectable(AuthoringToolProjectService)) .service('ProjectAssetService', ProjectAssetService) - .service('SessionService', SessionService) + .factory('SessionService', downgradeInjectable(SessionService)) .service('SpaceService', SpaceService) - .service('StudentAssetService', StudentAssetService) + .factory('StudentAssetService', downgradeInjectable(StudentAssetService)) .service('StudentDataService', StudentDataService) .service('StudentStatusService', StudentStatusService) .service('StudentWebSocketService', StudentWebSocketService) diff --git a/src/main/webapp/wise5/authoringTool/authoringToolController.ts b/src/main/webapp/wise5/authoringTool/authoringToolController.ts index 11129103af..fc2234a980 100644 --- a/src/main/webapp/wise5/authoringTool/authoringToolController.ts +++ b/src/main/webapp/wise5/authoringTool/authoringToolController.ts @@ -1,7 +1,7 @@ 'use strict'; import * as angular from 'angular'; import { ConfigService } from '../services/configService'; -import SessionService from '../services/sessionService'; +import { SessionService } from '../services/sessionService'; import TeacherDataService from '../services/teacherDataService'; import { AuthoringToolProjectService } from './authoringToolProjectService'; @@ -193,11 +193,15 @@ class AuthoringToolController { this.SessionService.closeWarningAndRenewSession(); }, () => { - this.SessionService.forceLogOut(); + this.logOut(); } ); }); + $scope.$on('logOut', () => { + this.logOut(); + }); + this.$scope.$on('showRequestLogout', ev => { const alert = this.$mdDialog .confirm() @@ -343,21 +347,31 @@ class AuthoringToolController { this.$rootScope.$broadcast('setGlobalMessage', { globalMessage: globalMessage }); } - saveEvent(eventName, category) { + logOut() { + this.saveEvent('logOut', 'Navigation').then(() => { + this.SessionService.logOut(); + }); + } + + saveEvent(eventName, category): any { const context = 'AuthoringTool'; const nodeId = null; const componentId = null; const componentType = null; const data = {}; - this.TeacherDataService.saveEvent( + const projectId = null; + return this.TeacherDataService.saveEvent( context, nodeId, componentId, componentType, category, eventName, - data - ); + data, + projectId + ).then((result) => { + return result; + }); } } diff --git a/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts b/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts index cd78f58d76..0a99b93be1 100644 --- a/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts +++ b/src/main/webapp/wise5/authoringTool/components/shared/topBar/topBar.ts @@ -2,6 +2,8 @@ import { ConfigService } from '../../../../services/configService'; import { AuthoringToolProjectService } from '../../../authoringToolProjectService'; +import { SessionService } from '../../../../services/sessionService'; +import TeacherDataService from '../../../../services/teacherDataService'; class TopBarController { avatarColor: any; @@ -11,14 +13,23 @@ class TopBarController { contextPath: string; runId: number; - static $inject = ['$rootScope', '$state', '$window', 'ConfigService', 'ProjectService']; + static $inject = [ + '$rootScope', + '$state', + '$window', + 'ConfigService', + 'ProjectService', + 'SessionService' + ]; constructor( private $rootScope: any, private $state: any, private $window: any, private ConfigService: ConfigService, - private ProjectService: AuthoringToolProjectService + private ProjectService: AuthoringToolProjectService, + private SessionService: SessionService, + private TeacherDataService: TeacherDataService ) { this.workgroupId = this.ConfigService.getWorkgroupId(); if (this.workgroupId == null) { @@ -57,12 +68,31 @@ class TopBarController { goHome() { this.ProjectService.notifyAuthorProjectEnd().then(() => { - this.$rootScope.$broadcast('goHome'); + this.SessionService.goHome(); }); } logOut() { - this.$rootScope.$broadcast('logOut'); + const context = 'AuthoringTool'; + const category = 'Navigation'; + const eventName = 'logOutButtonClicked'; + const nodeId = null; + const componentId = null; + const componentType = null; + const data = {}; + const projectId = null; + this.TeacherDataService.saveEvent( + context, + nodeId, + componentId, + componentType, + category, + eventName, + data, + projectId + ).then((result) => { + this.SessionService.logOut(); + }); } } diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json index dd3ce2e6f0..c9666b9360 100644 --- a/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json +++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_ar.json @@ -156,7 +156,6 @@ "insertAsFirstStep": "أدرج كخطوة أولى", "insertInside": "إدراج بالداخل", "isCompleted": "اكتمل", - "isPlanningActivityCompleted": "اكتمل نشاط التخطيط", "isVisible": "مرئي", "isVisitable": "قابل للزيارة", "isVisited": "تمت زيارته", @@ -305,4 +304,4 @@ "youAreNotAllowedToInsertTheSelectedItemAfterItself": "غير مسموح لك بإدراج العنصر المُحدد بعده.", "youAreNotAllowedToInsertTheSelectedItemsAfterItself": "غير مسموح لك بإدراج العناصر المُحددة بعده.", "youCannotCopyActivitiesAtThisTime": "لا يُمكنك نسخ هذه الأنشطة في هذا الوقت." -} \ No newline at end of file +} diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json index 8f685bead5..b9e8e41cd6 100644 --- a/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json +++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_el.json @@ -103,7 +103,6 @@ "insertAsFirstStep": "Εισαγωγή ως Πρώτο Βήμα", "insertInside": "Εισαγωγή Εντός", "isCompleted": "Είναι Ολοκληρωμένο", - "isPlanningActivityCompleted": "Η Δραστηριότητα Σχεδιασμού Είναι Ολοκληρωμένη", "isVisible": "Είναι Ορατό", "isVisitable": "Είναι Επισκέψιμο", "isVisited": "Έχει γίνει Επίσκεψη", @@ -193,4 +192,4 @@ "yes": "Ναι", "youAreNotAllowedToInsertTheSelectedItemAfterItself": "Δεν επιτρέπεται να εισάγετε το επιλεγμένο αντικείμενο ύστερα από το ίδιο", "youAreNotAllowedToInsertTheSelectedItemsAfterItself": "Δεν επιτρέπεται να εισάγετε τα επιλεγμένα αντικείμενα ύστερα από τα ίδια" -} \ No newline at end of file +} diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json index 1597e6c18e..fea32bfcf4 100644 --- a/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json +++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_en.json @@ -206,7 +206,6 @@ "insertAsFirstStep": "Insert As First Step", "insertInside": "Insert Inside", "isCompleted": "Is Completed", - "isPlanningActivityCompleted": "Is Planning Lesson Completed", "isVisible": "Is Visible", "isVisitable": "Is Visitable", "isVisited": "Is Visited", diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json index 526a0991cd..4ca6720e76 100644 --- a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json +++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_CN.json @@ -78,7 +78,6 @@ "insertAfter": "在后面插入", "insertInside": "在中间插入", "isCompleted": "已完成", - "isPlanningActivityCompleted": "规划活动完成了么", "isVisible": "是否可见", "isVisitable": "是否可以访问", "isVisited": "是否访问过", @@ -148,4 +147,4 @@ "viewHistory": "显示历史", "whenToChoosePath": "什么时候选择路径", "yes": "是" -} \ No newline at end of file +} diff --git a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json index 78a3ec31a1..d1d3315edd 100755 --- a/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json +++ b/src/main/webapp/wise5/authoringTool/i18n/i18n_zh_TW.json @@ -80,7 +80,6 @@ "insertAfter": "在後面插入", "insertInside": "在中間插入", "isCompleted": "已完成", - "isPlanningActivityCompleted": "規劃活動完成了嗎", "isVisible": "是否可見", "isVisitable": "是否可以訪問", "isVisited": "是否訪問過", @@ -156,4 +155,4 @@ "viewHistory": "顯示歷史", "whenToChoosePath": "什麼時候選擇路徑", "yes": "是" -} \ No newline at end of file +} diff --git a/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts b/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts index 0bba566c01..018dbd719e 100644 --- a/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts +++ b/src/main/webapp/wise5/authoringTool/main/authoringToolMainController.ts @@ -64,9 +64,6 @@ class AuthoringToolMainController { if (this.is_rtl) { this.icons = { prev: 'arrow_forward', next: 'arrow_back' }; } - this.$rootScope.$on('logOut', () => { - this.saveEvent('logOut', 'Navigation', {}, null); - }); } getProjectByProjectId(projectId) { diff --git a/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts b/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts index d493bb07f0..e0499aa767 100644 --- a/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts +++ b/src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts @@ -282,10 +282,6 @@ class NodeAuthoringController { } ] }, - { - value: 'isPlanningActivityCompleted', - text: this.$translate('isPlanningActivityCompleted') - }, { value: 'wroteXNumberOfWords', text: this.$translate('wroteXNumberOfWords'), diff --git a/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html b/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html index 065f36d28b..6028df20da 100644 --- a/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html +++ b/src/main/webapp/wise5/authoringTool/structure/automatedAssessment/choose-item.html @@ -4,7 +4,7 @@
+ ng-class="::{'groupHeader': item.node.type == 'group', 'stepHeader': item.node.type != 'group'}">
-
-
-
@@ -47,7 +35,6 @@
class="md-long-text noright list-item md-whiteframe-1dp"
aria-label="{{::$ctrl.nodeTitle}}"
ng-class="{'nav-item--list--group': $ctrl.isGroup,
- 'nav-item--planning-mode': $ctrl.planningMode && $ctrl.isPlanningInstance,
'list-item--warn': $ctrl.newAlert,
'warn': $ctrl.newAlert,
'text-secondary': !$ctrl.nodeHasWork}">
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
index a8d2274397..52cced510a 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts
@@ -3,7 +3,6 @@
import AnnotationService from '../../../../services/annotationService';
import { ConfigService } from '../../../../services/configService';
import NotificationService from '../../../../services/notificationService';
-import PlanningService from '../../../../services/planningService';
import { ClassroomMonitorProjectService } from '../../../classroomMonitorProjectService';
import StudentStatusService from '../../../../services/studentStatusService';
import TeacherDataService from '../../../../services/teacherDataService';
@@ -12,7 +11,6 @@ import * as $ from 'jquery';
class NavItemController {
$translate: any;
- availablePlanningNodes: any;
alertIconClass: string;
alertIconLabel: string;
alertIconName: string;
@@ -27,9 +25,6 @@ class NavItemController {
icon: any;
isCurrentNode: boolean;
isGroup: boolean;
- isParentGroupPlanning: boolean;
- isPlanning: boolean;
- isPlanningNode: boolean;
isWorkgroupOnlineOnNode: boolean;
item: any;
maxScore: number;
@@ -53,7 +48,6 @@ class NavItemController {
'AnnotationService',
'ConfigService',
'NotificationService',
- 'PlanningService',
'ProjectService',
'StudentStatusService',
'TeacherDataService',
@@ -68,7 +62,6 @@ class NavItemController {
private AnnotationService: AnnotationService,
private ConfigService: ConfigService,
private NotificationService: NotificationService,
- private PlanningService: PlanningService,
private ProjectService: ClassroomMonitorProjectService,
private StudentStatusService: StudentStatusService,
private TeacherDataService: TeacherDataService,
@@ -80,7 +73,6 @@ class NavItemController {
this.AnnotationService = AnnotationService;
this.ConfigService = ConfigService;
this.NotificationService = NotificationService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.StudentStatusService = StudentStatusService;
this.TeacherDataService = TeacherDataService;
@@ -105,26 +97,12 @@ class NavItemController {
this.maxScore = this.ProjectService.getMaxScoreForNode(this.nodeId);
this.workgroupsOnNodeData = [];
this.isWorkgroupOnlineOnNode = false;
- this.isPlanning = this.PlanningService.isPlanning(this.nodeId);
this.icon = this.ProjectService.getNodeIconByNodeId(this.nodeId);
this.parentGroupId = null;
var parentGroup = this.ProjectService.getParentGroup(this.nodeId);
if (parentGroup != null) {
this.parentGroupId = parentGroup.id;
}
- if (this.isPlanning) {
- /*
- * planning is enabled for this group so we will get the available
- * planning nodes that can be used
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.nodeId);
- } else if (this.isPlanningNode) {
- /* this is an available planning node for its parent group, so we
- * need to calculate the total number of times it has been added
- * to the project by all the workgroups in the current period
- */
- }
-
this.setWorkgroupsOnNodeData();
this.$onInit = () => {
@@ -260,64 +238,6 @@ class NavItemController {
}
}
- /**
- * Returns the max times a planning node can be added to the project (-1 is
- * is returned if there is no limit)
- * @param planningNodeId
- */
- getPlannindNodeMaxAllowed(planningNodeId) {
- let maxAddAllowed = -1; // by default, students can add as many instances as they want
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
- // get the maxAddAllowed value by looking up the planningNode in the project.
- if (planningGroupNode && planningGroupNode.availablePlanningNodes) {
- for (let a = 0; a < planningGroupNode.availablePlanningNodes.length; a++) {
- let availablePlanningNode = planningGroupNode.availablePlanningNodes[a];
- if (availablePlanningNode.nodeId === planningNodeId && availablePlanningNode.max != null) {
- maxAddAllowed = availablePlanningNode.max;
- }
- }
- }
-
- return maxAddAllowed;
- }
-
- /**
- * Returns the number of times a planning node has been added to the project
- * @param planningNodeId
- */
- getNumPlannindNodeInstances(planningNodeId) {
- let numPlanningNodesAdded = 0; // keep track of number of instances
- // otherwise, see how many times the planning node template has been used.
-
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
-
- // loop through the child ids in the planning group and see how many times they've been used
- if (planningGroupNode && planningGroupNode.ids) {
- for (let c = 0; c < planningGroupNode.ids.length; c++) {
- let childPlanningNodeId = planningGroupNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- if (
- childPlanningNode != null &&
- childPlanningNode.planningNodeTemplateId === planningNodeId
- ) {
- numPlanningNodesAdded++;
- }
- }
- }
-
- return numPlanningNodesAdded;
- }
-
/**
* Get the node title
* @param nodeId get the title for this node
@@ -442,8 +362,7 @@ const NavItem = {
bindings: {
nodeId: '<',
showPosition: '<',
- type: '<',
- isPlanningNode: '<'
+ type: '<'
},
templateUrl:
'/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html',
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
index 4b0dd37e21..2499cc23f2 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts
@@ -3,6 +3,7 @@
import { ConfigService } from '../../../../services/configService';
import { ClassroomMonitorProjectService } from '../../../classroomMonitorProjectService';
import TeacherDataService from '../../../../services/teacherDataService';
+import { SessionService } from '../../../../services/sessionService';
class TopBarController {
$translate: any;
@@ -22,7 +23,8 @@ class TopBarController {
'$state',
'ConfigService',
'ProjectService',
- 'TeacherDataService'
+ 'TeacherDataService',
+ 'SessionService'
];
constructor(
@@ -31,7 +33,8 @@ class TopBarController {
private $state: any,
private ConfigService: ConfigService,
private ProjectService: ClassroomMonitorProjectService,
- private TeacherDataService: TeacherDataService
+ private TeacherDataService: TeacherDataService,
+ private SessionService: SessionService
) {
this.$translate = $filter('translate');
this.workgroupId = this.ConfigService.getWorkgroupId();
@@ -125,29 +128,33 @@ class TopBarController {
componentType,
category,
event,
- eventData
+ eventData,
+ null
);
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
}
logOut() {
- var context = 'ClassroomMonitor';
- var nodeId = null;
- var componentId = null;
- var componentType = null;
- var category = 'Navigation';
- var event = 'logOutButtonClicked';
- var eventData = {};
+ const context = 'ClassroomMonitor';
+ const category = 'Navigation';
+ const eventName = 'logOutButtonClicked';
+ const nodeId = null;
+ const componentId = null;
+ const componentType = null;
+ const data = {};
+ const projectId = null;
this.TeacherDataService.saveEvent(
context,
nodeId,
componentId,
componentType,
category,
- event,
- eventData
- );
- this.$rootScope.$broadcast('logOut');
+ eventName,
+ data,
+ projectId
+ ).then((result) => {
+ this.SessionService.logOut();
+ });
}
}
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
index 14edd99032..7e8197cae2 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts
@@ -5,7 +5,7 @@ import NodeService from '../services/nodeService';
import NotebookService from '../services/notebookService';
import NotificationService from '../services/notificationService';
import TeacherDataService from '../services/teacherDataService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import * as angular from 'angular';
import { ClassroomMonitorProjectService } from './classroomMonitorProjectService';
@@ -141,11 +141,15 @@ class ClassroomMonitorController {
this.SessionService.closeWarningAndRenewSession();
},
() => {
- this.SessionService.forceLogOut();
+ this.logOut();
}
);
});
+ this.$scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('showRequestLogout', ev => {
const alert = $mdDialog
.confirm()
@@ -177,13 +181,14 @@ class ClassroomMonitorController {
this.themePath = this.ProjectService.getThemePath();
this.notifications = this.NotificationService.notifications;
- let context = 'ClassroomMonitor',
+ const context = 'ClassroomMonitor',
nodeId = null,
componentId = null,
componentType = null,
category = 'Navigation',
event = 'sessionStarted',
- data = {};
+ data = {},
+ projectId = null;
this.TeacherDataService.saveEvent(
context,
nodeId,
@@ -191,7 +196,8 @@ class ClassroomMonitorController {
componentType,
category,
event,
- data
+ data,
+ projectId
);
this.$window.onbeforeunload = () => {
@@ -251,6 +257,33 @@ class ClassroomMonitorController {
this.$mdToast.hide(this.connectionLostDisplay);
this.connectionLostShown = false;
}
+
+ logOut() {
+ this.saveEvent('logOut', 'Navigation').then(() => {
+ this.SessionService.logOut();
+ });
+ }
+
+ saveEvent(eventName, category): any {
+ const context = 'ClassroomMonitor';
+ const nodeId = null;
+ const componentId = null;
+ const componentType = null;
+ const data = {};
+ const projectId = null;
+ return this.TeacherDataService.saveEvent(
+ context,
+ nodeId,
+ componentId,
+ componentType,
+ category,
+ eventName,
+ data,
+ projectId
+ ).then((result) => {
+ return result;
+ });
+ }
}
export default ClassroomMonitorController;
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
index 2bcba094ae..f8c3502ff9 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_ar.json
@@ -105,7 +105,6 @@
"notAssigned": "لم يتم تعيينها",
"notCompleted": "لم يتم الانتهاء منها",
"notVisited": "لم تتم زيارته",
- "noteThisActivityIncludesStudentPlanning": "ملاحظة: يتضمن هذا النشاط تخطيط الطالب",
"numberOfAssessmentItems_0": "0 عناصر تقييم العمل ",
"numberOfAssessmentItems_1": " 1 عنصر تقييم واحد ",
"numberOfStudentOnStep": "#عدد من الطلاب بالخطوة ",
@@ -184,4 +183,4 @@
"visited": "تمت الزيارة\n",
"workgroups": "مجموعات العمل\n",
"yes": "نعم"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
index f85b6747f7..9f4759eeb5 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_el.json
@@ -89,7 +89,6 @@
"noMatchesFound": "Δεν βρέθηκαν αντιστοιχήσεις",
"noNotes": "Η ομάδα δεν έχει ακόμα δημιουργήσει καθόλου σημειώσεις",
"notCompleted": "Μη συμπληρωμένο",
- "noteThisActivityIncludesStudentPlanning": "Σημείωση: Αυτή η δραστηριότητα περιλαμβάνει σχεδιασμό από τους μαθητές",
"notVisited": "Δεν έχει γίνει επίσκεψη",
"noWork": "Καμμία Δουλειά",
"numberOfAssessmentItems_0": "0 αντικείμενα αξιολόγησης",
@@ -166,4 +165,4 @@
"visited": "Έχει ήδη γίνει επίσκεψη",
"workgroups": "Ομάδες Εργασίας",
"yes": "Ναι"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
index 97f202f67d..aa014e5fec 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_en.json
@@ -145,7 +145,6 @@
"notAssigned": "Not Assigned",
"notCompleted": "Not Completed",
"notes": "Notes",
- "noteThisActivityIncludesStudentPlanning": "Note: This lesson includes student planning.",
"notVisited": "Not Visited",
"noWork": "No Work",
"numberOfAssessmentItems_0": "0 assessment items",
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
index 5922bc5e32..e846e524b7 100644
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_CN.json
@@ -42,7 +42,6 @@
"newWork": "新作品",
"newWorkCounter": "新作品数: {{count}}",
"noNotes": "学生还没有创建任何笔记",
- "noteThisActivityIncludesStudentPlanning": "注意：该活动包含学生计划。",
"notVisited": "未访问",
"noWork": "无作品",
"numberOfStudentOnStep": "# 在本步骤上的学生",
@@ -85,4 +84,4 @@
"unpauseStudentScreens": "解锁学生屏幕",
"visited": "已访问",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
index 49674ba128..6f7e1c66b3 100755
--- a/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/classroomMonitor/i18n/i18n_zh_TW.json
@@ -49,7 +49,6 @@
"newWorkCounter": "新作業數量: {{count}}",
"noMatchesFound": "找不到匹配的",
"noNotes": "學生還沒有建立任何筆記",
- "noteThisActivityIncludesStudentPlanning": "注意：此活動包含學生計劃。",
"notVisited": "未訪問",
"noWork": "無作業",
"numberOfStudentOnStep": "# 在本步驟上的學生",
@@ -100,4 +99,4 @@
"unpauseStudentScreens": "解鎖學生螢幕",
"visited": "已訪問",
"yes": "是"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/components/componentController.ts b/src/main/webapp/wise5/components/componentController.ts
index f9d0276316..ffb626ebf7 100644
--- a/src/main/webapp/wise5/components/componentController.ts
+++ b/src/main/webapp/wise5/components/componentController.ts
@@ -5,7 +5,7 @@ import { ConfigService } from "../services/configService";
import NodeService from "../services/nodeService";
import NotebookService from "../services/notebookService";
import { ProjectService } from "../services/projectService";
-import StudentAssetService from "../services/studentAssetService";
+import { StudentAssetService } from "../services/studentAssetService";
import { UtilService } from "../services/utilService";
import StudentDataService from "../services/studentDataService";
@@ -42,6 +42,7 @@ class ComponentController {
isSubmit: boolean;
saveMessage: any;
isStudentAttachmentEnabled: boolean;
+ isStudentAudioRecordingEnabled: boolean;
isPromptVisible: boolean;
isSaveButtonVisible: boolean;
isSubmitButtonVisible: boolean;
@@ -114,7 +115,7 @@ class ComponentController {
};
this.isStudentAttachmentEnabled = this.componentContent.isStudentAttachmentEnabled;
-
+ this.isStudentAudioRecordingEnabled = this.componentContent.isStudentAudioRecordingEnabled || false;
this.isPromptVisible = true;
this.isSaveButtonVisible = false;
this.isSubmitButtonVisible = false;
@@ -1234,10 +1235,12 @@ class ComponentController {
}
attachStudentAsset(studentAsset) {
- this.StudentAssetService.copyAssetForReference(studentAsset).then((copiedAsset) => {
+ return this.StudentAssetService.copyAssetForReference(studentAsset).then((copiedAsset) => {
const attachment = {
studentAssetId: copiedAsset.id,
- iconURL: copiedAsset.iconURL
+ iconURL: copiedAsset.iconURL,
+ url: copiedAsset.url,
+ type: copiedAsset.type
};
this.attachments.push(attachment);
this.studentDataChanged();
@@ -1289,6 +1292,18 @@ class ComponentController {
}
});
}
+
+ registerAudioRecordedListener() {
+ this.$scope.$on('audioRecorded', (event, {requester, audioFile}) => {
+ if (requester === `${this.nodeId}-${this.componentId}`) {
+ this.StudentAssetService.uploadAsset(audioFile).then((studentAsset) => {
+ this.attachStudentAsset(studentAsset).then(() => {
+ this.StudentAssetService.deleteAsset(studentAsset);
+ })
+ });
+ }
+ });
+ }
}
export default ComponentController;
diff --git a/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts b/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
index 3911d66dc7..a9aeaf34c4 100644
--- a/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
+++ b/src/main/webapp/wise5/components/conceptMap/conceptMapService.ts
@@ -1,7 +1,7 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
import { ConfigService } from '../../services/configService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
import ConceptMapNode from './conceptMapNode';
import ConceptMapLink from './conceptMapLink';
diff --git a/src/main/webapp/wise5/components/draw/drawService.ts b/src/main/webapp/wise5/components/draw/drawService.ts
index c423ef0307..b3cc89904a 100644
--- a/src/main/webapp/wise5/components/draw/drawService.ts
+++ b/src/main/webapp/wise5/components/draw/drawService.ts
@@ -2,7 +2,7 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class DrawService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/embedded/embeddedService.ts b/src/main/webapp/wise5/components/embedded/embeddedService.ts
index fffaf636b3..8ef7099bfd 100644
--- a/src/main/webapp/wise5/components/embedded/embeddedService.ts
+++ b/src/main/webapp/wise5/components/embedded/embeddedService.ts
@@ -1,7 +1,7 @@
import * as $ from 'jquery';
import * as html2canvas from 'html2canvas';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class EmbeddedService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/label/labelService.ts b/src/main/webapp/wise5/components/label/labelService.ts
index cb0398c3a2..b69ab0a659 100644
--- a/src/main/webapp/wise5/components/label/labelService.ts
+++ b/src/main/webapp/wise5/components/label/labelService.ts
@@ -1,6 +1,6 @@
import * as angular from 'angular';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class LabelService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/components/match/matchController.ts b/src/main/webapp/wise5/components/match/matchController.ts
index b5a634a8a0..f7f86373d1 100644
--- a/src/main/webapp/wise5/components/match/matchController.ts
+++ b/src/main/webapp/wise5/components/match/matchController.ts
@@ -22,6 +22,7 @@ class MatchController extends ComponentController {
isLatestComponentStateSubmit: boolean;
sourceBucket: any;
privateNotebookItems: any[];
+ autoScroll: any;
static $inject = [
'$filter',
@@ -79,6 +80,7 @@ class MatchController extends ComponentController {
this.dragulaService = dragulaService;
this.MatchService = MatchService;
this.$mdMedia = $mdMedia;
+ this.autoScroll = require('dom-autoscroller');
this.choices = [];
this.buckets = [];
@@ -219,6 +221,15 @@ class MatchController extends ComponentController {
this.disableDraggingIfNeeded(dragId);
const drake = this.dragulaService.find(this.$scope, dragId).drake;
this.showVisualIndicatorWhileDragging(drake);
+ this.autoScroll(
+ [document.querySelector('#content')], {
+ margin: 30,
+ pixels: 50,
+ scrollWhenOutside: true,
+ autoScroll: function() {
+ return this.down && drake.dragging;
+ }
+ });
}
registerStudentDataChangedOnDrop(dragId) {
diff --git a/src/main/webapp/wise5/components/openResponse/authoring.html b/src/main/webapp/wise5/components/openResponse/authoring.html
index df6fdce5d2..f80ef985f1 100644
--- a/src/main/webapp/wise5/components/openResponse/authoring.html
+++ b/src/main/webapp/wise5/components/openResponse/authoring.html
@@ -25,6 +25,13 @@
+
{{item.node.title}}:
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts b/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
index 66a6e0d63e..f59190dca7 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitor.ts
@@ -24,7 +24,7 @@ import ClassroomMonitorController from './classroomMonitorController';
import { ClassroomMonitorProjectService } from './classroomMonitorProjectService';
import '../components/conceptMap/conceptMapComponentModule';
import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
+import { CRaterService } from '../services/cRaterService';
import '../directives/components';
import ComponentService from '../components/componentService';
import './dashboard/dashboardController';
@@ -58,13 +58,12 @@ import NotebookService from '../services/notebookService';
import NotificationService from '../services/notificationService';
import '../components/openResponse/openResponseComponentModule';
import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import * as SockJS from 'sockjs-client';
import * as StompJS from '@stomp/stompjs';
window['SockJS'] = SockJS;
window['Stomp'] = StompJS.Stomp;
-import StudentAssetService from '../services/studentAssetService';
+import { StudentAssetService } from '../services/studentAssetService';
import StudentDataService from '../services/studentDataService';
import StudentGradingController from './studentGrading/studentGradingController';
import StudentProgressController from './studentProgress/studentProgressController';
@@ -76,6 +75,7 @@ import TeacherDataService from '../services/teacherDataService';
import TeacherWebSocketService from '../services/teacherWebSocketService';
import { UtilService } from '../services/utilService';
import * as moment from 'moment';
+import { AudioRecorderService } from '../services/audioRecorderService';
const classroomMonitorModule = angular
.module('classroomMonitor', [
@@ -115,18 +115,18 @@ const classroomMonitorModule = angular
])
.service('AchievementService', AchievementService)
.service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
.service('ComponentService', ComponentService)
.factory('ConfigService', downgradeInjectable(ConfigService))
- .service('CRaterService', CRaterService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
.service('HttpInterceptor', HttpInterceptor)
.service('MilestoneService', MilestoneService)
.service('NodeService', NodeService)
.service('NotebookService', NotebookService)
.service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
.factory('ProjectService', downgradeInjectable(ClassroomMonitorProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
+ .factory('SessionService', downgradeInjectable(SessionService))
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
.service('StudentDataService', StudentDataService)
.service('StudentStatusService', StudentStatusService)
.service('StudentWebSocketService', StudentWebSocketService)
diff --git a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
index e7835255a5..c1d1bc880e 100644
--- a/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
+++ b/src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.html
@@ -13,9 +13,6 @@
- {{ ::'noteThisActivityIncludesStudentPlanning' | translate }}
-
{{ ::'advancedAuthoringOptions' | translate }}
ng-change='openResponseController.authoringViewComponentChanged()'/>+
+
+ {{ ::'openResponse.enableStudentAudioResponse' | translate }}
+
+
{{ ::'openResponse.enableCRater' | translate }}:
-
+
+
-
+
+ {{ ::'openResponse.previousVersions' | translate }}: {{nodeController.getRevisions().length - 1}}
-
+
-
{
- if (result != null) {
- // get the CRater response
- const data = result.data;
+ (data: any) => {
+ /*
+ * annotations we put in the component state will be
+ * removed from the component state and saved separately
+ */
+ componentState.annotations = [];
+
+ // get the CRater score
+ let score = data.score;
+ let concepts = data.concepts;
+ let previousScore = null;
+ if (data.scores != null) {
+ const maxSoFarFunc = (accumulator, currentValue) => {
+ return Math.max(accumulator, currentValue.score);
+ };
+ score = data.scores.reduce(maxSoFarFunc, 0);
+ }
- if (data != null) {
- /*
- * annotations we put in the component state will be
- * removed from the component state and saved separately
- */
- componentState.annotations = [];
-
- // get the CRater score
- let score = data.score;
- let concepts = data.concepts;
- let previousScore = null;
- if (data.scores != null) {
- const maxSoFarFunc = (accumulator, currentValue) => {
- return Math.max(accumulator, currentValue.score);
- };
- score = data.scores.reduce(maxSoFarFunc, 0);
- }
+ if (score != null) {
+ const autoScoreAnnotationData: any = {
+ value: score,
+ maxAutoScore: this.ProjectService.getMaxScoreForComponent(
+ this.nodeId,
+ this.componentId
+ ),
+ concepts: concepts,
+ autoGrader: 'cRater'
+ };
+ if (data.scores != null) {
+ autoScoreAnnotationData.scores = data.scores;
+ }
- if (score != null) {
- const autoScoreAnnotationData: any = {
- value: score,
- maxAutoScore: this.ProjectService.getMaxScoreForComponent(
- this.nodeId,
- this.componentId
- ),
- concepts: concepts,
- autoGrader: 'cRater'
- };
- if (data.scores != null) {
- autoScoreAnnotationData.scores = data.scores;
- }
+ let autoScoreAnnotation = this.createAutoScoreAnnotation(autoScoreAnnotationData);
- let autoScoreAnnotation = this.createAutoScoreAnnotation(autoScoreAnnotationData);
+ let annotationGroupForScore = null;
- let annotationGroupForScore = null;
+ if (this.$scope.$parent.nodeController != null) {
+ // get the previous score and comment annotations
+ let latestAnnotations = this.$scope.$parent.nodeController.getLatestComponentAnnotations(
+ this.componentId
+ );
- if (this.$scope.$parent.nodeController != null) {
- // get the previous score and comment annotations
- let latestAnnotations = this.$scope.$parent.nodeController.getLatestComponentAnnotations(
- this.componentId
- );
+ if (
+ latestAnnotations != null &&
+ latestAnnotations.score != null &&
+ latestAnnotations.score.data != null
+ ) {
+ // get the previous score annotation value
+ previousScore = latestAnnotations.score.data.value;
+ }
- if (
- latestAnnotations != null &&
- latestAnnotations.score != null &&
- latestAnnotations.score.data != null
- ) {
- // get the previous score annotation value
- previousScore = latestAnnotations.score.data.value;
- }
+ if (
+ this.componentContent.enableGlobalAnnotations &&
+ this.componentContent.globalAnnotationSettings != null
+ ) {
+ let globalAnnotationMaxCount = 0;
+ if (
+ this.componentContent.globalAnnotationSettings.globalAnnotationMaxCount !=
+ null
+ ) {
+ globalAnnotationMaxCount = this.componentContent.globalAnnotationSettings
+ .globalAnnotationMaxCount;
+ }
+ // get the annotation properties for the score that the student got.
+ annotationGroupForScore = this.ProjectService.getGlobalAnnotationGroupByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+
+ // check if we need to apply this globalAnnotationSetting to this annotation: we don't need to if we've already reached the maxCount
+ if (annotationGroupForScore != null) {
+ let globalAnnotationGroupsByNodeIdAndComponentId = this.AnnotationService.getAllGlobalAnnotationGroups();
+ annotationGroupForScore.annotationGroupCreatedTime =
+ autoScoreAnnotation.clientSaveTime; // save annotation creation time
if (
- this.componentContent.enableGlobalAnnotations &&
- this.componentContent.globalAnnotationSettings != null
+ globalAnnotationGroupsByNodeIdAndComponentId.length >=
+ globalAnnotationMaxCount
) {
- let globalAnnotationMaxCount = 0;
- if (
- this.componentContent.globalAnnotationSettings.globalAnnotationMaxCount !=
- null
- ) {
- globalAnnotationMaxCount = this.componentContent.globalAnnotationSettings
- .globalAnnotationMaxCount;
- }
- // get the annotation properties for the score that the student got.
- annotationGroupForScore = this.ProjectService.getGlobalAnnotationGroupByScore(
- this.componentContent,
- previousScore,
- score
- );
-
- // check if we need to apply this globalAnnotationSetting to this annotation: we don't need to if we've already reached the maxCount
- if (annotationGroupForScore != null) {
- let globalAnnotationGroupsByNodeIdAndComponentId = this.AnnotationService.getAllGlobalAnnotationGroups();
- annotationGroupForScore.annotationGroupCreatedTime =
- autoScoreAnnotation.clientSaveTime; // save annotation creation time
-
- if (
- globalAnnotationGroupsByNodeIdAndComponentId.length >=
- globalAnnotationMaxCount
- ) {
- // we've already applied this annotation properties to maxCount annotations, so we don't need to apply it any more.
- annotationGroupForScore = null;
- }
- }
-
- if (
- annotationGroupForScore != null &&
- annotationGroupForScore.isGlobal &&
- annotationGroupForScore.unGlobalizeCriteria != null
- ) {
- // check if this annotation is global and what criteria needs to be met to un-globalize.
- annotationGroupForScore.unGlobalizeCriteria.map(unGlobalizeCriteria => {
- // if the un-globalize criteria is time-based (e.g. isVisitedAfter, isRevisedAfter, isVisitedAndRevisedAfter, etc), store the timestamp of this annotation in the criteria
- // so we can compare it when we check for criteria satisfaction.
- if (unGlobalizeCriteria.params != null) {
- unGlobalizeCriteria.params.criteriaCreatedTimestamp =
- autoScoreAnnotation.clientSaveTime; // save annotation creation time to criteria
- }
- });
- }
-
- if (annotationGroupForScore != null) {
- // copy over the annotation properties into the autoScoreAnnotation's data
- angular.merge(autoScoreAnnotation.data, annotationGroupForScore);
- }
+ // we've already applied this annotation properties to maxCount annotations, so we don't need to apply it any more.
+ annotationGroupForScore = null;
}
}
- componentState.annotations.push(autoScoreAnnotation);
-
- if (this.mode === 'authoring') {
- if (this.latestAnnotations == null) {
- this.latestAnnotations = {};
- }
+ if (
+ annotationGroupForScore != null &&
+ annotationGroupForScore.isGlobal &&
+ annotationGroupForScore.unGlobalizeCriteria != null
+ ) {
+ // check if this annotation is global and what criteria needs to be met to un-globalize.
+ annotationGroupForScore.unGlobalizeCriteria.map(unGlobalizeCriteria => {
+ // if the un-globalize criteria is time-based (e.g. isVisitedAfter, isRevisedAfter, isVisitedAndRevisedAfter, etc), store the timestamp of this annotation in the criteria
+ // so we can compare it when we check for criteria satisfaction.
+ if (unGlobalizeCriteria.params != null) {
+ unGlobalizeCriteria.params.criteriaCreatedTimestamp =
+ autoScoreAnnotation.clientSaveTime; // save annotation creation time to criteria
+ }
+ });
+ }
- /*
- * we are in the authoring view so we will set the
- * latest score annotation manually
- */
- this.latestAnnotations.score = autoScoreAnnotation;
+ if (annotationGroupForScore != null) {
+ // copy over the annotation properties into the autoScoreAnnotation's data
+ angular.merge(autoScoreAnnotation.data, annotationGroupForScore);
}
+ }
+ }
- let autoComment = null;
+ componentState.annotations.push(autoScoreAnnotation);
- // get the submit counter
- const submitCounter = this.submitCounter;
+ if (this.mode === 'authoring') {
+ if (this.latestAnnotations == null) {
+ this.latestAnnotations = {};
+ }
- if (
- this.componentContent.cRater.enableMultipleAttemptScoringRules &&
- submitCounter > 1
- ) {
- /*
- * this step has multiple attempt scoring rules and this is
- * a subsequent submit
- */
- // get the feedback based upon the previous score and current score
- autoComment = this.CRaterService.getMultipleAttemptCRaterFeedbackTextByScore(
- this.componentContent,
- previousScore,
- score
- );
- } else {
- // get the feedback text
- autoComment = this.CRaterService.getCRaterFeedbackTextByScore(
- this.componentContent,
- score
- );
- }
+ /*
+ * we are in the authoring view so we will set the
+ * latest score annotation manually
+ */
+ this.latestAnnotations.score = autoScoreAnnotation;
+ }
- if (autoComment != null) {
- // create the auto comment annotation
- const autoCommentAnnotationData: any = {};
- autoCommentAnnotationData.value = autoComment;
- autoCommentAnnotationData.concepts = concepts;
- autoCommentAnnotationData.autoGrader = 'cRater';
-
- const autoCommentAnnotation = this.createAutoCommentAnnotation(
- autoCommentAnnotationData
- );
-
- if (this.componentContent.enableGlobalAnnotations) {
- if (annotationGroupForScore != null) {
- // copy over the annotation properties into the autoCommentAnnotation's data
- angular.merge(autoCommentAnnotation.data, annotationGroupForScore);
- }
- }
- componentState.annotations.push(autoCommentAnnotation);
+ let autoComment = null;
- if (this.mode === 'authoring') {
- if (this.latestAnnotations == null) {
- this.latestAnnotations = {};
- }
+ // get the submit counter
+ const submitCounter = this.submitCounter;
- /*
- * we are in the authoring view so we will set the
- * latest comment annotation manually
- */
- this.latestAnnotations.comment = autoCommentAnnotation;
- }
- }
- if (
- this.componentContent.enableNotifications &&
- this.componentContent.notificationSettings &&
- this.componentContent.notificationSettings.notifications
- ) {
- const notificationForScore: any = this.ProjectService.getNotificationByScore(
- this.componentContent,
- previousScore,
- score
- );
- if (notificationForScore != null) {
- notificationForScore.score = score;
- notificationForScore.nodeId = this.nodeId;
- notificationForScore.componentId = this.componentId;
- this.NotificationService.sendNotificationForScore(notificationForScore);
- }
+ if (
+ this.componentContent.cRater.enableMultipleAttemptScoringRules &&
+ submitCounter > 1
+ ) {
+ /*
+ * this step has multiple attempt scoring rules and this is
+ * a subsequent submit
+ */
+ // get the feedback based upon the previous score and current score
+ autoComment = this.CRaterService.getMultipleAttemptCRaterFeedbackTextByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+ } else {
+ // get the feedback text
+ autoComment = this.CRaterService.getCRaterFeedbackTextByScore(
+ this.componentContent,
+ score
+ );
+ }
+
+ if (autoComment != null) {
+ // create the auto comment annotation
+ const autoCommentAnnotationData: any = {};
+ autoCommentAnnotationData.value = autoComment;
+ autoCommentAnnotationData.concepts = concepts;
+ autoCommentAnnotationData.autoGrader = 'cRater';
+
+ const autoCommentAnnotation = this.createAutoCommentAnnotation(
+ autoCommentAnnotationData
+ );
+
+ if (this.componentContent.enableGlobalAnnotations) {
+ if (annotationGroupForScore != null) {
+ // copy over the annotation properties into the autoCommentAnnotation's data
+ angular.merge(autoCommentAnnotation.data, annotationGroupForScore);
}
+ }
+ componentState.annotations.push(autoCommentAnnotation);
- // display global annotations dialog if needed
- if (
- this.componentContent.enableGlobalAnnotations &&
- annotationGroupForScore != null &&
- annotationGroupForScore.isGlobal &&
- annotationGroupForScore.isPopup
- ) {
- this.$scope.$emit('displayGlobalAnnotations');
+ if (this.mode === 'authoring') {
+ if (this.latestAnnotations == null) {
+ this.latestAnnotations = {};
}
+
+ /*
+ * we are in the authoring view so we will set the
+ * latest comment annotation manually
+ */
+ this.latestAnnotations.comment = autoCommentAnnotation;
+ }
+ }
+ if (
+ this.componentContent.enableNotifications &&
+ this.componentContent.notificationSettings &&
+ this.componentContent.notificationSettings.notifications
+ ) {
+ const notificationForScore: any = this.ProjectService.getNotificationByScore(
+ this.componentContent,
+ previousScore,
+ score
+ );
+ if (notificationForScore != null) {
+ notificationForScore.score = score;
+ notificationForScore.nodeId = this.nodeId;
+ notificationForScore.componentId = this.componentId;
+ this.NotificationService.sendNotificationForScore(notificationForScore);
}
}
+
+ // display global annotations dialog if needed
+ if (
+ this.componentContent.enableGlobalAnnotations &&
+ annotationGroupForScore != null &&
+ annotationGroupForScore.isGlobal &&
+ annotationGroupForScore.isPopup
+ ) {
+ this.$scope.$emit('displayGlobalAnnotations');
+ }
}
/*
@@ -1035,6 +1036,63 @@ class OpenResponseController extends ComponentController {
const action = 'change';
this.createComponentStateAndBroadcast(action);
}
+
+ startRecordingAudio() {
+ if (this.hasAudioResponses()) {
+ if (confirm(this.$translate(`openResponse.confirmReplaceAudioResponse`))) {
+ this.removeAudioAttachments();
+ } else {
+ return;
+ }
+ }
+ this.AudioRecorderService.startRecording(`${this.nodeId}-${this.componentId}`);
+ this.startAudioCountdown();
+ this.isRecordingAudio = true;
+ }
+
+ startAudioCountdown() {
+ this.audioRecordingStartTime = new Date().getTime();
+ this.audioRecordingInterval = setInterval(() => {
+ if (this.getAudioRecordingTimeLeft() <= 0) {
+ this.stopRecordingAudio();
+ }
+ }, 500);
+ }
+
+ stopRecordingAudio() {
+ this.AudioRecorderService.stopRecording();
+ this.isRecordingAudio = false;
+ clearInterval(this.audioRecordingInterval);
+ }
+
+ getAudioRecordingTimeElapsed() {
+ const now = new Date().getTime();
+ return now - this.audioRecordingStartTime;
+ }
+
+ getAudioRecordingTimeLeft() {
+ return Math.floor((this.audioRecordingMaxTime - this.getAudioRecordingTimeElapsed()) / 1000);
+ }
+
+ hasAudioResponses() {
+ return this.attachments.filter(attachment => {
+ return attachment.type === 'audio';
+ }).length > 0;
+ }
+
+ removeAudioAttachment(attachment) {
+ if (confirm(this.$translate(`openResponse.confirmRemoveAudioResponse`))) {
+ this.removeAttachment(attachment);
+ }
+ }
+
+ removeAudioAttachments() {
+ this.attachments.forEach(attachment => {
+ if (attachment.type === 'audio') {
+ this.removeAttachment(attachment);
+ }
+ });
+ }
}
export default OpenResponseController;
diff --git a/src/main/webapp/wise5/components/openResponse/openResponseService.ts b/src/main/webapp/wise5/components/openResponse/openResponseService.ts
index 0a33b36467..361903aa6b 100644
--- a/src/main/webapp/wise5/components/openResponse/openResponseService.ts
+++ b/src/main/webapp/wise5/components/openResponse/openResponseService.ts
@@ -47,7 +47,7 @@ class OpenResponseService extends ComponentService {
let studentData = componentState.studentData;
if (studentData != null) {
- if (studentData.response) {
+ if (studentData.response || studentData.attachments.length > 0) {
// there is a response so the component is completed
result = true;
}
@@ -111,7 +111,8 @@ class OpenResponseService extends ComponentService {
hasResponse(componentState) {
const response = componentState.studentData.response;
- return response != null && response !== '';
+ const attachments = componentState.studentData.attachments;
+ return (response != null && response !== '') || attachments.length > 0;
}
}
diff --git a/src/main/webapp/wise5/components/table/tableService.ts b/src/main/webapp/wise5/components/table/tableService.ts
index 93c9ad0b09..f92fcd8b55 100644
--- a/src/main/webapp/wise5/components/table/tableService.ts
+++ b/src/main/webapp/wise5/components/table/tableService.ts
@@ -1,7 +1,7 @@
import * as angular from 'angular';
import * as html2canvas from 'html2canvas';
import ComponentService from '../componentService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class TableService extends ComponentService {
$q: any;
diff --git a/src/main/webapp/wise5/services/audioRecorderService.ts b/src/main/webapp/wise5/services/audioRecorderService.ts
new file mode 100644
index 0000000000..282900ff1a
--- /dev/null
+++ b/src/main/webapp/wise5/services/audioRecorderService.ts
@@ -0,0 +1,56 @@
+export class AudioRecorderService {
+
+ mediaRecorder: MediaRecorder;
+ requester: string;
+
+ static $inject = [
+ '$rootScope',
+ ];
+
+ constructor(private $rootScope: any) {
+ }
+
+ async init(constraints) {
+ try {
+ const stream = await navigator.mediaDevices.getUserMedia(constraints);
+ const options = {
+ mimeType: 'audio/webm'
+ };
+ try {
+ this.mediaRecorder = new MediaRecorder(stream, options);
+ this.mediaRecorder.ondataavailable = (event: any) => {
+ this.$rootScope.$broadcast('audioRecorded',
+ { requester: this.requester, audioFile: this.getAudioFile(event.data) });
+ }
+ this.mediaRecorder.start();
+ } catch (e) {
+ console.error('Exception while creating MediaRecorder:', e);
+ return;
+ }
+ } catch (e) {
+ console.error('navigator.getUserMedia error:', e);
+ }
+ }
+
+ getAudioFile(blob: Blob) {
+ const now = new Date().getTime();
+ const filename = encodeURIComponent(`audio_${now}.webm`);
+ return new File([blob], filename, {
+ lastModified: now,
+ });
+ }
+
+ startRecording(requester: string) {
+ this.requester = requester;
+ const constraints = {
+ audio: {
+ echoCancellation: {exact: true}
+ }
+ };
+ this.init(constraints);
+ }
+
+ stopRecording() {
+ this.mediaRecorder.stop();
+ }
+}
diff --git a/src/main/webapp/wise5/services/cRaterService.js b/src/main/webapp/wise5/services/cRaterService.ts
similarity index 80%
rename from src/main/webapp/wise5/services/cRaterService.js
rename to src/main/webapp/wise5/services/cRaterService.ts
index f00ebb7d7b..8ca189bbf0 100644
--- a/src/main/webapp/wise5/services/cRaterService.js
+++ b/src/main/webapp/wise5/services/cRaterService.ts
@@ -1,27 +1,35 @@
-class CRaterService {
- constructor($http, ConfigService) {
- this.$http = $http;
- this.ConfigService = ConfigService;
+'use strict';
+
+import { Injectable } from "@angular/core";
+import { HttpClient, HttpParams } from "@angular/common/http";
+import { ConfigService } from "./configService";
+
+@Injectable()
+export class CRaterService {
+ constructor(
+ protected http: HttpClient,
+ protected ConfigService: ConfigService
+ ) {
+
}
/**
* Make a CRater request to score student data
- * @param cRaterResponseId a randomly generated id used to keep track
- * of the request
+ * @param cRaterItemId
+ * @param cRaterResponseId a randomly generated id used to keep track of the request
* @param studentData the student data
* @returns a promise that returns the result of the CRater request
*/
- makeCRaterScoringRequest(cRaterItemId, cRaterResponseId, studentData) {
- const httpParams = {
- method: 'GET',
- url: this.ConfigService.getCRaterRequestURL() + '/score',
- params: {
- itemId: cRaterItemId,
- responseId: cRaterResponseId,
- studentData: studentData
- }
+ makeCRaterScoringRequest(cRaterItemId: string, cRaterResponseId: number, studentData: any) {
+ const url = this.ConfigService.getCRaterRequestURL() + '/score';
+ const params = new HttpParams()
+ .set('itemId', cRaterItemId)
+ .set('responseId', cRaterResponseId + '')
+ .set('studentData', studentData);
+ const options = {
+ params: params
};
- return this.$http(httpParams).then((response) => {
+ return this.http.get(url, options).toPromise().then((response) => {
return response;
});
}
@@ -30,7 +38,7 @@ class CRaterService {
* Get the CRater item type from the component
* @param component the component content
*/
- getCRaterItemType(component) {
+ getCRaterItemType(component: any) {
if (component != null && component.cRater != null) {
return component.cRater.itemType;
}
@@ -41,7 +49,7 @@ class CRaterService {
* Get the CRater item id from the component
* @param component the component content
*/
- getCRaterItemId(component) {
+ getCRaterItemId(component: any) {
if (component != null && component.cRater != null) {
return component.cRater.itemId;
}
@@ -53,7 +61,7 @@ class CRaterService {
* @param component the component content
* @returns when to perform the CRater scoring e.g. 'submit', 'save', 'change', 'exit'
*/
- getCRaterScoreOn(component) {
+ getCRaterScoreOn(component: any) {
if (component != null) {
/*
* CRater can be enabled in two ways
@@ -74,7 +82,7 @@ class CRaterService {
* Check if CRater is enabled for this component
* @param component the component content
*/
- isCRaterEnabled(component) {
+ isCRaterEnabled(component: any) {
if (component != null) {
// get the item type and item id
const cRaterItemType = this.getCRaterItemType(component);
@@ -91,7 +99,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on save
*/
- isCRaterScoreOnSave(component) {
+ isCRaterScoreOnSave(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -107,7 +115,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on submit
*/
- isCRaterScoreOnSubmit(component) {
+ isCRaterScoreOnSubmit(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -123,7 +131,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on change
*/
- isCRaterScoreOnChange(component) {
+ isCRaterScoreOnChange(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -139,7 +147,7 @@ class CRaterService {
* @param component the component content
* @returns whether the CRater is set to score on exit
*/
- isCRaterScoreOnExit(component) {
+ isCRaterScoreOnExit(component: any) {
if (component != null) {
// find when we should perform the CRater scoring
const scoreOn = this.getCRaterScoreOn(component);
@@ -156,7 +164,7 @@ class CRaterService {
* @param score the score
* @returns the scoring rule for the given score
*/
- getCRaterScoringRuleByScore(component, score) {
+ getCRaterScoringRuleByScore(component: any, score: any) {
if (component != null && score != null) {
const cRater = component.cRater;
if (cRater != null) {
@@ -186,7 +194,7 @@ class CRaterService {
* @param score the score we want feedback for
* @returns the feedback text for the given score
*/
- getCRaterFeedbackTextByScore(component, score) {
+ getCRaterFeedbackTextByScore(component: any, score: any) {
const scoringRule = this.getCRaterScoringRuleByScore(component, score);
if (scoringRule != null) {
return scoringRule.feedbackText;
@@ -201,8 +209,8 @@ class CRaterService {
* @param currentScore the score from the current submit
* @returns the feedback text for the given previous score and current score
*/
- getMultipleAttemptCRaterFeedbackTextByScore(component, previousScore,
- currentScore) {
+ getMultipleAttemptCRaterFeedbackTextByScore(component: any, previousScore: any,
+ currentScore: any) {
const scoringRule = this.getMultipleAttemptCRaterScoringRuleByScore(
component, previousScore, currentScore);
if (scoringRule != null) {
@@ -219,8 +227,8 @@ class CRaterService {
* @param currentScore the score from the current submit
* @returns the scoring rule for the given previous score and current score
*/
- getMultipleAttemptCRaterScoringRuleByScore(component, previousScore,
- currentScore) {
+ getMultipleAttemptCRaterScoringRuleByScore(component: any, previousScore: any,
+ currentScore: any) {
if (component != null && previousScore != null && currentScore != null) {
const cRater = component.cRater;
if (cRater != null) {
@@ -260,23 +268,14 @@ class CRaterService {
* @param itemId A string.
* @return A promise that returns whether the item id is valid.
*/
- makeCRaterVerifyRequest(itemId) {
- const httpParams = {
- method: 'GET',
- url: this.ConfigService.getCRaterRequestURL() + '/verify',
- params: {
- itemId: itemId
- }
- };
- return this.$http(httpParams).then((response) => {
- return response.data.isAvailable;
+ makeCRaterVerifyRequest(itemId: string) {
+ const url = this.ConfigService.getCRaterRequestURL() + '/verify';
+ const params = new HttpParams().set('itemId', itemId);
+ const options = {
+ params: params
+ };
+ return this.http.get(url, options).toPromise().then((response: any) => {
+ return response.isAvailable;
});
}
}
-
-CRaterService.$inject = [
- '$http',
- 'ConfigService'
-];
-
-export default CRaterService;
diff --git a/src/main/webapp/wise5/services/notificationService.js b/src/main/webapp/wise5/services/notificationService.js
index 9ad1fccad5..a4b4540834 100644
--- a/src/main/webapp/wise5/services/notificationService.js
+++ b/src/main/webapp/wise5/services/notificationService.js
@@ -69,6 +69,10 @@ class NotificationService {
retrieveNotifications() {
+ if (this.ConfigService.isPreview()) {
+ this.notifications = [];
+ return;
+ }
const config = {
method: 'GET',
url: this.ConfigService.getNotificationURL(),
diff --git a/src/main/webapp/wise5/services/planningService.js b/src/main/webapp/wise5/services/planningService.js
deleted file mode 100644
index 966c0ce8cd..0000000000
--- a/src/main/webapp/wise5/services/planningService.js
+++ /dev/null
@@ -1,127 +0,0 @@
-'use strict';
-
-class PlanningService {
- constructor(ProjectService) {
- this.ProjectService = ProjectService;
- };
-
- getPlanningNodes() {
- return this.ProjectService.project.planningNodes;
- };
-
- /**
- * Check if a node is a planning node
- * @param nodeId the node id
- * @returns whether the node is a planning node
- */
- isPlanning(nodeId) {
- const node = this.ProjectService.getNodeById(nodeId);
- return node != null && node.planning;
- }
-
- /**
- * Check if a node is a planning node instance
- * @param nodeId the node id
- * @returns whether the node is a planning node instance
- */
- isPlanningInstance(nodeId) {
- const node = this.ProjectService.getNodeById(nodeId);
- return node != null && node.planningNodeTemplateId;
- }
-
- /**
- * Get the available planning nodes for a given group
- * @param nodeId the node id of the group
- * @returns an array of planning node templates
- */
- getAvailablePlanningNodes(nodeId) {
- const availablePlanningNodesSoFar = [];
- const node = this.ProjectService.getNodeById(nodeId);
- if (node != null && node.availablePlanningNodes != null) {
- const availablePlanningNodes = node.availablePlanningNodes;
- for (let availablePlanningNode of availablePlanningNodes) {
- const availablePlanningNodeActual =
- this.ProjectService.getNodeById(availablePlanningNode.nodeId);
- if (availablePlanningNodeActual != null) {
- if (availablePlanningNode.max != null) {
- availablePlanningNodeActual.max = availablePlanningNode.max;
- }
- availablePlanningNodesSoFar.push(availablePlanningNodeActual);
- }
- }
- }
- return availablePlanningNodesSoFar;
- }
-
- /**
- * Create a planning node instance and add it to the project
- * @param nodeId the node id of the planning node template
- * @param nextAvailablePlanningNodeId the node id of the planning node instance
- */
- createPlanningNodeInstance(nodeId, nextAvailablePlanningNodeId) {
- const planningNodeInstance = this.ProjectService.copyNode(nodeId);
- planningNodeInstance.planningNodeTemplateId = nodeId;
- planningNodeInstance.id = nextAvailablePlanningNodeId;
- return planningNodeInstance;
- }
-
- /**
- * Add a planning node instance inside a group node
- * @param nodeIdToInsertInside the group id to insert into
- * @param planningNodeInstance the planning node instance to add
- */
- addPlanningNodeInstanceInside(nodeIdToInsertInside, planningNodeInstance) {
- const planningNodeInstanceNodeId = planningNodeInstance.id;
- this.ProjectService.setIdToNode(planningNodeInstanceNodeId, planningNodeInstance);
- this.ProjectService.addNode(planningNodeInstance);
- this.ProjectService.insertNodeInsideOnlyUpdateTransitions(planningNodeInstanceNodeId, nodeIdToInsertInside);
- this.ProjectService.insertNodeInsideInGroups(planningNodeInstanceNodeId, nodeIdToInsertInside);
- this.ProjectService.recalculatePositionsInGroup(nodeIdToInsertInside);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Add a planning node instance after a node
- * @param nodeIdToInsertAfter the node to insert after
- * @param planningNodeInstance the planning node instance to add
- */
- addPlanningNodeInstanceAfter(nodeIdToInsertAfter, planningNodeInstance) {
- const planningNodeInstanceNodeId = planningNodeInstance.id;
- this.ProjectService.setIdToNode(planningNodeInstanceNodeId, planningNodeInstance);
- this.ProjectService.addNode(planningNodeInstance);
- this.ProjectService.insertNodeAfterInTransitions(planningNodeInstance, nodeIdToInsertAfter);
- this.ProjectService.insertNodeAfterInGroups(planningNodeInstanceNodeId, nodeIdToInsertAfter);
- const parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
- this.ProjectService.recalculatePositionsInGroup(parentGroup.id);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Move a planning node instance inside a group
- * @param nodeIdToMove the node to move
- * @param nodeIdToInsertInside the group to move the node into
- */
- movePlanningNodeInstanceInside(nodeIdToMove, nodeIdToInsertInside) {
- this.ProjectService.moveNodesInside([nodeIdToMove], nodeIdToInsertInside);
- this.ProjectService.recalculatePositionsInGroup(nodeIdToInsertInside);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-
- /**
- * Move a planning node instance after a node
- * @param nodeIdToMove the node to move
- * @param nodeIdToInsertAfter the other node to move the node after
- */
- movePlanningNodeInstanceAfter(nodeIdToMove, nodeIdToInsertAfter) {
- this.ProjectService.moveNodesAfter([nodeIdToMove], nodeIdToInsertAfter);
- const parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
- this.ProjectService.recalculatePositionsInGroup(parentGroup.id);
- this.ProjectService.calculateNodeOrderOfProject();
- }
-}
-
-PlanningService.$inject = [
- 'ProjectService'
-];
-
-export default PlanningService;
diff --git a/src/main/webapp/wise5/services/projectService.ts b/src/main/webapp/wise5/services/projectService.ts
index e24cc20d0e..3dcb42c00d 100644
--- a/src/main/webapp/wise5/services/projectService.ts
+++ b/src/main/webapp/wise5/services/projectService.ts
@@ -248,19 +248,11 @@ export class ProjectService {
}
}
- loadPlanningNodes(planningNodes) {
- for (const planningNode of planningNodes) {
- this.setIdToNode(planningNode.id, planningNode);
- // TODO: may need to add more function calls here to add the planning
- }
- }
-
parseProject() {
this.clearProjectFields();
this.instantiateDefaults();
this.metadata = this.project.metadata;
this.loadNodes(this.project.nodes);
- this.loadPlanningNodes(this.project.planningNodes);
this.loadInactiveNodes(this.project.inactiveNodes);
this.loadConstraints(this.project.constraints);
this.rootNode = this.getRootNode(this.project.nodes[0].id);
@@ -275,7 +267,6 @@ export class ProjectService {
instantiateDefaults() {
this.project.nodes = this.project.nodes ? this.project.nodes : [];
- this.project.planningNodes = this.project.planningNodes ? this.project.planningNodes : [];
this.project.inactiveNodes = this.project.inactiveNodes ? this.project.inactiveNodes : [];
this.project.constraints = this.project.constraints ? this.project.constraints : [];
}
@@ -1600,7 +1591,7 @@ export class ProjectService {
const consumedNodes = [];
for (const path of paths) {
if (path.includes(nodeId)) {
- const subPath = path.slice(0, path.indexOf(nodeId));
+ const subPath = path.splice(0, path.indexOf(nodeId));
for (const nodeIdInPath of subPath) {
if (!consumedNodes.includes(nodeIdInPath)) {
consumedNodes.push(nodeIdInPath);
@@ -2939,11 +2930,19 @@ export class ProjectService {
* ]
*/
for (let transitionCopy of transitionsCopy) {
- // insert a transition from the node we are removing
- transitions.splice(insertIndex, 0, transitionCopy);
- insertIndex++;
+ if (!this.isTransitionExist(transitions, transitionCopy)) {
+ const toNodeId = transitionCopy.to;
+ if (this.isApplicationNode(node.id) && this.isGroupNode(toNodeId) &&
+ this.hasGroupStartId(toNodeId)) {
+ this.addToTransition(node, this.getGroupStartId(toNodeId));
+ } else {
+ transitions.splice(insertIndex, 0, transitionCopy);
+ insertIndex++;
+ }
+ }
}
}
+ t--;
// check if the node we are moving is a group
if (this.isGroupNode(nodeId)) {
@@ -2961,6 +2960,15 @@ export class ProjectService {
}
}
+ if (transitions.length === 0 && parentIdOfNodeToRemove != 'group0' &&
+ parentIdOfNodeToRemove != this.getParentGroupId(node.id)) {
+ /*
+ * the from node no longer has any transitions so we will make it transition to the
+ * parent of the node we are removing
+ */
+ this.addToTransition(node, parentIdOfNodeToRemove);
+ }
+
if (this.isBranchPoint(nodeId)) {
/*
* the node we are deleting is a branch point so we to
@@ -2990,6 +2998,15 @@ export class ProjectService {
}
}
+ isTransitionExist(transitions: any[], transition: any) {
+ for (const tempTransition of transitions) {
+ if (tempTransition.from === transition.from && tempTransition.to === transition.to) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Remove the node id from all groups
* @param nodeId the node id to remove
@@ -3487,12 +3504,6 @@ export class ProjectService {
fromNodeTitle: fromNodeTitle,
toNodeTitle: toNodeTitle
});
- } else if (name === 'isPlanningActivityCompleted') {
- const nodeId = params.nodeId;
- if (nodeId != null) {
- const nodeTitle = this.getNodePositionAndTitleByNodeId(nodeId);
- message += this.upgrade.$injector.get('$filter')('translate')('completeNodeTitle', { nodeTitle: nodeTitle });
- }
} else if (name === 'wroteXNumberOfWords') {
const nodeId = params.nodeId;
if (nodeId != null) {
@@ -3587,6 +3598,11 @@ export class ProjectService {
return this.getNodeById(nodeId).startId;
}
+ hasGroupStartId(nodeId) {
+ const startId = this.getGroupStartId(nodeId);
+ return startId != null && startId != '';
+ }
+
/**
* Update the transitions so that the fromGroup points to the newToGroup
*
diff --git a/src/main/webapp/wise5/services/sessionService.js b/src/main/webapp/wise5/services/sessionService.js
deleted file mode 100644
index 4e4b92c30a..0000000000
--- a/src/main/webapp/wise5/services/sessionService.js
+++ /dev/null
@@ -1,144 +0,0 @@
-class SessionService {
- constructor($http, $location, $rootScope, ConfigService) {
- this.$http = $http;
- this.$location = $location;
- this.$rootScope = $rootScope;
- this.ConfigService = ConfigService;
- this.warningVisible = false;
- this.defaultForceLogoutAfterWarningInterval = this.convertMinutesToSeconds(5);
- const intervals = this.calculateIntervals(this.ConfigService.getConfigParam('sessionTimeout'));
- this.showWarningInterval = intervals.showWarningInterval;
- this.forceLogoutAfterWarningInterval = intervals.forceLogoutAfterWarningInterval;
- this.checkMouseEventInterval = this.convertMinutesToMilliseconds(1);
- this.updateLastActivityTimestamp();
- this.initializeListeners();
- this.initializeSession();
- }
-
- calculateIntervals(sessionTimeout) {
- const forceLogoutAfterWarningInterval = Math.min(
- sessionTimeout * 0.1,
- this.defaultForceLogoutAfterWarningInterval
- );
- const showWarningInterval = sessionTimeout - forceLogoutAfterWarningInterval;
- return {
- showWarningInterval: showWarningInterval,
- forceLogoutAfterWarningInterval: forceLogoutAfterWarningInterval
- };
- }
-
- initializeListeners() {
- this.$rootScope.$on('goHome', () => {
- this.goHome();
- });
-
- this.$rootScope.$on('logOut', () => {
- this.logOut();
- });
- }
-
- goHome() {
- this.$rootScope.$broadcast('exit');
- this.$location.url(this.ConfigService.getConfigParam('userType'));
- }
-
- logOut() {
- window.location.href = this.ConfigService.getSessionLogOutURL();
- }
-
- initializeSession() {
- if (!this.ConfigService.isPreview()) {
- this.startCheckMouseEvent();
- }
- }
-
- startCheckMouseEvent() {
- setInterval(() => {
- this.checkMouseEvent();
- }, this.checkMouseEventInterval);
- }
-
- convertMinutesToSeconds(minutes) {
- return minutes * 60;
- }
-
- convertMinutesToMilliseconds(minutes) {
- return minutes * 60 * 1000;
- }
-
- /**
- * Note: This does not get called when the warning popup is being shown.
- */
- mouseMoved() {
- this.updateLastActivityTimestamp();
- }
-
- updateLastActivityTimestamp() {
- this.lastActivityTimestamp = new Date();
- }
-
- checkMouseEvent() {
- if (this.isActiveWithinLastMinute()) {
- this.renewSession();
- } else if (this.isInactiveLongEnoughToForceLogout()) {
- this.forceLogOut();
- } else if (this.isInactiveLongEnoughToWarn() && !this.isShowingWarning()) {
- this.showWarning();
- }
- }
-
- isActiveWithinLastMinute() {
- return new Date() - this.lastActivityTimestamp < this.convertMinutesToMilliseconds(1);
- }
-
- isInactiveLongEnoughToForceLogout() {
- return (
- this.getInactiveTimeInSeconds() >=
- this.showWarningInterval + this.forceLogoutAfterWarningInterval
- );
- }
-
- isInactiveLongEnoughToWarn() {
- return this.getInactiveTimeInSeconds() >= this.showWarningInterval;
- }
-
- isShowingWarning() {
- return this.warningVisible;
- }
-
- getInactiveTimeInSeconds() {
- return Math.floor(this.getInactiveTimeInMilliseconds() / 1000);
- }
-
- getInactiveTimeInMilliseconds() {
- return new Date() - this.lastActivityTimestamp;
- }
-
- forceLogOut() {
- this.$rootScope.$broadcast('logOut');
- }
-
- showWarning() {
- this.warningVisible = true;
- this.$rootScope.$broadcast('showSessionWarning');
- }
-
- closeWarningAndRenewSession() {
- this.warningVisible = false;
- this.updateLastActivityTimestamp();
- this.renewSession();
- }
-
- renewSession() {
- const renewSessionURL = this.ConfigService.getConfigParam('renewSessionURL');
- this.$http.get(renewSessionURL).then(result => {
- if (result.data === 'false') {
- this.logOut();
- }
- });
- }
-}
-
-SessionService.$inject = ['$http', '$location', '$rootScope', 'ConfigService'];
-
-export default SessionService;
diff --git a/src/main/webapp/wise5/services/sessionService.ts b/src/main/webapp/wise5/services/sessionService.ts
new file mode 100644
index 0000000000..9ae2d95418
--- /dev/null
+++ b/src/main/webapp/wise5/services/sessionService.ts
@@ -0,0 +1,154 @@
+'use strict';
+
+import { Injectable } from '@angular/core';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { HttpClient } from '@angular/common/http';
+import { ConfigService } from "./configService";
+
+@Injectable()
+export class SessionService {
+ private warningVisible: boolean = false;
+ private defaultForceLogoutAfterWarningInterval: number = this.convertMinutesToSeconds(5);
+ private forceLogoutAfterWarningInterval: number;
+ private showWarningInterval: number;
+ private checkMouseEventInterval: number;
+ private lastActivityTimestamp: number;
+
+ constructor(
+ protected upgrade: UpgradeModule,
+ protected http: HttpClient,
+ protected ConfigService: ConfigService
+ ) {
+ const intervals: any =
+ this.calculateIntervals(this.ConfigService.getConfigParam('sessionTimeout'));
+ this.showWarningInterval = intervals.showWarningInterval;
+ this.forceLogoutAfterWarningInterval = intervals.forceLogoutAfterWarningInterval;
+ this.checkMouseEventInterval = this.convertMinutesToMilliseconds(1);
+ this.updateLastActivityTimestamp();
+ this.initializeSession();
+ }
+
+ calculateIntervals(sessionTimeout): any {
+ const forceLogoutAfterWarningInterval: number = Math.min(
+ sessionTimeout * 0.1,
+ this.defaultForceLogoutAfterWarningInterval
+ );
+ const showWarningInterval: number = sessionTimeout - forceLogoutAfterWarningInterval;
+ return {
+ showWarningInterval: showWarningInterval,
+ forceLogoutAfterWarningInterval: forceLogoutAfterWarningInterval
+ };
+ }
+
+ goHome() {
+ this.upgrade.$injector.get('$rootScope').$broadcast('exit');
+ this.upgrade.$injector.get('$location').url(
+ this.ConfigService.getConfigParam('userType')
+ );
+ }
+
+ logOut() {
+ window.location.href = this.ConfigService.getSessionLogOutURL();
+ }
+
+ initializeSession() {
+ if (!this.ConfigService.isPreview()) {
+ this.startCheckMouseEvent();
+ }
+ }
+
+ startCheckMouseEvent() {
+ setInterval(() => {
+ this.checkMouseEvent();
+ }, this.checkMouseEventInterval);
+ }
+
+ convertMinutesToSeconds(minutes): number {
+ return minutes * 60;
+ }
+
+ convertMinutesToMilliseconds(minutes): number {
+ return minutes * 60 * 1000;
+ }
+
+ /**
+ * Note: This does not get called when the warning popup is being shown.
+ */
+ mouseMoved() {
+ this.updateLastActivityTimestamp();
+ }
+
+ updateLastActivityTimestamp() {
+ this.lastActivityTimestamp = new Date().getTime();
+ }
+
+ checkMouseEvent() {
+ if (this.isActiveWithinLastMinute()) {
+ this.renewSession();
+ } else {
+ this.checkForLogout();
+ }
+ }
+
+ checkForLogout() {
+ if (this.isInactiveLongEnoughToForceLogout()) {
+ this.forceLogOut();
+ } else if (this.isInactiveLongEnoughToWarn() && !this.isShowingWarning()) {
+ this.showWarning();
+ }
+ }
+
+ isActiveWithinLastMinute(): boolean {
+ return (
+ new Date().getTime() - this.lastActivityTimestamp <
+ this.convertMinutesToMilliseconds(1)
+ );
+ }
+
+ isInactiveLongEnoughToForceLogout(): boolean {
+ return (
+ this.getInactiveTimeInSeconds() >=
+ this.showWarningInterval + this.forceLogoutAfterWarningInterval
+ );
+ }
+
+ isInactiveLongEnoughToWarn(): boolean {
+ return this.getInactiveTimeInSeconds() >= this.showWarningInterval;
+ }
+
+ isShowingWarning(): boolean {
+ return this.warningVisible;
+ }
+
+ getInactiveTimeInSeconds(): number {
+ return Math.floor(this.getInactiveTimeInMilliseconds() / 1000);
+ }
+
+ getInactiveTimeInMilliseconds(): number {
+ return new Date().getTime() - this.lastActivityTimestamp;
+ }
+
+ forceLogOut() {
+ this.upgrade.$injector.get('$rootScope').$broadcast('logOut');
+ }
+
+ showWarning() {
+ this.warningVisible = true;
+ this.upgrade.$injector.get('$rootScope').$broadcast('showSessionWarning');
+ }
+
+ closeWarningAndRenewSession() {
+ this.warningVisible = false;
+ this.updateLastActivityTimestamp();
+ this.renewSession();
+ }
+
+ renewSession() {
+ const renewSessionURL = this.ConfigService.getConfigParam('renewSessionURL');
+ this.http.get(renewSessionURL).toPromise().then(result => {
+ if (result === 'false') {
+ this.logOut();
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/main/webapp/wise5/services/studentAssetService.js b/src/main/webapp/wise5/services/studentAssetService.js
deleted file mode 100644
index 10d9911808..0000000000
--- a/src/main/webapp/wise5/services/studentAssetService.js
+++ /dev/null
@@ -1,276 +0,0 @@
-'use strict';
-
-class StudentAssetService {
- constructor(
- $filter,
- $http,
- $q,
- Upload,
- $rootScope,
- ConfigService) {
- this.$filter = $filter;
- this.$http = $http;
- this.$q = $q;
- this.Upload = Upload;
- this.$rootScope = $rootScope;
- this.ConfigService = ConfigService;
- this.$translate = this.$filter('translate');
- this.allAssets = []; // keep track of student's assets
- }
-
- getAssetById(assetId) {
- for (let asset of this.allAssets) {
- if (asset.id === assetId) {
- return asset;
- }
- }
- return null;
- };
-
- retrieveAssets() {
- if (this.ConfigService.isPreview()) {
- // if we're in preview, don't make any request to the server but pretend we did
- this.allAssets = [];
- let deferred = this.$q.defer();
- deferred.resolve(this.allAssets);
- return deferred.promise;
- } else {
- let config = {
- method: "GET",
- url: this.ConfigService.getStudentAssetsURL(),
- params: {
- workgroupId: this.ConfigService.getWorkgroupId()
- }
- };
- return this.$http(config).then((response) => {
- // loop through the assets and make them into JSON object with more details
- let result = [];
- let assets = response.data;
- let studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- for (let asset of assets) {
- if (!asset.isReferenced && asset.serverDeleteTime == null && asset.fileName !== '.DS_Store') {
- asset.url = studentUploadsBaseURL + asset.filePath;
- if (this.isImage(asset)) {
- asset.type = 'image';
- asset.iconURL = asset.url;
- } else if (this.isAudio(asset)) {
- asset.type = 'audio';
- asset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- asset.type = 'file';
- asset.iconURL = 'wise5/vle/notebook/file.png';
- }
- result.push(asset);
- }
- }
- this.allAssets = result;
- return result;
- });
- }
- };
-
- getAssetContent(asset) {
- const assetContentURL = asset.url;
-
- // retrieve the csv file and parse it
- const config = {};
- config.method = 'GET';
- config.url = assetContentURL;
- return this.$http(config).then((response) => {
- return response.data;
- });
- };
-
- isImage(asset) {
- const imageFileExtensions = ['png', 'jpg', 'jpeg', 'gif'];
- if (asset != null) {
- const assetURL = asset.url;
- if (assetURL != null && assetURL.lastIndexOf('.') !== -1) {
- const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
- if (imageFileExtensions.indexOf(assetExtension.toLowerCase()) != -1) {
- return true;
- }
- }
- }
- return false;
- };
-
- isAudio(asset) {
- const imageFileExtensions = ['wav', 'mp3', 'ogg', 'm4a', 'm4p', 'raw', 'aiff'];
- if (asset != null) {
- const assetURL = asset.url;
- if (assetURL != null && assetURL.lastIndexOf('.') != -1) {
- const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
- if (imageFileExtensions.indexOf(assetExtension.toLowerCase()) != -1) {
- return true;
- }
- }
- }
- return false;
- };
-
- uploadAsset(file) {
- if (this.ConfigService.isPreview()) {
- return this.$q((resolve, reject) => {
- const reader = new FileReader();
-
- // Closure to capture the file information.
- reader.onload = ( (theFile) => {
- return (e) => {
- let fileSrc = e.target.result;
- let fileName = theFile.name;
-
- let asset = {};
- asset.file = file;
- asset.url = fileSrc;
- // assume this is an image for now. in the future, support audio and other file formats.
- asset.type = 'image';
- asset.iconURL = asset.url;
-
- this.allAssets.push(asset);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- return resolve(asset);
- };
- })(file);
-
- // Read in the image file as a data URL.
- reader.readAsDataURL(file);
- });
- } else {
- const studentAssetsURL = this.ConfigService.getStudentAssetsURL();
- const deferred = this.$q.defer();
-
- this.Upload.upload({
- url: studentAssetsURL,
- fields: {
- 'runId': this.ConfigService.getRunId(),
- 'workgroupId': this.ConfigService.getWorkgroupId(),
- 'periodId': this.ConfigService.getPeriodId(),
- 'clientSaveTime': Date.parse(new Date())
- },
- file: file
- }).success((asset, status, headers, config) => {
- if (asset === "error") {
- alert(this.$translate('THERE_WAS_AN_ERROR_UPLOADING'));
- } else {
- const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- asset.url = studentUploadsBaseURL + asset.filePath;
- if (this.isImage(asset)) {
- asset.type = 'image';
- asset.iconURL = asset.url;
- } else if (this.isAudio(asset)) {
- asset.type = 'audio';
- asset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- asset.type = 'file';
- asset.iconURL = 'wise5/vle/notebook/file.png';
- }
- this.allAssets.push(asset);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- deferred.resolve(asset);
- }
- }).error((asset, status, headers, config) => {
- alert(this.$translate('THERE_WAS_AN_ERROR_UPLOADING_YOU_MIGHT_HAVE_REACHED_LIMIT'));
- });
-
- return deferred.promise;
- }
- };
-
- uploadAssets(files) {
- const studentAssetsURL = this.ConfigService.getStudentAssetsURL();
- const promises = files.map((file) => {
- return this.Upload.upload({
- url: studentAssetsURL,
- fields: {
- 'runId': this.ConfigService.getRunId(),
- 'workgroupId': this.ConfigService.getWorkgroupId(),
- 'periodId': this.ConfigService.getPeriodId(),
- 'clientSaveTime': Date.parse(new Date())
- },
- file: file
- }).progress((evt) => {
- const progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
- //console.log('progress: ' + progressPercentage + '% ' + evt.config.file.name);
- }).success((data, status, headers, config) => {
- //console.log('file ' + config.file.name + 'uploaded. Response: ' + JSON.stringify(data));
- });
- });
- return this.$q.all(promises);
- };
-
- // given asset, makes a copy of it so steps can use for reference. Returns newly-copied asset.
- copyAssetForReference(studentAsset) {
- if (this.ConfigService.isPreview()) {
- return this.$q((resolve, reject) => {
- return resolve(studentAsset);
- });
- } else {
- const config = {};
- config.method = 'POST';
- config.url = this.ConfigService.getStudentAssetsURL() + '/copy';
- config.headers = {'Content-Type': 'application/x-www-form-urlencoded'};
- const params = {};
- params.studentAssetId = studentAsset.id;
- params.workgroupId = this.ConfigService.getWorkgroupId();
- params.periodId = this.ConfigService.getPeriodId();
- params.clientSaveTime = Date.parse(new Date());
-
- config.data = $.param(params);
-
- return this.$http(config).then((result) => {
- const copiedAsset = result.data;
- if (copiedAsset != null) {
- const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
- if (copiedAsset.isReferenced && copiedAsset.fileName !== '.DS_Store') {
- copiedAsset.url = studentUploadsBaseURL + copiedAsset.filePath;
- if (this.isImage(copiedAsset)) {
- copiedAsset.type = 'image';
- copiedAsset.iconURL = copiedAsset.url;
- } else if (this.isAudio(copiedAsset)) {
- copiedAsset.type = 'audio';
- copiedAsset.iconURL = 'wise5/vle/notebook/audio.png';
- } else {
- copiedAsset.type = 'file';
- copiedAsset.iconURL = 'wise5/vle/notebook/file.png';
- }
- //this.$rootScope.$broadcast('studentAssetsUpdated');
- return copiedAsset;
- }
- }
- return null;
- });
- }
- };
-
- deleteAsset(studentAsset) {
- const config = {};
- config.method = 'POST';
- config.url = this.ConfigService.getStudentAssetsURL() + '/remove';
- config.headers = {'Content-Type': 'application/x-www-form-urlencoded'};
- const params = {};
- params.studentAssetId = studentAsset.id;
- params.workgroupId = this.ConfigService.getWorkgroupId();
- params.periodId = this.ConfigService.getPeriodId();
- params.clientDeleteTime = Date.parse(new Date());
- config.data = $.param(params);
-
- return this.$http(config).then((result) => {
- //const deletedAsset = result.data;
- // also remove from local copy of all assets
- this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
- this.$rootScope.$broadcast('studentAssetsUpdated');
- return studentAsset;
- });
- };
-}
-
-StudentAssetService.$inject = [
- '$filter',
- '$http',
- '$q',
- 'Upload',
- '$rootScope',
- 'ConfigService'];
-
-export default StudentAssetService;
diff --git a/src/main/webapp/wise5/services/studentAssetService.ts b/src/main/webapp/wise5/services/studentAssetService.ts
new file mode 100644
index 0000000000..2326c6a700
--- /dev/null
+++ b/src/main/webapp/wise5/services/studentAssetService.ts
@@ -0,0 +1,231 @@
+'use strict';
+
+import { Injectable } from '@angular/core';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { ConfigService } from './configService';
+
+@Injectable()
+export class StudentAssetService {
+ allAssets = [];
+ imageFileExtensions = ['png', 'jpg', 'jpeg', 'gif'];
+ audioFileExtensions = ['wav', 'mp3', 'ogg', 'm4a', 'm4p', 'raw', 'aiff', 'webm'];
+
+ constructor(private upgrade: UpgradeModule, private http: HttpClient,
+ private ConfigService: ConfigService) {
+ }
+
+ getAssetById(assetId) {
+ for (const asset of this.allAssets) {
+ if (asset.id === assetId) {
+ return asset;
+ }
+ }
+ return null;
+ }
+
+ retrieveAssets() {
+ if (this.ConfigService.isPreview()) {
+ this.allAssets = [];
+ const deferred = this.upgrade.$injector.get('$q').defer();
+ deferred.resolve(this.allAssets);
+ return deferred.promise;
+ } else {
+ const options = {
+ params: new HttpParams().set("workgroupId", this.ConfigService.getWorkgroupId())
+ };
+ return this.http.get(this.ConfigService.getStudentAssetsURL(), options)
+ .toPromise().then((assets: any) => {
+ // loop through the assets and make them into JSON object with more details
+ let result = [];
+ let studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ for (const asset of assets) {
+ if (!asset.isReferenced && asset.serverDeleteTime == null &&
+ asset.fileName !== '.DS_Store') {
+ asset.url = studentUploadsBaseURL + asset.filePath;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/vle/notebook/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/vle/notebook/file.png';
+ }
+ result.push(asset);
+ }
+ }
+ this.allAssets = result;
+ return result;
+ });
+ }
+ }
+
+ getAssetContent(asset) {
+ return this.http.get(asset.url).toPromise().then(response => {
+ return response;
+ });
+ }
+
+ hasSuffix(assetURL, suffixes) {
+ const assetExtension = assetURL.substring(assetURL.lastIndexOf('.') + 1);
+ return suffixes.includes(assetExtension.toLowerCase());
+ }
+
+ isImage(asset) {
+ return this.hasSuffix(this.getFileNameFromAsset(asset), this.imageFileExtensions);
+ }
+
+ isAudio(asset) {
+ return this.hasSuffix(this.getFileNameFromAsset(asset), this.audioFileExtensions);
+ }
+
+ getFileNameFromAsset(asset) {
+ if (this.ConfigService.isPreview()) {
+ return asset.file.name;
+ } else {
+ return asset.fileName;
+ }
+ }
+
+ uploadAsset(file) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = (theFile => {
+ return e => {
+ let fileSrc = e.target.result;
+ let fileName = theFile.name;
+
+ let asset: any = {};
+ asset.file = file;
+ asset.url = fileSrc;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/themes/default/images/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/themes/default/images/file.png';
+ }
+ this.allAssets.push(asset);
+ return resolve(asset);
+ };
+ })(file);
+ reader.readAsDataURL(file);
+ });
+ } else {
+ const deferred = this.upgrade.$injector.get('$q').defer();
+ this.upgrade.$injector.get('Upload').upload({
+ url: this.ConfigService.getStudentAssetsURL(),
+ fields: {
+ runId: this.ConfigService.getRunId(),
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ },
+ file: file
+ })
+ .success((asset, status, headers, config) => {
+ if (asset === 'error') {
+ alert(this.upgrade.$injector.get('$filter')('translate')('THERE_WAS_AN_ERROR_UPLOADING'));
+ } else {
+ const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ asset.url = studentUploadsBaseURL + asset.filePath;
+ if (this.isImage(asset)) {
+ asset.type = 'image';
+ asset.iconURL = asset.url;
+ } else if (this.isAudio(asset)) {
+ asset.type = 'audio';
+ asset.iconURL = 'wise5/themes/default/images/audio.png';
+ } else {
+ asset.type = 'file';
+ asset.iconURL = 'wise5/themes/default/images/file.png';
+ }
+ this.allAssets.push(asset);
+ deferred.resolve(asset);
+ }
+ })
+ .error((asset, status, headers, config) => {
+ alert(this.upgrade.$injector.get('$filter')('translate')('THERE_WAS_AN_ERROR_UPLOADING_YOU_MIGHT_HAVE_REACHED_LIMIT'));
+ });
+ return deferred.promise;
+ }
+ }
+
+ uploadAssets(files) {
+ const promises = files.map(file => {
+ return this.upgrade.$injector.get('Upload').upload({
+ url: this.ConfigService.getStudentAssetsURL(),
+ fields: {
+ runId: this.ConfigService.getRunId(),
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ },
+ file: file
+ })
+ });
+ return this.upgrade.$injector.get('$q').all(promises);
+ }
+
+ // given asset, makes a copy of it so steps can use for reference. Returns newly-copied asset.
+ copyAssetForReference(studentAsset) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ return resolve(studentAsset);
+ });
+ } else {
+ return this.http.post(`${this.ConfigService.getStudentAssetsURL()}/copy`,
+ {
+ studentAssetId: studentAsset.id,
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientSaveTime: Date.parse(new Date().toString())
+ })
+ .toPromise().then((copiedAsset: any) => {
+ if (copiedAsset != null) {
+ const studentUploadsBaseURL = this.ConfigService.getStudentUploadsBaseURL();
+ if (copiedAsset.isReferenced && copiedAsset.fileName !== '.DS_Store') {
+ copiedAsset.url = studentUploadsBaseURL + copiedAsset.filePath;
+ if (this.isImage(copiedAsset)) {
+ copiedAsset.type = 'image';
+ copiedAsset.iconURL = copiedAsset.url;
+ } else if (this.isAudio(copiedAsset)) {
+ copiedAsset.type = 'audio';
+ copiedAsset.iconURL = 'wise5/vle/notebook/audio.png';
+ } else {
+ copiedAsset.type = 'file';
+ copiedAsset.iconURL = 'wise5/vle/notebook/file.png';
+ }
+ return copiedAsset;
+ }
+ }
+ return null;
+ });
+ }
+ }
+
+ deleteAsset(studentAsset) {
+ if (this.ConfigService.isPreview()) {
+ return this.upgrade.$injector.get('$q')((resolve, reject) => {
+ this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
+ return resolve(studentAsset);
+ });
+ } else {
+ return this.http.post(`${this.ConfigService.getStudentAssetsURL()}/delete`,
+ {
+ studentAssetId: studentAsset.id,
+ workgroupId: this.ConfigService.getWorkgroupId(),
+ periodId: this.ConfigService.getPeriodId(),
+ clientDeleteTime: Date.parse(new Date().toString()),
+ }).toPromise().then(() => {
+ this.allAssets = this.allAssets.splice(this.allAssets.indexOf(studentAsset), 1);
+ return studentAsset;
+ });
+ }
+ }
+}
diff --git a/src/main/webapp/wise5/services/studentDataService.js b/src/main/webapp/wise5/services/studentDataService.js
index 0fd30fd344..5bafc0ec5d 100644
--- a/src/main/webapp/wise5/services/studentDataService.js
+++ b/src/main/webapp/wise5/services/studentDataService.js
@@ -9,7 +9,6 @@ class StudentDataService {
$rootScope,
AnnotationService,
ConfigService,
- PlanningService,
ProjectService,
UtilService
) {
@@ -20,7 +19,6 @@ class StudentDataService {
this.$rootScope = $rootScope;
this.AnnotationService = AnnotationService;
this.ConfigService = ConfigService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.UtilService = UtilService;
this.$translate = this.$filter('translate');
@@ -37,8 +35,6 @@ class StudentDataService {
this.runStatus = null;
this.maxScore = null;
- this.maxPlanningNodeNumber = 0;
-
/*
* A counter to keep track of how many saveToServer requests we have
* made that we haven't received a response for yet. When this value
@@ -814,7 +810,7 @@ class StudentDataService {
return;
}
const context = 'VLE';
- this.saveEvent(context, nodeId, componentId, componentType, category, event, data);
+ return this.saveEvent(context, nodeId, componentId, componentType, category, event, data);
}
saveEvent(context, nodeId, componentId, componentType, category, event, data) {
@@ -831,7 +827,7 @@ class StudentDataService {
events.push(newEvent);
const componentStates = undefined;
const annotations = undefined;
- this.saveToServer(componentStates, events, annotations);
+ return this.saveToServer(componentStates, events, annotations);
}
createNewEvent(nodeId, componentId, context, componentType, category, event, data) {
@@ -1661,7 +1657,6 @@ StudentDataService.$inject = [
'$rootScope',
'AnnotationService',
'ConfigService',
- 'PlanningService',
'ProjectService',
'UtilService'
];
diff --git a/src/main/webapp/wise5/test-unit/services/sessionService.spec.js b/src/main/webapp/wise5/test-unit/services/sessionService.spec.js
deleted file mode 100644
index 3d6a72a3b3..0000000000
--- a/src/main/webapp/wise5/test-unit/services/sessionService.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import vleModule from '../../vle/vle';
-
-let SessionService;
-
-describe('SessionService', () => {
- beforeEach(angular.mock.module(vleModule.name));
-
- beforeEach(inject(_SessionService_ => {
- SessionService = _SessionService_;
- }));
-
- describe('calculateIntervals()', () => {
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs10Minutes();
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs30Minutes();
- shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs60Minutes();
- });
-});
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs10Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 10 minutes', () => {
- const sessionTimeout = 600;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(540);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(60);
- });
-}
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs30Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 30 minutes', () => {
- const sessionTimeout = 1800;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(1620);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(180);
- });
-}
-
-function shouldCalculateTheWarnAndLogoutIntervalsWhenSessionTimeoutIs60Minutes() {
- it('should calculate the warn and logout intervals when session timeout is 60 minutes', () => {
- const sessionTimeout = 3600;
- const intervals = SessionService.calculateIntervals(sessionTimeout);
- expect(intervals.showWarningInterval).toEqual(3300);
- expect(intervals.forceLogoutAfterWarningInterval).toEqual(300);
- });
-}
diff --git a/src/main/webapp/wise5/themes/default/navigation/navigation.html b/src/main/webapp/wise5/themes/default/navigation/navigation.html
index 34c0a5b825..a0b085f580 100644
--- a/src/main/webapp/wise5/themes/default/navigation/navigation.html
+++ b/src/main/webapp/wise5/themes/default/navigation/navigation.html
@@ -1,4 +1,3 @@
-
+
![]()
-
cancel
+
+
+ mic {{ ::'openResponse.recordResponse' | translate }}
+
+
+ stop {{ ::'openResponse.stopRecording' | translate }}
+
+
+ {{ ::'openResponse.recording' | translate }} {{ ::'openResponse.recordingTimeLeft' | translate }} :{{ openResponseController.getAudioRecordingTimeLeft() }}
+
+
+
@@ -11,7 +10,7 @@
{{vleController.totalSco
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html b/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
deleted file mode 100644
index 43acdf6947..0000000000
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
{{vleController.totalSco
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html b/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
deleted file mode 100644
index 43acdf6947..0000000000
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/choosePlanningItem.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
- ![{{navitemCtrl.nodeStatuses[item.id].icon.imgAlt}}]()
-
- {{navitemCtrl.nodeStatuses[item.id].icon.fontName}}
-
-
- {{ navitemCtrl.getNodeTitle(item.id) }} (Used: {{ navitemCtrl.getNumPlannindNodeInstances(item.id) }}, Available: {{ navitemCtrl.getPlannindNodeMaxAllowed(item.id)-navitemCtrl.getNumPlannindNodeInstances(item.id) }})
- {{ navitemCtrl.getNodeDescription(item.id) }}
-
-
-
-
-
- {{ 'CANCEL' | translate }}
-
-
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
index 4114c72383..bb882b0686 100644
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
+++ b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItem.html
@@ -11,17 +11,8 @@
remove
-
-
- {{ ::'planningMode' | translate }}: {{ navitemCtrl.planningMode ? (::'on' | translate) : (::'off' | translate) }}
-
-
-
+
-
-
- add_circle
- {{ ::'addItem' | translate }}
-
-
@@ -57,17 +40,10 @@
+ aria-label="Go to {{::navitemCtrl.nodeTitle}}"
+ ng-class="{'nav-item--list--group':navitemCtrl.isGroup}">
{{ ::navitemCtrl.nodeTitle }} lock
- delete
- reorder
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
index b08297f592..2ba717b9d7 100644
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
+++ b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
@@ -7,24 +7,20 @@ class NavItemController {
$element,
dragulaService,
NodeService,
- PlanningService,
ProjectService,
StudentDataService,
$mdDialog) {
-
this.$filter = $filter;
this.$rootScope = $rootScope;
this.$scope = $scope;
this.$element = $element;
this.dragulaService = dragulaService;
this.NodeService = NodeService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.StudentDataService = StudentDataService;
this.$mdDialog = $mdDialog;
this.$translate = this.$filter('translate');
this.autoScroll = require('dom-autoscroller');
-
this.expanded = false;
}
@@ -38,64 +34,12 @@ class NavItemController {
this.currentNode = this.StudentDataService.currentNode;
this.previousNode = null;
this.isCurrentNode = (this.currentNode.id === this.nodeId);
-
- // whether this node is a planning node
- this.isPlanning = this.PlanningService.isPlanning(this.nodeId);
-
- // the array of nodes used for drag/drop planning sorting
- this.availablePlanningNodes = [];
-
- // whether the node is a planning node instance
this.node = this.ProjectService.getNodeById(this.nodeId);
- this.isPlanningInstance = this.PlanningService.isPlanningInstance(this.nodeId);
-
this.parentGroupId = null;
-
- /*
- * whether planning mode is on or off which determines if students
- * can edit planning related aspects of the project such as adding,
- * moving, or deleting planning steps.
- */
- this.planningMode = false;
-
var parentGroup = this.ProjectService.getParentGroup(this.nodeId);
if (parentGroup != null) {
this.parentGroupId = parentGroup.id;
- this.isParentGroupPlanning = this.PlanningService.isPlanning(this.parentGroupId);
- }
-
- if (this.isPlanning) {
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.nodeId);
- }
-
- if (this.isParentGroupPlanning) {
-
- if (parentGroup.planningMode) {
- // the parent is currently in planning mode
- this.planningMode = true;
- }
-
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.parentGroupId);
-
- this.$scope.$watch(
- () => {
- // watch the position of this node
- return this.ProjectService.nodeIdToNumber[this.nodeId];
- },
- (value) => {
- // the position has changed for this node so we will update it in the UI
- this.nodeTitle = this.showPosition ? (this.ProjectService.nodeIdToNumber[this.nodeId] + ': ' + this.item.title) : this.item.title;
- }
- );
}
this.$scope.$watch(
@@ -149,60 +93,6 @@ class NavItemController {
this.$scope.$parent.itemExpanded = value;
}
);
-
- // a group node has turned on or off planning mode
- this.$rootScope.$on('togglePlanningMode', (event, args) => {
-
- // get the group node that has had its planning node changed
- let planningModeClickedNodeId = args.nodeId;
- let planningMode = args.planningMode;
-
- // get this node's parent group
- let parentGroup = this.ProjectService.getParentGroup(this.nodeId);
- let parentGroupId = null;
-
- if (parentGroup != null) {
- parentGroupId = parentGroup.id;
- }
-
- if (parentGroupId == planningModeClickedNodeId) {
- // the parent of this node has changed their planning mode
- this.planningMode = planningMode;
- }
- });
-
- let dragId = 'planning_' + this.nodeId ;
- // handle item drop events
- let dropEvent = dragId + '.drop-model';
- this.$scope.$on(dropEvent, (el, target, source) => {
- let nodeChangedId = target.data().nodeid;
- this.planningNodeItemsChanged(nodeChangedId);
- });
-
- this.dragulaService.options(this.$scope, dragId, {
- moves: (el, source, handle, sibling) => {
- if (!this.planningMode) {
- return false;
- }
-
- let nodeId = el.getAttribute('data-nodeid');
- return this.PlanningService.isPlanningInstance(nodeId);
- }
- });
-
- let drake = this.dragulaService.find(this.$scope, dragId).drake;
-
- // support scroll while dragging
- let scroll = this.autoScroll(
- [document.querySelector('#content')], {
- margin: 30,
- pixels: 50,
- scrollWhenOutside: true,
- autoScroll: function() {
- // Only scroll when the pointer is down, and there is a child being dragged
- return this.down && drake.dragging;
- }
- });
}
getTemplateUrl(){
@@ -232,259 +122,10 @@ class NavItemController {
}
}
} else {
- if (this.StudentDataService.planningMode) {
- // Don't allow students to enter planning steps while in planning mode
- this.$mdDialog.show(
- this.$mdDialog.alert()
- .title(this.$translate('itemLocked'))
- .textContent(this.$translate('planningModeStepsUnVisitable'))
- .ariaLabel(this.$translate('itemLocked'))
- .ok(this.$translate('ok'))
- .targetEvent(event)
- );
- } else {
- this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
- }
- }
- };
-
- /**
- * Save an event when planning node is added
- * @param planningNodeAdded
- */
- savePlanningNodeAddedEvent(planningNodeAdded) {
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeAdded";
- let eventData = {
- nodeIdAdded: planningNodeAdded.id,
- planningNodeTemplateId: planningNodeAdded.planningNodeTemplateId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- };
-
- /**
- * Returns the max times a planning node can be added to the project (-1 is
- * is returned if there is no limit)
- * @param planningNodeId
- */
- getPlannindNodeMaxAllowed(planningNodeId) {
- let maxAddAllowed = -1; // by default, students can add as many instances as they want
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
- // get the maxAddAllowed value by looking up the planningNode in the project.
- if (planningGroupNode && planningGroupNode.availablePlanningNodes) {
- for (let a = 0; a < planningGroupNode.availablePlanningNodes.length; a++) {
- let availablePlanningNode = planningGroupNode.availablePlanningNodes[a];
- if (availablePlanningNode.nodeId === planningNodeId && availablePlanningNode.max != null) {
- maxAddAllowed = availablePlanningNode.max;
- }
- }
- }
-
- return maxAddAllowed;
- };
-
- /**
- * Returns the number of times a planning node has been added to the project
- * @param planningNodeId
- */
- getNumPlannindNodeInstances(planningNodeId) {
- let numPlanningNodesAdded = 0; // keep track of number of instances
- // otherwise, see how many times the planning node template has been used.
-
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
-
- // loop through the child ids in the planning group and see how many times they've been used
- if (planningGroupNode && planningGroupNode.ids) {
- for (let c = 0; c < planningGroupNode.ids.length; c++) {
- let childPlanningNodeId = planningGroupNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- if (childPlanningNode != null && childPlanningNode.planningNodeTemplateId === planningNodeId) {
- numPlanningNodesAdded++;
- }
- }
- }
-
- return numPlanningNodesAdded;
- };
-
- /**
- * Returns true iff this student can add the specified planning node.
- * Limits include reaching the max allowed count
- * @param planningNodeId
- */
- canAddPlanningNode(planningNodeId) {
- let maxAddAllowed = this.getPlannindNodeMaxAllowed(planningNodeId);
-
- // if maxAddAllowed was not found or is set to 0, it means students can add as many as they want
- if (maxAddAllowed < 1) {
- return true;
- }
-
- let numPlanningNodesAdded = this.getNumPlannindNodeInstances(planningNodeId);
-
- return numPlanningNodesAdded < maxAddAllowed;
- };
-
- /**
- * Create a planning node instance and add it to the project
- * @param groupId the group the new planning node instance will be added to
- * @param templateNodeId the node id of the planning node template
- * @returns the planning node instance
- */
- addPlanningNodeInstanceInside(nodeIdToInsertInside, templateNodeId) {
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // add the planning node instance inside
- this.PlanningService.addPlanningNodeInstanceInside(nodeIdToInsertInside, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
-
- /**
- * Open the planning mode select dialog to choose a planning node template
- * to create a new planning instance
- * @param event the trigger event
- * @param targetNodeId the node to insert the new planning instance after or inside
- * @param insertInside boolean whether to insert the new planning instance
- * inside the target node (optional; default is after)
- */
- addPlanningInstance(event, targetNodeId, insertInside) {
- // show dialog with list of planning nodes user can add to current group
-
- let choosePlanningItemTemplateUrl = this.ProjectService.getThemePath() + '/themeComponents/navItem/choosePlanningItem.html';
- let navitemCtrl = this;
-
- this.$mdDialog.show({
- parent: angular.element(document.body),
- locals: {
- targetNodeId: targetNodeId,
- insertInside: insertInside,
- navitemCtrl: navitemCtrl,
- },
- templateUrl: choosePlanningItemTemplateUrl,
- targetEvent: event,
- controller: ChoosePlanningItemController
- });
-
- function ChoosePlanningItemController($scope, $mdDialog, targetNodeId, insertInside, navitemCtrl) {
- $scope.navitemCtrl = navitemCtrl;
- $scope.targetNodeId = targetNodeId;
- $scope.insertInside = insertInside;
-
- $scope.addSelectedPlanningInstance = (templateNodeId) => {
- if ($scope.insertInside) {
- $scope.navitemCtrl.addPlanningNodeInstanceInside($scope.targetNodeId, templateNodeId);
- } else {
- $scope.navitemCtrl.addPlanningNodeInstanceAfter($scope.targetNodeId, templateNodeId);
- }
-
- $mdDialog.hide();
- };
-
- $scope.close = () => {
- $mdDialog.hide();
- };
+ this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
}
- ChoosePlanningItemController.$inject = ["$scope", "$mdDialog", "targetNodeId", "insertInside", "navitemCtrl"];
};
- /**
- * Create a planning node instance and add it to the project after the specified nodeId
- * @param groupId the group the new planning node instance will be added to
- * @param nodeId the node id of the planning node template
- */
- addPlanningNodeInstanceAfter(nodeIdToInsertAfter, templateNodeId) {
-
- var parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
-
- if (parentGroup != null) {
- var parentGroupId = parentGroup.id;
-
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // insert planning node instance after
- this.PlanningService.addPlanningNodeInstanceAfter(nodeIdToInsertAfter, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
- }
-
- /**
- * Remove the planning node instance
- * @param planningNodeInstanceNodeId the planning node instance to remove
- * @param event the event that triggered the function call
- */
- removePlanningNodeInstance(planningNodeInstanceNodeId, event) {
- let confirm = this.$mdDialog.confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('areYouSureYouWantToDeleteThisItem'))
- .textContent(this.$translate('noteAnyWorkYouHaveDoneOnThisItemWillBeLost'))
- .ariaLabel(this.$translate('deleteItemFromProject'))
- .targetEvent(event)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(confirm).then(() => {
- // delete the node from the project
- this.ProjectService.deleteNode(planningNodeInstanceNodeId);
-
- // perform any necessary updating
- this.planningNodeChanged(this.parentGroupId);
-
- // Save remove planning node event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeRemoved";
- let eventData = {
- nodeIdRemoved: planningNodeInstanceNodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- }, () => {});
- }
-
/**
* Get the node title
* @param nodeId get the title for this node
@@ -493,11 +134,9 @@ class NavItemController {
getNodeTitle(nodeId) {
var node = this.ProjectService.idToNode[nodeId];
var title = null;
-
if (node != null) {
title = node.title;
}
-
return title;
}
@@ -516,126 +155,6 @@ class NavItemController {
return description;
}
-
- /**
- * Move the planning node. If the other node is a group node, we will
- * insert this node as the first node in the group. If the other node is
- * a step node, we will insert this node after the other node.
- * @param otherNodeId the other node we will move this node inside or after
- */
- movePlanningNode(nodeIdToMove, nodeIdToMoveAfter) {
-
- /*
- * check that this node is not the same as the other node.
- * if they are the same we don't need to do anything.
- */
- if (nodeIdToMove != nodeIdToMoveAfter) {
- if (this.ProjectService.isGroupNode(nodeIdToMoveAfter)) {
- this.PlanningService.movePlanningNodeInstanceInside(nodeIdToMove, nodeIdToMoveAfter);
- } else {
- this.PlanningService.movePlanningNodeInstanceAfter(nodeIdToMove, nodeIdToMoveAfter);
- }
- }
-
- // perform any necessary updating
- this.planningNodeChanged();
- }
-
- /**
- * Something related to planning has changed in the project. This
- * means a planning node was added, moved, or deleted.
- * @param param planningNodeId planning node id
- */
- planningNodeChanged(planningNodeId) {
- this.savePlanningNodeChanges(planningNodeId);
-
- this.$rootScope.$broadcast('planningNodeChanged');
- }
-
- /**
- * Save the changed nodes in NodeState
- * @param param planningNodeId planning node id
- **/
- savePlanningNodeChanges(planningNodeId) {
- let nodeState = this.NodeService.createNewNodeState();
- let nodeId = planningNodeId ? planningNodeId : this.nodeId;
- nodeState.nodeId = nodeId;
- nodeState.isAutoSave = false;
- nodeState.isSubmit = false;
-
- var studentData = {};
- studentData.nodeId = nodeId;
- studentData.nodes = [];
- let planningNode = this.ProjectService.getNodeById(nodeId);
- studentData.nodes.push(planningNode); // add the planning node (group)
- // loop through the child ids in the planning group and save them also
- if (planningNode.ids != null) {
- for (let c = 0; c < planningNode.ids.length; c++) {
- let childPlanningNodeId = planningNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- studentData.nodes.push(childPlanningNode);
- }
- }
-
- nodeState.studentData = studentData;
- var nodeStates = [];
- nodeStates.push(nodeState);
- this.StudentDataService.saveNodeStates(nodeStates);
- }
-
- /**
- * Toggle the planning mode on and off. Notify child nodes that
- * the planning mode has changed so they can act accordingly.
- */
- togglePlanningMode() {
- /*if (this.StudentDataService.planningMode && !this.item.planningMode) {
- // Don't allow multiple concurrent planning modes.
- this.$translate('planningModeOnlyOnePlanningModeAllowed').then((planningModeOnlyOnePlanningModeAllowed) => {
- alert(planningModeOnlyOnePlanningModeAllowed);
- });
-
- return;
- }*/
-
- // toggle the planning mode
- //this.planningMode = !this.planningMode;
- this.item.planningMode = this.planningMode;
-
- // also toggle StudentDataService planning mode. This will be used to constrain the entire project when in planning mode.
- this.StudentDataService.planningMode = this.planningMode;
-
- // Save planning mode on/off event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = this.planningMode ? "planningModeOn" : "planningModeOff";
- let eventData = {
- nodeId: this.nodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
-
- // notify the child nodes that the planning mode of this group node has changed
- this.$rootScope.$broadcast('togglePlanningMode', { nodeId: this.nodeId, planningMode: this.planningMode });
- }
-
- /**
- * The planning node's items array has changed
- * @param newValue the new value of the planning node's items array
- * @param oldValue the old value of the planning node's items array
- */
- planningNodeItemsChanged(nodeChangedId) {
- let index = this.item.ids.indexOf(nodeChangedId);
- let nodeIdAddedAfter = this.item.ids[index-1];
-
- if (nodeIdAddedAfter) {
- // the node was moved after another node in the group
- this.movePlanningNode(nodeChangedId, nodeIdAddedAfter);
- } else {
- // the node was moved to the beginning of the group
- this.movePlanningNode(nodeChangedId, this.nodeId);
- }
- };
}
NavItemController.$inject = [
@@ -645,7 +164,6 @@ NavItemController.$inject = [
'$element',
'dragulaService',
'NodeService',
- 'PlanningService',
'ProjectService',
'StudentDataService',
'$mdDialog'
diff --git a/src/main/webapp/wise5/themes/default/themeController.js b/src/main/webapp/wise5/themes/default/themeController.js
index bcb229c9f0..4e08079914 100644
--- a/src/main/webapp/wise5/themes/default/themeController.js
+++ b/src/main/webapp/wise5/themes/default/themeController.js
@@ -52,7 +52,6 @@ class ThemeController {
this.notebookConfig = this.NotebookService.getNotebookConfig();
this.notebookFilter = '';
this.currentNode = this.StudentDataService.getCurrentNode();
- this.planningMode = false;
// set current notebook type filter to first enabled type
if (this.notebookConfig.enabled) {
@@ -130,29 +129,6 @@ class ThemeController {
);
});
- // alert user when inactive for a long time
- this.$scope.$on('showSessionWarning', ev => {
- let alert = this.$mdDialog
- .confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('sessionTimeout'))
- .textContent(this.$translate('autoLogoutMessage'))
- .ariaLabel(this.$translate('sessionTimeout'))
- .targetEvent(ev)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(alert).then(
- () => {
- this.SessionService.closeWarningAndRenewSession();
- alert = undefined;
- },
- () => {
- this.SessionService.forceLogOut();
- }
- );
- });
-
// alert user when inactive for a long time
this.$scope.$on('showRequestLogout', ev => {
let alert = this.$mdDialog
@@ -251,11 +227,6 @@ class ThemeController {
StudentAssetDialogController.$inject = ['$scope', '$mdDialog', 'componentController'];
});
- // a group node has turned on or off planning mode
- this.$scope.$on('togglePlanningMode', (event, args) => {
- this.planningMode = args.planningMode;
- });
-
// handle request for notification dismiss codes
this.$scope.$on('viewCurrentAmbientNotification', (event, args) => {
let notification = args.notification;
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_ar.json b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
index b84ce03a23..1102cbde38 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
@@ -68,9 +68,6 @@
"on": "تشغيل",
"onlyAvailableInPreviewMode": "غير مُتاح إلا في وضع المعاينة",
"openAccountMenu": "فتح قائمة الحساب",
- "planningMode": "وضع التخطيط",
- "planningModeOnlyOnePlanningModeAllowed": "لا يُمكنك العمل إلا على نشاط تخطيط واحد فقط في المرة الواحدة. أوقف تشغيل وضع التخطيط في نشاط التخطيط الحالي قبل العمل على هذا. ",
- "planningModeStepsUnVisitable": "غير مسموح لك بعرض العناصر أثناء وضع التخطيط. يُرجى إيقاف تشغيل وضع التخطيط والمحاولة مرة أخرى.",
"previousItem": "العنصر السابق",
"projectCompletion": "إتمام المشروع\n",
"projectItemSelect": "تحديد عنصر المشروع",
@@ -110,4 +107,4 @@
"writeXNumberOfWordsOnNodeTitle": "اكتب {{requiredNumberOfWords}} كلمة على {{nodeTitle}}",
"yes": "نعم",
"yourTeacherHasPausedAllTheScreensInTheClass": "لقد أوقف المُعلم جميع الشاشات مؤقتًا في الفصل."
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_el.json b/src/main/webapp/wise5/vle/i18n/i18n_el.json
index 5d7e3f2190..1fcae12494 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_el.json
@@ -63,9 +63,6 @@
"onlyAvailableInPreviewMode": "Διαθέσιμο μόνο για Προεπισκόπηση",
"off": "OFF",
"openAccountMenu": "Άνοιγμα μενού λογαριασμού",
- "planningMode": "Λειτουργία Σχεδιασμού",
- "planningModeOnlyOnePlanningModeAllowed": "Μπορείτε να εργαστείτε μόνο σε μία Δραστηριότητα Σχεδιασμού κάθε φορά. Απενεργοποιήστε τη Λειτουργία Σχεδιασμού στην τρέχουσα Δραστηριότητα Σχεδιασμού προκειμένου να εργαστείτε στη νέα.",
- "planningModeStepsUnVisitable": "Δεν επιτρέπεται να δείτε αντικείμενα όσο είστε σε Λειτουργία Σχεδιασμού. Παρακαλώ απενεργοποιήστε τη Λειτουργία Σχεδιασμού και προσπαθήστε ξανά. ",
"previousItem": "Προηγούμενο Στοιχείο",
"projectCompletion": "Ολοκλήρωση ενότητας",
"projectItemSelect": "Επιλογή αντικειμένου ενότητας",
@@ -101,4 +98,4 @@
"visitNodeTitle": "Επίσκεψη στο \"{{nodeTitle}}\"",
"yes": "Ναι",
"yourTeacherHasPausedAllTheScreensInTheClass": "Ο εκπαιδευτικός έχει σταματήσει όλες τις οθόνες της αίθουσας"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_en.json b/src/main/webapp/wise5/vle/i18n/i18n_en.json
index 4753aa5695..2f4ba01f51 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_en.json
@@ -72,9 +72,6 @@
"onlyAvailableInPreviewMode": "Only Available in Preview Mode",
"off": "OFF",
"openAccountMenu": "Open account menu",
- "planningMode": "Planning Mode",
- "planningModeOnlyOnePlanningModeAllowed": "You can only work on one Planning Activity at a time. Turn off Planning Mode on the existing Planning Activity before working on this one.",
- "planningModeStepsUnVisitable": "You are not allowed to view items while in Planning Mode. Please turn off Planning Mode and try again.",
"previousItem": "Previous Item",
"projectCompletion": "Unit Completion",
"projectItemSelect": "Unit item select",
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
index 4f234c738d..f61233f6a8 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
@@ -57,9 +57,6 @@
"on": "打开",
"off": "关闭",
"openAccountMenu": "打开账号菜单",
- "planningMode": "规划模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能规划一个活动，在规划这个活动前关闭正在规划的活动。",
- "planningModeStepsUnVisitable": "不允许在规划模式下显示条目。请关闭规划模式并重试。",
"previousItem": "上一条",
"projectCompletion": "项目完成度",
"projectItemSelect": "项目条目选择",
@@ -90,4 +87,4 @@
"viewNote": "显示 {{noteLabel}}",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老师已经暂停了班里的所有屏幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
index 12d72e9cd4..f55d716fc3 100755
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
@@ -62,9 +62,6 @@
"onlyAvailableInPreviewMode": "僅在預覽模式下可以使用",
"off": "關閉",
"openAccountMenu": "打開帳號清單",
- "planningMode": "規劃模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能規劃一個活動，在規劃這個活動前關閉正在規劃的活動。",
- "planningModeStepsUnVisitable": "不允許在規劃模式下顯示項目。請關閉規劃模式並重試。",
"previousItem": "上一個項目",
"projectCompletion": "專題完成度",
"projectItemSelect": "專題項目選擇",
@@ -99,4 +96,4 @@
"visitNodeTitle": "訪問“{{nodeTitle}}”",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老師已經暫停了班上的所有螢幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/preview.ts b/src/main/webapp/wise5/vle/preview.ts
index a390379f94..4d8424866d 100644
--- a/src/main/webapp/wise5/vle/preview.ts
+++ b/src/main/webapp/wise5/vle/preview.ts
@@ -1,428 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js'
-import '../themes/default/theme';
-
-export default angular
- .module('preview', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('preview').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/preview',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.preview', {
- url: '/unit/:projectId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.preview.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: "",
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- }
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('preview');
diff --git a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
index e32313e024..d4742d14b1 100644
--- a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
+++ b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
@@ -1,7 +1,7 @@
'use strict';
import { ConfigService } from '../../services/configService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class StudentAssetController {
$translate: any;
diff --git a/src/main/webapp/wise5/vle/vle.ts b/src/main/webapp/wise5/vle/vle.ts
index e221496be2..c535bd9d43 100644
--- a/src/main/webapp/wise5/vle/vle.ts
+++ b/src/main/webapp/wise5/vle/vle.ts
@@ -1,429 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js';
-import '../themes/default/theme';
-
-export default angular
- .module('vle', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('vle').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/student',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.run', {
- url: '/unit/:runId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- notifications: [
- 'NotificationService',
- 'studentData',
- 'config',
- 'project',
- (NotificationService, studentData, config, project) => {
- return NotificationService.retrieveNotifications();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.run.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: ""
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('vle');
diff --git a/src/main/webapp/wise5/vle/vleController.ts b/src/main/webapp/wise5/vle/vleController.ts
index eb7df02bdd..e0022a4d77 100644
--- a/src/main/webapp/wise5/vle/vleController.ts
+++ b/src/main/webapp/wise5/vle/vleController.ts
@@ -5,7 +5,7 @@ import { ConfigService } from '../services/configService';
import NotificationService from '../services/notificationService';
import NotebookService from '../services/notebookService';
import { VLEProjectService } from './vleProjectService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import StudentDataService from '../services/studentDataService';
import * as angular from 'angular';
import * as $ from 'jquery';
@@ -119,6 +119,29 @@ class VLEController {
});
}
+ this.$scope.$on('showSessionWarning', () => {
+ const confirm = $mdDialog
+ .confirm()
+ .parent(angular.element(document.body))
+ .title(this.$translate('SESSION_TIMEOUT'))
+ .content(this.$translate('SESSION_TIMEOUT_MESSAGE'))
+ .ariaLabel(this.$translate('SESSION_TIMEOUT'))
+ .ok(this.$translate('YES'))
+ .cancel(this.$translate('NO'));
+ $mdDialog.show(confirm).then(
+ () => {
+ this.SessionService.closeWarningAndRenewSession();
+ },
+ () => {
+ this.logOut();
+ }
+ );
+ });
+
+ this.$scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('currentNodeChanged', (event, args) => {
let previousNode = args.previousNode;
let currentNode = this.StudentDataService.getCurrentNode();
@@ -368,16 +391,15 @@ class VLEController {
event,
eventData
);
-
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
}
- logOut() {
+ logOut(eventName = 'logOut') {
const nodeId = null;
const componentId = null;
const componentType = null;
const category = 'Navigation';
- const event = 'logOutButtonClicked';
+ const event = eventName;
const eventData = {};
this.StudentDataService.saveVLEEvent(
nodeId,
@@ -386,9 +408,9 @@ class VLEController {
category,
event,
eventData
- );
-
- this.$rootScope.$broadcast('logOut');
+ ).then(() => {
+ this.SessionService.logOut();
+ });
}
loadRoot() {
diff --git a/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
new file mode 100644
index 0000000000..aa4bb05a5e
--- /dev/null
+++ b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
@@ -0,0 +1,426 @@
+import '../lib/jquery/jquery-global';
+import '../lib/bootstrap/js/bootstrap.min'
+import AchievementService from '../services/achievementService';
+import * as angular from 'angular';
+import { downgradeInjectable } from '@angular/upgrade/static';
+import * as angularDragula from 'angular-dragula';
+import 'ng-file-upload';
+import 'angular-material';
+import 'angular-moment';
+import 'ng-onload';
+import 'angular-sanitize';
+import 'ng-stomp';
+import 'angular-toarrayfilter';
+import 'angular-translate';
+import 'angular-translate-loader-partial';
+import 'angular-ui-router';
+import 'angular-ui-scrollpoint';
+import '../components/animation/animationComponentModule';
+import AnnotationService from '../services/annotationService';
+import '../components/audioOscillator/audioOscillatorComponentModule';
+import { AudioRecorderService } from '../services/audioRecorderService';
+import * as canvg from 'canvg';
+import '../components/conceptMap/conceptMapComponentModule';
+import { ConfigService } from '../services/configService';
+import { CRaterService } from '../services/cRaterService';
+import '../directives/components';
+import ComponentService from '../components/componentService';
+import '../components/discussion/discussionComponentModule';
+import '../components/draw/drawComponentModule';
+import '../components/embedded/embeddedComponentModule';
+import * as fabric from 'fabric';
+window['fabric'] = fabric.fabric
+import Filters from '../filters/filters';
+import '../lib/highcharts/highcharts-ng';
+import * as Highcharts from '../lib/highcharts/highcharts.src';
+import '../lib/draggable-points/draggable-points';
+import * as HighchartsExporting from '../lib/highcharts-exporting@4.2.1';
+import * as covariance from 'compute-covariance';
+window['Highcharts'] = Highcharts;
+window['HighchartsExporting'] = HighchartsExporting;
+window['covariance'] = covariance;
+import '../components/graph/graphComponentModule';
+import * as hopscotch from 'hopscotch';
+window['hopscotch'] = hopscotch;
+import '../components/html/htmlComponentModule';
+import HttpInterceptor from '../services/httpInterceptor';
+import '../components/label/labelComponentModule';
+import '../components/match/matchComponentModule';
+import '../components/multipleChoice/multipleChoiceComponentModule';
+import NavigationController from './navigation/navigationController';
+import NodeController from './node/nodeController';
+import NodeService from '../services/nodeService';
+import NotebookService from '../services/notebookService';
+import NotificationService from '../services/notificationService';
+import '../components/openResponse/openResponseComponentModule';
+import '../components/outsideURL/outsideURLComponentModule';
+import { SessionService } from '../services/sessionService';
+import './studentAsset/studentAsset';
+import { StudentAssetService } from '../services/studentAssetService';
+import StudentDataService from '../services/studentDataService';
+import StudentStatusService from '../services/studentStatusService';
+import StudentWebSocketService from '../services/studentWebSocketService';
+import '../components/summary/summaryComponentModule';
+import '../components/table/tableComponentModule';
+import { UtilService } from '../services/utilService';
+import VLEController from './vleController';
+import { VLEProjectService } from './vleProjectService';
+import * as moment from 'moment';
+import * as SockJS from 'sockjs-client';
+import * as StompJS from '@stomp/stompjs';
+window['SockJS'] = SockJS;
+window['Stomp'] = StompJS.Stomp;
+import '../lib/summernote/dist/summernote.min';
+import '../lib/angular-summernote/dist/angular-summernote.min';
+import '../lib/summernoteExtensions/summernote-ext-addNote.js';
+import '../lib/summernoteExtensions/summernote-ext-print.js';
+import '../themes/default/theme';
+
+export function createModule(type = 'preview') {
+ return angular.module(type, [
+ angularDragula(angular),
+ 'angularMoment',
+ 'angular-toArrayFilter',
+ 'animationComponentModule',
+ 'audioOscillatorComponentModule',
+ 'components',
+ 'conceptMapComponentModule',
+ 'discussionComponentModule',
+ 'drawComponentModule',
+ 'embeddedComponentModule',
+ 'filters',
+ 'graphComponentModule',
+ 'highcharts-ng',
+ 'htmlComponentModule',
+ 'labelComponentModule',
+ 'matchComponentModule',
+ 'multipleChoiceComponentModule',
+ 'ngAria',
+ 'ngFileUpload',
+ 'ngMaterial',
+ 'ngOnload',
+ 'ngSanitize',
+ 'ngStomp',
+ 'openResponseComponentModule',
+ 'outsideURLComponentModule',
+ 'pascalprecht.translate',
+ 'studentAsset',
+ 'summaryComponentModule',
+ 'summernote',
+ 'tableComponentModule',
+ 'theme',
+ 'ui.router',
+ 'ui.scrollpoint'
+ ])
+ .service('AchievementService', AchievementService)
+ .service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
+ .factory('ConfigService', downgradeInjectable(ConfigService))
+ .service('ComponentService', ComponentService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
+ .service('HttpInterceptor', HttpInterceptor)
+ .service('NodeService', NodeService)
+ .service('NotebookService', NotebookService)
+ .service('NotificationService', NotificationService)
+ .factory('ProjectService', downgradeInjectable(VLEProjectService))
+ .factory('SessionService', downgradeInjectable(SessionService))
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
+ .service('StudentDataService', StudentDataService)
+ .service('StudentStatusService', StudentStatusService)
+ .service('StudentWebSocketService', StudentWebSocketService)
+ .factory('UtilService', downgradeInjectable(UtilService))
+ .controller('NavigationController', NavigationController)
+ .controller('NodeController', NodeController)
+ .controller('VLEController', VLEController)
+ .filter('Filters', Filters)
+ .config([
+ '$stateProvider',
+ '$translateProvider',
+ '$translatePartialLoaderProvider',
+ '$controllerProvider',
+ '$locationProvider',
+ '$mdThemingProvider',
+ '$httpProvider',
+ (
+ $stateProvider,
+ $translateProvider,
+ $translatePartialLoaderProvider,
+ $controllerProvider,
+ $locationProvider,
+ $mdThemingProvider,
+ $httpProvider
+ ) => {
+ angular.module(type).$controllerProvider = $controllerProvider;
+ $locationProvider.html5Mode(true);
+ $stateProvider
+ .state('root', {
+ url: type === 'preview' ? '/preview' : '/student',
+ abstract: true,
+ resolve: {
+ config: [
+ 'ConfigService',
+ ConfigService => {
+ return ConfigService.retrieveConfig(`/config/vle`);
+ }
+ ]
+ },
+ templateProvider: [
+ '$http',
+ 'ProjectService',
+ ($http, ProjectService) => {
+ let themePath = ProjectService.getThemePath();
+ return $http.get(themePath + '/vle.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'VLEController',
+ controllerAs: 'vleController'
+ })
+ .state(type === 'preview' ? 'root.preview' : 'root.run', {
+ url: type === 'preview' ? '/unit/:projectId' : '/unit/:runId',
+ resolve: {
+ config: [
+ 'ConfigService',
+ '$stateParams',
+ (ConfigService, $stateParams) => {
+ if (type === 'preview') {
+ return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
+ } else {
+ return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
+ }
+ }
+ ],
+ project: [
+ 'ProjectService',
+ 'config',
+ (ProjectService, config) => {
+ return ProjectService.retrieveProject();
+ }
+ ],
+ studentData: [
+ 'StudentDataService',
+ 'config',
+ 'project',
+ (StudentDataService, config, project) => {
+ return StudentDataService.retrieveStudentData();
+ }
+ ],
+ notebook: [
+ 'NotebookService',
+ 'ConfigService',
+ 'StudentAssetService',
+ 'studentData',
+ 'config',
+ 'project',
+ (
+ NotebookService,
+ ConfigService,
+ StudentAssetService,
+ studentData,
+ config,
+ project
+ ) => {
+ return StudentAssetService.retrieveAssets().then(studentAssets => {
+ return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
+ notebook => {
+ return notebook;
+ }
+ );
+ });
+ }
+ ],
+ achievements: [
+ 'AchievementService',
+ 'studentData',
+ 'config',
+ 'project',
+ (AchievementService, studentData, config, project) => {
+ return AchievementService.retrieveStudentAchievements();
+ }
+ ],
+ notifications: [
+ 'NotificationService',
+ 'studentData',
+ 'config',
+ 'project',
+ (NotificationService, studentData, config, project) => {
+ return NotificationService.retrieveNotifications();
+ }
+ ],
+ runStatus: [
+ 'StudentDataService',
+ 'config',
+ (StudentDataService, config) => {
+ return StudentDataService.retrieveRunStatus();
+ }
+ ],
+ webSocket: [
+ 'StudentWebSocketService',
+ 'ConfigService',
+ 'config',
+ 'project',
+ (StudentWebSocketService, ConfigService, config, project) => {
+ if (!ConfigService.isPreview()) {
+ return StudentWebSocketService.initialize();
+ }
+ }
+ ],
+ language: [
+ '$translate',
+ 'ConfigService',
+ 'config',
+ ($translate, ConfigService, config) => {
+ let locale = ConfigService.getLocale(); // defaults to "en"
+ $translate.use(locale);
+ }
+ ]
+ },
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ]
+ }
+ }
+ })
+ .state(type === 'preview' ? 'root.preview.node' : 'root.run.node', {
+ url: '/:nodeId',
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'NodeController',
+ controllerAs: 'nodeController'
+ }
+ }
+ })
+ .state("sink", {
+ url: "/*path",
+ template: ""
+ });
+
+ $httpProvider.interceptors.push('HttpInterceptor');
+
+ // Set up Translations
+ $translatePartialLoaderProvider.addPart('i18n');
+ $translatePartialLoaderProvider.addPart('vle/i18n');
+ $translateProvider
+ .useLoader('$translatePartialLoader', {
+ urlTemplate: '/wise5/{part}/i18n_{lang}.json'
+ })
+ .fallbackLanguage(['en'])
+ .registerAvailableLanguageKeys(
+ ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
+ {
+ en_US: 'en',
+ en_UK: 'en'
+ }
+ )
+ .determinePreferredLanguage()
+ .useSanitizeValueStrategy('sanitizeParameters', 'escape');
+
+ // ngMaterial default theme configuration
+ // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
+ $mdThemingProvider.definePalette('primary', {
+ '50': 'e1f0f4',
+ '100': 'b8dbe4',
+ '200': '8ec6d4',
+ '300': '5faec2',
+ '400': '3d9db5',
+ '500': '1c8ca8',
+ '600': '197f98',
+ '700': '167188',
+ '800': '136377',
+ '900': '0e4957',
+ A100: 'abf3ff',
+ A200: '66e2ff',
+ A400: '17bee5',
+ A700: '00A1C6',
+ contrastDefaultColor: 'light', // whether, by default, text (contrast)
+ // on this palette should be dark or light
+ contrastDarkColors: [
+ '50',
+ '100', //hues which contrast should be 'dark' by default
+ '200',
+ '300',
+ 'A100'
+ ],
+ contrastLightColors: undefined // could also specify this if default was 'dark'
+ });
+
+ $mdThemingProvider.definePalette('accent', {
+ '50': 'fde9e6',
+ '100': 'fbcbc4',
+ '200': 'f8aca1',
+ '300': 'f4897b',
+ '400': 'f2705f',
+ '500': 'f05843',
+ '600': 'da503c',
+ '700': 'c34736',
+ '800': 'aa3e2f',
+ '900': '7d2e23',
+ A100: 'ff897d',
+ A200: 'ff7061',
+ A400: 'ff3829',
+ A700: 'cc1705',
+ contrastDefaultColor: 'light',
+ contrastDarkColors: ['50', '100', '200', '300', 'A100'],
+ contrastLightColors: undefined
+ });
+
+ $mdThemingProvider
+ .theme('default')
+ .primaryPalette('primary')
+ .accentPalette('accent', {
+ default: '500'
+ })
+ .warnPalette('red', {
+ default: '800'
+ });
+
+ let lightMap = $mdThemingProvider.extendPalette('grey', {
+ A100: 'ffffff'
+ });
+ $mdThemingProvider.definePalette('light', lightMap);
+
+ $mdThemingProvider
+ .theme('light')
+ .primaryPalette('light', {
+ default: 'A100'
+ })
+ .accentPalette('primary');
+
+ $mdThemingProvider.setDefaultTheme('default');
+ $mdThemingProvider.enableBrowserColor();
+
+ // moment.js default overrides
+ // TODO: add i18n support
+ moment.updateLocale('en', {
+ calendar: {
+ lastDay: '[Yesterday at] LT',
+ sameDay: '[Today at] LT',
+ nextDay: '[Tomorrow at] LT',
+ lastWeek: '[last] dddd [at] LT',
+ nextWeek: 'dddd [at] LT',
+ sameElse: 'll'
+ }
+ });
+ }
+ ]);
+}
diff --git a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
index 2a8555ad60..6a8c3c4a5c 100644
--- a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
+++ b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
@@ -92,7 +92,7 @@ public void setUp() throws Exception {
@Test
public void getStudentWorkListByParams_WithRunThatHasNoStudentWork_ShouldReturnNoStudentWork() {
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(0, studentWorkList.size());
}
@@ -102,7 +102,7 @@ public void getStudentWorkListByParams_WithRunThatHasStudentWork_ShouldReturnStu
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(3, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -115,7 +115,7 @@ public void getStudentWorkListByParams_ByWorkgroup_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- workgroup1, null, null, null, null, null, null, null);
+ workgroup1, null, null, null, null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -127,24 +127,12 @@ public void getStudentWorkListByParams_ByNodeId_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, "node1", null, null, null, null);
+ null, null, null, "node1", null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
}
- @Test
- public void getStudentWorkListByParams_OnlyLatest_ShouldReturnStudentWork() {
- createStudentWork(workgroup1, "node1", "studentWork1");
- createStudentWork(workgroup1, "node2", "studentWork2");
- createStudentWork(workgroup2, "node1", "studentWork3");
- List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, true);
- assertEquals(2, studentWorkList.size());
- assertEquals("studentWork2", studentWorkList.get(0).getStudentData());
- assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
- }
-
private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String studentData) {
StudentWork studentWork = new StudentWork();
Calendar now = Calendar.getInstance();
@@ -161,4 +149,4 @@ private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String
studentWorkDao.save(studentWork);
return studentWork;
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
new file mode 100644
index 0000000000..a45620bee3
--- /dev/null
+++ b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
@@ -0,0 +1,87 @@
+package org.wise.portal.service.vle.wise5.impl;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.easymock.EasyMockRunner;
+import org.easymock.Mock;
+import org.easymock.TestSubject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wise.portal.dao.work.StudentWorkDao;
+import org.wise.portal.domain.workgroup.Workgroup;
+import org.wise.portal.domain.workgroup.impl.WorkgroupImpl;
+import org.wise.portal.service.vle.wise5.VLEService;
+import org.wise.vle.domain.work.StudentWork;
+
+/**
+ * @author Hiroki Terashima
+ */
+@RunWith(EasyMockRunner.class)
+public class VLEServiceImplTest {
+
+ @TestSubject
+ private VLEService vleService = new VLEServiceImpl();
+
+ @Mock
+ private StudentWorkDao studentWorkDao;
+
+ private List allStudentWork;
+
+ private StudentWork studentWork1, studentWork2, studentWork3;
+
+ private Workgroup workgroup1, workgroup2;
+
+ @Before
+ public void setup() {
+ workgroup1 = createWorkgroup(1L);
+ workgroup2 = createWorkgroup(2L);
+ studentWork1 = createStudentWork(workgroup1, new Timestamp(1));
+ studentWork2 = createStudentWork(workgroup2, new Timestamp(2));
+ studentWork3 = createStudentWork(workgroup1, new Timestamp(3));
+ allStudentWork = new ArrayList(Arrays.asList(studentWork1, studentWork2,
+ studentWork3));
+ }
+
+ private StudentWork createStudentWork(Workgroup workgroup, Timestamp serverSaveTime) {
+ StudentWork studentWork = new StudentWork();
+ studentWork.setWorkgroup(workgroup);
+ studentWork.setServerSaveTime(serverSaveTime);
+ return studentWork;
+ }
+
+ private Workgroup createWorkgroup(long id) {
+ Workgroup workgroup = new WorkgroupImpl();
+ workgroup.setId(id);
+ return workgroup;
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyTrue_ReturnFilteredList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, true);
+ assertEquals(2, studentWorkList.size());
+ assertEquals(studentWork3, studentWorkList.get(0));
+ assertEquals(studentWork2, studentWorkList.get(1));
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyFalse_ReturnAllList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, false);
+ assertEquals(3, studentWorkList.size());
+ }
+}
- {{navitemCtrl.nodeStatuses[item.id].icon.fontName}}
-
-
-
- {{ navitemCtrl.getNodeTitle(item.id) }} (Used: {{ navitemCtrl.getNumPlannindNodeInstances(item.id) }}, Available: {{ navitemCtrl.getPlannindNodeMaxAllowed(item.id)-navitemCtrl.getNumPlannindNodeInstances(item.id) }})
-{{ navitemCtrl.getNodeDescription(item.id) }}
-
-
- {{ ::'planningMode' | translate }}: {{ navitemCtrl.planningMode ? (::'on' | translate) : (::'off' | translate) }}
-
-
+
-
studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(0, studentWorkList.size());
}
@@ -102,7 +102,7 @@ public void getStudentWorkListByParams_WithRunThatHasStudentWork_ShouldReturnStu
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
assertEquals(3, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -115,7 +115,7 @@ public void getStudentWorkListByParams_ByWorkgroup_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- workgroup1, null, null, null, null, null, null, null);
+ workgroup1, null, null, null, null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork2", studentWorkList.get(1).getStudentData());
@@ -127,24 +127,12 @@ public void getStudentWorkListByParams_ByNodeId_ShouldReturnStudentWork() {
createStudentWork(workgroup1, "node2", "studentWork2");
createStudentWork(workgroup2, "node1", "studentWork3");
List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, "node1", null, null, null, null);
+ null, null, null, "node1", null, null, null);
assertEquals(2, studentWorkList.size());
assertEquals("studentWork1", studentWorkList.get(0).getStudentData());
assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
}
- @Test
- public void getStudentWorkListByParams_OnlyLatest_ShouldReturnStudentWork() {
- createStudentWork(workgroup1, "node1", "studentWork1");
- createStudentWork(workgroup1, "node2", "studentWork2");
- createStudentWork(workgroup2, "node1", "studentWork3");
- List studentWorkList = studentWorkDao.getStudentWorkListByParams(null, run, null,
- null, null, null, null, null, null, null, true);
- assertEquals(2, studentWorkList.size());
- assertEquals("studentWork2", studentWorkList.get(0).getStudentData());
- assertEquals("studentWork3", studentWorkList.get(1).getStudentData());
- }
-
private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String studentData) {
StudentWork studentWork = new StudentWork();
Calendar now = Calendar.getInstance();
@@ -161,4 +149,4 @@ private StudentWork createStudentWork(Workgroup workgroup, String nodeId, String
studentWorkDao.save(studentWork);
return studentWork;
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
new file mode 100644
index 0000000000..a45620bee3
--- /dev/null
+++ b/src/test/java/org/wise/portal/service/vle/wise5/impl/VLEServiceImplTest.java
@@ -0,0 +1,87 @@
+package org.wise.portal.service.vle.wise5.impl;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.easymock.EasyMockRunner;
+import org.easymock.Mock;
+import org.easymock.TestSubject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wise.portal.dao.work.StudentWorkDao;
+import org.wise.portal.domain.workgroup.Workgroup;
+import org.wise.portal.domain.workgroup.impl.WorkgroupImpl;
+import org.wise.portal.service.vle.wise5.VLEService;
+import org.wise.vle.domain.work.StudentWork;
+
+/**
+ * @author Hiroki Terashima
+ */
+@RunWith(EasyMockRunner.class)
+public class VLEServiceImplTest {
+
+ @TestSubject
+ private VLEService vleService = new VLEServiceImpl();
+
+ @Mock
+ private StudentWorkDao studentWorkDao;
+
+ private List allStudentWork;
+
+ private StudentWork studentWork1, studentWork2, studentWork3;
+
+ private Workgroup workgroup1, workgroup2;
+
+ @Before
+ public void setup() {
+ workgroup1 = createWorkgroup(1L);
+ workgroup2 = createWorkgroup(2L);
+ studentWork1 = createStudentWork(workgroup1, new Timestamp(1));
+ studentWork2 = createStudentWork(workgroup2, new Timestamp(2));
+ studentWork3 = createStudentWork(workgroup1, new Timestamp(3));
+ allStudentWork = new ArrayList(Arrays.asList(studentWork1, studentWork2,
+ studentWork3));
+ }
+
+ private StudentWork createStudentWork(Workgroup workgroup, Timestamp serverSaveTime) {
+ StudentWork studentWork = new StudentWork();
+ studentWork.setWorkgroup(workgroup);
+ studentWork.setServerSaveTime(serverSaveTime);
+ return studentWork;
+ }
+
+ private Workgroup createWorkgroup(long id) {
+ Workgroup workgroup = new WorkgroupImpl();
+ workgroup.setId(id);
+ return workgroup;
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyTrue_ReturnFilteredList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, true);
+ assertEquals(2, studentWorkList.size());
+ assertEquals(studentWork3, studentWorkList.get(0));
+ assertEquals(studentWork2, studentWorkList.get(1));
+ }
+
+ @Test
+ public void getStudentWorkList_LatestOnlyFalse_ReturnAllList() {
+ expect(studentWorkDao.getStudentWorkListByParams(null, null, null, null, null,
+ null, null, null, null, null)).andReturn(allStudentWork);
+ replay(studentWorkDao);
+ List studentWorkList = vleService.getStudentWorkList(null, null, null, null, null,
+ null, null, null, null, null, false);
+ assertEquals(3, studentWorkList.size());
+ }
+}
-
- add_circle
- {{ ::'addItem' | translate }}
-
-
@@ -57,17 +40,10 @@
+ aria-label="Go to {{::navitemCtrl.nodeTitle}}"
+ ng-class="{'nav-item--list--group':navitemCtrl.isGroup}">
delete
- reorder
diff --git a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
index b08297f592..2ba717b9d7 100644
--- a/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
+++ b/src/main/webapp/wise5/themes/default/themeComponents/navItem/navItemController.js
@@ -7,24 +7,20 @@ class NavItemController {
$element,
dragulaService,
NodeService,
- PlanningService,
ProjectService,
StudentDataService,
$mdDialog) {
-
this.$filter = $filter;
this.$rootScope = $rootScope;
this.$scope = $scope;
this.$element = $element;
this.dragulaService = dragulaService;
this.NodeService = NodeService;
- this.PlanningService = PlanningService;
this.ProjectService = ProjectService;
this.StudentDataService = StudentDataService;
this.$mdDialog = $mdDialog;
this.$translate = this.$filter('translate');
this.autoScroll = require('dom-autoscroller');
-
this.expanded = false;
}
@@ -38,64 +34,12 @@ class NavItemController {
this.currentNode = this.StudentDataService.currentNode;
this.previousNode = null;
this.isCurrentNode = (this.currentNode.id === this.nodeId);
-
- // whether this node is a planning node
- this.isPlanning = this.PlanningService.isPlanning(this.nodeId);
-
- // the array of nodes used for drag/drop planning sorting
- this.availablePlanningNodes = [];
-
- // whether the node is a planning node instance
this.node = this.ProjectService.getNodeById(this.nodeId);
- this.isPlanningInstance = this.PlanningService.isPlanningInstance(this.nodeId);
-
this.parentGroupId = null;
-
- /*
- * whether planning mode is on or off which determines if students
- * can edit planning related aspects of the project such as adding,
- * moving, or deleting planning steps.
- */
- this.planningMode = false;
-
var parentGroup = this.ProjectService.getParentGroup(this.nodeId);
if (parentGroup != null) {
this.parentGroupId = parentGroup.id;
- this.isParentGroupPlanning = this.PlanningService.isPlanning(this.parentGroupId);
- }
-
- if (this.isPlanning) {
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.nodeId);
- }
-
- if (this.isParentGroupPlanning) {
-
- if (parentGroup.planningMode) {
- // the parent is currently in planning mode
- this.planningMode = true;
- }
-
- /*
- * planning is enabled so we will get the available planning
- * nodes that can be used in this group
- */
- this.availablePlanningNodes = this.PlanningService.getAvailablePlanningNodes(this.parentGroupId);
-
- this.$scope.$watch(
- () => {
- // watch the position of this node
- return this.ProjectService.nodeIdToNumber[this.nodeId];
- },
- (value) => {
- // the position has changed for this node so we will update it in the UI
- this.nodeTitle = this.showPosition ? (this.ProjectService.nodeIdToNumber[this.nodeId] + ': ' + this.item.title) : this.item.title;
- }
- );
}
this.$scope.$watch(
@@ -149,60 +93,6 @@ class NavItemController {
this.$scope.$parent.itemExpanded = value;
}
);
-
- // a group node has turned on or off planning mode
- this.$rootScope.$on('togglePlanningMode', (event, args) => {
-
- // get the group node that has had its planning node changed
- let planningModeClickedNodeId = args.nodeId;
- let planningMode = args.planningMode;
-
- // get this node's parent group
- let parentGroup = this.ProjectService.getParentGroup(this.nodeId);
- let parentGroupId = null;
-
- if (parentGroup != null) {
- parentGroupId = parentGroup.id;
- }
-
- if (parentGroupId == planningModeClickedNodeId) {
- // the parent of this node has changed their planning mode
- this.planningMode = planningMode;
- }
- });
-
- let dragId = 'planning_' + this.nodeId ;
- // handle item drop events
- let dropEvent = dragId + '.drop-model';
- this.$scope.$on(dropEvent, (el, target, source) => {
- let nodeChangedId = target.data().nodeid;
- this.planningNodeItemsChanged(nodeChangedId);
- });
-
- this.dragulaService.options(this.$scope, dragId, {
- moves: (el, source, handle, sibling) => {
- if (!this.planningMode) {
- return false;
- }
-
- let nodeId = el.getAttribute('data-nodeid');
- return this.PlanningService.isPlanningInstance(nodeId);
- }
- });
-
- let drake = this.dragulaService.find(this.$scope, dragId).drake;
-
- // support scroll while dragging
- let scroll = this.autoScroll(
- [document.querySelector('#content')], {
- margin: 30,
- pixels: 50,
- scrollWhenOutside: true,
- autoScroll: function() {
- // Only scroll when the pointer is down, and there is a child being dragged
- return this.down && drake.dragging;
- }
- });
}
getTemplateUrl(){
@@ -232,259 +122,10 @@ class NavItemController {
}
}
} else {
- if (this.StudentDataService.planningMode) {
- // Don't allow students to enter planning steps while in planning mode
- this.$mdDialog.show(
- this.$mdDialog.alert()
- .title(this.$translate('itemLocked'))
- .textContent(this.$translate('planningModeStepsUnVisitable'))
- .ariaLabel(this.$translate('itemLocked'))
- .ok(this.$translate('ok'))
- .targetEvent(event)
- );
- } else {
- this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
- }
- }
- };
-
- /**
- * Save an event when planning node is added
- * @param planningNodeAdded
- */
- savePlanningNodeAddedEvent(planningNodeAdded) {
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeAdded";
- let eventData = {
- nodeIdAdded: planningNodeAdded.id,
- planningNodeTemplateId: planningNodeAdded.planningNodeTemplateId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- };
-
- /**
- * Returns the max times a planning node can be added to the project (-1 is
- * is returned if there is no limit)
- * @param planningNodeId
- */
- getPlannindNodeMaxAllowed(planningNodeId) {
- let maxAddAllowed = -1; // by default, students can add as many instances as they want
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
- // get the maxAddAllowed value by looking up the planningNode in the project.
- if (planningGroupNode && planningGroupNode.availablePlanningNodes) {
- for (let a = 0; a < planningGroupNode.availablePlanningNodes.length; a++) {
- let availablePlanningNode = planningGroupNode.availablePlanningNodes[a];
- if (availablePlanningNode.nodeId === planningNodeId && availablePlanningNode.max != null) {
- maxAddAllowed = availablePlanningNode.max;
- }
- }
- }
-
- return maxAddAllowed;
- };
-
- /**
- * Returns the number of times a planning node has been added to the project
- * @param planningNodeId
- */
- getNumPlannindNodeInstances(planningNodeId) {
- let numPlanningNodesAdded = 0; // keep track of number of instances
- // otherwise, see how many times the planning node template has been used.
-
- let planningGroupNode = null;
- if (this.isParentGroupPlanning) {
- planningGroupNode = this.ProjectService.getNodeById(this.parentGroupId);
- } else {
- planningGroupNode = this.ProjectService.getNodeById(this.nodeId);
- }
-
- // loop through the child ids in the planning group and see how many times they've been used
- if (planningGroupNode && planningGroupNode.ids) {
- for (let c = 0; c < planningGroupNode.ids.length; c++) {
- let childPlanningNodeId = planningGroupNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- if (childPlanningNode != null && childPlanningNode.planningNodeTemplateId === planningNodeId) {
- numPlanningNodesAdded++;
- }
- }
- }
-
- return numPlanningNodesAdded;
- };
-
- /**
- * Returns true iff this student can add the specified planning node.
- * Limits include reaching the max allowed count
- * @param planningNodeId
- */
- canAddPlanningNode(planningNodeId) {
- let maxAddAllowed = this.getPlannindNodeMaxAllowed(planningNodeId);
-
- // if maxAddAllowed was not found or is set to 0, it means students can add as many as they want
- if (maxAddAllowed < 1) {
- return true;
- }
-
- let numPlanningNodesAdded = this.getNumPlannindNodeInstances(planningNodeId);
-
- return numPlanningNodesAdded < maxAddAllowed;
- };
-
- /**
- * Create a planning node instance and add it to the project
- * @param groupId the group the new planning node instance will be added to
- * @param templateNodeId the node id of the planning node template
- * @returns the planning node instance
- */
- addPlanningNodeInstanceInside(nodeIdToInsertInside, templateNodeId) {
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // add the planning node instance inside
- this.PlanningService.addPlanningNodeInstanceInside(nodeIdToInsertInside, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
-
- /**
- * Open the planning mode select dialog to choose a planning node template
- * to create a new planning instance
- * @param event the trigger event
- * @param targetNodeId the node to insert the new planning instance after or inside
- * @param insertInside boolean whether to insert the new planning instance
- * inside the target node (optional; default is after)
- */
- addPlanningInstance(event, targetNodeId, insertInside) {
- // show dialog with list of planning nodes user can add to current group
-
- let choosePlanningItemTemplateUrl = this.ProjectService.getThemePath() + '/themeComponents/navItem/choosePlanningItem.html';
- let navitemCtrl = this;
-
- this.$mdDialog.show({
- parent: angular.element(document.body),
- locals: {
- targetNodeId: targetNodeId,
- insertInside: insertInside,
- navitemCtrl: navitemCtrl,
- },
- templateUrl: choosePlanningItemTemplateUrl,
- targetEvent: event,
- controller: ChoosePlanningItemController
- });
-
- function ChoosePlanningItemController($scope, $mdDialog, targetNodeId, insertInside, navitemCtrl) {
- $scope.navitemCtrl = navitemCtrl;
- $scope.targetNodeId = targetNodeId;
- $scope.insertInside = insertInside;
-
- $scope.addSelectedPlanningInstance = (templateNodeId) => {
- if ($scope.insertInside) {
- $scope.navitemCtrl.addPlanningNodeInstanceInside($scope.targetNodeId, templateNodeId);
- } else {
- $scope.navitemCtrl.addPlanningNodeInstanceAfter($scope.targetNodeId, templateNodeId);
- }
-
- $mdDialog.hide();
- };
-
- $scope.close = () => {
- $mdDialog.hide();
- };
+ this.StudentDataService.endCurrentNodeAndSetCurrentNodeByNodeId(this.nodeId);
}
- ChoosePlanningItemController.$inject = ["$scope", "$mdDialog", "targetNodeId", "insertInside", "navitemCtrl"];
};
- /**
- * Create a planning node instance and add it to the project after the specified nodeId
- * @param groupId the group the new planning node instance will be added to
- * @param nodeId the node id of the planning node template
- */
- addPlanningNodeInstanceAfter(nodeIdToInsertAfter, templateNodeId) {
-
- var parentGroup = this.ProjectService.getParentGroup(nodeIdToInsertAfter);
-
- if (parentGroup != null) {
- var parentGroupId = parentGroup.id;
-
- // create the planning node instance
- let nextAvailablePlanningNodeId = this.StudentDataService.getNextAvailablePlanningNodeId();
- let planningNodeInstance = this.PlanningService.createPlanningNodeInstance(templateNodeId, nextAvailablePlanningNodeId);
-
- // insert planning node instance after
- this.PlanningService.addPlanningNodeInstanceAfter(nodeIdToInsertAfter, planningNodeInstance);
-
- /*
- * update the node statuses so that a node status is created for
- * the new planning node instance
- */
- this.StudentDataService.updateNodeStatuses();
-
- // perform any necessary updating
- this.planningNodeChanged();
-
- // Save add planning node event
- this.savePlanningNodeAddedEvent(planningNodeInstance);
-
- return planningNodeInstance;
- }
- }
-
- /**
- * Remove the planning node instance
- * @param planningNodeInstanceNodeId the planning node instance to remove
- * @param event the event that triggered the function call
- */
- removePlanningNodeInstance(planningNodeInstanceNodeId, event) {
- let confirm = this.$mdDialog.confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('areYouSureYouWantToDeleteThisItem'))
- .textContent(this.$translate('noteAnyWorkYouHaveDoneOnThisItemWillBeLost'))
- .ariaLabel(this.$translate('deleteItemFromProject'))
- .targetEvent(event)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(confirm).then(() => {
- // delete the node from the project
- this.ProjectService.deleteNode(planningNodeInstanceNodeId);
-
- // perform any necessary updating
- this.planningNodeChanged(this.parentGroupId);
-
- // Save remove planning node event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = "planningNodeRemoved";
- let eventData = {
- nodeIdRemoved: planningNodeInstanceNodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
- }, () => {});
- }
-
/**
* Get the node title
* @param nodeId get the title for this node
@@ -493,11 +134,9 @@ class NavItemController {
getNodeTitle(nodeId) {
var node = this.ProjectService.idToNode[nodeId];
var title = null;
-
if (node != null) {
title = node.title;
}
-
return title;
}
@@ -516,126 +155,6 @@ class NavItemController {
return description;
}
-
- /**
- * Move the planning node. If the other node is a group node, we will
- * insert this node as the first node in the group. If the other node is
- * a step node, we will insert this node after the other node.
- * @param otherNodeId the other node we will move this node inside or after
- */
- movePlanningNode(nodeIdToMove, nodeIdToMoveAfter) {
-
- /*
- * check that this node is not the same as the other node.
- * if they are the same we don't need to do anything.
- */
- if (nodeIdToMove != nodeIdToMoveAfter) {
- if (this.ProjectService.isGroupNode(nodeIdToMoveAfter)) {
- this.PlanningService.movePlanningNodeInstanceInside(nodeIdToMove, nodeIdToMoveAfter);
- } else {
- this.PlanningService.movePlanningNodeInstanceAfter(nodeIdToMove, nodeIdToMoveAfter);
- }
- }
-
- // perform any necessary updating
- this.planningNodeChanged();
- }
-
- /**
- * Something related to planning has changed in the project. This
- * means a planning node was added, moved, or deleted.
- * @param param planningNodeId planning node id
- */
- planningNodeChanged(planningNodeId) {
- this.savePlanningNodeChanges(planningNodeId);
-
- this.$rootScope.$broadcast('planningNodeChanged');
- }
-
- /**
- * Save the changed nodes in NodeState
- * @param param planningNodeId planning node id
- **/
- savePlanningNodeChanges(planningNodeId) {
- let nodeState = this.NodeService.createNewNodeState();
- let nodeId = planningNodeId ? planningNodeId : this.nodeId;
- nodeState.nodeId = nodeId;
- nodeState.isAutoSave = false;
- nodeState.isSubmit = false;
-
- var studentData = {};
- studentData.nodeId = nodeId;
- studentData.nodes = [];
- let planningNode = this.ProjectService.getNodeById(nodeId);
- studentData.nodes.push(planningNode); // add the planning node (group)
- // loop through the child ids in the planning group and save them also
- if (planningNode.ids != null) {
- for (let c = 0; c < planningNode.ids.length; c++) {
- let childPlanningNodeId = planningNode.ids[c];
- let childPlanningNode = this.ProjectService.getNodeById(childPlanningNodeId);
- studentData.nodes.push(childPlanningNode);
- }
- }
-
- nodeState.studentData = studentData;
- var nodeStates = [];
- nodeStates.push(nodeState);
- this.StudentDataService.saveNodeStates(nodeStates);
- }
-
- /**
- * Toggle the planning mode on and off. Notify child nodes that
- * the planning mode has changed so they can act accordingly.
- */
- togglePlanningMode() {
- /*if (this.StudentDataService.planningMode && !this.item.planningMode) {
- // Don't allow multiple concurrent planning modes.
- this.$translate('planningModeOnlyOnePlanningModeAllowed').then((planningModeOnlyOnePlanningModeAllowed) => {
- alert(planningModeOnlyOnePlanningModeAllowed);
- });
-
- return;
- }*/
-
- // toggle the planning mode
- //this.planningMode = !this.planningMode;
- this.item.planningMode = this.planningMode;
-
- // also toggle StudentDataService planning mode. This will be used to constrain the entire project when in planning mode.
- this.StudentDataService.planningMode = this.planningMode;
-
- // Save planning mode on/off event
- let componentId = null;
- let componentType = null;
- let category = "Planning";
- let eventName = this.planningMode ? "planningModeOn" : "planningModeOff";
- let eventData = {
- nodeId: this.nodeId
- };
- let eventNodeId = this.nodeId;
- this.StudentDataService.saveVLEEvent(eventNodeId, componentId, componentType, category, eventName, eventData);
-
- // notify the child nodes that the planning mode of this group node has changed
- this.$rootScope.$broadcast('togglePlanningMode', { nodeId: this.nodeId, planningMode: this.planningMode });
- }
-
- /**
- * The planning node's items array has changed
- * @param newValue the new value of the planning node's items array
- * @param oldValue the old value of the planning node's items array
- */
- planningNodeItemsChanged(nodeChangedId) {
- let index = this.item.ids.indexOf(nodeChangedId);
- let nodeIdAddedAfter = this.item.ids[index-1];
-
- if (nodeIdAddedAfter) {
- // the node was moved after another node in the group
- this.movePlanningNode(nodeChangedId, nodeIdAddedAfter);
- } else {
- // the node was moved to the beginning of the group
- this.movePlanningNode(nodeChangedId, this.nodeId);
- }
- };
}
NavItemController.$inject = [
@@ -645,7 +164,6 @@ NavItemController.$inject = [
'$element',
'dragulaService',
'NodeService',
- 'PlanningService',
'ProjectService',
'StudentDataService',
'$mdDialog'
diff --git a/src/main/webapp/wise5/themes/default/themeController.js b/src/main/webapp/wise5/themes/default/themeController.js
index bcb229c9f0..4e08079914 100644
--- a/src/main/webapp/wise5/themes/default/themeController.js
+++ b/src/main/webapp/wise5/themes/default/themeController.js
@@ -52,7 +52,6 @@ class ThemeController {
this.notebookConfig = this.NotebookService.getNotebookConfig();
this.notebookFilter = '';
this.currentNode = this.StudentDataService.getCurrentNode();
- this.planningMode = false;
// set current notebook type filter to first enabled type
if (this.notebookConfig.enabled) {
@@ -130,29 +129,6 @@ class ThemeController {
);
});
- // alert user when inactive for a long time
- this.$scope.$on('showSessionWarning', ev => {
- let alert = this.$mdDialog
- .confirm()
- .parent(angular.element(document.body))
- .title(this.$translate('sessionTimeout'))
- .textContent(this.$translate('autoLogoutMessage'))
- .ariaLabel(this.$translate('sessionTimeout'))
- .targetEvent(ev)
- .ok(this.$translate('yes'))
- .cancel(this.$translate('no'));
-
- this.$mdDialog.show(alert).then(
- () => {
- this.SessionService.closeWarningAndRenewSession();
- alert = undefined;
- },
- () => {
- this.SessionService.forceLogOut();
- }
- );
- });
-
// alert user when inactive for a long time
this.$scope.$on('showRequestLogout', ev => {
let alert = this.$mdDialog
@@ -251,11 +227,6 @@ class ThemeController {
StudentAssetDialogController.$inject = ['$scope', '$mdDialog', 'componentController'];
});
- // a group node has turned on or off planning mode
- this.$scope.$on('togglePlanningMode', (event, args) => {
- this.planningMode = args.planningMode;
- });
-
// handle request for notification dismiss codes
this.$scope.$on('viewCurrentAmbientNotification', (event, args) => {
let notification = args.notification;
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_ar.json b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
index b84ce03a23..1102cbde38 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_ar.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_ar.json
@@ -68,9 +68,6 @@
"on": "تشغيل",
"onlyAvailableInPreviewMode": "غير مُتاح إلا في وضع المعاينة",
"openAccountMenu": "فتح قائمة الحساب",
- "planningMode": "وضع التخطيط",
- "planningModeOnlyOnePlanningModeAllowed": "لا يُمكنك العمل إلا على نشاط تخطيط واحد فقط في المرة الواحدة. أوقف تشغيل وضع التخطيط في نشاط التخطيط الحالي قبل العمل على هذا. ",
- "planningModeStepsUnVisitable": "غير مسموح لك بعرض العناصر أثناء وضع التخطيط. يُرجى إيقاف تشغيل وضع التخطيط والمحاولة مرة أخرى.",
"previousItem": "العنصر السابق",
"projectCompletion": "إتمام المشروع\n",
"projectItemSelect": "تحديد عنصر المشروع",
@@ -110,4 +107,4 @@
"writeXNumberOfWordsOnNodeTitle": "اكتب {{requiredNumberOfWords}} كلمة على {{nodeTitle}}",
"yes": "نعم",
"yourTeacherHasPausedAllTheScreensInTheClass": "لقد أوقف المُعلم جميع الشاشات مؤقتًا في الفصل."
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_el.json b/src/main/webapp/wise5/vle/i18n/i18n_el.json
index 5d7e3f2190..1fcae12494 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_el.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_el.json
@@ -63,9 +63,6 @@
"onlyAvailableInPreviewMode": "Διαθέσιμο μόνο για Προεπισκόπηση",
"off": "OFF",
"openAccountMenu": "Άνοιγμα μενού λογαριασμού",
- "planningMode": "Λειτουργία Σχεδιασμού",
- "planningModeOnlyOnePlanningModeAllowed": "Μπορείτε να εργαστείτε μόνο σε μία Δραστηριότητα Σχεδιασμού κάθε φορά. Απενεργοποιήστε τη Λειτουργία Σχεδιασμού στην τρέχουσα Δραστηριότητα Σχεδιασμού προκειμένου να εργαστείτε στη νέα.",
- "planningModeStepsUnVisitable": "Δεν επιτρέπεται να δείτε αντικείμενα όσο είστε σε Λειτουργία Σχεδιασμού. Παρακαλώ απενεργοποιήστε τη Λειτουργία Σχεδιασμού και προσπαθήστε ξανά. ",
"previousItem": "Προηγούμενο Στοιχείο",
"projectCompletion": "Ολοκλήρωση ενότητας",
"projectItemSelect": "Επιλογή αντικειμένου ενότητας",
@@ -101,4 +98,4 @@
"visitNodeTitle": "Επίσκεψη στο \"{{nodeTitle}}\"",
"yes": "Ναι",
"yourTeacherHasPausedAllTheScreensInTheClass": "Ο εκπαιδευτικός έχει σταματήσει όλες τις οθόνες της αίθουσας"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_en.json b/src/main/webapp/wise5/vle/i18n/i18n_en.json
index 4753aa5695..2f4ba01f51 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_en.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_en.json
@@ -72,9 +72,6 @@
"onlyAvailableInPreviewMode": "Only Available in Preview Mode",
"off": "OFF",
"openAccountMenu": "Open account menu",
- "planningMode": "Planning Mode",
- "planningModeOnlyOnePlanningModeAllowed": "You can only work on one Planning Activity at a time. Turn off Planning Mode on the existing Planning Activity before working on this one.",
- "planningModeStepsUnVisitable": "You are not allowed to view items while in Planning Mode. Please turn off Planning Mode and try again.",
"previousItem": "Previous Item",
"projectCompletion": "Unit Completion",
"projectItemSelect": "Unit item select",
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
index 4f234c738d..f61233f6a8 100644
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_CN.json
@@ -57,9 +57,6 @@
"on": "打开",
"off": "关闭",
"openAccountMenu": "打开账号菜单",
- "planningMode": "规划模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能规划一个活动，在规划这个活动前关闭正在规划的活动。",
- "planningModeStepsUnVisitable": "不允许在规划模式下显示条目。请关闭规划模式并重试。",
"previousItem": "上一条",
"projectCompletion": "项目完成度",
"projectItemSelect": "项目条目选择",
@@ -90,4 +87,4 @@
"viewNote": "显示 {{noteLabel}}",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老师已经暂停了班里的所有屏幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
index 12d72e9cd4..f55d716fc3 100755
--- a/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
+++ b/src/main/webapp/wise5/vle/i18n/i18n_zh_TW.json
@@ -62,9 +62,6 @@
"onlyAvailableInPreviewMode": "僅在預覽模式下可以使用",
"off": "關閉",
"openAccountMenu": "打開帳號清單",
- "planningMode": "規劃模式",
- "planningModeOnlyOnePlanningModeAllowed": "您一次只能規劃一個活動，在規劃這個活動前關閉正在規劃的活動。",
- "planningModeStepsUnVisitable": "不允許在規劃模式下顯示項目。請關閉規劃模式並重試。",
"previousItem": "上一個項目",
"projectCompletion": "專題完成度",
"projectItemSelect": "專題項目選擇",
@@ -99,4 +96,4 @@
"visitNodeTitle": "訪問“{{nodeTitle}}”",
"yes": "是",
"yourTeacherHasPausedAllTheScreensInTheClass": "您的老師已經暫停了班上的所有螢幕。"
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/wise5/vle/preview.ts b/src/main/webapp/wise5/vle/preview.ts
index a390379f94..4d8424866d 100644
--- a/src/main/webapp/wise5/vle/preview.ts
+++ b/src/main/webapp/wise5/vle/preview.ts
@@ -1,428 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js'
-import '../themes/default/theme';
-
-export default angular
- .module('preview', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('preview').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/preview',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.preview', {
- url: '/unit/:projectId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.preview.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: "",
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- }
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('preview');
diff --git a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
index e32313e024..d4742d14b1 100644
--- a/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
+++ b/src/main/webapp/wise5/vle/studentAsset/studentAssetController.ts
@@ -1,7 +1,7 @@
'use strict';
import { ConfigService } from '../../services/configService';
-import StudentAssetService from '../../services/studentAssetService';
+import { StudentAssetService } from '../../services/studentAssetService';
class StudentAssetController {
$translate: any;
diff --git a/src/main/webapp/wise5/vle/vle.ts b/src/main/webapp/wise5/vle/vle.ts
index e221496be2..c535bd9d43 100644
--- a/src/main/webapp/wise5/vle/vle.ts
+++ b/src/main/webapp/wise5/vle/vle.ts
@@ -1,429 +1,2 @@
-'use strict';
-
-import '../lib/jquery/jquery-global';
-import '../lib/bootstrap/js/bootstrap.min'
-import AchievementService from '../services/achievementService';
-import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
-import * as angularDragula from 'angular-dragula';
-import 'ng-file-upload';
-import 'angular-material';
-import 'angular-moment';
-import 'ng-onload';
-import 'angular-sanitize';
-import 'ng-stomp';
-import 'angular-toarrayfilter';
-import 'angular-translate';
-import 'angular-translate-loader-partial';
-import 'angular-ui-router';
-import 'angular-ui-scrollpoint';
-import '../components/animation/animationComponentModule';
-import AnnotationService from '../services/annotationService';
-import '../components/audioOscillator/audioOscillatorComponentModule';
-import * as canvg from 'canvg';
-import '../components/conceptMap/conceptMapComponentModule';
-import { ConfigService } from '../services/configService';
-import CRaterService from '../services/cRaterService';
-import '../directives/components';
-import ComponentService from '../components/componentService';
-import '../components/discussion/discussionComponentModule';
-import '../components/draw/drawComponentModule';
-import '../components/embedded/embeddedComponentModule';
-import * as fabric from 'fabric';
-window['fabric'] = fabric.fabric
-import Filters from '../filters/filters';
-import '../lib/highcharts/highcharts-ng';
-import * as Highcharts from '../../wise5/lib/highcharts/highcharts.src';
-import '../../wise5/lib/draggable-points/draggable-points';
-import * as HighchartsExporting from '../../wise5/lib/highcharts-exporting@4.2.1';
-import * as covariance from 'compute-covariance';
-window['Highcharts'] = Highcharts;
-window['HighchartsExporting'] = HighchartsExporting;
-window['covariance'] = covariance;
-import '../components/graph/graphComponentModule';
-import * as hopscotch from 'hopscotch';
-window['hopscotch'] = hopscotch;
-import '../components/html/htmlComponentModule';
-import HttpInterceptor from '../services/httpInterceptor';
-import '../components/label/labelComponentModule';
-import '../components/match/matchComponentModule';
-import '../components/multipleChoice/multipleChoiceComponentModule';
-import NavigationController from './navigation/navigationController';
-import NodeController from './node/nodeController';
-import NodeService from '../services/nodeService';
-import NotebookService from '../services/notebookService';
-import NotificationService from '../services/notificationService';
-import '../components/openResponse/openResponseComponentModule';
-import '../components/outsideURL/outsideURLComponentModule';
-import PlanningService from '../services/planningService';
-import SessionService from '../services/sessionService';
-import './studentAsset/studentAsset';
-import StudentAssetService from '../services/studentAssetService';
-import StudentDataService from '../services/studentDataService';
-import StudentStatusService from '../services/studentStatusService';
-import StudentWebSocketService from '../services/studentWebSocketService';
-import '../components/summary/summaryComponentModule';
-import '../components/table/tableComponentModule';
-import { UtilService } from '../services/utilService';
-import VLEController from './vleController';
-import { VLEProjectService } from './vleProjectService';
-import * as moment from 'moment';
-import * as SockJS from 'sockjs-client';
-import * as StompJS from '@stomp/stompjs';
-window['SockJS'] = SockJS;
-window['Stomp'] = StompJS.Stomp;
-import '../lib/summernote/dist/summernote.min';
-import '../lib/angular-summernote/dist/angular-summernote.min';
-import '../lib/summernoteExtensions/summernote-ext-addNote.js';
-import '../lib/summernoteExtensions/summernote-ext-print.js';
-import '../themes/default/theme';
-
-export default angular
- .module('vle', [
- angularDragula(angular),
- 'angularMoment',
- 'angular-toArrayFilter',
- 'animationComponentModule',
- 'audioOscillatorComponentModule',
- 'components',
- 'conceptMapComponentModule',
- 'discussionComponentModule',
- 'drawComponentModule',
- 'embeddedComponentModule',
- 'filters',
- 'graphComponentModule',
- 'highcharts-ng',
- 'htmlComponentModule',
- 'labelComponentModule',
- 'matchComponentModule',
- 'multipleChoiceComponentModule',
- 'ngAria',
- 'ngFileUpload',
- 'ngMaterial',
- 'ngOnload',
- 'ngSanitize',
- 'ngStomp',
- 'openResponseComponentModule',
- 'outsideURLComponentModule',
- 'pascalprecht.translate',
- 'studentAsset',
- 'summaryComponentModule',
- 'summernote',
- 'tableComponentModule',
- 'theme',
- 'ui.router',
- 'ui.scrollpoint'
- ])
- .service('AchievementService', AchievementService)
- .service('AnnotationService', AnnotationService)
- .factory('ConfigService', downgradeInjectable(ConfigService))
- .service('ComponentService', ComponentService)
- .service('CRaterService', CRaterService)
- .service('HttpInterceptor', HttpInterceptor)
- .service('NodeService', NodeService)
- .service('NotebookService', NotebookService)
- .service('NotificationService', NotificationService)
- .service('PlanningService', PlanningService)
- .factory('ProjectService', downgradeInjectable(VLEProjectService))
- .service('SessionService', SessionService)
- .service('StudentAssetService', StudentAssetService)
- .service('StudentDataService', StudentDataService)
- .service('StudentStatusService', StudentStatusService)
- .service('StudentWebSocketService', StudentWebSocketService)
- .factory('UtilService', downgradeInjectable(UtilService))
- .controller('NavigationController', NavigationController)
- .controller('NodeController', NodeController)
- .controller('VLEController', VLEController)
- .filter('Filters', Filters)
- .config([
- '$urlRouterProvider',
- '$stateProvider',
- '$translateProvider',
- '$translatePartialLoaderProvider',
- '$controllerProvider',
- '$locationProvider',
- '$mdThemingProvider',
- '$httpProvider',
- '$injector',
- '$provide',
- (
- $urlRouterProvider,
- $stateProvider,
- $translateProvider,
- $translatePartialLoaderProvider,
- $controllerProvider,
- $locationProvider,
- $mdThemingProvider,
- $httpProvider,
- $injector,
- $provide
- ) => {
- angular.module('vle').$controllerProvider = $controllerProvider;
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('root', {
- url: '/student',
- abstract: true,
- resolve: {
- config: [
- 'ConfigService',
- ConfigService => {
- return ConfigService.retrieveConfig(`/config/vle`);
- }
- ]
- },
- templateProvider: [
- '$http',
- 'ProjectService',
- ($http, ProjectService) => {
- let themePath = ProjectService.getThemePath();
- return $http.get(themePath + '/vle.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'VLEController',
- controllerAs: 'vleController'
- })
- .state('root.run', {
- url: '/unit/:runId',
- resolve: {
- config: [
- 'ConfigService',
- '$stateParams',
- (ConfigService, $stateParams) => {
- return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
- }
- ],
- project: [
- 'ProjectService',
- 'config',
- (ProjectService, config) => {
- return ProjectService.retrieveProject();
- }
- ],
- studentData: [
- 'StudentDataService',
- 'config',
- 'project',
- (StudentDataService, config, project) => {
- return StudentDataService.retrieveStudentData();
- }
- ],
- notebook: [
- 'NotebookService',
- 'ConfigService',
- 'StudentAssetService',
- 'studentData',
- 'config',
- 'project',
- (
- NotebookService,
- ConfigService,
- StudentAssetService,
- studentData,
- config,
- project
- ) => {
- return StudentAssetService.retrieveAssets().then(studentAssets => {
- return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
- notebook => {
- return notebook;
- }
- );
- });
- }
- ],
- achievements: [
- 'AchievementService',
- 'studentData',
- 'config',
- 'project',
- (AchievementService, studentData, config, project) => {
- return AchievementService.retrieveStudentAchievements();
- }
- ],
- notifications: [
- 'NotificationService',
- 'studentData',
- 'config',
- 'project',
- (NotificationService, studentData, config, project) => {
- return NotificationService.retrieveNotifications();
- }
- ],
- runStatus: [
- 'StudentDataService',
- 'config',
- (StudentDataService, config) => {
- return StudentDataService.retrieveRunStatus();
- }
- ],
- webSocket: [
- 'StudentWebSocketService',
- 'ConfigService',
- 'config',
- 'project',
- (StudentWebSocketService, ConfigService, config, project) => {
- if (!ConfigService.isPreview()) {
- return StudentWebSocketService.initialize();
- }
- }
- ],
- language: [
- '$translate',
- 'ConfigService',
- 'config',
- ($translate, ConfigService, config) => {
- let locale = ConfigService.getLocale(); // defaults to "en"
- $translate.use(locale);
- }
- ]
- },
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
- return response.data;
- });
- }
- ]
- }
- }
- })
- .state('root.run.node', {
- url: '/:nodeId',
- views: {
- nodeView: {
- templateProvider: [
- '$http',
- 'ConfigService',
- ($http, ConfigService) => {
- let wiseBaseURL = ConfigService.getWISEBaseURL();
- return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
- return response.data;
- });
- }
- ],
- controller: 'NodeController',
- controllerAs: 'nodeController'
- }
- }
- })
- .state("sink", {
- url: "/*path",
- template: ""
- });
-
- $httpProvider.interceptors.push('HttpInterceptor');
-
- // Set up Translations
- $translatePartialLoaderProvider.addPart('i18n');
- $translatePartialLoaderProvider.addPart('vle/i18n');
- $translateProvider
- .useLoader('$translatePartialLoader', {
- urlTemplate: '/wise5/{part}/i18n_{lang}.json'
- })
- .fallbackLanguage(['en'])
- .registerAvailableLanguageKeys(
- ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
- {
- en_US: 'en',
- en_UK: 'en'
- }
- )
- .determinePreferredLanguage()
- .useSanitizeValueStrategy('sanitizeParameters', 'escape');
-
- // ngMaterial default theme configuration
- // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
- $mdThemingProvider.definePalette('primary', {
- '50': 'e1f0f4',
- '100': 'b8dbe4',
- '200': '8ec6d4',
- '300': '5faec2',
- '400': '3d9db5',
- '500': '1c8ca8',
- '600': '197f98',
- '700': '167188',
- '800': '136377',
- '900': '0e4957',
- A100: 'abf3ff',
- A200: '66e2ff',
- A400: '17bee5',
- A700: '00A1C6',
- contrastDefaultColor: 'light', // whether, by default, text (contrast)
- // on this palette should be dark or light
- contrastDarkColors: [
- '50',
- '100', //hues which contrast should be 'dark' by default
- '200',
- '300',
- 'A100'
- ],
- contrastLightColors: undefined // could also specify this if default was 'dark'
- });
-
- $mdThemingProvider.definePalette('accent', {
- '50': 'fde9e6',
- '100': 'fbcbc4',
- '200': 'f8aca1',
- '300': 'f4897b',
- '400': 'f2705f',
- '500': 'f05843',
- '600': 'da503c',
- '700': 'c34736',
- '800': 'aa3e2f',
- '900': '7d2e23',
- A100: 'ff897d',
- A200: 'ff7061',
- A400: 'ff3829',
- A700: 'cc1705',
- contrastDefaultColor: 'light',
- contrastDarkColors: ['50', '100', '200', '300', 'A100'],
- contrastLightColors: undefined
- });
-
- $mdThemingProvider
- .theme('default')
- .primaryPalette('primary')
- .accentPalette('accent', {
- default: '500'
- })
- .warnPalette('red', {
- default: '800'
- });
-
- let lightMap = $mdThemingProvider.extendPalette('grey', {
- A100: 'ffffff'
- });
- $mdThemingProvider.definePalette('light', lightMap);
-
- $mdThemingProvider
- .theme('light')
- .primaryPalette('light', {
- default: 'A100'
- })
- .accentPalette('primary');
-
- $mdThemingProvider.setDefaultTheme('default');
- $mdThemingProvider.enableBrowserColor();
-
- // moment.js default overrides
- // TODO: add i18n support
- moment.updateLocale('en', {
- calendar: {
- lastDay: '[Yesterday at] LT',
- sameDay: '[Today at] LT',
- nextDay: '[Tomorrow at] LT',
- lastWeek: '[last] dddd [at] LT',
- nextWeek: 'dddd [at] LT',
- sameElse: 'll'
- }
- });
- }
- ]);
+import { createModule } from './vlePreviewCommonModule';
+export default createModule('vle');
diff --git a/src/main/webapp/wise5/vle/vleController.ts b/src/main/webapp/wise5/vle/vleController.ts
index eb7df02bdd..e0022a4d77 100644
--- a/src/main/webapp/wise5/vle/vleController.ts
+++ b/src/main/webapp/wise5/vle/vleController.ts
@@ -5,7 +5,7 @@ import { ConfigService } from '../services/configService';
import NotificationService from '../services/notificationService';
import NotebookService from '../services/notebookService';
import { VLEProjectService } from './vleProjectService';
-import SessionService from '../services/sessionService';
+import { SessionService } from '../services/sessionService';
import StudentDataService from '../services/studentDataService';
import * as angular from 'angular';
import * as $ from 'jquery';
@@ -119,6 +119,29 @@ class VLEController {
});
}
+ this.$scope.$on('showSessionWarning', () => {
+ const confirm = $mdDialog
+ .confirm()
+ .parent(angular.element(document.body))
+ .title(this.$translate('SESSION_TIMEOUT'))
+ .content(this.$translate('SESSION_TIMEOUT_MESSAGE'))
+ .ariaLabel(this.$translate('SESSION_TIMEOUT'))
+ .ok(this.$translate('YES'))
+ .cancel(this.$translate('NO'));
+ $mdDialog.show(confirm).then(
+ () => {
+ this.SessionService.closeWarningAndRenewSession();
+ },
+ () => {
+ this.logOut();
+ }
+ );
+ });
+
+ this.$scope.$on('logOut', () => {
+ this.logOut();
+ });
+
this.$scope.$on('currentNodeChanged', (event, args) => {
let previousNode = args.previousNode;
let currentNode = this.StudentDataService.getCurrentNode();
@@ -368,16 +391,15 @@ class VLEController {
event,
eventData
);
-
- this.$rootScope.$broadcast('goHome');
+ this.SessionService.goHome();
}
- logOut() {
+ logOut(eventName = 'logOut') {
const nodeId = null;
const componentId = null;
const componentType = null;
const category = 'Navigation';
- const event = 'logOutButtonClicked';
+ const event = eventName;
const eventData = {};
this.StudentDataService.saveVLEEvent(
nodeId,
@@ -386,9 +408,9 @@ class VLEController {
category,
event,
eventData
- );
-
- this.$rootScope.$broadcast('logOut');
+ ).then(() => {
+ this.SessionService.logOut();
+ });
}
loadRoot() {
diff --git a/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
new file mode 100644
index 0000000000..aa4bb05a5e
--- /dev/null
+++ b/src/main/webapp/wise5/vle/vlePreviewCommonModule.ts
@@ -0,0 +1,426 @@
+import '../lib/jquery/jquery-global';
+import '../lib/bootstrap/js/bootstrap.min'
+import AchievementService from '../services/achievementService';
+import * as angular from 'angular';
+import { downgradeInjectable } from '@angular/upgrade/static';
+import * as angularDragula from 'angular-dragula';
+import 'ng-file-upload';
+import 'angular-material';
+import 'angular-moment';
+import 'ng-onload';
+import 'angular-sanitize';
+import 'ng-stomp';
+import 'angular-toarrayfilter';
+import 'angular-translate';
+import 'angular-translate-loader-partial';
+import 'angular-ui-router';
+import 'angular-ui-scrollpoint';
+import '../components/animation/animationComponentModule';
+import AnnotationService from '../services/annotationService';
+import '../components/audioOscillator/audioOscillatorComponentModule';
+import { AudioRecorderService } from '../services/audioRecorderService';
+import * as canvg from 'canvg';
+import '../components/conceptMap/conceptMapComponentModule';
+import { ConfigService } from '../services/configService';
+import { CRaterService } from '../services/cRaterService';
+import '../directives/components';
+import ComponentService from '../components/componentService';
+import '../components/discussion/discussionComponentModule';
+import '../components/draw/drawComponentModule';
+import '../components/embedded/embeddedComponentModule';
+import * as fabric from 'fabric';
+window['fabric'] = fabric.fabric
+import Filters from '../filters/filters';
+import '../lib/highcharts/highcharts-ng';
+import * as Highcharts from '../lib/highcharts/highcharts.src';
+import '../lib/draggable-points/draggable-points';
+import * as HighchartsExporting from '../lib/highcharts-exporting@4.2.1';
+import * as covariance from 'compute-covariance';
+window['Highcharts'] = Highcharts;
+window['HighchartsExporting'] = HighchartsExporting;
+window['covariance'] = covariance;
+import '../components/graph/graphComponentModule';
+import * as hopscotch from 'hopscotch';
+window['hopscotch'] = hopscotch;
+import '../components/html/htmlComponentModule';
+import HttpInterceptor from '../services/httpInterceptor';
+import '../components/label/labelComponentModule';
+import '../components/match/matchComponentModule';
+import '../components/multipleChoice/multipleChoiceComponentModule';
+import NavigationController from './navigation/navigationController';
+import NodeController from './node/nodeController';
+import NodeService from '../services/nodeService';
+import NotebookService from '../services/notebookService';
+import NotificationService from '../services/notificationService';
+import '../components/openResponse/openResponseComponentModule';
+import '../components/outsideURL/outsideURLComponentModule';
+import { SessionService } from '../services/sessionService';
+import './studentAsset/studentAsset';
+import { StudentAssetService } from '../services/studentAssetService';
+import StudentDataService from '../services/studentDataService';
+import StudentStatusService from '../services/studentStatusService';
+import StudentWebSocketService from '../services/studentWebSocketService';
+import '../components/summary/summaryComponentModule';
+import '../components/table/tableComponentModule';
+import { UtilService } from '../services/utilService';
+import VLEController from './vleController';
+import { VLEProjectService } from './vleProjectService';
+import * as moment from 'moment';
+import * as SockJS from 'sockjs-client';
+import * as StompJS from '@stomp/stompjs';
+window['SockJS'] = SockJS;
+window['Stomp'] = StompJS.Stomp;
+import '../lib/summernote/dist/summernote.min';
+import '../lib/angular-summernote/dist/angular-summernote.min';
+import '../lib/summernoteExtensions/summernote-ext-addNote.js';
+import '../lib/summernoteExtensions/summernote-ext-print.js';
+import '../themes/default/theme';
+
+export function createModule(type = 'preview') {
+ return angular.module(type, [
+ angularDragula(angular),
+ 'angularMoment',
+ 'angular-toArrayFilter',
+ 'animationComponentModule',
+ 'audioOscillatorComponentModule',
+ 'components',
+ 'conceptMapComponentModule',
+ 'discussionComponentModule',
+ 'drawComponentModule',
+ 'embeddedComponentModule',
+ 'filters',
+ 'graphComponentModule',
+ 'highcharts-ng',
+ 'htmlComponentModule',
+ 'labelComponentModule',
+ 'matchComponentModule',
+ 'multipleChoiceComponentModule',
+ 'ngAria',
+ 'ngFileUpload',
+ 'ngMaterial',
+ 'ngOnload',
+ 'ngSanitize',
+ 'ngStomp',
+ 'openResponseComponentModule',
+ 'outsideURLComponentModule',
+ 'pascalprecht.translate',
+ 'studentAsset',
+ 'summaryComponentModule',
+ 'summernote',
+ 'tableComponentModule',
+ 'theme',
+ 'ui.router',
+ 'ui.scrollpoint'
+ ])
+ .service('AchievementService', AchievementService)
+ .service('AnnotationService', AnnotationService)
+ .service('AudioRecorderService', AudioRecorderService)
+ .factory('ConfigService', downgradeInjectable(ConfigService))
+ .service('ComponentService', ComponentService)
+ .factory('CRaterService', downgradeInjectable(CRaterService))
+ .service('HttpInterceptor', HttpInterceptor)
+ .service('NodeService', NodeService)
+ .service('NotebookService', NotebookService)
+ .service('NotificationService', NotificationService)
+ .factory('ProjectService', downgradeInjectable(VLEProjectService))
+ .factory('SessionService', downgradeInjectable(SessionService))
+ .factory('StudentAssetService', downgradeInjectable(StudentAssetService))
+ .service('StudentDataService', StudentDataService)
+ .service('StudentStatusService', StudentStatusService)
+ .service('StudentWebSocketService', StudentWebSocketService)
+ .factory('UtilService', downgradeInjectable(UtilService))
+ .controller('NavigationController', NavigationController)
+ .controller('NodeController', NodeController)
+ .controller('VLEController', VLEController)
+ .filter('Filters', Filters)
+ .config([
+ '$stateProvider',
+ '$translateProvider',
+ '$translatePartialLoaderProvider',
+ '$controllerProvider',
+ '$locationProvider',
+ '$mdThemingProvider',
+ '$httpProvider',
+ (
+ $stateProvider,
+ $translateProvider,
+ $translatePartialLoaderProvider,
+ $controllerProvider,
+ $locationProvider,
+ $mdThemingProvider,
+ $httpProvider
+ ) => {
+ angular.module(type).$controllerProvider = $controllerProvider;
+ $locationProvider.html5Mode(true);
+ $stateProvider
+ .state('root', {
+ url: type === 'preview' ? '/preview' : '/student',
+ abstract: true,
+ resolve: {
+ config: [
+ 'ConfigService',
+ ConfigService => {
+ return ConfigService.retrieveConfig(`/config/vle`);
+ }
+ ]
+ },
+ templateProvider: [
+ '$http',
+ 'ProjectService',
+ ($http, ProjectService) => {
+ let themePath = ProjectService.getThemePath();
+ return $http.get(themePath + '/vle.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'VLEController',
+ controllerAs: 'vleController'
+ })
+ .state(type === 'preview' ? 'root.preview' : 'root.run', {
+ url: type === 'preview' ? '/unit/:projectId' : '/unit/:runId',
+ resolve: {
+ config: [
+ 'ConfigService',
+ '$stateParams',
+ (ConfigService, $stateParams) => {
+ if (type === 'preview') {
+ return ConfigService.retrieveConfig(`/config/preview/${$stateParams.projectId}`);
+ } else {
+ return ConfigService.retrieveConfig(`/config/studentRun/${$stateParams.runId}`);
+ }
+ }
+ ],
+ project: [
+ 'ProjectService',
+ 'config',
+ (ProjectService, config) => {
+ return ProjectService.retrieveProject();
+ }
+ ],
+ studentData: [
+ 'StudentDataService',
+ 'config',
+ 'project',
+ (StudentDataService, config, project) => {
+ return StudentDataService.retrieveStudentData();
+ }
+ ],
+ notebook: [
+ 'NotebookService',
+ 'ConfigService',
+ 'StudentAssetService',
+ 'studentData',
+ 'config',
+ 'project',
+ (
+ NotebookService,
+ ConfigService,
+ StudentAssetService,
+ studentData,
+ config,
+ project
+ ) => {
+ return StudentAssetService.retrieveAssets().then(studentAssets => {
+ return NotebookService.retrieveNotebookItems(ConfigService.getWorkgroupId()).then(
+ notebook => {
+ return notebook;
+ }
+ );
+ });
+ }
+ ],
+ achievements: [
+ 'AchievementService',
+ 'studentData',
+ 'config',
+ 'project',
+ (AchievementService, studentData, config, project) => {
+ return AchievementService.retrieveStudentAchievements();
+ }
+ ],
+ notifications: [
+ 'NotificationService',
+ 'studentData',
+ 'config',
+ 'project',
+ (NotificationService, studentData, config, project) => {
+ return NotificationService.retrieveNotifications();
+ }
+ ],
+ runStatus: [
+ 'StudentDataService',
+ 'config',
+ (StudentDataService, config) => {
+ return StudentDataService.retrieveRunStatus();
+ }
+ ],
+ webSocket: [
+ 'StudentWebSocketService',
+ 'ConfigService',
+ 'config',
+ 'project',
+ (StudentWebSocketService, ConfigService, config, project) => {
+ if (!ConfigService.isPreview()) {
+ return StudentWebSocketService.initialize();
+ }
+ }
+ ],
+ language: [
+ '$translate',
+ 'ConfigService',
+ 'config',
+ ($translate, ConfigService, config) => {
+ let locale = ConfigService.getLocale(); // defaults to "en"
+ $translate.use(locale);
+ }
+ ]
+ },
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/project/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ]
+ }
+ }
+ })
+ .state(type === 'preview' ? 'root.preview.node' : 'root.run.node', {
+ url: '/:nodeId',
+ views: {
+ nodeView: {
+ templateProvider: [
+ '$http',
+ 'ConfigService',
+ ($http, ConfigService) => {
+ let wiseBaseURL = ConfigService.getWISEBaseURL();
+ return $http.get(wiseBaseURL + '/wise5/vle/node/index.html').then(response => {
+ return response.data;
+ });
+ }
+ ],
+ controller: 'NodeController',
+ controllerAs: 'nodeController'
+ }
+ }
+ })
+ .state("sink", {
+ url: "/*path",
+ template: ""
+ });
+
+ $httpProvider.interceptors.push('HttpInterceptor');
+
+ // Set up Translations
+ $translatePartialLoaderProvider.addPart('i18n');
+ $translatePartialLoaderProvider.addPart('vle/i18n');
+ $translateProvider
+ .useLoader('$translatePartialLoader', {
+ urlTemplate: '/wise5/{part}/i18n_{lang}.json'
+ })
+ .fallbackLanguage(['en'])
+ .registerAvailableLanguageKeys(
+ ['ar', 'el', 'en', 'es', 'ja', 'ko', 'pt', 'tr', 'zh_CN', 'zh_TW'],
+ {
+ en_US: 'en',
+ en_UK: 'en'
+ }
+ )
+ .determinePreferredLanguage()
+ .useSanitizeValueStrategy('sanitizeParameters', 'escape');
+
+ // ngMaterial default theme configuration
+ // TODO: make dynamic and support alternate themes; allow projects to specify theme parameters and settings
+ $mdThemingProvider.definePalette('primary', {
+ '50': 'e1f0f4',
+ '100': 'b8dbe4',
+ '200': '8ec6d4',
+ '300': '5faec2',
+ '400': '3d9db5',
+ '500': '1c8ca8',
+ '600': '197f98',
+ '700': '167188',
+ '800': '136377',
+ '900': '0e4957',
+ A100: 'abf3ff',
+ A200: '66e2ff',
+ A400: '17bee5',
+ A700: '00A1C6',
+ contrastDefaultColor: 'light', // whether, by default, text (contrast)
+ // on this palette should be dark or light
+ contrastDarkColors: [
+ '50',
+ '100', //hues which contrast should be 'dark' by default
+ '200',
+ '300',
+ 'A100'
+ ],
+ contrastLightColors: undefined // could also specify this if default was 'dark'
+ });
+
+ $mdThemingProvider.definePalette('accent', {
+ '50': 'fde9e6',
+ '100': 'fbcbc4',
+ '200': 'f8aca1',
+ '300': 'f4897b',
+ '400': 'f2705f',
+ '500': 'f05843',
+ '600': 'da503c',
+ '700': 'c34736',
+ '800': 'aa3e2f',
+ '900': '7d2e23',
+ A100: 'ff897d',
+ A200: 'ff7061',
+ A400: 'ff3829',
+ A700: 'cc1705',
+ contrastDefaultColor: 'light',
+ contrastDarkColors: ['50', '100', '200', '300', 'A100'],
+ contrastLightColors: undefined
+ });
+
+ $mdThemingProvider
+ .theme('default')
+ .primaryPalette('primary')
+ .accentPalette('accent', {
+ default: '500'
+ })
+ .warnPalette('red', {
+ default: '800'
+ });
+
+ let lightMap = $mdThemingProvider.extendPalette('grey', {
+ A100: 'ffffff'
+ });
+ $mdThemingProvider.definePalette('light', lightMap);
+
+ $mdThemingProvider
+ .theme('light')
+ .primaryPalette('light', {
+ default: 'A100'
+ })
+ .accentPalette('primary');
+
+ $mdThemingProvider.setDefaultTheme('default');
+ $mdThemingProvider.enableBrowserColor();
+
+ // moment.js default overrides
+ // TODO: add i18n support
+ moment.updateLocale('en', {
+ calendar: {
+ lastDay: '[Yesterday at] LT',
+ sameDay: '[Today at] LT',
+ nextDay: '[Tomorrow at] LT',
+ lastWeek: '[last] dddd [at] LT',
+ nextWeek: 'dddd [at] LT',
+ sameElse: 'll'
+ }
+ });
+ }
+ ]);
+}
diff --git a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
index 2a8555ad60..6a8c3c4a5c 100644
--- a/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
+++ b/src/test/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDaoTest.java
@@ -92,7 +92,7 @@ public void setUp() throws Exception {
@Test
public void getStudentWorkListByParams_WithRunThatHasNoStudentWork_ShouldReturnNoStudentWork() {
List{{ ::navitemCtrl.nodeTitle }}