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

INLINE

Browse Source
This commit is contained in:
Velz2020 2019-09-05 16:01:02 +05:30
parent f0b21f0b04
commit 49053c03d5
8 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/application/config/api_user_auth_config.php
View File

@ -38,7 +38,7 @@ $config['api_user_auth_info'] = array(
'updatePDApplicants' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), 'updatePDApplicants' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20),
'allocatePD' => array(2,3,4,5,10,21,22), 'allocatePD' => array(2,3,4,5,10,21,22),
'schdulePD' => array(2,3,4,5,21,10,22), 'schdulePD' => array(2,3,4,5,21,10,22),
'generatePDReport' => array(6,7,10), 'generatePDReport' => array(3,6,7,10),
'savePDPhotos' => array(3,4,5,6,7,10,21,22), 'savePDPhotos' => array(3,4,5,6,7,10,21,22),
'savePDFormDetails' => array(3,4,5,6,7,10,21,22), 'savePDFormDetails' => array(3,4,5,6,7,10,21,22),
'getListOfPDTeam' => array(10), 'getListOfPDTeam' => array(10),
@ -57,8 +57,8 @@ $config['api_user_auth_info'] = array(
'getPDFormDetails' => array(3,4,5,6,7,10,21,22), 'getPDFormDetails' => array(3,4,5,6,7,10,21,22),
'getPDImages' => array(3,4,5,6,7,10,21,22), 'getPDImages' => array(3,4,5,6,7,10,21,22),
'updatePDPhoto' => array(3,4,5,6,7,10,21,22), 'updatePDPhoto' => array(3,4,5,6,7,10,21,22),
'saveHTMLReport' => array(6,7,10), 'saveHTMLReport' => array(1,2,3,6,7,10),
'archivePDImages' => array(6,7,10) 'archivePDImages' => array(1,2,3,6,7,10)
); );
?> ?>

39
api/application/controllers/Dash_Board_Controller.php
View File

@ -121,30 +121,31 @@ class Dash_Board_Controller extends REST_Controller {
$allocated_date = date_create($value['Allocated']); $allocated_date = date_create($value['Allocated']);
$accepted_date = $value['Accepted'] != "" ? date_create( $value['Accepted'] ) : date_create(date('y-m-d H:i:s')); $accepted_date = $value['Accepted'] != "" ? date_create( $value['Accepted'] ) : date_create(date('y-m-d H:i:s'));
$diff = date_diff($allocated_date,$accepted_date); $diff = date_diff($allocated_date,$accepted_date);
$res_array[$key]['pdid'] = $value['PD'];
$res_array[$key]['pd_sno'] = $value['pd_sno'];
$res_array[$key]['allocated'] = $value['Allocated'];
$res_array[$key]['accepted'] = $value['Accepted'];
$res_array[$key]['tat'] = $value['tat'] ? $value['tat'] : 'TAT NOT DEFINED';
//$res_array[$key]['diff'] = $diff->format('%m months %d days %H hrs %i mins %s secs');
if( $diff->d ) if( $diff->d )
{ {
$res_array[$key]['comment'] = $diff->format('%d days %H hrs %i mins %s secs');
$res_array[$key]['pdid'] = $value['PD']; $res_array[$key]['status'] = $value['tat'] && $diff->d ? 'TAT BREACH': 'NORMAL';
$res_array[$key]['allocated'] = $value['Allocated'];
$res_array[$key]['accepted'] = $value['Accepted'];
$res_array[$key]['comment'] = '###more than a day';
$res_array[$key]['diff'] = $diff->format('%d days %H hrs %i mins %s secs');
$res_array[$key]['tat'] = $value['tat'] ? $value['tat'] : 'TAT NOT DEFINED';
$res_array[$key]['status'] = '****ALERT TAT BREACH*****';
} }
else else if( !$diff->d && $diff->h)
{ {
$res_array[$key]['pdid'] = $value['PD']; $res_array[$key]['comment'] = $diff->format('%H hrs %i mins %s secs');
$res_array[$key]['allocated'] = $value['Allocated']; $res_array[$key]['status'] = $value['tat'] && $diff->h ? 'TAT BREACH': 'NORMAL';
$res_array[$key]['accepted'] = $value['Accepted'];
$res_array[$key]['comment'] = '###same day ya..';
$res_array[$key]['diff'] = $diff->format('%d days %H hrs %i mins %s secs');
$res_array[$key]['tat'] = $value['tat'] ? $value['tat'] : 'TAT NOT DEFINED';
$res_array[$key]['status'] = $diff->h < $value['tat'] ? 'NORMAL': '****ALERT TAT BREACH*****';
} }
//if($key == 10){ break;} else if(!$diff->d && !$diff->h && $diff->i)
{
$res_array[$key]['comment'] = $diff->format('%i mins %s secs');
$res_array[$key]['status'] = $value['tat'] && $diff->i ? 'TAT BREACH': 'NORMAL';
}
} }

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

