Merge branch 'release-5.15.3'

WISE-Community · Sep 2, 2020 · 232578f · 232578f
2 parents ebfa2d5 + 566d5fb
commit 232578f
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 173 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.15.2",
+  "version": "5.15.3",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.15.2</version>
+  <version>5.15.3</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.15.2
+5.15.3
diff --git a/src/main/webapp/wise5/authoringTool/project/project.html b/src/main/webapp/wise5/authoringTool/project/project.html
@@ -202,7 +202,7 @@
                   <md-icon>check</md-icon>
                   <md-tooltip md-direction="top" class="projectButtonTooltip">{{ ::"create" | translate }}</md-tooltip>
                 </md-button>
-                <md-button id="createGroupCancelButton" class='createButton md-raised md-primary' ng-click='projectController.cancelCreateGroupClicked()'>
+                <md-button id="createGroupCancelButton" class='createButton md-raised md-primary' ng-click='projectController.showProjectView()'>
                   <md-icon>close</md-icon>
                   <md-tooltip md-direction="top" class="projectButtonTooltip">{{ ::"CANCEL" | translate }}</md-tooltip>
                 </md-button>
@@ -222,7 +222,7 @@
                   <md-icon>check</md-icon>
                   <md-tooltip md-direction="top" class="projectButtonTooltip">{{ ::"create" | translate }}</md-tooltip>
                 </md-button>
-                <md-button id="createNodeCancelButton" class='createButton md-raised md-primary' ng-click='projectController.cancelCreateNodeClicked()'>
+                <md-button id="createNodeCancelButton" class='createButton md-raised md-primary' ng-click='projectController.showProjectView()'>
                   <md-icon>close</md-icon>
                   <md-tooltip md-direction="top" class="projectButtonTooltip">{{ ::"CANCEL" | translate }}</md-tooltip>
                 </md-button>

