Merge pull request #1216 from WISE-Community/issue-1198-create-parent…

…-component-service Create parent component service
WISE-Community · May 24, 2018 · 1f47694 · 1f47694
2 parents e5fa256 + 24a1519
commit 1f47694
Show file tree

Hide file tree

Showing 60 changed files with 591 additions and 3,662 deletions.
diff --git a/src/main/webapp/wise5/authoringTool/main.es6 b/src/main/webapp/wise5/authoringTool/main.es6
@@ -28,6 +28,7 @@ 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';
@@ -102,6 +103,7 @@ let authoringModule = angular.module('authoring', [
     ])
     .service(AnnotationService.name, AnnotationService)
     .service(AuthorWebSocketService.name, AuthorWebSocketService)
+    .service(ComponentService.name, ComponentService)
     .service(ConfigService.name, ConfigService)
     .service(CRaterService.name, CRaterService)
     .service(NodeService.name, NodeService)

diff --git a/src/main/webapp/wise5/authoringTool/main.js b/src/main/webapp/wise5/authoringTool/main.js
diff --git a/src/main/webapp/wise5/authoringTool/main.js.map b/src/main/webapp/wise5/authoringTool/main.js.map
diff --git a/src/main/webapp/wise5/classroomMonitor/main.es6 b/src/main/webapp/wise5/classroomMonitor/main.es6
@@ -26,6 +26,7 @@ import ConceptMapComponentModule from '../components/conceptMap/conceptMapCompon
 import ConfigService from '../services/configService';
 import CRaterService from '../services/cRaterService';
 import Components from '../directives/components';
+import ComponentService from '../components/componentService';
 import DashboardController from './dashboard/dashboardController';
 import DataExportController from './dataExport/dataExportController';
 import DiscussionComponentModule from '../components/discussion/discussionComponentModule';
@@ -100,6 +101,7 @@ let classroomMonitorModule = angular.module('classroomMonitor', [
     ])
     .service(AchievementService.name, AchievementService)
     .service(AnnotationService.name, AnnotationService)
+    .service(ComponentService.name, ComponentService)
     .service(ConfigService.name, ConfigService)
     .service(CRaterService.name, CRaterService)
     .service(HttpInterceptor.name, HttpInterceptor)

diff --git a/src/main/webapp/wise5/classroomMonitor/main.js b/src/main/webapp/wise5/classroomMonitor/main.js
diff --git a/src/main/webapp/wise5/classroomMonitor/main.js.map b/src/main/webapp/wise5/classroomMonitor/main.js.map