diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 01e89313..a9539e2f 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -118,7 +118,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.getStudentList(); $scope.getUniversityList(); $scope.getUniversitySearchList(); - $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy'); + // $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy'); } else { ipCookie.remove('cookiechk'); $window.localStorage.clear(); @@ -1232,7 +1232,6 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.updateStuDetails = function (form, p, hidedob) { $scope.editSaveButtonDisable = true; var firstError = null; - // alert(form.$invalid); if (form.$invalid) { var field = null, firstError = null; for (field in form) { @@ -1248,7 +1247,6 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", angular.element('.ng-invalid[name=' + firstError + ']').focus(); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { - // alert(p.DOB); var idProof = $scope.filesEdit[0]; @@ -1381,7 +1379,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.getStudentList(); $scope.getUniversityList(); $scope.getUniversitySearchList(); - $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy'); + // $scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy'); $scope.viewStudentDetailsPage = true; } @@ -2329,7 +2327,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.studentDocumentsList = response.data.student_doc_details; } else { $scope.docNotFound = true; - $scope.studentDocumentsList.call(); + // $scope.studentDocumentsList.call(); } }); } @@ -2636,7 +2634,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.updateStuDetails = function (form, p, hidedob) { var firstError = null; $scope.editSaveButtonDisable = true; - if (form.$invalid) { + if (form.$invalid) { alert("invalid"); var field = null, firstError = null; for (field in form) { if (field[0] != '$') { @@ -2931,3 +2929,23 @@ app.directive('fileDownload', function($window){ } } }) + +app.directive('capitalizeFirst', function($parse) { + return { + require: 'ngModel', + link: function(scope, element, attrs, modelCtrl) { + var capitalize = function(inputValue) { + if (inputValue === undefined) { inputValue = ''; } + var capitalized = inputValue.charAt(0).toUpperCase() + + inputValue.substring(1); + if(capitalized !== inputValue) { + modelCtrl.$setViewValue(capitalized); + modelCtrl.$render(); + } + return capitalized; + } + modelCtrl.$parsers.push(capitalize); + capitalize($parse(attrs.ngModel)(scope)); // capitalize initial value + } + }; +}); \ No newline at end of file diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html index 5808116b..3f73f03d 100755 --- a/Apollo/assets/views/student/editStudentDetails.html +++ b/Apollo/assets/views/student/editStudentDetails.html @@ -107,7 +107,7 @@ First Name + capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/> First Name is required Invalid First Name @@ -116,7 +116,7 @@ Last Name + capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/> Last Name is required Invalid Last Name @@ -127,7 +127,7 @@ Father Name + capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/> Father Name is required Invalid Father Name @@ -137,7 +137,7 @@ + capitalize-first ng-pattern="/^[a-zA-Z.\s]*$/" required/> Mother Name is required Invalid Mother Name @@ -171,7 +171,7 @@ + show-button-bar="true" /> Date of Birth is required. diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 7cb88ad6..9dfca013 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -329,7 +329,7 @@ - First Name is required Invalid First Name @@ -338,7 +338,7 @@ - Last Name is required Invalid Last Name @@ -349,7 +349,7 @@ - Father Name is required Invalid Father Name @@ -359,7 +359,7 @@ Mother Name - Mother Name is required Invalid Mother Name @@ -394,7 +394,7 @@ @@ -922,7 +922,7 @@ ng-model="existingStuPersonalDetails.DOB" is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions" placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" - show-button-bar="false" max-date="currentDate" /> + show-button-bar="true" max-date="currentDate" /> Date of Birth is required. @@ -1014,7 +1014,7 @@ + capitalizeFirstLetter /> Invalid Category Name diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 344c5589..856f08da 100644 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -11,6 +11,12 @@