diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index ba1bcf06..eeab03dc 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -130,25 +130,34 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter" - $scope.updatestatus = function (myModel, form, loading) - { -//alert(myModel.ID) +$scope.updatestatus = function (myModel, form, loading) +{ -//alert(myModel.Reason); +var firstError = null; + if (form.$invalid) { + + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + swal("Please Enter Reason!", "", "error"); + } else { var d = new Date(myModel.Date); -// console.log(d.getUTCDate()); // Hours -// console.log(d.getUTCMonth()); -// console.log(d.getUTCFullYear()); - var mdate = d.getUTCDate() + 1; var mmonth = d.getUTCMonth() + 1; var myear = d.getUTCFullYear(); var CDate = mdate+"-"+mmonth+"-"+myear; //console.log(CDate) - - var IsActive = ''; if(myModel.IsActive == true) @@ -189,8 +198,10 @@ else if(myModel.IsActive == false) $scope.close(); }); + + } - }; +}; diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 6d05da34..cfe19d6c 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -69,7 +69,8 @@ -
+ + + Type is Required -
+ --> +
diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 4a4a2241..df1ac54c 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -76,7 +76,7 @@

-
+ + Type is Required -
+
-->
diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index 96ec626a..37d0a046 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -51,7 +51,7 @@

-
+
diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html index f6a89d89..49c3874c 100644 --- a/Apollo/assets/views/edit_daybookentries.html +++ b/Apollo/assets/views/edit_daybookentries.html @@ -73,7 +73,7 @@ -
+
diff --git a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html index 2048e6de..33b44d01 100755 --- a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html +++ b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html @@ -368,7 +368,7 @@