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

SCHEDULAE

Browse Source
This commit is contained in:
velz 2018-10-17 18:27:32 +05:30
parent 4d4b6285aa
commit cb07e7aa41
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/constants.php
View File

@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto
// define login route name for token verification
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'updatePDMaster'); // no errors
/*********************AWS resources Constants*************************************************/
defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');

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

@ -449,18 +449,19 @@ class PD_Controller extends REST_Controller {
*/
public function updatePDMaster_post()
{
$pd_details = $this->post('pd_details');
$pd_details = $this->post('records');
//print_r($pd_details);
$where_condition_array = array('pd_id' => $pd_details['pd_id']);
$pd_id_modified = $this->PD_Model->updateRecords($pd_details,PDTRIGGER,$where_condition_array);
if($records['pd_status'] == TRIGGERED)
if($pd_details['pd_status'] == TRIGGERED)
{
// Create entries on `t_pd_category_weightage` table from Template Category weightage
}
if($pd_id_modified != null || $pd_id_modified != '' && $count != 0)
{
PDALERTS::pdnotification($pd_id);
PDALERTS::pdnotification($pd_details['pd_id']);
$data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK;
$data['records'] = true;
@ -686,28 +687,6 @@ class PD_Controller extends REST_Controller {
*/
public function schdulePD_post()
{
$records['fk_pd_id'] = 40;
$fields = array('fk_pd_template_id');
$where_condition_array = array('pd_id'=>$records['fk_pd_id']);
$res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER);
//print_r($res_array);
if(count($res_array))
{
$template_id = $res_array[0]['fk_pd_template_id'];
echo $template_id;
$fields = array('fk_question_category_id','weightage');
$where_condition_array = array('fk_template_id'=>$template_id);
$res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATECATEGORYWEIGHTAGE);
//print_r($res_array);
foreach($res_array as $key => $category)
{
$temp_data = array('fk_pd_id'=>$records['fk_pd_id'],'fk_category_id'=>$category['fk_question_category_id'],'pd_category_weightage'=>$category['weightage']);
$this->PD_Model->saveRecords($temp_data,PDCATEGORYWEIGHTAGE);
}
}
//die();
$records = $this->post('records');
if($records['schedule_time'] != "" || $records['schedule_time'] != null)
{

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

@ -284,10 +284,11 @@ class PD_Model extends SPARQ_Model {
foreach($categories as $category_key => $category)
{
$this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive');
$this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive,QUESTIONANSWERTYPE.answer_type_name');
//$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION');
$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION');
$this->db->JOIN(QUESTIONS.' as QUESTIONS','TEMPLATEQUESTION.fk_question_id = QUESTIONS.question_id','LEFT');
$this->db->JOIN(QUESTIONANSWERTYPE.' as QUESTIONANSWERTYPE','QUESTIONS.fk_question_answertype = QUESTIONANSWERTYPE.question_answer_type_id','LEFT');
// $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT');
// $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT');
$this->db->WHERE('TEMPLATEQUESTION.fk_template_question_category_id',$category['fk_question_category_id']);