Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Batch Order in All reports

Browse Source
This commit is contained in:
gandhimathi 2018-09-25 15:40:41 +05:30
parent b78f5c88d4
commit f35f9f471c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Reports_model.php
View File

@ -944,11 +944,11 @@ from T_Lead_Tracking_Followup as ltf
public function getBatch($universityID=null,$br=null) 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('UniversityID',$universityID);
$this->db->where('IsActive','1'); $this->db->where('IsActive','1');
$this->db->where('BranchCode',$br); $this->db->where('BranchCode',$br);
$this->db->order_by('BatchCode','DESC'); $this->db->order_by('BatchDate','DESC');
$batchDetails = $this->db->get(BATCH); $batchDetails = $this->db->get(BATCH);
return $batchDetails->result(); return $batchDetails->result();
} }

2
Apollo/assets/js/controllers/report_study_material_statusCtrl.js
View File

@ -161,7 +161,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.exportData = function () { $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]);
}; };