From f55d5a10afc6649731712e2519373167308bf8e8 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 30 Aug 2018 13:18:10 +0530 Subject: [PATCH 1/3] hall ticket sorting date --- Apollo/api/application/models/Hallticket_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index b7ac38ed..152cf58f 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -11,7 +11,7 @@ class Hallticket_model extends CI_Model { - /* + /* * get university details * created by velz * */ @@ -843,7 +843,7 @@ class Hallticket_model extends CI_Model JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$ind['SemID'],$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in = $res->result(); From 42453ef6222e1b1e2f823f2f67a2d846e067fdbe Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 14:15:53 +0530 Subject: [PATCH 2/3] constant and router changes --- Apollo/api/application/config/constants.php | 1 + Apollo/api/application/config/routes.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index 1ae3e72d..a7d21665 100755 --- a/Apollo/api/application/config/constants.php +++ b/Apollo/api/application/config/constants.php @@ -160,6 +160,7 @@ defined('STUDENTDOCUMENTDETAILS') OR define('STUDENTDOCUMENTDETAILS','T_StudentD defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','T_Student_DocumentTrack_Details'); defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details'); defined('ENROLMENTRECEIVEDFROMUNIV') OR define('ENROLMENTRECEIVEDFROMUNIV','T_Enrolment_Received_From_University'); +defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_FormId_FeeDetails_Received_From_University'); // define APPLICATION certificate type constant diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 3eaaa176..2aa9297b 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -346,4 +346,5 @@ $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 +$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails'; +$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails'; \ No newline at end of file From dc8f742501a221d47e9285e10dad7a5f640251bd Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 09:28:12 +0000 Subject: [PATCH 3/3] data_correction.html edited online with Bitbucket --- Apollo/assets/views/data_correction.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Apollo/assets/views/data_correction.html b/Apollo/assets/views/data_correction.html index d1064439..89937b1d 100644 --- a/Apollo/assets/views/data_correction.html +++ b/Apollo/assets/views/data_correction.html @@ -160,6 +160,8 @@ + +