From c1953330d7641c1d832628fc5ac68d4efa6ec580 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 11 Sep 2018 13:05:12 +0530
Subject: [PATCH] university enrolment bug fixed

---
 ...Receive_Enrolment_Fees_Univ_Controller.php | 15 ++--
 .../Receive_Enrolment_Fees_Univ_model.php     |  6 +-
 .../student_university_fee_compare.js         | 11 ++-
 .../views/student/UnivFormPaymentDetails.html |  4 +-
 .../student/studentUnivFeeCompareDetails.html | 70 +++++++++----------
 5 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
index d5b7adfc..6aa47610 100644
--- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
+++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
@@ -136,12 +136,12 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
         $formData['EnrolmentNo'] = $this->post('enrolmentId');;
 
         $getDetails = $this->receive_model->getFormIDFeeDetails($formData);
-        if ($getDetails['status']=true)
+        if ($getDetails['formTypeStatus']=true)
         {
             // Set the response and exit
             $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
-        else if($getDetails['status']=false){
+        else if($getDetails['formTypeStatus']=false){
             $this->response([
                 'message' => $getDetails['Message'],
             ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code
@@ -151,7 +151,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
             // Set the response and exit
             $this->response([
                 'message' => 'Something went wrong.please try again!',
-                'status' => false
+                'formTypeStatus' => false
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
@@ -160,9 +160,14 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
  
         $getDetailsFor = $this->post('getDetailsFor');
         $getUnmatchedFormDetails = $this->receive_model->getUnmatchedFormDetails($getDetailsFor);// Check if the users data store contains users (in case the database result returns NULL)
-        if ($getUnmatchedFormDetails)
+        if ($getUnmatchedFormDetails['unMatchedRecordStatus'])
         {
-            $getUnmatchedFormDetails['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false)
+        {
+            $getUnmatchedFormDetails['status'] = false;
             // Set the response and exit
             $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
index e16502b3..2a9f6068 100644
--- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
+++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
@@ -549,7 +549,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         } else {
             $resultArr['studentFeeCompareDetails'] = [];
             $resultArr['formTypeStatus'] = false;
-            $resultArr['message'] = "No record found";
+            $resultArr['message'] = "No record found...";
         }
         return $resultArr;
     }
@@ -734,7 +734,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                         $resultArr['unMatchedRecordDetails'] = $mergeFormDetails;
                         $resultArr['unMatchedRecordStatus'] = false;
                         $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
-                        $resultArr['message'] = "Successfully data generated";
+                        $resultArr['message'] = "No record found...";
                     }
 
 
@@ -743,7 +743,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                     $resultArr['unMatchedRecordDetails'] = [];
                     $resultArr['unMatchedRecordStatus'] = false;
                     $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
-                    $resultArr['message'] = "Successfully data generated";
+                    $resultArr['message'] = "No record found...";
                 }
 
             
diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js
index a2acd9ad..7da5390d 100644
--- a/Apollo/assets/js/controllers/student_university_fee_compare.js
+++ b/Apollo/assets/js/controllers/student_university_fee_compare.js
@@ -146,10 +146,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
 
     $scope.Searchloader = false;
     $scope.studentData = false;
-  
+    $scope.statusMessage="";
     $scope.onSubmit = function(){
-        $scope.Searchloader = true;
         if($scope.searchData.University !== '' && $scope.searchData.Session !==''){
+            $scope.statusMessage="";
             $scope.Searchloader = true;
             var empListreq = {
                 method: 'POST',
@@ -168,15 +168,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                     $scope.studentData = true;
                     $scope.data = response.data.studentFeeCompareDetails;
                     $scope.studentListLength = $scope.data.length;
-                    // $scope.statusMessage = $scope.data.message;
+                    $scope.statusMessage="";
                 } else {
                     $scope.Searchloader = false;
                     $scope.studentData = false;
-                    $scope.statusMessage = $scope.data.message;
+                    $scope.statusMessage = response.data.message;
+                    $scope.data="";
                 }
             });
-        }else {
-
         }
     }
     //export excel
diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html
index c35122ea..c1fcd875 100644
--- a/Apollo/assets/views/student/UnivFormPaymentDetails.html
+++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html
@@ -16,7 +16,7 @@
             <span class="mainDescription">Form List. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!--<div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white" ng-controller="univFormPaymentCtrl" data-ng-init="init()">
@@ -67,7 +67,7 @@
                     <thead>
                     <tr>
                         <th> Form ID</th>
-                        <th> Enrolment No</th>
+                        <th> Enrollment ID</th>
                         <th> Bill No</th>
                         <th> Date</th>
                         <th> Payable</th>
diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
index 3c03b06a..08d5c891 100644
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@@ -2,8 +2,8 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
-            <span class="mainDescription">Student Form Enrolment Details. </span>
+            <h1 class="mainTitle" translate="Enrollment Details">{{ mainTitle }}</h1>
+            <span class="mainDescription">Student Form Enrollment Details. </span>
         </div>
         <!--  <div ncy-breadcrumb></div>-->
     </div>
@@ -43,7 +43,7 @@
 
         <div class="row" ng-init="init()">
             <tabset id="here" class="tabbable">
-                <tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Enrolment Details" id="viewDetails">
+                <tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="Matched Details" id="viewDetails">
                     <script>
                         $("#selectBranch").change(function () {
                             $("#searchIn").focus();
@@ -52,7 +52,7 @@
                         });
                     </script>
                     <div class="col-md-12">
-                        <button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrolment Details</button>
+                        <button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrollment Details</button>
                     </div>
                     <div class="container" ng-show="enableEnrolment==true">
                         <form name="manualEnForm" id="manualEnForm" novalidate>
@@ -60,7 +60,7 @@
                                 <div class="col-md-12">
                                     <fieldset>
                                         <legend>
-                                            Add Enrolment Details
+                                            Add Enrollment Details
                                         </legend>
 
                                         <div class="row">
@@ -68,7 +68,7 @@
                                             <div class="col-md-12 form-group"
                                                  ng-class="{'has-error':manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid, 'has-success':manualEnForm.manualEnrolmentNo.$valid}">
                                                 <label>
-                                                    Enrolment ID<span class="symbol required"></span>
+                                                    Enrollment ID<span class="symbol required"></span>
                                                 </label>
 
                                                 <input type="text"  placeholder="Enter Enrolment No"
@@ -76,9 +76,9 @@
                                                        ng-model="manualEnModel.enrolmentNo" required />
                                                 <span class="error text-small block"
                                                       ng-if="manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid"
-                                                      ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrolment no is required</span>
+                                                      ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrollment no is required</span>
                                                 <span class="error text-small block"
-                                                      ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrolment no</span>
+                                                      ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrollment no</span>
 
                                             </div>
                                             <div class="col-md-6 form-group">
@@ -172,7 +172,7 @@
 
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               Course
+                                               Course <span class="symbol required"></span>
                         </label>
 
                                     <select ui-select2 class="form-control" tabindex="10" class="cs-select cs-skin-elastic" name="serachCourse" id="serachCourse" ng-model="searchData.Course">
@@ -191,14 +191,10 @@
 
                                 </div>
 
-                                <div class="col-md-2" style="padding-top: 2.3%;">
-                                    <div class="pull-right">
-
-                                        <button ng-disabled="searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="12">
-                                        Submit
+                                <div class="col-md-2" style="margin-top: 23px;">
+                                    <button ng-disabled="searchData.University == '' || searchData.Course == ''" type="submit" class="btn btn-success" tabindex="12">
+                                        Get Record
                                     </button>
-
-                                    </div>
                                 </div>
                             </div>
 
@@ -207,23 +203,24 @@
 
                     <div>
                         <!--{{data | json}}-->
-                <div class="row" style="text-align: right;">
-                       
-                        <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
-                    
-                </div>        
                 <div ng-if="Searchloader">
-                    <div align="center" >
-                        <h3 style="color: blue;">Loading...</h3></div>
-                   <h2> {{statusMessage}} </h2>
+                        <div style="color: blue; align: center;" align="center"> Loading...</div>
                 </div>
-                            <div class="table-responsive" ng-if="studentData">
+                        <div align="center" ng-if="studentData==false">
+                            <div style="color: red; align: center;" align="center"> {{statusMessage}}</div>
+                        </div>
+                        <div class="row" style="text-align: right;">
+
+                            <button class="btn btn-success btn-o" ng-click="exportData()" ng-if="studentData">Export to Excel</button>
+
+                        </div>
+                        <div class="table-responsive" ng-if="studentData">
                                 <table class="table table-hover" >
                                     <thead>
                                         <tr>
                                             <th> FormID
                                             </th>
-                                            <th> Enrolment No
+                                            <th> Enrollment ID
                                             </th>
                                             <th> Form Type
                                             </th>
@@ -240,7 +237,7 @@
 
                                         </tr>
                                     </thead>
-                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="matched">
                                         <tr>
                                             <td>
                                                     {{p.FormID}}
@@ -292,13 +289,13 @@
                                         </tr>-->
                                     </tbody>
                                 </table>
-                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                <dir-pagination-controls pagination-id="matched" max-size="10" direction-links="true" boundary-links="true">
                                 </dir-pagination-controls>
 
                             </div>
                     </div>
                 </tab>
-                <tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Unmatched Records" id="unmatchedRecord">
+                <tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Un-Matched Details" id="unmatchedRecord">
 
                     <div class="col-md-3 form-group">
                         <label for="form-field-select-2">
@@ -314,7 +311,8 @@
 
                     <div class="col-md-3 form-group">
                         <label for="form-field-select-2">
-                            Course
+                            Course <span class="symbol required"></span>
+                        </label>
                         </label>
                         <select class="form-control" tabindex="15" class="cs-select cs-skin-elastic" name="mismatchCourseSearch" id="mismatchCourseSearch" ng-model="misMatchsSearchData.Course">
                             <option value=""  selected>Select Course</option>
@@ -334,7 +332,7 @@
                     </div>
 
                     <div class="col-md-2" style="margin-top: 20px;">
-                        <button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
+                        <button class="btn btn-success" ng-disabled="!misMatchUnivSearch || misMatchsSearchData.Course=='' " ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
                     </div>
 
                    
@@ -344,11 +342,11 @@
                             <div style="color: blue; align: center;" align="center"> Loading...</div>
                         </div>
                         <div ng-if="unMatchedNoRecordFound">
-                            <div style="color: red; align: center;" align="center"> No Record Found ...</div>
+                            <div style="color: red; align: center;" align="center"> No record found ...</div>
                         </div>
                     </div>
 
-                    <div class="row" style="text-align: right;">
+                    <div class="row" style="text-align: right;" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
                        
                         <button class="btn btn-success btn-o" ng-click="exportDataTab2()">Export to Excel</button>
                     
@@ -359,7 +357,7 @@
                             <table class="table table-border table-hover" >
                                 <thead>
                                 <th>FormID</th>
-                                <th>EnrolmentNo</th>
+                                <th>Enrollment ID</th>
                                 <th>SemesterYear</th>
                                 <th>MobileNumber</th>
                                 <th>StudentName</th>
@@ -377,7 +375,7 @@
 
 
                                 </thead>
-                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="unmatched">
                                 <tr>
                                     <td>{{p.FormID}}</td>
                                     <td ng-if="p.EnromentStatus==true">{{p.EnrolmentNo}}</td>
@@ -402,7 +400,7 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                            <dir-pagination-controls pagination-id="unmatched" max-size="10" direction-links="true" boundary-links="true">
                             </dir-pagination-controls>
                         </div>