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

issue no:1663

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-26 15:33:58 +05:30
parent 82bdf93122
commit 39c2eaf31a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,9 +814,11 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
$results['lList'] = false;
$results['message'] = 'No record found';
}
//print_r($this->db->last_query());die();
return $results;
}
//and list.ListName like 'PENDING'
public function followupsToday($branchId = null, $requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo

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

@ -966,6 +966,9 @@ where std.active = 1 and sms.branch = '".$br."'
$results['balfeeList'] = false;
$results['message'] = 'No record found';
}
// print_r($this->db->last_query());die();
return $results;
@ -1158,13 +1161,18 @@ WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registrati
// $fromd= date("Y-m-d",strtotime($from));
//and str_to_date(DOJ,?)>=?
$subQuery.=" and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')>='".$fromd."'";
// $subQuery.=" and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')>='".$fromd."'";
$subQuery.=" and str_to_date(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>='".$fromd."'";
}
if ($tod != ''){
// $tod=date("Y-m-d",strtotime($to));
$subQuery.="and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')<='".$tod."'";
/// $subQuery.="and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')<='".$tod."'";
$subQuery.="and str_to_date(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<='".$tod."'";
}