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

GET QUES KEY CHANGED2

Browse Source
This commit is contained in:
velz 2018-11-28 19:08:09 +05:30
parent 8f2667322a
commit 895daed42b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2182,6 +2182,8 @@ class PD_Controller extends REST_Controller {
$household_expenses = array(); $household_expenses = array();
$household_expenses_flag = 0; $household_expenses_flag = 0;
$overall_purchase_total = 0;
//Get all Master Details //Get all Master Details
$result_array = $this->PD_Model->getAssessedIncome($pd_id); $result_array = $this->PD_Model->getAssessedIncome($pd_id);
print_r($result_array); print_r($result_array);
@ -2286,6 +2288,12 @@ class PD_Controller extends REST_Controller {
if($gross_profit_calculation_type[0]['mode'] == 1) if($gross_profit_calculation_type[0]['mode'] == 1)
{ {
//calculate overall purchase //calculate overall purchase
$overall_purchase_total = 0;
foreach()
{
}
} }
else else
{ {

4
api/application/controllers/Template_Management_Controller.php
View File

@ -543,7 +543,7 @@ class Template_Management_Controller extends REST_Controller {
if(!count($exits_questions)) if(!count($exits_questions))
{ {
$fields = array('fk_form_id','question','key','ismaster','master_name'); $fields = array('question_key_mapping_id,fk_form_id','question','key','ismaster','master_name');
$where_condition_array = array(); $where_condition_array = array();
if($formid != 0) if($formid != 0)
{ {
@ -594,7 +594,7 @@ class Template_Management_Controller extends REST_Controller {
array_push($temp_array,$res['fk_key']); array_push($temp_array,$res['fk_key']);
} }
//print_r($temp_array); //print_r($temp_array);
$this->db->SELECT('QUESTIONKEYMAPPING.fk_form_id,QUESTIONKEYMAPPING.question,QUESTIONKEYMAPPING.key,QUESTIONKEYMAPPING.master_name,SCORECARDQUESTIONS.score_question_id,SCORECARDQUESTIONS.fk_template_id,SCORECARDQUESTIONS.fk_form_id,SCORECARDQUESTIONS.fk_key,SCORECARDQUESTIONS.weightage,SCORECARDQUESTIONS.calc_type'); $this->db->SELECT('QUESTIONKEYMAPPING.question_key_mapping_id,QUESTIONKEYMAPPING.fk_form_id,QUESTIONKEYMAPPING.question,QUESTIONKEYMAPPING.key,QUESTIONKEYMAPPING.master_name,SCORECARDQUESTIONS.score_question_id,SCORECARDQUESTIONS.fk_template_id,SCORECARDQUESTIONS.fk_form_id,SCORECARDQUESTIONS.fk_key,SCORECARDQUESTIONS.weightage,SCORECARDQUESTIONS.calc_type');
$this->db->FROM(QUESTIONKEYMAPPING.' as QUESTIONKEYMAPPING'); $this->db->FROM(QUESTIONKEYMAPPING.' as QUESTIONKEYMAPPING');
$this->db->JOIN(SCORECARDQUESTIONS.' as SCORECARDQUESTIONS','QUESTIONKEYMAPPING.fk_form_id = SCORECARDQUESTIONS.fk_form_id AND QUESTIONKEYMAPPING.key = SCORECARDQUESTIONS.fk_key AND SCORECARDQUESTIONS.isactive = 1','LEFT'); $this->db->JOIN(SCORECARDQUESTIONS.' as SCORECARDQUESTIONS','QUESTIONKEYMAPPING.fk_form_id = SCORECARDQUESTIONS.fk_form_id AND QUESTIONKEYMAPPING.key = SCORECARDQUESTIONS.fk_key AND SCORECARDQUESTIONS.isactive = 1','LEFT');