@ -62,7 +62,8 @@ class Entity_Management_Controller extends REST_Controller {
if($entity_id != '' || $entity_id != null) if($entity_id != '' || $entity_id != null)
{ {
$CUSTOM_DEBUG_INFO = 'CUSTOM_DEBUG_INFO :- Entity Created Successfully! '. $entity_id;
log_message('ERROR',$CUSTOM_DEBUG_INFO);
// If New Entity is Lender(2) type, then create a S3 bucket for corresponding lender. // If New Entity is Lender(2) type, then create a S3 bucket for corresponding lender.
if($records['fk_entity_type_id'] == 2) if($records['fk_entity_type_id'] == 2)
{ {
@ -71,6 +72,8 @@ class Entity_Management_Controller extends REST_Controller {
$bucket_status = $this->aws_s3->createNewBucket($bucket_name); $bucket_status = $this->aws_s3->createNewBucket($bucket_name);
if($bucket_status['Location']) if($bucket_status['Location'])
{ {
$CUSTOM_DEBUG_INFO = 'CUSTOM_DEBUG_INFO :- Bucket Created Successfully! '. $entity_id;
log_message('ERROR',$CUSTOM_DEBUG_INFO);
$cors_status = $this->aws_s3->setCors($bucket_name); $cors_status = $this->aws_s3->setCors($bucket_name);
} }

8
api/application/controllers/PD_Controller.php
View File

@ -1695,7 +1695,7 @@ public function assignPDTempalate($data)
//echo 'Find General Team ID'; //echo 'Find General Team ID';die();
$fields = array('pdteam_id'); $fields = array('pdteam_id');
$where_condition_array = array('team_name' => "General"); $where_condition_array = array('team_name' => "General");
$general_team_id = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTEAM); $general_team_id = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTEAM);
@ -2694,9 +2694,12 @@ public function getPDFormDetailsJSON_post()
} }
$rec = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON); $rec = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
// print_r($rec); // print_r($rec);
if(isset($rec[0]['json']))
{
$temp_rec = json_decode($rec[0]['json'],true); $temp_rec = json_decode($rec[0]['json'],true);
if(count($temp_rec)) if(($temp_rec))
{ {
$pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id); $pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id);
$bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id']; $bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id'];
@ -2782,6 +2785,7 @@ public function getPDFormDetailsJSON_post()
} }
$rec[0]['json'] = json_encode($temp_rec); $rec[0]['json'] = json_encode($temp_rec);
}
// print_r($rec);die(); // print_r($rec);die();
// if(count($rec)) // if(count($rec))
// { // {

2
api/application/controllers/User_Management_Controller.php
View File

