From 17e654509c71572e266ac1f7ab0020154fae1821 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 12:53:08 +0530 Subject: [PATCH] common files changes university enrolment details --- .../models/Receive_Enrolment_Fees_Univ_model.php | 1 + Apollo/assets/js/config.constant.js | 3 +++ Apollo/assets/js/controllers/univFormPaymentCtrl.js | 0 .../assets/views/student/UnivFormPaymentDetails.html | 10 ++++++++++ 4 files changed, 14 insertions(+) create mode 100644 Apollo/assets/js/controllers/univFormPaymentCtrl.js create mode 100644 Apollo/assets/views/student/UnivFormPaymentDetails.html 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 e1cb468c..827920e5 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -755,6 +755,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->select('UniversityID,UniversityName'); $this->db->order_by('UniversityID','DESC'); $this->db->where('IsActive','1'); + $this->db->group_by('UniversityName'); // $this->db->where('BranchCode',$branchID); $universityDetails = $this->db->get(UNIVERSITY); $universityResult=array(); diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 82beca4b..15774703 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -243,6 +243,9 @@ app.constant('JS_REQUIRES', { 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', 'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js', + // university form payment details + 'univFormPaymentCtrl': 'assets/js/controllers/univFormPaymentCtrl.js', + }, //*** angularJS Modules diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js new file mode 100644 index 00000000..e69de29b diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html new file mode 100644 index 00000000..566549bd --- /dev/null +++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file