diff --git a/src/main/webapp/wise5/authoringTool/project/projectController.ts b/src/main/webapp/wise5/authoringTool/project/projectController.ts
@@ -19,7 +19,6 @@ class ProjectController {
   projectTitle: string;
   showCreateGroup: boolean = false;
   showCreateNode: boolean = false;
-  showTemplateChooser: boolean;
 
   inactiveGroupNodes: any[];
   inactiveStepNodes: any[];
@@ -59,13 +58,10 @@ class ProjectController {
   ];
 
   static $inject = [
-    '$anchorScroll',
     '$filter',
     '$mdDialog',
-    '$rootScope',
     '$scope',
     '$state',
-    '$stateParams',
     '$stomp',
     '$timeout',
     '$transitions',
@@ -77,13 +73,10 @@ class ProjectController {
   ];
 
   constructor(
-    private $anchorScroll: any,
     $filter,
     private $mdDialog,
-    private $rootScope,
     private $scope,
     private $state,
-    $stateParams,
     private $stomp,
     private $timeout,
     private $transitions,
@@ -98,7 +91,7 @@ class ProjectController {
     this.ProjectService = ProjectService;
     this.TeacherDataService = TeacherDataService;
     this.UtilService = UtilService;
-    this.projectId = $stateParams.projectId;
+    this.projectId = this.ConfigService.getProjectId();
     this.runId = this.ConfigService.getRunId();
     this.items = this.ProjectService.idToOrder;
     this.nodeIds = this.ProjectService.getFlattenedProjectAsNodeIds();
@@ -137,10 +130,6 @@ class ProjectController {
       this.scrollToBottomOfPage();
     });
 
-    this.$rootScope.$on('$stateChangeSuccess', (event, transition) => {
-      this.scrollToBottomOfPage();
-    });
-
     this.saveEvent('projectOpened', 'Navigation');
 
     /*
@@ -170,20 +159,16 @@ class ProjectController {
     });
   }
 
-  previewProject() {
-    const previewProjectEventData = { constraints: true };
+  previewProject(enableConstraints: boolean = true) {
+    const previewProjectEventData = { constraints: enableConstraints };
     this.saveEvent('projectPreviewed', 'Navigation', previewProjectEventData);
     window.open(
-      `${this.ConfigService.getConfigParam('previewProjectURL')}`
+      `${this.ConfigService.getConfigParam('previewProjectURL')}?constraints=${enableConstraints}`
     );
   }
 
   previewProjectWithoutConstraints() {
-    const previewProjectEventData = { constraints: false };
-    this.saveEvent('projectPreviewed', 'Navigation', previewProjectEventData);
-    window.open(
-      `${this.ConfigService.getConfigParam('previewProjectURL')}?constraints=false`
-    );
+    this.previewProject(false);
   }
 
   viewProjectAssets() {
@@ -244,11 +229,6 @@ class ProjectController {
     this.$state.go('root.at.project.node', { projectId: this.projectId, nodeId: nodeId });
   }
 
-  /**
-   * The constraint icon on a step in the project view was clicked.
-   * We will open the constraint view for the step.
-   * @param nodeId The node id of the step.
-   */
   constraintIconClicked(nodeId) {
     this.TeacherDataService.endCurrentNodeAndSetCurrentNodeByNodeId(nodeId);
     this.$state.go('root.at.project.nodeConstraints', {
@@ -257,11 +237,6 @@ class ProjectController {
     });
   }
 
-  /**
-   * The branch icon on a step in the project view was clicked.
-   * We will open the transitions view for the step.
-   * @param nodeId The node id of the step.
-   */
   branchIconClicked(nodeId) {
     this.TeacherDataService.endCurrentNodeAndSetCurrentNodeByNodeId(nodeId);
     this.$state.go('root.at.project.nodeEditPaths', { projectId: this.projectId, nodeId: nodeId });
@@ -710,11 +685,6 @@ class ProjectController {
     });
   }
 
-  projectTitleChanged() {
-    this.ProjectService.setProjectTitle(this.projectTitle);
-    this.ProjectService.saveProject();
-  }
-
   importStep() {
     this.$state.go('root.at.project.import-step.choose-step', { projectId: this.projectId });
   }
@@ -731,48 +701,34 @@ class ProjectController {
     });
   }
 
-  /**
-   * Check if the specified node is in any branch path
-   * @param nodeId the node id of the node
-   * @return whether the node is in any branch path
-   */
   isNodeInAnyBranchPath(nodeId) {
     return this.ProjectService.isNodeInAnyBranchPath(nodeId);
   }
 
+  showProjectView() {
+    this.clearNodeAndGroupTitle();
+    this.showCreateGroup = false;
+    this.showCreateNode = false;
+  }
+
   toggleView(view) {
-    this.createGroupTitle = '';
-    this.createNodeTitle = '';
-    if (view === 'project') {
-      this.showCreateGroup = false;
-      this.showCreateNode = false;
-    } else if (view === 'createGroup') {
+    this.clearNodeAndGroupTitle();
+    if (view === 'createGroup') {
       this.showCreateGroup = !this.showCreateGroup;
       this.showCreateNode = false;
     } else if (view === 'createNode') {
       this.showCreateGroup = false;
       this.showCreateNode = !this.showCreateNode;
-      this.showTemplateChooser = false;
     }
   }
 
-  goBackToProjectList() {
-    this.$state.go('root.at.main');
-  }
-
-  projectHomeClicked() {
-    this.showProjectHome();
-  }
-
-  showProjectHome() {
-    // we are going to the project view so we will set the current node to null
-    this.TeacherDataService.setCurrentNode(null);
-    this.toggleView('project');
-    this.scrollToTopOfPage();
+  clearNodeAndGroupTitle() {
+    this.createGroupTitle = '';
+    this.createNodeTitle = '';
   }
 
-  scrollToTopOfPage() {
-    this.$anchorScroll('top');
+  goBackToProjectList() {
+    this.$state.go('root.at.main');
   }
 
   scrollToBottomOfPage() {
@@ -784,14 +740,6 @@ class ProjectController {
     );
   }
 
-  cancelCreateGroupClicked() {
-    this.toggleView('project');
-  }
-
-  cancelCreateNodeClicked() {
-    this.toggleView('project');
-  }
-
   /**
    * Temporarily highlight the new nodes to draw attention to them
    * @param newNodes the new nodes to highlight
@@ -964,7 +912,7 @@ class ProjectController {
   }
 
   getNumberOfConstraintsOnNode(nodeId) {
-    let constraints = this.ProjectService.getConstraintsOnNode(nodeId);
+    const constraints = this.ProjectService.getConstraintsOnNode(nodeId);
     return constraints.length;
   }
 

diff --git a/...app/wise5/classroomMonitor/classroomMonitorComponents/shared/periodSelect/periodSelect.ts b/...app/wise5/classroomMonitor/classroomMonitorComponents/shared/periodSelect/periodSelect.ts
@@ -77,7 +77,7 @@ class PeriodSelectController {
 
   getSelectedText() {
     if (this.currentPeriod.periodId === -1) {
-      return this.currentPeriod.periodName;
+      return this.$translate('allPeriods');
     } else {
       return this.$translate('periodLabel', { name: this.currentPeriod.periodName });
     }