Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php

@@ -647,7 +647,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
     foreach ($formFeeDetails as $formIdDetails){
     
         $formIds = $formIdDetails['FormId'];
-// $bar ? $bar : $baz;
         $formType = $formIdDetails['Form Type'] ? $formIdDetails['Form Type'] : '';
         $CentreCode = $formIdDetails['CentreCode'] ?: '';
         $CourseCode = $formIdDetails['Course_Code'] ?: '';
@@ -757,14 +756,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
     public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){
     // echo $univID, $courseID;exit();
 
-            $this->db->select('t1.*,t2.EnrolmentNo,t2.CourseName, t4.*,t5.UniversityID, t5.UniversityName');
+            $this->db->select('t1.FormID, t1.FormType, t2.SemesterYear, t2.EnrolmentNo,t2.CourseName,t2.RollNo,  t4.*,t5.UniversityID, t5.UniversityName');
             $this->db->from('T_FormId_FeeDetails_Received_From_University as t1');
             $this->db->join('T_Enrolment_Received_From_University as t2', 't2.FormID = t1.FormID');
             $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo');
             $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID');
             $this->db->join('T_UniversityMaster as t5', 't5.UniversityID = t3.UniversityID');
-            // $this->db->where('t2.CourseCode', $courseID);
+            $this->db->where('t2.CourseCode', $courseCode);
-            // $this->db->where('t2.UniversityCode', $univCode);
+            $this->db->where('t2.UniversityCode', $univCode);
             $details = $this->db->get();
             $detailsList = $details->result();
 

Apollo/assets/js/controllers/student_university_fee_compare.js

@@ -115,7 +115,12 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
 
     };
 
+    
+    $scope.Searchloader = false;
+    $scope.studentData = false;
+  
     $scope.onSubmit = function(){
+        $scope.Searchloader = true;
         if($scope.searchData.University !== '' && $scope.searchData.Course !==''){
             $scope.Searchloader = true;
             var empListreq = {
@@ -135,9 +140,11 @@ 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;
                 } else {
                     $scope.Searchloader = false;
                     $scope.studentData = false;
+                    $scope.statusMessage = $scope.data.message;
                 }
             });
         }else {
@@ -145,6 +152,11 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
         }
     }
 
+    $scope.editId = -1;
+    $scope.setEditId=function(id){
+        $scope.editId = id;
+    }
+
     /*upload model*/
     $scope.uploadModel = {
         university: "",
@@ -263,7 +275,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
         };
 
         $http(updateUniversityEnrolment).then(function (response) {
-            if (response.data.branchListStatus == true) {
+            if (response.data.stuFeeList == true) {
                 swal("", "Updated Successfully", "success");
             } else {
                 swal("", "Failed", "error");
@@ -271,4 +283,32 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
         });
     }
 
+    $scope.popupLoad = false;
+    $scope.popupLoadData = false;
+    $scope.getFeeCompareDetails = function(formId, enrolmentId){
+        $scope.popupLoad = true;
+        var getFeeCompareDetailsList = {
+            method: 'POST',
+            url: apiPoint.url + 'getjsldkfjalkjlkkjf/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                localDetails: localDetail,
+                formId: formId,
+                enrolmentId: enrolmentId
+            }
+        };
+
+        $http(getFeeCompareDetailsList).then(function (response) {
+            if (response.data.stuFeeList == true) {
+                $scope.popupLoad = false;
+                $scope.popupLoadData = true;
+            } else {
+                $scope.popupLoad = false;
+                $scope.popupLoadData = true;
+            }
+        });
+    }
+
 }]);

Apollo/assets/views/data_correction.html

@@ -160,6 +160,8 @@
          </tbody>
       </table>
    </div>
+   <dir-pagination-controls  direction-links="true" boundary-links="true">
+        </dir-pagination-controls>
 </div>
 
 </form>

Apollo/assets/views/student/studentUnivFeeCompareDetails.html

@@ -82,7 +82,7 @@
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div class="pull-right">
 
-                                        <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                        <button ng-disabled="searchData.Course == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="8">
                                         Submit
                                     </button>
 
@@ -94,13 +94,19 @@
                     </div>
                     <div>
                         <!--{{data | json}}-->
-
+<div ng-if="Searchloader">
-                            <div class="table-responsive">
+    <div align="center" >
-                                <table class="table table-hover">
+        <h3 style="color: blue;">Loading...</h3></div>
+   <h2> {{statusMessage}} </h2>
+</div>
+                            <div class="table-responsive" ng-if="studentData">
+                                <table class="table table-hover" >
                                     <thead>
                                         <tr>
                                             <th> FormID
                                             </th>
+                                            <th> Form Type
+                                            </th>
                                             <th> Student Name
                                             </th>
                                             <th> Father Name
@@ -108,9 +114,13 @@
                                             <th> University
                                             </th>
                                             <th> Course
+                                           </th>
+                                            <th> Sem/Year
                                            </th>
                                             <th> Enrolment ID
                                            </th>
+                                           <th> Action
+                                           </th>
                                         </tr>
                                     </thead>
                                     <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
@@ -118,6 +128,9 @@
                                             <td>
                                                     {{p.FormID}}
                                             </td>
+                                            <td>
+                                                    {{p.FormType}}
+                                            </td>
                                             <td>
                                                 <a tooltip="View Student" ng-click="open(p);" class="text-dark">
                                                     {{p.Firstname}} {{p.Lastname}}
@@ -126,7 +139,37 @@
                                             <td>{{p.Fathername}}</td>
                                             <td>{{p.UniversityName}}</td>
                                             <td>{{p.CourseName}}</td>
+                                            <td>{{p.SemesterYear}}</td>
                                             <td>{{p.EnrolmentNo}}</td>
+                                            <td> 
+                                                <i class="ti-write" tooltip="View Fee Details" id="personalDetailButton"  ng-click="setEditId(p.FormID);getFeeCompareDetails(p.FormID, p.EnrolmentNo)"></i>
+                                            </td>
+                                        </tr>
+                                        <tr ng-show="editId === p.FormID" ng-if="editId === p.FormID">
+                                         <td colspan="9">
+                                             <div ng-if="popupLoad">
+                                                <div align="center" >
+                                                        <h3 style="color: blue;">Loading...</h3></div>
+                                                <h2> {{statusMessage}} </h2>
+                                             </div> 
+                                             <div class="container">
+                                                 <div class="container" align="center">
+                                                     <table class="table table-border">
+                                                         <thead>
+                                                             <th>University Fee Details</th>
+                                                             <th>Student Fee Paid Details</th>
+                                                         </thead>
+                                                         <tbody>
+                                                             <tr>
+                                                                 <td></td>
+                                                                 <td></td>
+                                                             </tr>
+                                                         </tbody>
+                                                     </table>
+                                                 </div>
+                                                 <button class="btn btn-warning pull-right" ng-click="setEditId(-1);">Cancel</button>
+                                             </div>
+                                         </td>
                                         </tr>
                                     </tbody>
                                 </table>