Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10 TO 60DAYS FILTER CHANGED

Browse Source
This commit is contained in:
Velz2020 2020-03-10 11:59:20 +05:30
parent dcff61a625
commit fbe6933aa5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/application/controllers/Sales_PD_Controller.php
View File

@ -281,7 +281,7 @@ class Sales_PD_Controller extends REST_Controller {
} }
// FILTERING THE LAST 10 DAYS RECORDS // FILTERING THE LAST 10 DAYS RECORDS
$key_date='SALES_PD_DATA.createdon BETWEEN DATE_SUB(NOW(), INTERVAL 10 DAY) AND NOW()'; $key_date='SALES_PD_DATA.createdon BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()';
$condition_value=null; $condition_value=null;
$where_condition_array[$key_date] = $condition_value; $where_condition_array[$key_date] = $condition_value;
// print_r ($where_condition_array); // print_r ($where_condition_array);
@ -922,7 +922,8 @@ public function filterSalesPDList_post() {
$pd_lender = $records['pd_lender']; $pd_lender = $records['pd_lender'];
$pd_applicant_name = strtolower($records['pd_applicant_name']); $pd_applicant_name = strtolower($records['pd_applicant_name']);
$pd_officer_name = isset($records['pd_officer']) ? $records['pd_officer'] : null ; $pd_officer_name = isset($records['pd_officer']) ? $records['pd_officer'] : null ;
$result_data=$this->Sales_PD_Model->getSalesPDListwithFilters($pd_status,$pd_from_date,$pd_to_date,$pd_products,$pd_lender,$pd_applicant_name,$pd_officer_name); $sales_pd_officer_id = isset($records['sales_pd_officer_id']) ? $records['sales_pd_officer_id'] : null ;
$result_data=$this->Sales_PD_Model->getSalesPDListwithFilters($pd_status,$pd_from_date,$pd_to_date,$pd_products,$pd_lender,$pd_applicant_name,$pd_officer_name,$sales_pd_officer_id);
// print_r ($result_data); // print_r ($result_data);
if(count($result_data)){ if(count($result_data)){
$data['dataStatus'] = true; $data['dataStatus'] = true;

2
api/application/models/PD_Model.php
View File

@ -123,7 +123,7 @@ class PD_Model extends SPARQ_Model {
} }
// FILTERING THE LAST 10 DAYS RECORDS // FILTERING THE LAST 10 DAYS RECORDS
$filter_rec='PDTRIGGER.pd_date_of_initiation BETWEEN DATE_SUB(NOW(), INTERVAL 10 DAY) AND NOW()'; $filter_rec='PDTRIGGER.pd_date_of_initiation BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()';
$this->db->WHERE($filter_rec); $this->db->WHERE($filter_rec);
// ----END OF FILTERING THE LAST 10 DAYS RECORDS--- // ----END OF FILTERING THE LAST 10 DAYS RECORDS---

6
api/application/models/Sales_PD_Model.php
View File

@ -8,7 +8,7 @@ class Sales_PD_Model extends SPARQ_Model {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
} }
public function getSalesPDListwithFilters($pd_status = '',$pd_from_date = '',$pd_to_date = '',$pd_products = '',$pd_lender = '',$pd_applicant_name = '',$pd_officer_name = '') { public function getSalesPDListwithFilters($pd_status = '',$pd_from_date = '',$pd_to_date = '',$pd_products = '',$pd_lender = '',$pd_applicant_name = '',$pd_officer_name = '',$sales_pd_officer_id) {
// SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id, SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,DATE_FORMAT(SALES_PD_DATA.createdon, "%d/%m/%Y") as pd_createdon,SALES_PD_DATA.status // SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id, SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,DATE_FORMAT(SALES_PD_DATA.createdon, "%d/%m/%Y") as pd_createdon,SALES_PD_DATA.status
$this->db->SELECT(' SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id, SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,SALES_PD_DATA.createdon, $this->db->SELECT(' SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id, SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,SALES_PD_DATA.createdon,
DATE_FORMAT(SALES_PD_DATA.createdon, "%Y-%m-%d") as pd_createdon, SALES_PD_DATA.status'); DATE_FORMAT(SALES_PD_DATA.createdon, "%Y-%m-%d") as pd_createdon, SALES_PD_DATA.status');
@ -40,6 +40,10 @@ class Sales_PD_Model extends SPARQ_Model {
if(!empty($pd_officer_name)) { if(!empty($pd_officer_name)) {
$this->db->like('SALES_PD_DATA.officer_name',$pd_officer_name); $this->db->like('SALES_PD_DATA.officer_name',$pd_officer_name);
} }
if(!empty($sales_pd_officer_id)) {
$this->db->WHERE('SALES_PD_DATA.createdby',$sales_pd_officer_id);
}
$this->db->order_by('SALES_PD_DATA.sales_pd_id','desc'); $this->db->order_by('SALES_PD_DATA.sales_pd_id','desc');
$this->db->limit(1000,0); $this->db->limit(1000,0);
$result = $this->db->get()->result_array(); $result = $this->db->get()->result_array();