From 31a2ead630928a4d2479e8207bba66156fce9ead Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Thu, 30 Aug 2018 11:20:29 +0530
Subject: [PATCH] student university fee details comparition : kdk

---
 .../Receive_Enrolment_Fees_Univ_model.php     | 43 +++++++++++--------
 .../student_university_fee_compare.js         |  4 +-
 .../student/studentUnivFeeCompareDetails.html | 43 +++++++++++++++++++
 3 files changed, 71 insertions(+), 19 deletions(-)

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 3de970e7..ef67760c 100644
--- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
+++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
@@ -736,25 +736,34 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 //             }
 //         }
         
-        return 'true';
+        $results['stuFeeList'] = true;
+        $results['stuFeeList_details'] = "details updated successfully.";
+        return $results;
     }
 
- public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){
-// echo $univID, $courseID;exit();
+    public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){
+    // echo $univID, $courseID;exit();
 
-        // $this->db->select('t1.*,t2.EnrolmentNo');
-        // $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', 'LEFT');
-        // $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo', 'LEFT');
-        // $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID', 'LEFT');
-        // // $this->db->where('t2.CourseCode', $courseID);
-        // // $this->db->where('t2.UniversityCode', $univCode);
-        // $details = $this->db->get();
-        // $detailsList = $details->result();
-        // print_r($detailsList);exit();
-
-        // return "$roleDetails->Sem_Year $roleDetails->CourseName";
-
- }
+            $this->db->select('t1.*,t2.EnrolmentNo,t2.CourseName, 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.UniversityCode', $univCode);
+            $details = $this->db->get();
+            $detailsList = $details->result();
 
+            if($detailsList){
+                $resultArr['studentFeeCompareDetails'] = $detailsList;
+                $resultArr['formTypeStatus'] = true;
+                $resultArr['message'] = "Successfully data generated";
+            } else {
+                $resultArr['studentFeeCompareDetails'] = [];
+                $resultArr['formTypeStatus'] = false;
+                $resultArr['message'] = "No record found";
+            }
+        return $resultArr;
+    }
 }
\ No newline at end of file
diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js
index 8f2539d9..b81d0011 100644
--- a/Apollo/assets/js/controllers/student_university_fee_compare.js
+++ b/Apollo/assets/js/controllers/student_university_fee_compare.js
@@ -130,10 +130,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                 }
             };
             $http(empListreq).then(function (response) {
-                if (response.data.studentList) {
+                if (response.data.formTypeStatus) {
                     $scope.Searchloader = false;
                     $scope.studentData = true;
-                    $scope.data = response.data.student_details;
+                    $scope.data = response.data.studentFeeCompareDetails;
                     $scope.studentListLength = $scope.data.length;
                 } else {
                     $scope.Searchloader = false;
diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
index 5f18476b..347ecd0b 100644
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@@ -92,6 +92,49 @@
 
                         </form>
                     </div>
+                    <div>
+                        <!--{{data | json}}-->
+
+                            <div class="table-responsive">
+                                <table class="table table-hover">
+                                    <thead>
+                                        <tr>
+                                            <th> FormID
+                                            </th>
+                                            <th> Student Name
+                                            </th>
+                                            <th> Father Name
+                                           </th>
+                                            <th> University
+                                            </th>
+                                            <th> Course
+                                           </th>
+                                            <th> Enrolment ID
+                                           </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                        <tr>
+                                            <td>
+                                                    {{p.FormID}}
+                                            </td>
+                                            <td>
+                                                <a tooltip="View Student" ng-click="open(p);" class="text-dark">
+                                                    {{p.Firstname}} {{p.Lastname}}
+                                                </a>
+                                            </td>
+                                            <td>{{p.Fathername}}</td>
+                                            <td>{{p.UniversityName}}</td>
+                                            <td>{{p.CourseName}}</td>
+                                            <td>{{p.EnrolmentNo}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>
+
+                            </div>
+                    </div>
                 </tab>
                 <tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Files" id="uploadFiles">
                     <div class="container-fluid">