Merge branch 'release-5.17.1'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.17.0",
+  "version": "5.17.1",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

pom.xml

@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.17.0</version>
+  <version>5.17.1</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

src/main/resources/version.txt

@@ -1 +1 @@
-5.17.0
+5.17.1

src/main/webapp/wise5/authoringTool/authoringToolController.ts

@@ -1,4 +1,5 @@
 'use strict';
+import { Directive } from '@angular/core';
 import * as angular from 'angular';
 import { Subscription } from 'rxjs';
 import { ConfigService } from '../services/configService';
@@ -7,6 +8,7 @@ import { SessionService } from '../services/sessionService';
 import { TeacherDataService } from '../services/teacherDataService';
 import { TeacherProjectService } from '../services/teacherProjectService';
 
+@Directive()
 class AuthoringToolController {
   $anchorScroll: any;
   $filter: any;

src/main/webapp/wise5/authoringTool/components/shared/toolbar/toolbar.ts

@@ -1,7 +1,9 @@
 'use strict';
 
+import { Directive } from "@angular/core";
 import { NotificationService } from "../../../../services/notificationService";
 
+@Directive()
 class ToolbarController {
   globalMessage: string;
   isJSONValid: boolean = null;

src/main/webapp/wise5/authoringTool/node/nodeAuthoringController.ts

@@ -10,7 +10,9 @@ import * as $ from 'jquery';
 import { TagService } from '../../services/tagService';
 import { NotificationService } from '../../services/notificationService';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class NodeAuthoringController {
   $translate: any;
   authoringNodeContentJSONString: string;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestoneDetails/milestoneDetails.ts

@@ -5,7 +5,9 @@ import { TeacherDataService } from '../../../../services/teacherDataService';
 import * as angular from 'angular';
 import { NodeService } from '../../../../services/nodeService';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class MilestoneDetailsController {
   $translate: any;
   onShowWorkgroup: any;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/nodeGradingView/nodeGradingView.ts

@@ -10,7 +10,9 @@ import { TeacherDataService } from '../../../../services/teacherDataService';
 import * as angular from 'angular';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class NodeGradingViewController {
   $translate: any;
   canViewStudentNames: boolean;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItem/navItem.ts

@@ -9,7 +9,9 @@ import { TeacherWebSocketService } from '../../../../services/teacherWebSocketSe
 import * as $ from 'jquery';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class NavItemController {
   $translate: any;
   alertIconClass: string;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebookItemGrading/notebookItemGrading.ts

@@ -1,11 +1,13 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import { AnnotationService } from '../../../../services/annotationService';
 import { ConfigService } from '../../../../services/configService';
 import { NotebookService } from '../../../../services/notebookService';
 import { TeacherDataService } from '../../../../services/teacherDataService';
 import { UtilService } from '../../../../services/utilService';
 
+@Directive()
 class NotebookItemGradingController {
   annotationId: any;
   canGradeStudentWork: boolean;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/componentGrading/componentGrading.ts

@@ -6,7 +6,9 @@ import { TeacherDataService } from '../../../../services/teacherDataService';
 import { UtilService } from '../../../../services/utilService';
 import * as angular from 'angular';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class ComponentGradingController {
   $translate: any;
   annotationId: number;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/componentNewWorkBadge/componentNewWorkBadge.ts

@@ -1,8 +1,10 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import { AnnotationService } from '../../../../services/annotationService';
 import { TeacherDataService } from '../../../../services/teacherDataService';
 
+@Directive()
 class ComponentNewWorkBadgeController {
   componentId: string;
   hasNewWork: boolean;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/periodSelect/periodSelect.ts

@@ -1,9 +1,11 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import { StudentStatusService } from '../../../../services/studentStatusService';
 import { TeacherDataService } from '../../../../services/teacherDataService';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
 
+@Directive()
 class PeriodSelectController {
   $translate: any;
   currentPeriod: any;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/topBar/topBar.ts

@@ -5,7 +5,9 @@ import { TeacherDataService } from '../../../../services/teacherDataService';
 import { SessionService } from '../../../../services/sessionService';
 import { TeacherProjectService } from '../../../../services/teacherProjectService';
 import { NotificationService } from '../../../../services/notificationService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class TopBarController {
   translate: any;
   avatarColor: any;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/shared/workgroupSelect/workgroupSelect.ts

@@ -3,7 +3,9 @@
 import { ConfigService } from '../../../../services/configService';
 import { TeacherDataService } from '../../../../services/teacherDataService';
 import * as angular from 'angular';
+import { Directive } from '@angular/core';
 
+@Directive()
 class WorkgroupSelectController {
   $translate: any;
   byStudent: boolean;

src/main/webapp/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/studentGradingTools/studentGradingTools.ts

@@ -4,7 +4,9 @@ import { ConfigService } from '../../../../services/configService';
 import { TeacherDataService } from '../../../../services/teacherDataService';
 import * as $ from 'jquery';
 import * as angular from 'angular';
+import { Directive } from '@angular/core';
 
+@Directive()
 class StudentGradingToolsController {
   $translate: any;
   avatarColor: string;

src/main/webapp/wise5/classroomMonitor/classroomMonitorController.ts

@@ -8,7 +8,9 @@ import { TeacherDataService } from '../services/teacherDataService';
 import { SessionService } from '../services/sessionService';
 import * as angular from 'angular';
 import { TeacherProjectService } from '../services/teacherProjectService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class ClassroomMonitorController {
   $translate: any;
   connectionLostDisplay: any;

src/main/webapp/wise5/classroomMonitor/milestones/milestonesController.ts

@@ -1,11 +1,13 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import * as angular from 'angular';
 import { AchievementService } from '../../services/achievementService';
 import { AnnotationService } from '../../services/annotationService';
 import { MilestoneService } from '../../services/milestoneService';
 import { TeacherDataService } from '../../services/teacherDataService';
 
+@Directive()
 class MilestonesController {
   $translate: any;
   milestones: any[];

src/main/webapp/wise5/classroomMonitor/studentGrading/studentGradingController.ts

@@ -8,7 +8,9 @@ import { TeacherDataService } from '../../services/teacherDataService';
 import * as angular from 'angular';
 import { TeacherProjectService } from '../../services/teacherProjectService';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class StudentGradingController {
   $translate: any;
   isExpandAll: boolean;

src/main/webapp/wise5/classroomMonitor/studentProgress/studentProgressController.ts

@@ -1,11 +1,13 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { ConfigService } from '../../services/configService';
 import { StudentStatusService } from '../../services/studentStatusService';
 import { TeacherDataService } from '../../services/teacherDataService';
 import { TeacherWebSocketService } from '../../services/teacherWebSocketService';
 
+@Directive()
 class StudentProgressController {
   currentWorkgroup: any;
   permissions: any;

src/main/webapp/wise5/components/audioOscillator/audioOscillatorController.ts

@@ -1,8 +1,10 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import ComponentController from '../componentController';
 import { AudioOscillatorService } from './audioOscillatorService';
 
+@Directive()
 class AudioOscillatorController extends ComponentController {
   $q: any;
   $timeout: any;

src/main/webapp/wise5/components/componentController.ts

@@ -11,7 +11,9 @@ import { StudentDataService } from "../services/studentDataService";
 import { NotificationService } from '../services/notificationService';
 import { AudioRecorderService } from '../services/audioRecorderService';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class ComponentController {
   $filter: any;
   $injector: any;

src/main/webapp/wise5/components/discussion/discussionController.ts

@@ -3,7 +3,9 @@
 import ComponentController from '../componentController';
 import { DiscussionService } from './discussionService';
 import { NotificationService } from '../../services/notificationService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class DiscussionController extends ComponentController {
   $mdMedia: any;
   $q: any;

src/main/webapp/wise5/components/embedded/embeddedController.ts

@@ -4,7 +4,9 @@ import * as $ from 'jquery';
 import * as html2canvas from 'html2canvas';
 import ComponentController from '../componentController';
 import { EmbeddedService } from './embeddedService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class EmbeddedController extends ComponentController {
   $q: any;
   $sce: any;

src/main/webapp/wise5/components/graph/graphController.ts

@@ -7,7 +7,9 @@ import canvg from 'canvg';
 import html2canvas from 'html2canvas';
 import * as covariance from 'compute-covariance';
 import { Subscription } from 'rxjs';
+import { Directive } from '@angular/core';
 
+@Directive()
 class GraphController extends ComponentController {
   $q: any;
   $timeout: any;

src/main/webapp/wise5/components/match/matchController.ts

@@ -1,9 +1,11 @@
 'use strict';
 
+import { Directive } from '@angular/core';
 import * as angular from 'angular';
 import ComponentController from '../componentController';
 import { MatchService } from './matchService';
 
+@Directive()
 class MatchController extends ComponentController {
   $mdMedia: any;
   $q: any;

src/main/webapp/wise5/vle/node/nodeController.ts

@@ -10,7 +10,9 @@ import * as $ from 'jquery';
 import { Subscription } from 'rxjs';
 import { SessionService } from '../../services/sessionService';
 import { StudentAssetService } from '../../services/studentAssetService';
+import { Directive } from '@angular/core';
 
+@Directive()
 class NodeController {
   $translate: any;
   autoSaveInterval: any;