From 3468e68815263d97732b15b009c202d0657b1757 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 22 Aug 2018 09:29:42 +0530
Subject: [PATCH 01/14] application status  update staff login changes : kdk

---
 Apollo/assets/js/controllers/applicationStatusCtrl.js     | 1 -
 Apollo/assets/views/status-update/application_status.html | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js
index fe89f7a6..0ad95cc8 100644
--- a/Apollo/assets/js/controllers/applicationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js
@@ -364,7 +364,6 @@ $scope.editStatusID = id;
 
     $scope.statusUpdate = {
         submit: function (form, localBranchDetails, id) {
-            // alert(localBranchDetails);
             var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index f10b322c..0beb8894 100644
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -217,7 +217,7 @@
                                          <tr ng-show="statusUpdationId ===p.UNI_ID" ng-if="statusUpdationId === p.UNI_ID">
                                             <td colspan="7">
 <div ng-if="OpenWindowStatus">
-                            <div  ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                            <div  ng-if="!localTypeSuperAdmin">
                                 <style>
                                     #cancel_button {
                                         margin-top: 1px;
@@ -261,9 +261,9 @@
                                                                      <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>
                                                                  </tr>
                                                              <tr ng-if="editStatusID == stufmtype.ID">
-                                                                 <td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit1(Form, localBranchDetails, stufmtype.ID)" method="post">
+                                                                 <td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, localBranchDetails, stufmtype.ID)" method="post">
                                                                      <div class="container">
-                                                                <div class="row">
+                                                                <div class="row"> {{stufmtype.ID}}
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
                                                         <label for="form-field-select-2">
                                                Status <span class="symbol required"></span>
@@ -411,7 +411,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </form></div>
+                           </div>
                             <div  ng-if="localTypeSuperAdmin">
                                 <style>
                                     #cancel_button {

From 9dfb040c4df24602abf4a7112807115655a919b1 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 10:01:26 +0530
Subject: [PATCH 02/14] footer changes

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

diff --git a/Apollo/assets/views/login_login.html b/Apollo/assets/views/login_login.html
index 3e6aca69..91eb58c1 100755
--- a/Apollo/assets/views/login_login.html
+++ b/Apollo/assets/views/login_login.html
@@ -614,7 +614,7 @@ ng-minlength="6" required/>
 
 				<div class="copyright">
 
-					© 2018 Apollo Distance Education Center. All rights reserved
+					© 2018 Apollo Distance Education College. All rights reserved
 
 				</div>
 

From 5f644ccdba6345fe76a390ea0b66e2ca0ecec607 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 10:01:37 +0530
Subject: [PATCH 03/14] footer changes

---
 Apollo/assets/js/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/js/main.js b/Apollo/assets/js/main.js
index b47b5a04..a56751ff 100755
--- a/Apollo/assets/js/main.js
+++ b/Apollo/assets/js/main.js
@@ -14,8 +14,8 @@ function ($rootScope, $state, $stateParams) {
     // set below basic information
     $rootScope.app = {
         name: 'Apollo', // name of your project
-        author: 'Apollo Distance Education Center', // author's name or company name
-        description: 'Distance Education Center', // brief description
+        author: 'Apollo Distance Education College', // author's name or company name
+        description: 'Distance Education College', // brief description
         version: '1.0', // current version
         year: ((new Date()).getFullYear()), // automatic current year (for copyright information)
         isMobile: (function () {// true if the browser is a mobile device

From 51dbcec9afee485783193b4c665c21e42a61a83a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 10:11:15 +0530
Subject: [PATCH 04/14] drop down issues fixes in reports

---
 .../report_markcard_certificateCtrl.js        | 26 +++++++++++++++++++
 .../assets/views/report_answer_booklets.html  | 18 ++++++++-----
 .../views/report_application_pending.html     | 20 +++++++++-----
 Apollo/assets/views/report_balance_fee.html   | 22 +++++++++-------
 .../assets/views/report_document_pending.html | 22 ++++++++++------
 .../assets/views/report_exam_writing_fee.html | 20 +++++++++-----
 Apollo/assets/views/report_expense.html       |  1 +
 .../views/report_mark_certificate_status.html | 18 +++++++++----
 .../assets/views/report_waiver_referal.html   | 20 +++++++++-----
 9 files changed, 118 insertions(+), 49 deletions(-)

diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index af4fe036..cd1bc23e 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -83,6 +83,32 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 }
             });
         }
+		/* watch university model for bind batch objects*/
+
+        $scope.$watchCollection('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+                $scope.disableSubmit=true;
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                    $scope.disableSubmit=false;
+                }
+            }
+
+        });
+        // disable submit
+        $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                    $scope.disableSubmit=false;
+
+            }
+
+        });
 
         $scope.onSubmit = function () {
             //alert($scope.batch.name);
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html
index efed3b3f..9cf967c8 100755
--- a/Apollo/assets/views/report_answer_booklets.html
+++ b/Apollo/assets/views/report_answer_booklets.html
@@ -41,20 +41,26 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html
index 02d43f09..efefaf4f 100755
--- a/Apollo/assets/views/report_application_pending.html
+++ b/Apollo/assets/views/report_application_pending.html
@@ -38,25 +38,31 @@
 
                         <div class="row">
                             
-                             <div class="col-md-3">
+                            <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html
index ce388210..61ca29e3 100755
--- a/Apollo/assets/views/report_balance_fee.html
+++ b/Apollo/assets/views/report_balance_fee.html
@@ -30,27 +30,31 @@
     
                             <div class="row">
                                 
-                                 <div class="col-md-3">
+                                <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university"  required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-									<option ng-repeat="details in university" value="{{details.universityID}}">{{details.universityName}}</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch"  required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-									<option ng-repeat="batch in univModel.university.batchDetails" value="{{batch.BatchCode}}">{{batch.BatchName}}</option>
-                                 </select>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div >
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html
index 614a6270..196735c2 100755
--- a/Apollo/assets/views/report_document_pending.html
+++ b/Apollo/assets/views/report_document_pending.html
@@ -36,25 +36,31 @@ td,th {
 
                         <div class="row">
                             
-                             <div class="col-md-3">
+                            <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
-                                    <option value="" selected >Select Batch</option>
-                                 </select>
-								<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
+                                    <option value="" selected>Select Batch</option>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index 0f3e1135..d5b73131 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -36,25 +36,31 @@
     
                             <div class="row">
                                 
-                                 <div class="col-md-3">
+                               <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div >
diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html
index 263e52b8..9306517b 100755
--- a/Apollo/assets/views/report_expense.html
+++ b/Apollo/assets/views/report_expense.html
@@ -86,6 +86,7 @@
             
         </div>
         <div pdf-save-content="getpdf" class="table-responsive">
+		<h4 style="text-align:center;">Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}</h4>
             <table  id="datatable"   class="table table-hover">
                   
                            
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 9b03961b..6444ce49 100755
--- a/Apollo/assets/views/report_mark_certificate_status.html
+++ b/Apollo/assets/views/report_mark_certificate_status.html
@@ -41,18 +41,26 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                         </div>
                         <div class="row">
@@ -96,7 +104,7 @@ td,th {
                             <div class="col-md-3" style="padding-top: 2.3%;">
                                 <div >
 
-                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8"  ng-disabled="disableSubmit==true">
                                         Submit
                                     </button>
 
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 7307d27c..0937e42b 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -34,25 +34,31 @@
 
                         <div class="row">
                             
-                             <div class="col-md-3">
+                              <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                               <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >

From 9067637d4d6dfb54959ebfa906fb3cf1fdcc9946 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 10:53:56 +0530
Subject: [PATCH 05/14] drop down issues in report

---
 .../js/controllers/report_ans_bookletCtrl.js  | 13 ++++++++++
 .../js/controllers/report_app_pendingCtrl.js  | 14 ++++++++++
 .../js/controllers/report_balfeeCtrl.js       | 13 ++++++++++
 .../js/controllers/report_doc_pendingCtrl.js  | 14 ++++++++++
 .../js/controllers/report_examfeeCtrl.js      | 13 ++++++++++
 .../report_markcard_certificateCtrl.js        | 26 -------------------
 .../controllers/report_waiver_referalCtrl.js  | 12 +++++++++
 7 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
index 1f0e9b59..21ed7cad 100755
--- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
+++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
@@ -82,6 +82,19 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
          $scope.show = false;
         $scope.onSubmit = function (form) {
 			var firstError = null;
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index 4a860046..8d68f3e1 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
+		//Response data
         $scope.show = false;
         $scope.onSubmit = function (form) {
 			var firstError = null;
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index 01ed7ef8..f8a92377 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -90,6 +90,19 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
         // response data
        $scope.show = false;
 	   $scope.returnResultData = [];
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index 13e268ad..b1b0906e 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -82,6 +82,20 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
+		//Response data
           $scope.show = false;
         $scope.onSubmit = function (form) {
 			
diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js
index 66bca916..a66e6e88 100755
--- a/Apollo/assets/js/controllers/report_examfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js
@@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 
         $scope.show = false;
         $scope.onSubmit = function (form) {
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index cd1bc23e..af4fe036 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -83,32 +83,6 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 }
             });
         }
-		/* watch university model for bind batch objects*/
-
-        $scope.$watchCollection('univModel.university', function (newValue,oldValue) {
-            if(newValue==undefined || newValue==''){
-                $scope.filterBatchDetails="";
-                $scope.disableSubmit=true;
-            }
-            else{
-                if(angular.isString(newValue)){
-                    $scope.filterBatchDetails=angular.fromJson(newValue);
-                    $scope.disableSubmit=false;
-                }
-            }
-
-        });
-        // disable submit
-        $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
-            if(newValue==undefined || newValue=='' || newValue==null){
-                $scope.disableSubmit=true;
-            }
-            else{
-                    $scope.disableSubmit=false;
-
-            }
-
-        });
 
         $scope.onSubmit = function () {
             //alert($scope.batch.name);
diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
index d668ee2e..8d1ff908 100755
--- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
+++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
@@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                 }
             });
         }
