From f35f9f471ce34aaef9a4487b3e6325013d4bbe89 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 25 Sep 2018 15:40:41 +0530 Subject: [PATCH] Batch Order in All reports --- Apollo/api/application/models/Reports_model.php | 4 ++-- .../assets/js/controllers/report_study_material_statusCtrl.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 53197f04..eb3888ca 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -944,11 +944,11 @@ from T_Lead_Tracking_Followup as ltf public function getBatch($universityID=null,$br=null) { - $this->db->select('BatchCode,BatchName'); + $this->db->select('BatchCode,BatchName,str_to_date(BatchDate, "%d-%m-%Y") BatchDate'); $this->db->where('UniversityID',$universityID); $this->db->where('IsActive','1'); $this->db->where('BranchCode',$br); - $this->db->order_by('BatchCode','DESC'); + $this->db->order_by('BatchDate','DESC'); $batchDetails = $this->db->get(BATCH); return $batchDetails->result(); } diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 5baa4742..1d5953c4 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -161,7 +161,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,Date,Status as StudyMaterial_Status INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,appdate as ApplicationSendtoUnivDate,Status as StudyMaterialStatus,Date as Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); };