diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 49cab1c4..34946de2 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -1196,7 +1196,6 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.studentEntrollPendingDocFORM = { submit: function (form, myModelAddPendingDocDetails, stuID) { - $scope.documentTrackAddDetailsLoading = true; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -1213,11 +1212,14 @@ 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 { + $scope.documentTrackAddDetailsLoading = true; + $scope.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString(); + var ModelDetails = { "student": stuID, "doc_Details": myModelAddPendingDocDetails.documentDetails, "checkTracking": myModelAddPendingDocDetails.checkTracking, - "documentdate": myModelAddPendingDocDetails.date + "documentdate": $filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy') }; var updateStudentPendingDocDetails = { method: 'POST', @@ -1238,6 +1240,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "documentDetails": "", "checkTracking": false } + form.$setPristine(true); } else { swal(" ", res.data.message, "error"); $scope.documentTrackAddDetailsLoading = false; @@ -2734,7 +2737,6 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.studentEntrollPendingDocFORM = { submit: function (form, myModelAddPendingDocDetails, stuID) { - $scope.documentTrackAddDetailsLoading = true; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -2751,6 +2753,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl 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 { + $scope.documentTrackAddDetailsLoading = true; $scope.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString(); //alert($filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy')); // exist(); @@ -2779,6 +2782,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl "documentDetails": "", "checkTracking": false } + form.$setPristine(true); } else { swal(" ", res.data.message, "error"); $scope.documentTrackAddDetailsLoading = false;