From 3e42f6392121bca3a4c10be2129908305d104e23 Mon Sep 17 00:00:00 2001 From: Lloyd Wheeler Date: Tue, 28 Nov 2017 15:30:00 -0800 Subject: [PATCH] SupportCall: Moving support call status into a separate angular app #1450 --- Gruntfile.js | 17 ++++- apache_rewrite_rules.txt | 1 + .../instructionalSupportApp.js | 7 -- .../InstructionalSupportCallStatusCtrl.js | 2 +- .../controllers/ModalAddSupportCallCtrl.js | 2 +- .../ModalContactSupportCallCtrl.js | 2 +- .../instructorSupportCallTooltip.js | 0 .../directives/modalAddSupportCall.js | 0 .../directives/studentSupportCallTooltip.js | 0 .../instructionalSupportCallConfig.css | 0 .../instructionalSupportCallStatus.css | 0 ...uctionalSupportCallStatusActionCreators.js | 2 +- .../instructionalSupportCallStatusService.js | 2 +- .../services/supportCallStatusSelectors.js | 2 +- .../services/supportCallStatusStateService.js | 2 +- app/supportCall/supportCall.html | 66 +++++++++++++++++++ app/supportCall/supportCallApp.js | 42 ++++++++++++ .../templates/AddSupportCallModal.html | 0 .../templates/ContactSupportCallModal.html | 0 .../templates/SupportCallStatus.html | 0 20 files changed, 132 insertions(+), 15 deletions(-) rename app/{instructionalSupport/supportCallStatus => supportCall}/controllers/InstructionalSupportCallStatusCtrl.js (96%) rename app/{instructionalSupport/supportCallStatus => supportCall}/controllers/ModalAddSupportCallCtrl.js (98%) rename app/{instructionalSupport/supportCallStatus => supportCall}/controllers/ModalContactSupportCallCtrl.js (89%) rename app/{instructionalSupport/supportCallStatus => supportCall}/directives/instructorSupportCallTooltip.js (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/directives/modalAddSupportCall.js (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/directives/studentSupportCallTooltip.js (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/instructionalSupportCallConfig.css (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/instructionalSupportCallStatus.css (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/services/instructionalSupportCallStatusActionCreators.js (96%) rename app/{instructionalSupport/supportCallStatus => supportCall}/services/instructionalSupportCallStatusService.js (95%) rename app/{instructionalSupport/supportCallStatus => supportCall}/services/supportCallStatusSelectors.js (98%) rename app/{instructionalSupport/supportCallStatus => supportCall}/services/supportCallStatusStateService.js (99%) create mode 100644 app/supportCall/supportCall.html create mode 100644 app/supportCall/supportCallApp.js rename app/{instructionalSupport/supportCallStatus => supportCall}/templates/AddSupportCallModal.html (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/templates/ContactSupportCallModal.html (100%) rename app/{instructionalSupport/supportCallStatus => supportCall}/templates/SupportCallStatus.html (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 7a2d790dc..ff7e7e4ee 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -49,6 +49,11 @@ module.exports = function (grunt) { src: ['teachingCall/**/*.html'], dest: '<%= folders.webapp.build %>/js/teachingCallTemplates.js' }, + supportCallApp: { + cwd: '<%= folders.webapp.root %>', + src: ['supportCall/**/*.html'], + dest: '<%= folders.webapp.build %>/js/supportCallTemplates.js' + }, courseApp: { cwd: '<%= folders.webapp.root %>', src: ['course/**/*.html'], @@ -219,6 +224,14 @@ module.exports = function (grunt) { ], dest: '<%= folders.webapp.build %>/js/teachingCallApp.js' }, + jsSupportCall: { + src: [ + '<%= folders.webapp.root %>/supportCall/*.js', + '<%= folders.webapp.root %>/supportCall/**/*.js', + '<%= ngtemplates.supportCallApp.dest %>' + ], + dest: '<%= folders.webapp.build %>/js/supportCallApp.js' + }, // schedulingApp module files jsScheduling: { src: [ @@ -411,6 +424,7 @@ module.exports = function (grunt) { '<%= folders.webapp.build %>/scheduling.html', '<%= folders.webapp.build %>/summary.html', '<%= folders.webapp.build %>/teachingCall.html', + '<%= folders.webapp.build %>/supportCall.html', '<%= folders.webapp.build %>/teachingCallResponseReport.html', '<%= folders.webapp.build %>/workgroup.html'] } @@ -450,6 +464,7 @@ module.exports = function (grunt) { '^/assignments.* /assignment.html [L]', '^/instructionalSupport.* /instructionalSupport.html [L]', '^/teachingCalls.* /teachingCall.html [L]', + '^/supportCalls.* /supportCall.html [L]', '^/scheduling.* /scheduling.html [L]', '^/registrarReconciliationReport.* /registrarReconciliationReport.html [L]', '^/scheduleSummaryReport.* /scheduleSummaryReport.html [L]', @@ -494,7 +509,7 @@ module.exports = function (grunt) { 'concat:jsRegistrarReconciliationReport', 'concat:jsScheduleSummaryReport', 'concat:jsTeachingCallResponseReport', 'concat:cssLib', 'concat:cssShared', 'uglify:dist', 'cssmin', 'cachebreaker']); grunt.registerTask('serve', ['clean', 'eslint', 'copy', 'ngtemplates', 'bower_concat', 'concat:jsShared', 'concat:jsConfig', 'concat:jsDevSnippets', - 'concat:jsCourse', 'concat:jsAdmin', 'concat:jsBudget', 'concat:jsInstructionalSupport', 'concat:jsWorkgroup', 'concat:jsSummary', 'concat:jsAssignment', 'concat:jsTeachingCall', 'concat:jsScheduling', 'concat:jsRegistrarReconciliationReport', + 'concat:jsCourse', 'concat:jsAdmin', 'concat:jsBudget', 'concat:jsInstructionalSupport', 'concat:jsWorkgroup', 'concat:jsSummary', 'concat:jsAssignment', 'concat:jsTeachingCall', 'concat:jsSupportCall', 'concat:jsScheduling', 'concat:jsRegistrarReconciliationReport', 'concat:jsScheduleSummaryReport', 'concat:jsTeachingCallResponseReport', 'concat:cssLib', 'concat:cssShared', 'cachebreaker', 'connect', 'watch']); grunt.registerTask('default', ['serve']); diff --git a/apache_rewrite_rules.txt b/apache_rewrite_rules.txt index e0a1af58c..6c8d3b223 100644 --- a/apache_rewrite_rules.txt +++ b/apache_rewrite_rules.txt @@ -6,5 +6,6 @@ RewriteRule ^summary(.+)(? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + +
+
+
+
+
+
+ + + + + + + + + + + + + + diff --git a/app/supportCall/supportCallApp.js b/app/supportCall/supportCallApp.js new file mode 100644 index 000000000..4972f660d --- /dev/null +++ b/app/supportCall/supportCallApp.js @@ -0,0 +1,42 @@ +window.supportCallApp = angular.module("supportCallApp", ["sharedApp", "ngRoute"]); + +supportCallApp.config(function ($routeProvider) { + return $routeProvider + .when("/:workgroupId/:year/:termShortCode/supportCallStatus", { + templateUrl: "SupportCallStatus.html", + controller: "InstructionalSupportCallStatusCtrl", + resolve: { + validate: InstructionalSupportCallStatusCtrl.getPayload + } + }) + .otherwise({ + redirectTo: "/" + }); +}); + +// UNSORTED ACTIONS +var INIT_STATE = "INIT_STATE"; +var ADD_ASSIGNMENT_SLOTS = "ADD_ASSIGNMENT_SLOTS"; +var TOGGLE_ASSIGNMENT_PIVOT_VIEW = "TOGGLE_ASSIGNMENT_PIVOT_VIEW"; +var DELETE_ASSIGNMENT = "DELETE_ASSIGNMENT"; +var ADD_STUDENT_SUPPORT_CALL = "ADD_STUDENT_SUPPORT_CALL"; +var DELETE_STUDENT_SUPPORT_CALL = "DELETE_STUDENT_SUPPORT_CALL"; +var ADD_INSTRUCTOR_SUPPORT_CALL = "ADD_INSTRUCTOR_SUPPORT_CALL"; +var DELETE_INSTRUCTOR_SUPPORT_CALL = "DELETE_INSTRUCTOR_SUPPORT_CALL"; +var ADD_STUDENT_PREFERENCE = "ADD_STUDENT_PREFERENCE"; +var DELETE_STUDENT_PREFERENCE = "DELETE_STUDENT_PREFERENCE"; +var ASSIGN_STAFF_TO_SLOT = "ASSIGN_STAFF_TO_SLOT"; +var REMOVE_STAFF_FROM_SLOT = "REMOVE_STAFF_FROM_SLOT"; +var UPDATE_SUPPORT_CALL_RESPONSE = "UPDATE_SUPPORT_CALL_RESPONSE"; +var UPDATE_PREFERENCES_ORDER = "UPDATE_PREFERENCES_ORDER"; +var OPEN_INSTRUCTOR_SUPPORT_CALL_REVIEW = "OPEN_INSTRUCTOR_SUPPORT_CALL_REVIEW"; +var OPEN_STUDENT_SUPPORT_CALL_REVIEW = "OPEN_STUDENT_SUPPORT_CALL_REVIEW"; +var ADD_INSTRUCTOR_PREFERENCE = "ADD_INSTRUCTOR_PREFERENCE"; +var DELETE_INSTRUCTOR_PREFERENCE = "DELETE_INSTRUCTOR_PREFERENCE"; +var CONTACT_STUDENT_SUPPORT_CALL = "CONTACT_STUDENT_SUPPORT_CALL"; +var CONTACT_INSTRUCTOR_SUPPORT_CALL = "CONTACT_INSTRUCTOR_SUPPORT_CALL"; +var UPDATE_TABLE_FILTER = "UPDATE_TABLE_FILTER"; +var UPDATE_INSTRUCTOR_SUPPORT_CALL_REVIEW = "UPDATE_INSTRUCTOR_SUPPORT_CALL_REVIEW"; +var UPDATE_SUPPORT_STAFF_SUPPORT_CALL_REVIEW = "UPDATE_SUPPORT_STAFF_SUPPORT_CALL_REVIEW"; +var UPDATE_PREFERENCE = "UPDATE_PREFERENCE"; +var ASSIGN_STAFF_TO_SECTION_GROUP_SLOT = "ASSIGN_STAFF_TO_SECTION_GROUP_SLOT"; \ No newline at end of file diff --git a/app/instructionalSupport/supportCallStatus/templates/AddSupportCallModal.html b/app/supportCall/templates/AddSupportCallModal.html similarity index 100% rename from app/instructionalSupport/supportCallStatus/templates/AddSupportCallModal.html rename to app/supportCall/templates/AddSupportCallModal.html diff --git a/app/instructionalSupport/supportCallStatus/templates/ContactSupportCallModal.html b/app/supportCall/templates/ContactSupportCallModal.html similarity index 100% rename from app/instructionalSupport/supportCallStatus/templates/ContactSupportCallModal.html rename to app/supportCall/templates/ContactSupportCallModal.html diff --git a/app/instructionalSupport/supportCallStatus/templates/SupportCallStatus.html b/app/supportCall/templates/SupportCallStatus.html similarity index 100% rename from app/instructionalSupport/supportCallStatus/templates/SupportCallStatus.html rename to app/supportCall/templates/SupportCallStatus.html