+         //For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
 
+        });
         $scope.show = false;
         $scope.onSubmit = function (form) {
 			var firstError = null;

From eb0c4ed749fb8f3bcc970fc1089b1dd0a98f0af7 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 05:35:55 +0000
Subject: [PATCH 06/14] report_markcard_certificateCtrl.js edited online with
 Bitbucket

---
 .../report_markcard_certificateCtrl.js        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index af4fe036..740b6bb6 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -83,7 +83,32 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 }
             });
         }
+        /* watch university model for bind batch objects*/
 
+        $scope.$watchCollection('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+                $scope.disableSubmit=true;
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                    $scope.disableSubmit=false;
+                }
+            }
+
+        });
+        // disable submit
+        $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                    $scope.disableSubmit=false;
+
+            }
+
+        });
         $scope.onSubmit = function () {
             //alert($scope.batch.name);
             $scope.mark_cert_data = '';

From ef78090513a38bd8ad127a5ddc02ec2dd0b30fce Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 22 Aug 2018 11:15:51 +0530
Subject: [PATCH 07/14] receiptnumber active deacive

---
 Apollo/api/application/models/Fees_status_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 4b6896d3..9b330645 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model
 
             $this->db->select('ReceiptNo');
             $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
+            $this->db->where('IsActive', '1');
             if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
                 $result['paidStatus'] = false;
                 $result['message'] = "This receipt number is already exist!";

From 9b5b877adb215807f82b7dd87620fe7f1108c044 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:41:26 +0530
Subject: [PATCH 08/14] report changes

---
 Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index b1b0906e..c0b254c7 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -98,7 +98,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 		//Response data
           $scope.show = false;
         $scope.onSubmit = function (form) {
-			
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -126,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }

From 283e6b62fd56e8556d88f2910f4b1e17a2dd82f0 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:41:34 +0530
Subject: [PATCH 09/14] report changes

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

diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
index 21ed7cad..2ab1a193 100755
--- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
+++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
@@ -97,6 +97,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
         });
          $scope.show = false;
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -124,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }

