report issues fixes

Apollo/assets/js/controllers/report_ans_bookletCtrl.js

@@ -97,7 +97,6 @@ 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;
@@ -125,7 +124,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filterUniv.universityID,
+                    university: $scope.univModel.university.universityID,
                     batch: $scope.univModel.batch
                    
                 }

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -107,7 +107,6 @@ 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) {
@@ -135,7 +134,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filterUniv.universityID,
+                    university: $scope.univModel.university.universityID,
                     batch: $scope.univModel.batch
                    
                 }

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -110,7 +110,6 @@ 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 = '';
@@ -122,7 +121,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filterUniv.universityID,
+                    university: $scope.univModel.university.universityID,
                     batch: $scope.univModel.batch,
 					from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date

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.filterUniv.universityID,
+                    university: $scope.univModel.university.universityID,
                     batch: $scope.univModel.batch
                    
                 }

Apollo/assets/js/controllers/report_expenseCtrl.js

@@ -13,6 +13,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
 
         };
 		
+
      var localDetail = JSON.parse(localStorage.getItem('localObj'));
          const LOCALTYPE = localDetail.localType;
          //console.log(LOCALTYPE)

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -97,8 +97,6 @@ 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;
@@ -126,7 +124,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 },
                 data: {
                     branch:  JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filterUniv.universityID,
+                    university: $scope.univModel.university.universityID,
                     batch: $scope.univModel.batch
                 }
 

Apollo/assets/js/controllers/report_waiver_referalCtrl.js

@@ -144,7 +144,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Phone_number AS NUMBER) as PhoneNumber,staffname as Waiver/referalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Phone_number AS NUMBER) as PhoneNumber,staffname as Waiver_ReferalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]);
         };
 /*modal controller
    * */

Apollo/assets/views/report_certificate_status.html

@@ -156,15 +156,15 @@ td,th {
                     <tr>
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
-                        <td>{{p.Document_fee_paid_date}}</td>
+                        <td>{{p.Initial_paid_date}}</td>
                         <td>{{p.Enrollment_id}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
-                        <td>{{p.course_name}}</td>
+                        <td>{{p.Course_name}}</td>
                        <!--  <td>{{p.Sem_year}}</td> -->
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
-                        <td>{{p.Balance_fee}}</td>
+                        <td>{{p.Balance_Fee}}</td>
                         <td>{{p.Certificate_name}}</td>
                         <td>{{p.Certificate_status}}</td>
                         <td>{{p.Certificate_date}}</td>

Apollo/assets/views/report_expense.html

@@ -86,6 +86,7 @@
             
         </div>
         <div pdf-save-content="getpdf" class="table-responsive">
+		<h4 style="text-align:center;">Apollo Distance Education College - {{expense_data[0].branch}}</h4>
 		<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">