diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 47a78fdc..92177c19 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -8206,12 +8206,12 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() { - if($person['is_person_met_pic']) + if(!$person['is_person_met_pic']) { $person_met_selfie_count++; } - if($person['is_person_met_id_proof']) + if(!$person['is_person_met_id_proof']) { $person_met_id_proof_count++; } @@ -8231,7 +8231,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $sal_check = count($sal_check) ? $sal_check[0]['flag'] : null; } - if(!$person_met_is_applicant_count && $sal_check == null){ $incomplete_details[] = 'General Section - Person met is not an applicant'; } + //if(!$person_met_is_applicant_count && $sal_check == null){ $incomplete_details[] = 'General Section - Person met is not an applicant'; } if(!$person_met_selfie_count && $sal_check == null){ $incomplete_details[] = 'General Section - Person met selfie image with PD officer not captured'; } if(!$person_met_id_proof_count && $sal_check == null ){ $incomplete_details[] = 'General Section - Person met ID proof image not captured'; } #####End of General Form Questions######## diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 5c8753f3..b9eb2e01 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -182,7 +182,7 @@ class Sales_PD_Controller extends REST_Controller { if(!file_exists($this->external_path.'/sales_pd/'.$sales_pd_id)) { - mkdir($this->external_path.'/sales_pd/'.$sales_pd_id,0761); + mkdir($this->external_path.'/sales_pd/'.$sales_pd_id,0777); } if(!$sales_pd_data[0]['is_pdf'] || $sales_pd_data[0]['is_edited']) diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php index a5015af3..01d19053 100644 --- a/api/application/views/sale_pd_templates/MWISE.php +++ b/api/application/views/sale_pd_templates/MWISE.php @@ -87,6 +87,41 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* #########End of Score Card Table Styles######### */ + +/* #########Score Card2 Table Styles######### */ + + .scorecard_table2 { + /* font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;*/ + /*font-family: Merriweather;*/ + border-collapse: collapse; + width: 100%; + page-break-inside: avoid; + +} + +.scorecard_table2 td, .scorecard_table2 th { + border: 1px solid #000; + padding: 8px; + page-break-inside: avoid; + + +} + +.scorecard_table2 tr:nth-child(even){background-color: #f2f2f2;page-break-inside: avoid; } + +.scorecard_table2 tr:hover {background-color: #ddd;} + +.scorecard_table2 th { + padding-top: 8px; + padding-bottom: 8px; + text-align: center; + background-color: #0191ed; + color: white;page-break-inside: avoid; + +} + +/* #########End of Score Card 2 Table Styles######### */ + .tdcenteralign{ text-align: center; } .thlargefont{ font-size: 20px; } @@ -427,7 +462,7 @@ if(isset($section6)) ?>
- +
diff --git a/api/index.php b/api/index.php index 5cecb88b..3c4bf3c0 100644 --- a/api/index.php +++ b/api/index.php @@ -72,7 +72,7 @@ } 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'); define('XLPATH',$_SERVER['DOCUMENT_ROOT'].'/ssa_external_data/'.ENVIRONMENT); } else @@ -107,10 +107,10 @@ switch (ENVIRONMENT) case 'testing': error_reporting(-1); - ini_set('display_errors', 1); + ini_set('display_errors', 0); break; case 'production': - ini_set('display_errors', 1); + ini_set('display_errors', 0); if (version_compare(PHP_VERSION, '5.3', '>=')) { error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
Final Remarks of Sales officer