From 6a4d9facc5f4bb56713ffe6e804a7f3bf0ee46a5 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:41:43 +0530
Subject: [PATCH 10/14] report changes

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

diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index f8a92377..1d018b55 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -107,6 +107,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
        $scope.show = false;
 	   $scope.returnResultData = [];
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			$scope.returnResultData.length=0;
 			var firstError = null;
             if (form.$invalid) {
@@ -134,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }

From 9e8b83b6eb56509010683604bf8d8afc6cfc503f Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:41:55 +0530
Subject: [PATCH 11/14] report changes

---
 .../assets/js/controllers/report_study_material_statusCtrl.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index ff76c9af..0794ccee 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
           
   $scope.show = false;
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
             },
             data: {
                 branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                university : $scope.univModel.university.universityID,
+                university : $scope.filterUniv.universityID,
                 batch : $scope.univModel.batch
             }
             

From c39096e8c865f188a7d5b8117d83cfce1117ab67 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:42:03 +0530
Subject: [PATCH 12/14] report changes

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

diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js
index ab4cd9c0..93fe25ad 100755
--- a/Apollo/assets/js/controllers/report_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_certificateCtrl.js
@@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         });
 
         $scope.onSubmit = function () {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
             //alert($scope.batch.name);
             $scope.cert_data = '';
             $scope.message = '';
@@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch,
 					from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date

From 4236dd12a1abaf7a9eae35296193ab997aa465b4 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:42:20 +0530
Subject: [PATCH 13/14] report changes

---
 .../assets/js/controllers/report_markcard_certificateCtrl.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index 740b6bb6..62636564 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -110,6 +110,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
 
         });
         $scope.onSubmit = function () {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
             //alert($scope.batch.name);
             $scope.mark_cert_data = '';
             $scope.message = '';
@@ -121,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch,
                     from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date

From d1e9715e564b0382a717590a91cb25a36e124eec Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 11:42:31 +0530
Subject: [PATCH 14/14] report changes

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

diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index 93bf760d..477c6bee 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
 
         $scope.show = false;
         $scope.onSubmit = function (form) {
+
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 },
                 data: {
                     branch:  JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                 }