From bda44b1bbae786b1be90f2d10d5805c9c4608220 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 29 Aug 2018 18:33:01 +0530
Subject: [PATCH] university fee details upload changes : kdk

---
 Apollo/api/application/config/routes.php      |  1 +
 ...Receive_Enrolment_Fees_Univ_Controller.php | 27 +++++++++++++++++++
 .../Receive_Enrolment_Fees_Univ_model.php     | 16 +++++++++++
 .../student/studentUnivFeeCompareDetails.html |  2 +-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index 98749e5e..3eaaa176 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -346,3 +346,4 @@ $route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicati
 // update university enrolment and  fees details received
 $route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/receiveEnrolmentFromUniv';
 $route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails';
+$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
\ No newline at end of file
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 10a6c03f..e6281f3f 100644
--- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
+++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
@@ -65,6 +65,10 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
 
     }
 
+    /*
+     * This method used to add formid related student fee details form university
+     * created by kdk
+     * */
     public function insertFormIdUnivFeeDetails_post(){
         $formIdDetails = $this->post('details');
         $localDetails = $this->post('localDetails');
@@ -86,4 +90,27 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
 
     }
 
+    public function getStudentUnivFeeCompareDetails_post(){
+        $searchData = $this->post('search');
+        
+        $univID = $searchData['University'];
+        $courseID = $searchData['Course'];
+
+        $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($univID,$courseID);// Check if the users data store contains users (in case the database result returns NULL)
+        if ($getUnivStudentFeeCompare)
+        {
+            $getUnivStudentFeeCompare['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getUnivStudentFeeCompare, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'Something went wrong.please try again!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+    }
+
 }
\ No newline at end of file
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 bdc8114d..158fb9f2 100644
--- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
+++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
@@ -749,6 +749,22 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         return 'true';
     }
 
+ 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";
+
+ }
 
 }
\ No newline at end of file
diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
index 08e51840..5f18476b 100644
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@@ -75,7 +75,7 @@
                                     <select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course"
                                         ng-change="getValueChange()">
                         <option value="" selected>Select Course</option>
-                        <option ng-repeat="itemCourse in courseData"  value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}<span ng-show="itemCourse.CourseCode != ''">(<strong>{{itemCourse.CourseCode}}</strong>)</span></option>
+                        <option ng-repeat="itemCourse in courseData"  value="{{itemCourse.CourseCode}}">{{itemCourse.CourseName}}<span ng-show="itemCourse.CourseCode != ''">(<strong>{{itemCourse.CourseCode}}</strong>)</span></option>
                         </select>
                                 </div>