From 2060a3b3cb981583d192c17a8bdca64b604f9665 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 24 Feb 2018 16:54:45 +0530
Subject: [PATCH 1/9] course details changes done

---
 Apollo/assets/views/status-update/updateFeesStatus.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index bf2a1512..e8901d3f 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -413,7 +413,8 @@
 
                                     </tr>
                                     </thead>
-                                    <tbody dir-paginate="p in existStudentFeesDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
+                                    <tbody ng-repeat="p in existStudentFeesDetails|orderBy:sortKey:reverse|filter:search:strict">
+                                   <!-- itemsPerPage:10-->
                                     <tr>
                                         <td>{{p.FeesName}}</td>
                                         <td>{{p.CourseName}}</td>
@@ -532,8 +533,8 @@
                                     </tbody>
 
                                 </table>
-                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
-                                </dir-pagination-controls>
+                               <!-- <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>-->
 
                             </div>
                         </div>

From dca7d6eaa5e613c79954a7073c9dd20410b0a6cf Mon Sep 17 00:00:00 2001
From: saravana kumar kandasami <saravanakumar.k@venbainfotech.com>
Date: Sat, 24 Feb 2018 12:45:43 +0000
Subject: [PATCH 2/9] callTrackingCtrl.js for spell mistake in line no:1732