@ -132,7 +132,7 @@ class User_Management_Controller extends REST_Controller {
{ {
$entity_id = $records['fk_entity_type_id']; $entity_id = $records['fk_entity_type_id'];
$roles = $roles['user_role']; $roles = $roles['user_role'];
if($entity_id ==1 && $roles == 5 || $roles ==4){ if($entity_id ==1 && ($roles == 5 || $roles ==4)){
if($roles == 5) if($roles == 5)
{ {
$pdofficer['fk_pd_type_id'] = 1; $pdofficer['fk_pd_type_id'] = 1;

20
api/application/helpers/inlinephototransform_helper.php
View File

@ -16,12 +16,12 @@ class INLINEPHOTOTRANSFORM
if(isset($value['is_person_met_pic']) && $value['is_person_met_pic'] != "") if(isset($value['is_person_met_pic']) && $value['is_person_met_pic'] != "")
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$value['is_person_met_pic'],$value['applicant_name'],$pd_details,18); $base64 = self::addTimestampAndReturnBase64($CI,$value['is_person_met_pic'],$value['applicant_name'],$pd_details,18);
//$records['individuals'][$key]['is_person_met_pic'] = $base64; $records['individuals'][$key]['is_person_met_pic'] = '';
} }
if(isset($value['is_person_met_id_proof']) && $value['is_person_met_id_proof'] != "") if(isset($value['is_person_met_id_proof']) && $value['is_person_met_id_proof'] != "")
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$value['is_person_met_id_proof'],($value['applicant_name'].'-id_proof'),$pd_details,18); $base64 = self::addTimestampAndReturnBase64($CI,$value['is_person_met_id_proof'],($value['applicant_name'].'-id_proof'),$pd_details,18);
//$records['individuals'][$key]['is_person_met_id_proof'] = $base64; $records['individuals'][$key]['is_person_met_id_proof'] = '';
} }
} }
} }
@ -41,7 +41,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['shop_eat_act_cert_pic'],'shop_eat_act_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['shop_eat_act_cert_pic'],'shop_eat_act_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
// $records['shop_eat_act_cert_pic'] = $base64; $records['shop_eat_act_cert_pic'] = '';
} }
@ -50,7 +50,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['gst_Regn_cert_pic'],'gst_Regn_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['gst_Regn_cert_pic'],'gst_Regn_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['gst_Regn_cert_pic'] = $base64; $records['gst_Regn_cert_pic'] = '';
} }
@ -58,7 +58,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['pf_regn_pic'],'pf_regn_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['pf_regn_pic'],'pf_regn_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
// $records['pf_regn_pic'] = $base64; $records['pf_regn_pic'] = '';
} }
@ -67,7 +67,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['esic_regn_pic'],'esic_regn_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['esic_regn_pic'],'esic_regn_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['esic_regn_pic'] = $base64; $records['esic_regn_pic'] = '';
} }
@ -75,7 +75,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['export_import_cert_pic'],'export_import_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['export_import_cert_pic'],'export_import_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['export_import_cert_pic'] = $base64; $records['export_import_cert_pic'] = '';
} }
@ -84,7 +84,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['factory_cert_pic'],'factory_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['factory_cert_pic'],'factory_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['factory_cert_pic'] = $base64; $records['factory_cert_pic'] = '';
} }
@ -92,7 +92,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['practice_cert_pic'],'practice_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['practice_cert_pic'],'practice_cert_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['practice_cert_pic'] = $base64; $records['practice_cert_pic'] = '';
} }
@ -100,7 +100,7 @@ class INLINEPHOTOTRANSFORM
{ {
$base64 = self::addTimestampAndReturnBase64($CI,$records['fire_noc_pic'],'fire_noc_pic',$pd_details,13,$records['company_id'],$busienss_info_location); $base64 = self::addTimestampAndReturnBase64($CI,$records['fire_noc_pic'],'fire_noc_pic',$pd_details,13,$records['company_id'],$busienss_info_location);
//$records['fire_noc_pic'] = $base64; $records['fire_noc_pic'] = '';
} }

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

@ -14,7 +14,7 @@ class Entity_Management_Model extends SPARQ_Model {
{ {
$result_data = array(); $result_data = array();
$this->db->SELECT('ENTITY.entity_id, ENTITY.full_name, ENTITY.short_name,ENTITY.createdon, ENTITY.fk_createdby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby, ENTITY.updatedon, ENTITY.fk_updatedby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, ENTITY.isactive,ENTITY.fk_entity_type_id,ENTITYTYPE.name as entity_name'); $this->db->SELECT('ENTITY.entity_id, ENTITY.full_name, ENTITY.short_name,ENTITY.createdon, ENTITY.fk_createdby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby, ENTITY.updatedon, ENTITY.fk_updatedby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, ENTITY.isactive,ENTITY.fk_entity_type_id,ENTITYTYPE.name as entity_name,ENTITY.is_otp_enabled,ENTITY.is_score_card_enabled');
$this->db->FROM(ENTITY.' as ENTITY'); $this->db->FROM(ENTITY.' as ENTITY');
$this->db->JOIN(USERPROFILE.' as USERPROFILE','ENTITY.fk_createdby = USERPROFILE.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE','ENTITY.fk_createdby = USERPROFILE.userid','LEFT');
$this->db->JOIN(USERPROFILE.' as USERPROFILE1','ENTITY.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','ENTITY.fk_updatedby = USERPROFILE1.userid','LEFT');

2
api/index.php
View File

@ -69,7 +69,7 @@
} }
else if(isset($_SERVER['HTTP_HOST']) && !strcasecmp($_SERVER['HTTP_HOST'],'localhost') && isset($_SERVER['REQUEST_URI']) && substr_count($_SERVER['REQUEST_URI'], 'sparqapi') == 1) else if(isset($_SERVER['HTTP_HOST']) && !strcasecmp($_SERVER['HTTP_HOST'],'localhost') && isset($_SERVER['REQUEST_URI']) && substr_count($_SERVER['REQUEST_URI'], 'sparqapi') == 1)
{ {
define('ENVIRONMENT','testing'); define('ENVIRONMENT','development');
} }
else else
{ {