From 1fa98a3b62512544925a7139129b91b334c3b98a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 1 Jun 2018 12:14:32 +0530
Subject: [PATCH 1/4] pdf changes in fees status

---
 Apollo/assets/js/controllers/feesStatusCtrl.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 7b8099f4..254e6c62 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2176,6 +2176,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
     };
     //show hide function for pdf design
     $scope.billNo="";
+    $scope.receiptNo="";
     $scope.sessionName="";
     $scope.paymentType="";
     $scope.billDate="";
@@ -2198,7 +2199,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
         $scope.BranchAddr = pdfValue.Address;
         $scope.BranchLogo = pdfValue.LogoPath;
         $scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
-
+        $scope.receiptNo=pdfValue.ReceiptNo;
 
     }
 
@@ -2215,6 +2216,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
         $scope.BranchAddr = "";
         $scope.BranchLogo = "";
         $scope.FeesReceiptTitle="";
+        $scope.receiptNo="";
     }
 
 }]);

From 9107e9ac5091e8b79f07a75b9e3c7f2d005d6127 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 1 Jun 2018 12:14:43 +0530
Subject: [PATCH 2/4] pdf changes in fees status

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

diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index f43f03ed..0f33d802 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -460,7 +460,8 @@
                                                         <td style="width: 150px; height: 50px; text-align: center; border-bottom-style: hidden;padding-left:25%;" colspan="3">
                                                             <span style="border: 2px solid black; padding: 10px; border-radius: 15px; font-size: 14px; color: #fff; background-color: black;">FEES ESTIMATE</span>
                                                         </td>
-                                                        <td style="width: 137px; height: 50px; border-left-style: hidden; border-bottom-style: hidden;"><!--<strong>DOM:</strong>-->&nbsp;{{billNo}}</td>
+                                                        <td style="width: 137px; height: 50px; border-left-style: hidden; border-bottom-style: hidden;"><!--<strong>DOM:</strong>-->&nbsp;{{billNo}}<span ng-if="receiptNo!=''">&nbsp;/&nbsp;{{receiptNo}}</span></td>
+
                                                     </tr>
                                                     <tr style="height: 24px;">
                                                         <td style="width: 136px; height: 24px;" colspan="3"><!--<strong>RECEIVED FROM</strong>--></td>

From 4558889574b4e46337ae8f323f437db4dee3448b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 1 Jun 2018 13:14:37 +0530
Subject: [PATCH 3/4] student pending docs changes

---
 Apollo/assets/js/controllers/studentCtrl.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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;

From ebc2dbb2c9b86f9ccbddbbff04f0a21695134102 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 1 Jun 2018 13:15:18 +0530
Subject: [PATCH 4/4] student pending docs changes

---
 .../views/student/editStudentDetails.html     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html
index 5fce2f43..1579d1ef 100755
--- a/Apollo/assets/views/student/editStudentDetails.html
+++ b/Apollo/assets/views/student/editStudentDetails.html
@@ -550,7 +550,7 @@
                         <form name="FormPendDoc" id="formPendDoc" novalidate ng-submit="studentEntrollPendingDocFORM.submit(FormPendDoc, myModelAddPendingDocDetails, p.StudentID)"
                             method="post">
                             <div class="row">
-                                <div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
+                                <div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.pendingDocumentTextarea.$dirty && FormPendDoc.pendingDocumentTextarea.$invalid, 'has-success':FormPendDoc.pendingDocumentTextarea.$valid}">
                                     <label>
                                                Pending Document Details <span
                                                     class="symbol required"></span>
@@ -559,20 +559,25 @@
                                         ng-model="myModelAddPendingDocDetails.documentDetails" id="pendingDocumentTextarea" maxlength="100"
                                         required/>
                                     <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
-                                    <span class="error text-small block" ng-if="FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid" ng-hide="FormPendDoc.documentDetails.$error.maxlength || FormPendDoc.documentDetails.$error.minlength || FormPendDoc.documentDetails.$error.pattern">Pending Document Details required.</span>
+                                    <span class="error text-small block" ng-if="FormPendDoc.pendingDocumentTextarea.$dirty && FormPendDoc.pendingDocumentTextarea.$invalid">Pending document details required.</span>
+                                    <span class="error text-small block"
+                                          ng-if="FormDoc.FormPendDoc.$error.maxlength || FormPendDoc.pendingDocumentTextarea.$error.pattern">Enter a valid document details</span>
                                 </div>
-                                <div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
-                                    <div data-ng-controller="DatepickerDemoCtrl">
+
+
+                                <div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.FormPendDate.$dirty && FormPendDoc.FormPendDate.$invalid, 'has-success':FormPendDoc.FormPendDate.$valid}">
+
+                                <div data-ng-controller="DatepickerDemoCtrl">
 
                                         <label>
                                     Follow-up date<span
                                         class="symbol required"></span>
                                 </label>
-                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen =!startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAddPendingDocDetails.documentDate"
-                                            is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions"
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen =!startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAddPendingDocDetails.documentDate" min-date="currentDate"
+                                            is-open="startOpen" ng-init="startOpen = false" name="FormPendDate" datepicker-options="dateOptions"
                                             placeholder="Select Date" close-text="Close" ng-change="getDateFormat(p.SessionDate,'2');"
                                             required="required" ng-readonly="true" />
-                                        <span class="error text-small block" ng-if="Form.date.$dirty && Form.date.$error.required">Session date is required.</span>
+                                        <span class="error text-small block" ng-if="FormPendDoc.FormPendDate.$dirty && FormPendDoc.FormPendDate.$error.required">Follow-up date is required.</span>
                                         <!--<span class="success text-small block"-->
                                         <!--ng-if="Form.date.$valid ">Thank You</span>-->
                                     </div>
@@ -603,7 +608,7 @@
                                     <label>
                                          </label>
                                     <div>
-                                        <button tooltip="Upload" type="submit" ng-disabled="disableButton" tabindex="4002" class="btn btn-xs btn-success">
+                                        <button tooltip="Add" type="submit" ng-disabled="disableButton" tabindex="4002" class="btn btn-xs btn-success">
                                              Add
                                             </button>
                                         <button tooltip="Reset" class="btn btn-warning btn-xs" tabindex="4003" ng-click="studentEntrollPendingDocFORM.reset(FormPendDoc)">
@@ -617,8 +622,9 @@
                                     <h5 ng-show="documentTrackAddDetailsLoading" style="color:#007AFF">Loading...</h5>
                                 </div>
                             </div>
+                        </form>
                     </div>
-                    </form>
+
                 </fieldset>
                 <div id="documentDetalils" ng-init="getStudentPendingEntrolDocDetails(p.StudentID)">
                     <div class="table-responsive">