---
 Apollo/assets/js/controllers/callTrackingCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index a72f7096..a08fa518 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -1729,7 +1729,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
                 });
 
             } else {
-                swal("Failed!", "This student is not registerd", "warning");
+                swal("Failed!", "This student is not registred", "warning");
                 $scope.courseEditLoading = false;
                 $scope.studentDetails = "";
                 $scope.courseDetails = "";

From 5291cf9669bb78966943860cb2349fd1562d9e24 Mon Sep 17 00:00:00 2001
From: saravana kumar kandasami <saravanakumar.k@venbainfotech.com>
Date: Sat, 24 Feb 2018 12:48:08 +0000
Subject: [PATCH 3/9] callTrackingCtrl.js

---
 Apollo/assets/js/controllers/callTrackingCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index a08fa518..504285e2 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -1729,7 +1729,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
                 });
 
             } else {
-                swal("Failed!", "This student is not registred", "warning");
+                swal("Failed!", "This student is not registered", "warning");
                 $scope.courseEditLoading = false;
                 $scope.studentDetails = "";
                 $scope.courseDetails = "";

From 6890aff108f4cf151b594d7f99ffc0ddb4429cf6 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 24 Feb 2018 18:50:51 +0530
Subject: [PATCH 4/9] fees issues fixed

---
 .../assets/js/controllers/feesStatusCtrl.js   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 5bb02971..30cf6788 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -552,7 +552,19 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
     * createdcby kms
     * */
     $scope.changeBatch = function (Details) {
-       $scope.setFeesTotalAmount(Details,'2','2');
+
+
+
+       if(Details.InstallmentDetails != ''){
+           $scope.setFeesTotalAmount(Details,'2','2');
+       }
+       else{
+           $rootScope.updateMoreItems=[];
+           $scope.setModel.feesType.Others = '';
+
+           $scope.setFeesTotalAmount(Details,'1','1');
+
+       }
 
     }
 
@@ -649,7 +661,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
     * change installment values
     * */
     $scope.changeInstallemt = function (model,form) {
-
         if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
             $scope.BatchDetails=[];
             $rootScope.updateMoreItems=[];
@@ -1042,10 +1053,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
     * created by kms
     * */
     $scope.calculateInstallemntsExist  = function (model,totAmt,other,type,type1) {
-
-
         var exBatchDate = moment($scope.BatchDate);
-
             if(type==2 || type==1){
             if($rootScope.updateMoreItems.length>0){
                 var exDatenew1;
@@ -1059,9 +1067,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
                 else{
                     exDatenew1  = moment($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate);
                 }
-
                 if (exDatenew1 <= exBatchDate) {
-
                     if(type=='1'){
                         $scope.setTotalAmount = Math.round(parseInt(totAmt)-parseInt(other));
                        // $scope.setModel.feesType.Others = Math.round(parseInt(other));

From 950e1c06941c596fcf7cfe551f79abd62d9e10aa Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 24 Feb 2018 18:51:19 +0530
Subject: [PATCH 5/9] course details changes done

---
 Apollo/assets/views/status-update/setFeesForStudent.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index fa050887..5001b3a0 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -25,7 +25,7 @@
                                             ng-model="setModel.feesType"
                                             ng-options="fees.Sem_Year for fees in feesStructureInfo"
                                             required>
-                                        <option value=""> Select Fees Type</option>
+                                       <!-- <option value=""> Select Fees Type</option>-->
                                     </select>
                                     <span class="error text-small block"
                                           ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span>
@@ -39,7 +39,7 @@
                                             ng-model="setModel.feesType.BatchCode"
                                             ng-options="batch.BatchCode as batch.BatchName  for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
                                             required>
-                                        <option value=""> Select Batch</option>
+                                       <!-- <option value=""> Select Batch</option>-->
                                     </select>
                                     <span class="error text-small block"
                                           ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>

From 796b24d29ab175323b558866627cd31c1f8e4239 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 24 Feb 2018 19:02:06 +0530
Subject: [PATCH 6/9] course details changes done

---
 Apollo/assets/views/status-update/updateFeesStatus.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index e8901d3f..9a8258cf 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -53,7 +53,7 @@
                                             ng-model="updateModel.feesType"
                                             ng-options="fees.Sem_Year for fees in studentFeesInfo"
                                             required ng-change="changeTotalFees(updateModel.feesType);">
-                                        <option value=""> Select Fees Type</option>
+                                       <!-- <option value=""> Select Fees Type</option>-->
                                     </select>
                                     <span class="error text-small block"
                                           ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Fees type is required</span>

From 9f10015666e06896d4b7defbe3fd719bd820859c Mon Sep 17 00:00:00 2001
From: saravana kumar kandasami <saravanakumar.k@venbainfotech.com>
Date: Mon, 26 Feb 2018 05:54:46 +0000
Subject: [PATCH 7/9] student_details.html for auto caps in naming fields

---
 Apollo/assets/views/student/student_details.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 7238e830..83bfe1ec 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -11,7 +11,9 @@
 <!-- end: STUDENT TITLE -->
 <!-- start: LIST GROUP -->
 <div class="container-fluid container-fullw bg-white">
+  
     <style>
+	 
         /*#wrapper {
                     width: 200px;
                     height: 110px;
@@ -327,7 +329,7 @@
                                                 <label>
                                                 First Name <span class="symbol required"></span>
                                             </label>
-                                                <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname"
+                                                <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" style="text-transform: capitalize;"
                                                     ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                                 <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
                                                 <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
@@ -336,7 +338,7 @@
                                                 <label>
                                                 Last Name <span class="symbol required"></span>
                                             </label>
-                                                <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname"
+                                                <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" style="text-transform: capitalize;"
                                                     ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                                 <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
                                                 <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
@@ -347,7 +349,7 @@
                                                 <label>
                                                 Father Name <span class="symbol required"></span>
                                             </label>
-                                                <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername"
+                                                <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" style="text-transform: capitalize;"
                                                     ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                                 <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
                                                 <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
@@ -357,7 +359,7 @@
                                                 Mother Name <span class="symbol required"></span>
                                             </label>
 
-                                                <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername"
+                                                <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" style="text-transform: capitalize;"
                                                     ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                                 <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
                                                 <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>

From 561c1c50ecc08c62a6d35b2489f3b02e571a511a Mon Sep 17 00:00:00 2001
From: saravana kumar kandasami <saravanakumar.k@venbainfotech.com>
Date: Mon, 26 Feb 2018 05:56:04 +0000
Subject: [PATCH 8/9] student_details_SuperAdmin.html for auto caps naming
 fields

---
 .../assets/views/student/student_details_SuperAdmin.html  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index dff493e8..f21e39a7 100644
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -351,7 +351,7 @@
                                             <label>
                                                 First Name <span class="symbol required"></span>
                                             </label>
-                                            <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname"
+                                            <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" style="text-transform: capitalize;" name="firstname" ng-model="myModel.firstname"
                                                 ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                             <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
                                             <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
@@ -360,7 +360,7 @@
                                             <label>
                                                 Last Name <span class="symbol required"></span>
                                             </label>
-                                            <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname"
+                                            <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" style="text-transform: capitalize;"
                                                 ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                             <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
                                             <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
@@ -371,7 +371,7 @@
                                             <label>
                                                 Father Name <span class="symbol required"></span>
                                             </label>
-                                            <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername"
+                                            <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" style="text-transform: capitalize;"
                                                 ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                             <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
                                             <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
@@ -381,7 +381,7 @@
                                                 Mother Name <span class="symbol required"></span>
                                             </label>
 
-                                            <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername"
+                                            <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" style="text-transform: capitalize;"
                                                 ng-pattern="/^[a-zA-Z.\s]*$/" required/>
                                             <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
                                             <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>

From 75033b3eb4b0dff1b477fffc5cdb791cf24947f1 Mon Sep 17 00:00:00 2001
From: saravana kumar kandasami <saravanakumar.k@venbainfotech.com>
Date: Mon, 26 Feb 2018 06:20:44 +0000
Subject: [PATCH 9/9] sendSMSDetailssuperadmin.html for date issue

---
 Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
index 48df2df5..47da9048 100644
--- a/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
+++ b/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
@@ -24,7 +24,7 @@
                                             </label>
                             <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
                                 is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
-                                placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" show-button-bar="true"
+                                placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" show-button-bar="true" readonly
                             />
 
                         </div>
@@ -37,7 +37,7 @@
                                             </label>
                             <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
                                 is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
-                                placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" show-button-bar="true"
+                                placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" show-button-bar="true" readonly
                             />
 
                         </div>