diff --git a/Gruntfile.js b/Gruntfile.js index ff7e7e4ee..0c0852de5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -54,6 +54,11 @@ module.exports = function (grunt) { src: ['supportCall/**/*.html'], dest: '<%= folders.webapp.build %>/js/supportCallTemplates.js' }, + supportAssignmentApp: { + cwd: '<%= folders.webapp.root %>', + src: ['supportAssignment/**/*.html'], + dest: '<%= folders.webapp.build %>/js/supportAssignmentTemplates.js' + }, courseApp: { cwd: '<%= folders.webapp.root %>', src: ['course/**/*.html'], @@ -232,6 +237,14 @@ module.exports = function (grunt) { ], dest: '<%= folders.webapp.build %>/js/supportCallApp.js' }, + jsSupportAssignment: { + src: [ + '<%= folders.webapp.root %>/supportAssignment/*.js', + '<%= folders.webapp.root %>/supportAssignment/**/*.js', + '<%= ngtemplates.supportAssignmentApp.dest %>' + ], + dest: '<%= folders.webapp.build %>/js/supportAssignmentApp.js' + }, // schedulingApp module files jsScheduling: { src: [ @@ -425,6 +438,7 @@ module.exports = function (grunt) { '<%= folders.webapp.build %>/summary.html', '<%= folders.webapp.build %>/teachingCall.html', '<%= folders.webapp.build %>/supportCall.html', + '<%= folders.webapp.build %>/supportAssignment.html', '<%= folders.webapp.build %>/teachingCallResponseReport.html', '<%= folders.webapp.build %>/workgroup.html'] } @@ -465,6 +479,7 @@ module.exports = function (grunt) { '^/instructionalSupport.* /instructionalSupport.html [L]', '^/teachingCalls.* /teachingCall.html [L]', '^/supportCalls.* /supportCall.html [L]', + '^/supportAssignments.* /supportAssignment.html [L]', '^/scheduling.* /scheduling.html [L]', '^/registrarReconciliationReport.* /registrarReconciliationReport.html [L]', '^/scheduleSummaryReport.* /scheduleSummaryReport.html [L]', @@ -509,7 +524,8 @@ 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:jsSupportCall', 'concat:jsScheduling', 'concat:jsRegistrarReconciliationReport', + 'concat:jsCourse', 'concat:jsAdmin', 'concat:jsBudget', 'concat:jsInstructionalSupport', 'concat:jsWorkgroup', 'concat:jsSummary', 'concat:jsAssignment', 'concat:jsTeachingCall', 'concat:jsSupportCall', + 'concat:jsSupportAssignment', 'concat:jsScheduling', 'concat:jsRegistrarReconciliationReport', 'concat:jsScheduleSummaryReport', 'concat:jsTeachingCallResponseReport', 'concat:cssLib', 'concat:cssShared', 'cachebreaker', 'connect', 'watch']); grunt.registerTask('default', ['serve']); diff --git a/app/instructionalSupport/assignment/controllers/ModalManageInstructorReviewCtrl.js b/app/instructionalSupport/assignment/controllers/ModalManageInstructorReviewCtrl.js deleted file mode 100644 index 32cfc4b36..000000000 --- a/app/instructionalSupport/assignment/controllers/ModalManageInstructorReviewCtrl.js +++ /dev/null @@ -1,3 +0,0 @@ -instructionalSupportApp.controller('ModalManageInstructorReviewCtrl', this.ModalManageInstructorReviewCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators) { - // do nothing -}); \ No newline at end of file diff --git a/app/instructionalSupport/assignment/controllers/ModalManageStudentReviewCtrl.js b/app/instructionalSupport/assignment/controllers/ModalManageStudentReviewCtrl.js deleted file mode 100644 index 32cfc4b36..000000000 --- a/app/instructionalSupport/assignment/controllers/ModalManageStudentReviewCtrl.js +++ /dev/null @@ -1,3 +0,0 @@ -instructionalSupportApp.controller('ModalManageInstructorReviewCtrl', this.ModalManageInstructorReviewCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators) { - // do nothing -}); \ No newline at end of file diff --git a/app/instructionalSupport/instructionalSupportApp.js b/app/instructionalSupport/instructionalSupportApp.js index 75f6f4317..660842e94 100644 --- a/app/instructionalSupport/instructionalSupportApp.js +++ b/app/instructionalSupport/instructionalSupportApp.js @@ -2,21 +2,6 @@ window.instructionalSupportApp = angular.module("instructionalSupportApp", ["sha instructionalSupportApp.config(function ($routeProvider) { return $routeProvider - .when("/", { - templateUrl: "InstructionalSupportAssignment.html", - controller: "InstructionalSupportAssignmentCtrl", - resolve: { - payload: InstructionalSupportAssignmentCtrl.getPayload - } - }) - .when("/:workgroupId/:year/:termShortCode", { - templateUrl: "InstructionalSupportAssignment.html", - controller: "InstructionalSupportAssignmentCtrl", - reloadOnSearch: false, - resolve: { - payload: InstructionalSupportAssignmentCtrl.getPayload - } - }) .when("/:workgroupId/:year/:termShortCode/instructorSupportCallForm", { templateUrl: "InstructorSupportCallForm.html", controller: "InstructorSupportCallFormCtrl", diff --git a/app/instructionalSupport/assignment/controllers/InstructionalSupportAssignmentCtrl.js b/app/supportAssignment/controllers/InstructionalSupportAssignmentCtrl.js similarity index 97% rename from app/instructionalSupport/assignment/controllers/InstructionalSupportAssignmentCtrl.js rename to app/supportAssignment/controllers/InstructionalSupportAssignmentCtrl.js index ffa4da5df..13d65dbbd 100644 --- a/app/instructionalSupport/assignment/controllers/InstructionalSupportAssignmentCtrl.js +++ b/app/supportAssignment/controllers/InstructionalSupportAssignmentCtrl.js @@ -5,7 +5,7 @@ * # AssignmentCtrl * Controller of the ipaClientAngularApp */ -instructionalSupportApp.controller('InstructionalSupportAssignmentCtrl', ['$scope', '$rootScope', '$window', '$location', '$routeParams', '$uibModal', 'instructionalSupportAssignmentActionCreators', '$timeout', +supportAssignmentApp.controller('InstructionalSupportAssignmentCtrl', ['$scope', '$rootScope', '$window', '$location', '$routeParams', '$uibModal', 'instructionalSupportAssignmentActionCreators', '$timeout', this.InstructionalSupportAssignmentCtrl = function ($scope, $rootScope, $window, $location, $routeParams, $uibModal, instructionalSupportAssignmentActionCreators, $timeout) { $window.document.title = "Instructional Support"; $scope.workgroupId = $routeParams.workgroupId; diff --git a/app/instructionalSupport/assignment/controllers/ModalAddAssignmentSlotCtrl.js b/app/supportAssignment/controllers/ModalAddAssignmentSlotCtrl.js similarity index 76% rename from app/instructionalSupport/assignment/controllers/ModalAddAssignmentSlotCtrl.js rename to app/supportAssignment/controllers/ModalAddAssignmentSlotCtrl.js index 065c29b37..2d92c4ce3 100644 --- a/app/instructionalSupport/assignment/controllers/ModalAddAssignmentSlotCtrl.js +++ b/app/supportAssignment/controllers/ModalAddAssignmentSlotCtrl.js @@ -1,4 +1,4 @@ -instructionalSupportApp.controller('ModalAddAssignmentSlotCtrl', this.ModalAddAssignmentSlotCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators, sectionGroupId, appointmentType) { +supportAssignmentApp.controller('ModalAddAssignmentSlotCtrl', this.ModalAddAssignmentSlotCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators, sectionGroupId, appointmentType) { $scope.title = generateTitle($scope.appointmentType); $scope.formData = {appointmentPercentage: 50, numberOfAppointments: 1}; diff --git a/app/supportAssignment/controllers/ModalManageInstructorReviewCtrl.js b/app/supportAssignment/controllers/ModalManageInstructorReviewCtrl.js new file mode 100644 index 000000000..84a099c8f --- /dev/null +++ b/app/supportAssignment/controllers/ModalManageInstructorReviewCtrl.js @@ -0,0 +1,3 @@ +supportAssignmentApp.controller('ModalManageInstructorReviewCtrl', this.ModalManageInstructorReviewCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators) { + // do nothing +}); \ No newline at end of file diff --git a/app/supportAssignment/controllers/ModalManageStudentReviewCtrl.js b/app/supportAssignment/controllers/ModalManageStudentReviewCtrl.js new file mode 100644 index 000000000..84a099c8f --- /dev/null +++ b/app/supportAssignment/controllers/ModalManageStudentReviewCtrl.js @@ -0,0 +1,3 @@ +supportAssignmentApp.controller('ModalManageInstructorReviewCtrl', this.ModalManageInstructorReviewCtrl = function($scope, $rootScope, $uibModalInstance, instructionalSupportAssignmentActionCreators) { + // do nothing +}); \ No newline at end of file diff --git a/app/instructionalSupport/assignment/directives/courseAssignmentSelector.js b/app/supportAssignment/directives/courseAssignmentSelector.js similarity index 79% rename from app/instructionalSupport/assignment/directives/courseAssignmentSelector.js rename to app/supportAssignment/directives/courseAssignmentSelector.js index eb3a42a1b..39ff1a5f9 100644 --- a/app/instructionalSupport/assignment/directives/courseAssignmentSelector.js +++ b/app/supportAssignment/directives/courseAssignmentSelector.js @@ -1,7 +1,7 @@ /** * Provides the main course table in the Courses View */ -instructionalSupportApp.directive("courseAssignmentSelector", this.courseAssignmentSelector = function ($rootScope, instructionalSupportAssignmentActionCreators) { +supportAssignmentApp.directive("courseAssignmentSelector", this.courseAssignmentSelector = function ($rootScope, instructionalSupportAssignmentActionCreators) { return { restrict: 'E', templateUrl: 'CourseAssignmentSelector.html', diff --git a/app/instructionalSupport/assignment/directives/coursePivot.js b/app/supportAssignment/directives/coursePivot.js similarity index 62% rename from app/instructionalSupport/assignment/directives/coursePivot.js rename to app/supportAssignment/directives/coursePivot.js index 154b19c58..d21ce99be 100644 --- a/app/instructionalSupport/assignment/directives/coursePivot.js +++ b/app/supportAssignment/directives/coursePivot.js @@ -1,7 +1,7 @@ /** * Provides the main course table in the Courses View */ -instructionalSupportApp.directive("coursePivot", this.coursePivot = function ($rootScope, instructionalSupportAssignmentActionCreators) { +supportAssignmentApp.directive("coursePivot", this.coursePivot = function ($rootScope, instructionalSupportAssignmentActionCreators) { return { restrict: 'E', templateUrl: 'CoursePivot.html', diff --git a/app/instructionalSupport/assignment/directives/supportStaffPivot.js b/app/supportAssignment/directives/supportStaffPivot.js similarity index 61% rename from app/instructionalSupport/assignment/directives/supportStaffPivot.js rename to app/supportAssignment/directives/supportStaffPivot.js index f7a316ec5..4aa71a1a8 100644 --- a/app/instructionalSupport/assignment/directives/supportStaffPivot.js +++ b/app/supportAssignment/directives/supportStaffPivot.js @@ -1,7 +1,7 @@ /** * Provides the main course table in the Courses View */ -instructionalSupportApp.directive("supportStaffPivot", this.supportStaffPivot = function ($rootScope, instructionalSupportAssignmentActionCreators) { +supportAssignmentApp.directive("supportStaffPivot", this.supportStaffPivot = function ($rootScope, instructionalSupportAssignmentActionCreators) { return { restrict: 'E', templateUrl: 'SupportStaffPivot.html', diff --git a/app/instructionalSupport/assignment/directives/supportStaffSelector.js b/app/supportAssignment/directives/supportStaffSelector.js similarity index 73% rename from app/instructionalSupport/assignment/directives/supportStaffSelector.js rename to app/supportAssignment/directives/supportStaffSelector.js index dbe89d81d..a94896fb2 100644 --- a/app/instructionalSupport/assignment/directives/supportStaffSelector.js +++ b/app/supportAssignment/directives/supportStaffSelector.js @@ -1,7 +1,7 @@ /** * Provides the main course table in the Courses View */ -instructionalSupportApp.directive("supportStaffSelector", this.supportStaffSelector = function ($rootScope, instructionalSupportAssignmentActionCreators) { +supportAssignmentApp.directive("supportStaffSelector", this.supportStaffSelector = function ($rootScope, instructionalSupportAssignmentActionCreators) { return { restrict: 'E', templateUrl: 'SupportStaffSelector.html', diff --git a/app/instructionalSupport/assignment/instructionalSupportAssignment.css b/app/supportAssignment/instructionalSupportAssignment.css similarity index 100% rename from app/instructionalSupport/assignment/instructionalSupportAssignment.css rename to app/supportAssignment/instructionalSupportAssignment.css diff --git a/app/supportAssignment/instructionalSupportCallStatus.css b/app/supportAssignment/instructionalSupportCallStatus.css new file mode 100644 index 000000000..5f3f5ce62 --- /dev/null +++ b/app/supportAssignment/instructionalSupportCallStatus.css @@ -0,0 +1,341 @@ +.neon-dark-confirm-btn, +.neon-dark-confirm-btn:focus, +.neon-dark-confirm-btn:active, +.neon-dark-confirm-btn { + background-color: rgb(48, 54, 65); + border-color: rgb(48, 54, 65); + color: white; +} + +.neon-dark-confirm-btn:hover, +:not(.btn-danger).confirmbutton-yes:hover { + background-color: rgb(18, 24, 35); /* Darker Version for hover */ + color: white; +} + +.neon-dark-confirm-btn.disabled, +.neon-dark-confirm-btn.disabled:hover, +.neon-dark-confirm-btn.disabled:focus, +.neon-dark-confirm-btn.disabled:active { + background-color: rgb(48, 54, 65); + border-color: rgb(48, 54, 65); + color: white; +} + +.btn-default { + background-color: #fff; +} + +.flex { + display: flex; +} + +.flex-auto { + flex: auto; + margin: 2px; + padding: 2px; + overflow: hidden; +} + +.flex-table-content { + flex: 10 0 0px; +} + +.flex-ui-overlay { + flex: 1 0 0px; + display: flex; + justify-content: center; + align-items: center; + visibility: hidden; +} + +.support-call-row { + margin-top: 20px; +} + +.support-call-row:hover .flex-ui-overlay { + visibility: visible; +} + +.delete-support-call-button { + color: rgba(180, 20, 20, 0.8); + font-size: 24px; + padding: 0px; +} + +.table { + margin-top: 20px; +} + +.table-content { + flex: 1 1 0%; + color: black; + align-self: center; + margin: 2px; + padding: 2px; + overflow: hidden; +} + +.table-header { + font-weight: bold; +} + +.table-body { + background: #fff; +} + +.student-summary-header { + text-align: center; + padding-bottom: 5px; + padding-bottom: 25px; +} + +.container-box { + text-align: center; + border-radius: 3px; + border: 1px solid lightgray; + border-left: 4px solid #303641; + padding: 15px 0px 15px 0px; + text-align: center; +} + +.container-box-title { + text-align: center; +} + +.survey-number { + color: #4686A5; +} + +.people-info-icon { + color: #4686A5; +} + + +.begin-support-call-button { + margin-top:20px; + background-color: white; + width: 200px; + border-color: #ccc; +} + +/* teahing-call-status */ + +.instructor-table thead tr :first-child { + /*center checkbox */ + text-align: center !important; +} + +.instructor-table tbody tr :first-child { + /*center checkbox */ + text-align: center !important; +} + +.instructor-section { + margin-bottom: 50px; +} + +.instructor-section .panel-title { + font-weight: bold; +} + +.instructor-section .panel-teaching-call-status{ + border-radius: 0px !important; +} + +.teaching-call-status .btn-default { + border: 1px solid #d2d2d2 !important; +} + +.teaching-call-status .btn-group { + margin-top: 25px; + margin-bottom: 25px; +} + + + +/* modal style */ + +.instructors-modal .modal-header { + background: #303641; + color: white; +} + +.instructors-modal .modal-footer { + background-color:#f8f8f8; +} +.instructor-toggle { + margin: 15px 0px 15px 0px; +} + +.instructor-toggle label { + border: 1px solid #ccc !important; + padding-top: 3px; + padding-bottom: 3px; +} + +.instructor-toggle span { + font-size: 9pt !important; +} + +.instructor-box { + border: 1px solid #ccc !important; + border-radius: 5px; + flex: 1 1 auto; +} + +.instructor-tag { + font-size: 12px; + background-color: white !important; + border: 1px solid #303641 !important; + margin-bottom: 5px; + margin-left: 10px; + margin-top: 5px; + cursor: pointer; +} + +.instructor-tag-display { + background-color: white !important; + margin-bottom: 5px; + margin-left: 5px; + margin-top: 5px; + cursor: default; + +} + +.label-toggleout { + /* styles when toggled out */ + background-color: #ebebeb; + color: #adadad; + border: 1px solid #ebebeb !important; +} + +.remove-instructor-ui { + visibility: hidden; +} + +.table-row:hover .remove-instructor-ui { + visibility: visible; +} + +.teaching-call-status .first-cell { + border-left: 1px solid #ebebeb; +} + +.teaching-call-status .cell { + border-bottom: 1px solid #ebebeb; + border-right: 1px solid #ebebeb; + display: flex; + align-items: center; + justify-content: center; + min-height: 45px; +} + +.teaching-call-status .left-cell { + border-bottom: 1px solid #ebebeb; + border-right: 1px solid #ebebeb; + display: flex; + align-items: center; + min-height: 45px; +} + +.teaching-call-status .header-left-cell { + display: flex; + align-items: center; + border: 1px solid #ebebeb; + color: #a6a7aa; + background-color: #f5f5f6; + min-height: 36px; +} + +.teaching-call-status .header-cell { + display: flex; + align-items: center; + justify-content: center; + border: 1px solid #ebebeb; + color: #a6a7aa; + background-color: #f5f5f6; + min-height: 36px; +} + +.teaching-call-status .column-checkbox { + flex: 1 1 0px; +} + +.teaching-call-status .column-name { + flex: 7 1 0px; +} + +.teaching-call-status .column-last { + flex: 3 1 0px; +} + +.teaching-call-status .column-submitted { + flex: 3 1 0px; +} + +.teaching-call-status .column-due { + flex: 3 1 0px; +} + +.teaching-call-status .column-next { + flex: 3 1 0px; +} + +.teaching-call-status .column-hover-ui { + flex: 1 1 0px; + display: flex; + justify-content: center; + align-items: center; +} + +.table-title { + flex: 19 1 0px; + display: flex; + align-items: center; + font-weight: bold; + min-height: 36px; + color: #373e4a; + background-color: #ffffff; + font-size: 14px; +} + +.assignments-app .teaching-call-status-tooltip.confirmbutton-yes { + color: #fff; + background-color: rgba(180, 20, 20, 0.8); + border: rgba(180, 20, 20, 0.8); +} +.assignments-app .teaching-call-status-tooltip.confirmbutton-yes:hover { + + color: #fff; + background-color: #a11c1c; + border-color: #821717; +} + +.datepicker-bar { + width: 285px; +} + +.teaching-call-status-buttons { + width: 100%; + display: flex; + padding-right: 15px; + padding-bottom: 15px; + padding-top: 20px; +} + +body .support-call-status { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12px; + line-height: 1.42857143; + background-color: #fff; + color: #333; +} + +.allow-submission-row { + margin-bottom: 10px; +} + +.add-support-call-modal .instructor-list { + height: 200px; +} \ No newline at end of file diff --git a/app/supportAssignment/instructorSupportCallForm.css b/app/supportAssignment/instructorSupportCallForm.css new file mode 100644 index 000000000..3ccd5cf90 --- /dev/null +++ b/app/supportAssignment/instructorSupportCallForm.css @@ -0,0 +1,205 @@ +.tacall-instructor-header { + text-align: center; + padding-bottom: 5px; + border-bottom: 2px solid rgb(235, 235, 235); + padding-bottom: 25px; +} + +.main-content { + display: block !important; +} + +.ta-selector { + width: 65%; + margin-bottom: 17px; + align-self: center; +} + +.add-new-slot { + width: 65%; + margin-bottom: 20px; + position: relative; + height: 30px; + padding: 6px; + border: 1px solid #ebebeb; + align-self: center; +} + +.ta-info { + font-size: 8pt; + line-height: 20px; + width: 300px; + padding-left: 0px; + list-style: outside none none; +} + +.ta-slot-remove { + position: absolute; + right: 0; + top: 0; + color: #000; +} + +.ta-slot { + width: 65%; + align-self: center; + text-align: center; + position: relative; + height: 30px; + padding: 6px; + margin-bottom: 25px; +} + +.instructor-application { + display: flex; + flex-direction: row; +} + +.instructor-course-section { + margin-top: 10px; + display: flex; + flex: 1 1 20%; + flex-direction: column; +} + +.ta-section { + flex-direction: column; + display: flex; +} + +.instructor-application_title { + margin-top: 15px; + margin-bottom: 40px; + align-self: center; +} + +.move-ta-icon { + position: absolute; + left: -30px; + font-size: 15pt; + color: #373e4a; + cursor: pointer; +} + +.submit-application { + display: flex; + justify-content: center; +} + +.row { + margin-left: 0px; + margin-right: 0px; +} + +.btn-default p { + text-align: center; +} + +.popover-content { + color: gray; +} + +.selectboxit .selectboxit-option-icon-container { + margin-left: 25% !important; +} + +.page-body .select2-container .select2-choice { + /* adjust selector's height and padding-left */ + height: 30px; + line-height: 30px; + padding-left: 65px; +} + + +/* Comments btn */ + +.instructor-comments-btn { + margin-left: 30px; +} + +.instructor-comments-btn i { + font-size: 12pt; + color: #95989A; +} + +.instructor-comments-btn span { + color: #95989A; +} + +.instructor-comment-container { + flex: 1 0 auto; +} + +h4, .h4 { + font-size: 15px; +} + +.instructor-preference-selector { + width: 65%; + align-self: center; + text-align: center; + position: relative; + height: 30px; + border: 1px solid #ebebeb; + border-radius: 4px; + display: flex; + align-items: center; +} + +/* Properly isolated styles */ +.instructor-support-call-form { + padding-left: 6%; + padding-right:6%; +} + +.instructor-support-call-form .section-group-header { + border-right: 1px solid; + border-color: rgb(235, 235, 235); + color: rgb(51, 51, 51); + background-color: rgb(245, 245, 246); + font-size: 14px; + height: 34px; + display: flex; + justify-content: center; + align-items: center; + border-top: 1px solid rgb(235, 235, 235); + border-left: 1px solid rgb(235, 235, 235); +} + +.instructor-support-call-form .preferences-container { + border-top: 1px solid rgb(235, 235, 235); + border-left: 1px solid rgb(235, 235, 235); + border-bottom: 1px solid rgb(235, 235, 235); + padding-bottom: 10px; + height: 100%; + list-style: none; +} + +.instructor-support-call-form .section-group-container:last-child { + border-right: 1px solid rgb(235, 235, 235); +} + + +.instructor-support-call-form .preference-box { + border-radius: 4px; + border: 1px solid #adadad; + background-color: white; + display: flex; + justify-content: space-between; + width: 200px; + align-items: center; + padding: 10px; +} + +.instructor-support-call-form .instructor-preference { + display: flex; + align-items: center; + justify-content: center; + padding-top: 10px; + color: black; + cursor: pointer; +} + +.instructor-support-call-form .ui-sortable-handle { + cursor: move; +} \ No newline at end of file diff --git a/app/instructionalSupport/assignment/services/InstructionalSupportAssignmentService.js b/app/supportAssignment/services/InstructionalSupportAssignmentService.js similarity index 96% rename from app/instructionalSupport/assignment/services/InstructionalSupportAssignmentService.js rename to app/supportAssignment/services/InstructionalSupportAssignmentService.js index 39eb3169c..9c99b693f 100644 --- a/app/instructionalSupport/assignment/services/InstructionalSupportAssignmentService.js +++ b/app/supportAssignment/services/InstructionalSupportAssignmentService.js @@ -1,4 +1,4 @@ -instructionalSupportApp.factory("instructionalSupportAssignmentService", this.instructionalSupportAssignmentService = function($http, $q, $window) { +supportAssignmentApp.factory("instructionalSupportAssignmentService", this.instructionalSupportAssignmentService = function($http, $q, $window) { return { getInitialState: function(workgroupId, year, termShortCode) { var deferred = $q.defer(); diff --git a/app/instructionalSupport/assignment/services/instructionalSupportAssignmentActionCreators.js b/app/supportAssignment/services/instructionalSupportAssignmentActionCreators.js similarity index 96% rename from app/instructionalSupport/assignment/services/instructionalSupportAssignmentActionCreators.js rename to app/supportAssignment/services/instructionalSupportAssignmentActionCreators.js index 1da3bdcad..4b6a86ed2 100644 --- a/app/instructionalSupport/assignment/services/instructionalSupportAssignmentActionCreators.js +++ b/app/supportAssignment/services/instructionalSupportAssignmentActionCreators.js @@ -1,4 +1,4 @@ -instructionalSupportApp.service('instructionalSupportAssignmentActionCreators', function ($rootScope, $window, instructionalSupportAssignmentService, instructionalSupportAssignmentStateService) { +supportAssignmentApp.service('instructionalSupportAssignmentActionCreators', function ($rootScope, $window, instructionalSupportAssignmentService, instructionalSupportAssignmentStateService) { return { getInitialState: function (workgroupId, year, termShortCode, tab) { instructionalSupportAssignmentService.getInitialState(workgroupId, year, termShortCode).then(function (payload) { diff --git a/app/instructionalSupport/assignment/services/instructionalSupportAssignmentStateService.js b/app/supportAssignment/services/instructionalSupportAssignmentStateService.js similarity index 98% rename from app/instructionalSupport/assignment/services/instructionalSupportAssignmentStateService.js rename to app/supportAssignment/services/instructionalSupportAssignmentStateService.js index 87492d369..e05d60278 100644 --- a/app/instructionalSupport/assignment/services/instructionalSupportAssignmentStateService.js +++ b/app/supportAssignment/services/instructionalSupportAssignmentStateService.js @@ -1,4 +1,4 @@ -instructionalSupportApp.service('instructionalSupportAssignmentStateService', function ($rootScope, $log, supportAssignmentSelectors) { +supportAssignmentApp.service('instructionalSupportAssignmentStateService', function ($rootScope, $log, supportAssignmentSelectors) { return { _state: {}, _sectionGroupReducers: function (action, sectionGroups) { diff --git a/app/instructionalSupport/assignment/services/supportAssignmentSelectors.js b/app/supportAssignment/services/supportAssignmentSelectors.js similarity index 99% rename from app/instructionalSupport/assignment/services/supportAssignmentSelectors.js rename to app/supportAssignment/services/supportAssignmentSelectors.js index 19f1f05e1..5e07a7fd4 100644 --- a/app/instructionalSupport/assignment/services/supportAssignmentSelectors.js +++ b/app/supportAssignment/services/supportAssignmentSelectors.js @@ -1,7 +1,7 @@ /* Selectors are pure javascript functions that translate the normalized state into nested objects for the view */ -instructionalSupportApp.service('supportAssignmentSelectors', function () { +supportAssignmentApp.service('supportAssignmentSelectors', function () { return { /* Page State Schema: diff --git a/app/supportAssignment/supportAssignment.html b/app/supportAssignment/supportAssignment.html new file mode 100644 index 000000000..38d227a0c --- /dev/null +++ b/app/supportAssignment/supportAssignment.html @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + +
+
+
+
+
+
+ + + + + + + + + + + + + + diff --git a/app/supportAssignment/supportAssignmentApp.js b/app/supportAssignment/supportAssignmentApp.js new file mode 100644 index 000000000..5b638285b --- /dev/null +++ b/app/supportAssignment/supportAssignmentApp.js @@ -0,0 +1,50 @@ +window.supportAssignmentApp = angular.module("supportAssignmentApp", ["sharedApp", "ngRoute"]); + +supportAssignmentApp.config(function ($routeProvider) { + return $routeProvider + .when("/", { + templateUrl: "InstructionalSupportAssignment.html", + controller: "InstructionalSupportAssignmentCtrl", + resolve: { + payload: InstructionalSupportAssignmentCtrl.getPayload + } + }) + .when("/:workgroupId/:year/:termShortCode", { + templateUrl: "InstructionalSupportAssignment.html", + controller: "InstructionalSupportAssignmentCtrl", + reloadOnSearch: false, + resolve: { + payload: InstructionalSupportAssignmentCtrl.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/assignment/templates/AddAssignmentSlotModal.html b/app/supportAssignment/templates/AddAssignmentSlotModal.html similarity index 100% rename from app/instructionalSupport/assignment/templates/AddAssignmentSlotModal.html rename to app/supportAssignment/templates/AddAssignmentSlotModal.html diff --git a/app/instructionalSupport/assignment/templates/CourseAssignmentSelector.html b/app/supportAssignment/templates/CourseAssignmentSelector.html similarity index 100% rename from app/instructionalSupport/assignment/templates/CourseAssignmentSelector.html rename to app/supportAssignment/templates/CourseAssignmentSelector.html diff --git a/app/instructionalSupport/assignment/templates/CoursePivot.html b/app/supportAssignment/templates/CoursePivot.html similarity index 100% rename from app/instructionalSupport/assignment/templates/CoursePivot.html rename to app/supportAssignment/templates/CoursePivot.html diff --git a/app/instructionalSupport/assignment/templates/InstructionalSupportAssignment.html b/app/supportAssignment/templates/InstructionalSupportAssignment.html similarity index 100% rename from app/instructionalSupport/assignment/templates/InstructionalSupportAssignment.html rename to app/supportAssignment/templates/InstructionalSupportAssignment.html diff --git a/app/instructionalSupport/assignment/templates/SupportStaffPivot.html b/app/supportAssignment/templates/SupportStaffPivot.html similarity index 100% rename from app/instructionalSupport/assignment/templates/SupportStaffPivot.html rename to app/supportAssignment/templates/SupportStaffPivot.html diff --git a/app/instructionalSupport/assignment/templates/SupportStaffSelector.html b/app/supportAssignment/templates/SupportStaffSelector.html similarity index 100% rename from app/instructionalSupport/assignment/templates/SupportStaffSelector.html rename to app/supportAssignment/templates/SupportStaffSelector.html diff --git a/app/supportCall/supportCallApp.js b/app/supportCall/supportCallApp.js index 4972f660d..3ea244747 100644 --- a/app/supportCall/supportCallApp.js +++ b/app/supportCall/supportCallApp.js @@ -2,7 +2,7 @@ window.supportCallApp = angular.module("supportCallApp", ["sharedApp", "ngRoute" supportCallApp.config(function ($routeProvider) { return $routeProvider - .when("/:workgroupId/:year/:termShortCode/supportCallStatus", { + .when("/:workgroupId/:year/:termShortCode", { templateUrl: "SupportCallStatus.html", controller: "InstructionalSupportCallStatusCtrl", resolve: {