+ ng-class="{ 'checked': supportCallResponse.eligibilityConfirmed }">
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
index 0ef0ba90b..0c5f60eed 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
@@ -7,23 +7,13 @@ instructionalSupportApp.directive("confirmEligible", this.confirmEligible = func
state: '<'
},
link: function (scope, element, attrs) {
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
- });
-
- scope.mapStateToProps = function(state) {
- scope.props.supportCallResponse = state.supportCallResponse;
- scope.props.supportCallResponse.eligibilityConfirmed = Boolean(scope.props.supportCallResponse.eligibilityConfirmed);
- };
+ // Intentionally blank
scope.toggleEligibilityConfirmed = function() {
scope.props.supportCallResponse.eligibilityConfirmed = !scope.props.supportCallResponse.eligibilityConfirmed;
studentActions.updateSupportCallResponse(scope.props.supportCallResponse);
};
-
- scope.props = {};
- scope.mapStateToProps(scope.state);
}
};
});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js b/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
index aacbecc48..44116f7ba 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
@@ -1,22 +1,13 @@
-instructionalSupportApp.directive("confirmEligible", this.confirmEligible = function () {
+instructionalSupportApp.directive("modalPreferenceComments", this.modalPreferenceComments = function () {
return {
restrict: 'E',
- templateUrl: 'confirmEligible.html',
+ templateUrl: 'modalPreferenceComments.html',
replace: true,
scope: {
state: '<'
},
link: function (scope, element, attrs) {
- scope.props = {};
- scope.mapStateToProps(scope.state);
-
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
- });
-
- scope.mapStateToProps = function(state) {
- return state;
- };
+ // Intentionally blank
scope.submit = function () {
supportStaffFormActionCreators.updatePreference(scope.state.misc.scheduleId, scope.preference);
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.html b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.html
index e69de29bb..04891d085 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.html
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.html
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
index 9ddd850b1..ff7a48b4f 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
@@ -8,15 +8,16 @@ instructionalSupportApp.directive("crnAvailable", this.crnAvailable = function (
},
link: function (scope, element, attrs) {
scope.props = {};
- scope.mapStateToProps(scope.state);
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
+ scope.$watch('state',function() {
+ scope.mapStateToProps(scope.state);
});
scope.mapStateToProps = function(state) {
- return state;
+ scope.props.state = state;
};
+
+ scope.mapStateToProps(scope.state);
}
};
});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.html b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.html
index e69de29bb..005ad12a7 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.html
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.html
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
index d3b175bc3..68fc319f2 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
@@ -8,15 +8,16 @@ instructionalSupportApp.directive("gridAvailable", this.gridAvailable = function
},
link: function (scope, element, attrs) {
scope.props = {};
- scope.mapStateToProps(scope.state);
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
+ scope.$watch('state',function() {
+ scope.mapStateToProps(scope.state);
});
scope.mapStateToProps = function(state) {
- return state;
+ scope.props.state = state;
};
+
+ scope.mapStateToProps(scope.state);
}
};
});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.html b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.html
index e69de29bb..085494018 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.html
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.html
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
index 44d2a30f5..49d5c5e59 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
@@ -7,16 +7,7 @@ instructionalSupportApp.directive("studentAvailabilities", this.studentAvailabil
state: '<'
},
link: function (scope, element, attrs) {
- scope.props = {};
- scope.mapStateToProps(scope.state);
-
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
- });
-
- scope.mapStateToProps = function(state) {
- return state;
- };
+ // Intentionally blank
}
};
});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.css b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.css
index ae1d6e6a7..76dd75de4 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.css
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.css
@@ -1,3 +1,17 @@
.student-comments {
+}
+
+.student-comments__text {
+ display: block;
+ width: 100%;
+ height: 180px;
+ padding: 6px 12px;
+ font-size: 12px;
+ line-height: 1.42857143;
+ color: #555;
+ background-color: #fff;
+ background-image: none;
+ border: 1px solid #ebebeb;
+ border-radius: 3px;
}
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.html b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.html
index 33183d3e3..6167faee9 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.html
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.html
@@ -1,8 +1,8 @@
-
-
+
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
index f68cfc5db..fd25b326f 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
@@ -7,16 +7,7 @@ instructionalSupportApp.directive("studentPreferences", this.studentPreferences
state: '<'
},
link: function (scope, element, attrs) {
- scope.props = {};
- scope.mapStateToProps(scope.state);
-
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
- });
-
- scope.mapStateToProps = function(state) {
- return state;
- };
+ // Intentionally blank
}
};
});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.css b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.css
new file mode 100644
index 000000000..57c5bf394
--- /dev/null
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.css
@@ -0,0 +1,17 @@
+.student-qualifications {
+
+}
+
+.student-qualifications__text {
+ display: block;
+ width: 100%;
+ height: 180px;
+ padding: 6px 12px;
+ font-size: 12px;
+ line-height: 1.42857143;
+ color: #555;
+ background-color: #fff;
+ background-image: none;
+ border: 1px solid #ebebeb;
+ border-radius: 3px;
+}
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.html b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.html
new file mode 100644
index 000000000..e131f1e82
--- /dev/null
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.html
@@ -0,0 +1,8 @@
+
+
Teaching Qualification
+
+
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.js b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.js
new file mode 100644
index 000000000..e02809682
--- /dev/null
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentQualifications/studentQualifications.js
@@ -0,0 +1,15 @@
+instructionalSupportApp.directive("studentQualifications", this.studentQualifications = function (studentActions) {
+ return {
+ restrict: 'E',
+ templateUrl: 'studentQualifications.html',
+ replace: true,
+ scope: {
+ supportCallResponse: '<'
+ },
+ link: function (scope, element, attrs) {
+ scope.updateSupportCallResponse = function() {
+ studentActions.updateSupportCallResponse($scope.props.state.supportCallResponse);
+ };
+ }
+ };
+});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.css b/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.html b/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.html
deleted file mode 100644
index c3c2e8fd3..000000000
--- a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
Teaching Qualification
-
-
-
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js b/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js
deleted file mode 100644
index 46f5e4744..000000000
--- a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js
+++ /dev/null
@@ -1,22 +0,0 @@
-instructionalSupportApp.directive("teachingQualifications", this.teachingQualifications = function () {
- return {
- restrict: 'E',
- templateUrl: 'teachingQualifications.html',
- replace: true,
- scope: {
- state: '<'
- },
- link: function (scope, element, attrs) {
- scope.props = {};
- scope.mapStateToProps(scope.state);
-
- $rootScope.$on('supportStaffFormStateChanged', function (event, data) {
- scope.mapStateToProps(data);
- });
-
- scope.mapStateToProps = function(state) {
- return state;
- };
- }
- };
-});
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/services/studentReducers.js b/app/instructionalSupport/studentSupportCallForm/services/studentReducers.js
index 45753e875..b7fdd7ec2 100644
--- a/app/instructionalSupport/studentSupportCallForm/services/studentReducers.js
+++ b/app/instructionalSupport/studentSupportCallForm/services/studentReducers.js
@@ -147,6 +147,8 @@ instructionalSupportApp.service('studentReducers', function ($rootScope, $log, s
}
},
reduce: function (action) {
+ var scope = this;
+
newState = {};
newState.courses = scope._courseReducers(action, scope._state.courses);
newState.sectionGroups = scope._sectionGroupReducers(action, scope._state.sectionGroups);
diff --git a/app/instructionalSupport/studentSupportCallForm/studentSupportCallForm.css b/app/instructionalSupport/studentSupportCallForm/studentSupportCallForm.css
new file mode 100644
index 000000000..5a0c2f79e
--- /dev/null
+++ b/app/instructionalSupport/studentSupportCallForm/studentSupportCallForm.css
@@ -0,0 +1,29 @@
+.student-support-call-form {
+ padding: 10px 20px 10px 20px;
+}
+
+.student-support-call-form__loading-spinner {
+ padding-top: 200px;
+}
+
+.student-support-call-form__no-access {
+ text-align: center;
+ height: 100%;
+ background-color: white;
+}
+
+.student-support-call-form__main {
+ flex: 3 0 0px;
+}
+
+.student-support-call-form__sidebar {
+ flex: 1 0 0px;
+}
+
+.student-support-call-form__container {
+ width: 100%;
+}
+
+.student-support-call-form__page {
+ display: flex;
+}
\ No newline at end of file
Comments
- -Comments
+