From df7113c5f0a50e99808b035c08a3099ef6206532 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Tue, 15 Oct 2019 13:22:48 +0530 Subject: [PATCH] DASHBOARD CONTENT ADDED --- api/application/config/constants.php | 1 + api/application/config/routes.php | 1 + .../controllers/School_requirement.php | 12 +++++++++++ .../helpers/authorization_helper.php | 2 +- .../models/School_requirement_model.php | 20 +++++++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index db79562..931cc9c 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -94,6 +94,7 @@ defined('ROUTE_LOGIN_D') OR define('ROUTE_LOGIN_D', 'getFilterDistricts') defined('ROUTE_LOGIN_E') OR define('ROUTE_LOGIN_E', 'testRedirect'); // login api defined('ROUTE_LOGIN_F') OR define('ROUTE_LOGIN_F', '(getFilterSchools/:any)'); // login api defined('ROUTE_LOGIN_G') OR define('ROUTE_LOGIN_G', 'getFilterMaterials'); // login api +defined('ROUTE_LOGIN_H') OR define('ROUTE_LOGIN_H', 'csrDashboardContent'); // login api // DB TABLE CONSTANTS diff --git a/api/application/config/routes.php b/api/application/config/routes.php index ad564c8..effefad 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -67,6 +67,7 @@ $route['checkTxnStatus'] = 'iobpay/checkTxnStatus'; $route['getFilterDistricts'] = 'school_requirement/getFilterDistricts'; $route['(getFilterSchools/:any)'] = 'school_requirement/getFilterSchools'; $route['getFilterMaterials'] = 'school_requirement/getFilterMaterials'; +$route['csrDashboardContent'] = 'school_requirement/csrDashboardContent'; diff --git a/api/application/controllers/School_requirement.php b/api/application/controllers/School_requirement.php index 5670871..b375f17 100644 --- a/api/application/controllers/School_requirement.php +++ b/api/application/controllers/School_requirement.php @@ -279,6 +279,18 @@ class school_requirement extends REST_Controller } } + + public function csrDashboardContent_get() + { + $res_data = $this->school_requirement_model->csrDashboardContent(); + + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $res_data; + $this->response($data,REST_Controller::HTTP_OK); + } + + diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php index 1b17aaa..77f0976 100644 --- a/api/application/helpers/authorization_helper.php +++ b/api/application/helpers/authorization_helper.php @@ -75,7 +75,7 @@ class AUTHORIZATION exit; } //For all route name except contant route - else if($routingName != ROUTE_LOGIN && $routingName != ROUTE_LOGIN_A && $routingName != ROUTE_LOGIN_B && $routingName != ROUTE_LOGIN_C && $routingName != ROUTE_LOGIN_D && $routingName != ROUTE_LOGIN_E && $routingName != ROUTE_LOGIN_F && $routingName != ROUTE_LOGIN_G){ + else if($routingName != ROUTE_LOGIN && $routingName != ROUTE_LOGIN_A && $routingName != ROUTE_LOGIN_B && $routingName != ROUTE_LOGIN_C && $routingName != ROUTE_LOGIN_D && $routingName != ROUTE_LOGIN_E && $routingName != ROUTE_LOGIN_F && $routingName != ROUTE_LOGIN_G && $routingName != ROUTE_LOGIN_H){ $validateToken = self::validateTimestamp(); return $validateToken; } diff --git a/api/application/models/School_requirement_model.php b/api/application/models/School_requirement_model.php index c7d7299..b1f6782 100644 --- a/api/application/models/School_requirement_model.php +++ b/api/application/models/School_requirement_model.php @@ -149,5 +149,25 @@ class school_requirement_model extends Custom_Model { } + function csrDashboardContent() + { + // $no_of_schools_posted = $this->db->get_compiled_select('SELECT count(distinct school_id) FROM '.CSR_SCHOOL_REQUIREMENTS); + + // $total_amount_required = $this->db->get_compiled_select('SELECT sum((qty * CSR_MATERIAL_MASTER.cost_per_unit)) as required_amount FROM '.CSR_SCHOOL_REQUIREMENTS.' as CSR_SCHOOL_REQUIREMENTS + // LEFT JOIN '.CSR_MATERIAL_MASTER.'as CSR_MATERIAL_MASTER on CSR_SCHOOL_REQUIREMENTS.mat_id = CSR_MATERIAL_MASTER.id'); + // $no_of_schools_posted = $this->db->get_compiled_select('SELECT count(distinct school_id) FROM '.CSR_SCHOOL_REQUIREMENTS); + + // $this->db->SELECT("count(distinct user_id) as supporters,sum(amount) as contributed_amount,($no_of_schools_posted) as no_of_schools_posted,($total_amount_required) as total_amount_required"); + // $this->db->FROM(CSR_CONTRIBUTIONS); + // // return $this->db->GET()->result_array(); + // echo $no_of_schools_posted; + // echo $total_amount_required; + + $query = "SELECT count(distinct user_id) as supporters,sum(amount) as contributed_amount,(SELECT count(distinct school_id) FROM ".CSR_SCHOOL_REQUIREMENTS.") as no_of_schools_posted,(SELECT sum((qty * CSR_MATERIAL_MASTER.cost_per_unit)) as required_amount FROM ".CSR_SCHOOL_REQUIREMENTS." as CSR_SCHOOL_REQUIREMENTS LEFT JOIN ".CSR_MATERIAL_MASTER." as CSR_MATERIAL_MASTER on CSR_SCHOOL_REQUIREMENTS.mat_id = CSR_MATERIAL_MASTER.id) as total_amount_required FROM ".CSR_CONTRIBUTIONS.""; + return $this->db->query($query)->result_array()[0]; + + + } + } \ No newline at end of file