From 4a4624de4b691eb1b577fe49549a0b8ada61e8d3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 21 Aug 2018 10:57:00 +0530
Subject: [PATCH 1/3] daybook approval

---
 Apollo/assets/views/daybook/dayBookApproval.html          | 8 +++++---
 Apollo/assets/views/daybook/dayBookadminApproval.html     | 6 +++---
 .../assets/views/daybook/daybooksuperAdminApproval.html   | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

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 @@
 
                                             </div>
                                         </div>
-                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+
+                                       <!--  <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                             <label for="form-field-select-2">
                                                Income/Expense 
                                                 </label>
@@ -78,11 +79,12 @@
                                                 <option value="" selected>Select</option>
                                                  <option value="I001">EXPENSE</option>
                                                 <option value="I002">INCOME</option>
-                                                <!-- <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                            
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
 
-                                        </div>
+                                        </div> -->
+                                        
                                     </div>
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
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 @@
                                     <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
 
                                 </div>
-                                        <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                       <!--  <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                             <label for="form-field-select-2">
                                                Income/Expense 
                                                 </label>
@@ -85,11 +85,11 @@
                                                 <option value="" selected>Select</option>
                                                  <option value="I001">EXPENSE</option>
                                                 <option value="I002">INCOME</option>
-                                                <!-- <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                              
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
 
-                                        </div>
+                                        </div> -->
                                     </div>
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
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 @@
                                     <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
 
                                 </div>
-                                        <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                       <!--  <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                             <label for="form-field-select-2">
                                                Income/Expense 
                                                 </label>   
@@ -63,7 +63,7 @@
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
 
-                                        </div>
+                                        </div> -->
                                     </div>
                                       <div>
                                             <div ng-show="loadingsearch" class="center">

From 15a73cff5c773dbcc4786268b5569d3b9ced3259 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 21 Aug 2018 11:03:40 +0530
Subject: [PATCH 2/3] sms group actice deactive

---
 Apollo/assets/views/sendSMS/sendSMSsuperadmin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
                                             <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="mobileNumList.grouptype"
                                                 ng-Change="getall_Numbers(mobileNumList.grouptype);" required>
                                                       <option value="" disabled selected>Select Group</option>
-                                                    <option  ng-repeat="p in statusInfo" value="{{p.ID}}">{{p.GroupName}}</option>
+                                                    <option  ng-repeat="p in statusInfo" ng-if="p.IsActive" value="{{p.ID}}">{{p.GroupName}}</option>
                                             </select>
                                         </div>
                                         <div class="col-md-6">

From bbd0fab01fb9efbdaafdbcdbeed0dd411f641f37 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 21 Aug 2018 11:24:35 +0530
Subject: [PATCH 3/3] datacorrection change

---
 .../js/controllers/datacorrectionCtrl.js      | 33 ++++++++++++-------
 Apollo/assets/views/edit_daybookentries.html  |  2 +-
 2 files changed, 23 insertions(+), 12 deletions(-)

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/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 @@
 
 
 
-                         <div class="col-md-3 form-group" >
+                         <div class="col-md-3 form-group" ng-class="{'has-error':p.Reason.$dirty && p.Reason.$invalid, 'has-success':p.Reason.$valid}">
                             <label>
                               Reason to Deactivate <span class="symbol required"></span>
                             </label>