Skip to content

updated map.php #2559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hadianoor121 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

updated map.php #2559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91a60dc
updated map.php
Hadianoor121 Jan 18, 2021
bae55d9
Map and graph files edited
Hadianoor121 Jan 19, 2021
98e61d4
ChangesDone
Hadianoor121 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 55 additions & 19 deletions application/controllers/graph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,14 +1149,22 @@ public function graphframe($slug) {
$counter = 0;
foreach ($category_list as $category) {
$counter ++;
$district_wise_catorized = $this->form_results_model->get_district_categorized_count($form_id, $district['district_name'], $filter_attribute[0], $category, $from_date, $to_date);
$district_wise_catorized = $this->form_results_model
->get_district_categorized_count($form_id,
$district['district_name'], $filter_attribute[0],
$category, $from_date, $to_date);
$total += $district_wise_catorized;
$final_district_wise_array = array_merge($final_district_wise_array, array('district' => $district['district_name'], $category => $district_wise_catorized));
$final_district_wise_array = array_merge
($final_district_wise_array, array('district' =>
$district['district_name'], $category =>
$district_wise_catorized));
if ($counter == count($category_list)) {
$final_district_wise_array = array_merge($final_district_wise_array, array('total' => $total));
$final_district_wise_array = array_merge
($final_district_wise_array, array('total' => $total));
}
}
$final_district_wise_array2[$district['district_name']] = $final_district_wise_array;
$final_district_wise_array2[$district
['district_name']] = $final_district_wise_array;
}
$data['district_categorized'] = $final_district_wise_array2;

Expand All @@ -1165,8 +1173,11 @@ public function graphframe($slug) {
foreach ($category_list as $category) {
$categorieslist = explode(',', $category);
foreach ($categorieslist as $catu) {
$category_count = $this->form_results_model->getCountCatgoryBase($form_id, $catu, $filter_attribute, $from_date, $to_date, $selected_district = '');
$category_list_count = array_merge($category_list_count, array($catu => $category_count));
$category_count = $this->form_results_model->getCountCatgoryBase
($form_id, $catu, $filter_attribute, $from_date,
$to_date, $selected_district = '');
$category_list_count = array_merge($category_list_count,
array($catu => $category_count));
$totalRecords += $category_count;
}
}
Expand All @@ -1185,7 +1196,8 @@ public function graphframe($slug) {
$data['category_list'] = $category_list;
$data['total_records'] = $total_record;
$data['category_list_count'] = $category_list_count;
$data['graph_text'] = 'Graph By Category <b> ' . str_replace('_', ' ', $filter_attribute[0]) . '</b>';
$data['graph_text'] = 'Graph By Category <b> ' .
str_replace('_', ' ', $filter_attribute[0]) . '</b>';
$data['pageTitle'] = " Graph-View";
$data['graph_type'] = 'Category';
$data['app_id'] = $selected_form['app_id'];
Expand Down Expand Up @@ -1222,16 +1234,19 @@ public function graph_type($slug) {
$data['app_name'] = $selected_app['name'];

if ($graph_type == 'user') {
$users_lists = $this->app_users_model->get_app_users_app_based($selected_form['app_id'], $login_district);
$users_lists = $this->app_users_model->get_app_users_app_based
($selected_form['app_id'], $login_district);
$users_lists_array = array();
foreach ($users_lists as $users_name) {

$users_lists_array[] = array('imei_no' => $users_name['imei_no'], 'user_name' => $users_name['user_name']);
$users_lists_array[] = array('imei_no' =>
$users_name['imei_no'], 'user_name' => $users_name['user_name']);
}
$users_wise_counter = array();
$totalRecords = 0;
foreach ($users_lists_array as $users) {
$users_count = $this->form_results_model->getCountUserBased($slug, $users['imei_no']);
$users_count = $this->form_results_model
->getCountUserBased($slug, $users['imei_no']);
$users_wise_counter = array_merge($users_wise_counter, array($users['user_name'] => $users_count));
$totalRecords += $users_count;
}
Expand Down Expand Up @@ -1598,13 +1613,21 @@ public function exportdistrictreport($slug) {
if (!array_key_exists($val['district_name'], $final_district_wise_array2)) {
$final_district_wise_array2[$val['district_name']] = array();
foreach ($new_category_list as $cat_listvv) {
$final_district_wise_array2[$val['district_name']] = array_merge($final_district_wise_array2[$val['district_name']], array('district' => $val['district_name'], $cat_listvv => '0', 'total' => '0'));
$final_district_wise_array2[$val['district_name']] = array_merge(
$final_district_wise_array2[$val['district_name']],
array('district' => $val['district_name'],
$cat_listvv => '0', 'total' => '0'));
}
}
if (array_key_exists($val['district_name'], $final_district_wise_array2)) {
$final_district_wise_array2[$val['district_name']] = array_merge($final_district_wise_array2[$val['district_name']], array($cat_listv => $val['total'], 'total' => $final_district_wise_array2[$val['district_name']]['total'] + $val['total']));
$final_district_wise_array2[$val['district_name']] = array_merge(
$final_district_wise_array2[$val['district_name']],
array($cat_listv => $val['total'], 'total' => $final_district_wise_array2
[$val['district_name']]['total'] + $val['total']));
} else {
$final_district_wise_array2[$val['district_name']] = array('district' => $val['district_name'], $cat_listv => $val['total'], 'total' => $val['total']);
$final_district_wise_array2[$val['district_name']] = array(
'district' => $val['district_name'], $cat_listv => $val['total'],
'total' => $val['total']);
}
}
}
Expand Down Expand Up @@ -1666,7 +1689,8 @@ public function exportschoolreport($slug) {
$selected_form = $this->form_model->get_form($slug);
//print_r($selected_form);
$form_single_to_query = array();
$form_single_to_query[] = array('form_id' => $form_id, 'table_name' => 'zform_' . $form_id, 'form_name' => $selected_form['name']);
$form_single_to_query[] = array('form_id' => $form_id,
'table_name' => 'zform_' . $form_id, 'form_name' => $selected_form['name']);

/** Get filters from multiple forms * */
$multiple_filters = $this->form_model->get_form_filters($form_single_to_query);
Expand All @@ -1692,7 +1716,8 @@ public function exportschoolreport($slug) {

$filter_result = get_graph_view_settings($selected_form['app_id']);

if (isset($filter_result->district_wise_report) && $filter_result->district_wise_report == 1) {
if (isset($filter_result->district_wise_report)
&& $filter_result->district_wise_report == 1) {

$new_category_list = array();
foreach ($category_list as $cl_key => $cl_value) {
Expand All @@ -1707,19 +1732,30 @@ public function exportschoolreport($slug) {
$data['category_list'] = $new_category_list;
$final_district_wise_array2 = array();
foreach ($new_category_list as $cat_listv) {
$district_wise_catorized = $this->form_results_model->get_school_categorized_count_new($form_id, $_REQUEST['district'], $filter_attribute[0], $cat_listv, $from_date, $to_date);
$district_wise_catorized = $this->
form_results_model->get_school_categorized_count_new($form_id,
$_REQUEST['district'], $filter_attribute[0], $cat_listv, $from_date, $to_date);

foreach ($district_wise_catorized as $key => $val) {
if (!array_key_exists($val['EMIS_Code'], $final_district_wise_array2)) {
$final_district_wise_array2[$val['EMIS_Code']] = array();
foreach ($new_category_list as $cat_listvv) {
$final_district_wise_array2[$val['EMIS_Code']] = array_merge($final_district_wise_array2[$val['EMIS_Code']], array('school' => $val['school_name'], 'Category' => $val['Category'], $cat_listvv => '0','total' => '0'));
$final_district_wise_array2[$val['EMIS_Code']] = array_merge(
$final_district_wise_array2[$val['EMIS_Code']],
array('school' => $val['school_name'],
'Category' => $val['Category'], $cat_listvv => '0','total' => '0'));
}
}
if (array_key_exists($val['EMIS_Code'], $final_district_wise_array2)) {
$final_district_wise_array2[$val['EMIS_Code']] = array_merge($final_district_wise_array2[$val['EMIS_Code']], array($cat_listv => $val['total'], 'Category' => $val['Category'], 'total' => $final_district_wise_array2[$val['EMIS_Code']]['total'] + $val['total']));
$final_district_wise_array2[$val['EMIS_Code']] = array_merge(
$final_district_wise_array2[$val['EMIS_Code']], array(
$cat_listv => $val['total'], 'Category' => $val['Category'],
'total' => $final_district_wise_array2
[$val['EMIS_Code']]['total'] + $val['total']));
} else {
$final_district_wise_array2[$val['EMIS_Code']] = array('school' => $val['school_name'], $cat_listv => $val['total'], 'Category' => $val['Category'], 'total' => $val['total']);
$final_district_wise_array2[$val['EMIS_Code']] = array('school' =>
$val['school_name'], $cat_listv => $val['total'], 'Category' =>
$val['Category'], 'total' => $val['total']);
}
}
}
Expand Down
39 changes: 27 additions & 12 deletions application/controllers/map.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public function __construct() {
* @return array An array of form heading and its data
* @author UbaidUllah Balti <ubaidcskiu@gmail.com>
*/
public function get_heading_data_by_category($forms_list, $to_date, $from_date, $category_name, $filter_attribute_search, $town_filter, $posted_filters, $search_text = null, $export = null) {
public function get_heading_data_by_category($forms_list, $to_date,
$from_date, $category_name, $filter_attribute_search,
$town_filter, $posted_filters, $search_text = null, $export = null) {
$form_id = $forms_list[0]['form_id'];
$data['form_id'] = $form_id;
$selected_form = $this->form_model->get_form($form_id);
Expand Down Expand Up @@ -162,7 +164,8 @@ public function get_data_ajax($slug = "") {
$data['headings'] = $array_final['headings'];
$data['form'] = $array_final['form'];
$data['form_id'] = $forms_list[0]['form_id'];
$total_record_return = $this->form_results_model->TotalRecMultipleForm($forms_list);
$total_record_return = $this->form_results_model->
TotalRecMultipleForm($forms_list);
$pdata['app_id'] = $slug;
$pdata['TotalRec'] = $total_record_return;
$pdata['perPage'] = $this->perPage;
Expand All @@ -180,13 +183,15 @@ public function get_data_ajax($slug = "") {
public function pagination_ajax_data($slug = Null) {
$forms_list = array();
$form_single_to_query = array();
$form_single_to_query[] = array('form_id' => $slug, 'table_name' => 'zform_' . $slug);
$form_single_to_query[] = array('form_id' => $slug,
'table_name' => 'zform_' . $slug);
$page_variable = isset($_POST['page']) ? $_POST['page'] : 0;
$array_final = array();
$array_final = $this->get_heading_n_data($form_single_to_query, 0);
$data['headings'] = $array_final['headings'];
$data['form'] = $array_final['form'];
$total_record_return = $this->form_results_model->return_total_record($form_single_to_query);
$total_record_return = $this->form_results_model->
return_total_record($form_single_to_query);
$pdata['app_id'] = $slug;
$pdata['TotalRec'] = $total_record_return;
$pdata['perPage'] = $this->perPage;
Expand All @@ -202,7 +207,8 @@ public function pagination_ajax_data($slug = Null) {
}

/**
* method used to render the form pagination data by ajax call called from paging.php based on category
* method used to render the form pagination data by
ajax call called from paging.php based on category
* @return void
* @author UbaidUllah Balti <ubaidcskiu@gmail.com>
*/
Expand Down Expand Up @@ -233,7 +239,8 @@ public function get_data_ajax_category_filter() {
} else {
$data['selected_filters'] = '';
}
$cat_filter_value = isset($_GET['cat_filter_value']) ? $_GET['cat_filter_value'] : " ";
$cat_filter_value = isset($_GET['cat_filter_value'])
? $_GET['cat_filter_value'] : " ";
$filter_attribute_search = $_GET['filter_attribute_search'];
$search_text = $_GET['search_text'];
$form_list_filter = $_GET['form_list_filter'];
Expand All @@ -248,16 +255,21 @@ public function get_data_ajax_category_filter() {
$form_id = $slug;
$array_final = array();
$cat_filter_value = $value = str_replace('_', '/', $cat_filter_value);
$array_final = $this->get_heading_data_by_category($view_list, $to_date, $from_date, $cat_filter_value, $filter_attribute_search, $town_filter, $posted_filters, $search_text, $export = '');
$array_final = $this->get_heading_data_by_category($view_list, $to_date,
$from_date, $cat_filter_value, $filter_attribute_search,
$town_filter, $posted_filters, $search_text, $export = '');
$data['headings'] = $array_final['headings'];
$data['form'] = $array_final['form'];
$selected_form = $this->form_model->get_form($slug);
$forms_list = array();
$all_forms = $this->form_model->get_form_by_app($selected_form['app_id']);
foreach ($all_forms as $forms) {
$forms_list[] = array('form_id' => $forms['form_id'], 'form_name' => $forms['form_name']);
$forms_list[] = array('form_id' => $forms['form_id'],
'form_name' => $forms['form_name']);
}
$total_record_return = $this->form_results_model->TotalRecByCategoryFilter($forms_list, $to_date, $from_date, $cat_filter_value, $filter_attribute_search, $town_filter, $posted_filters, $search_text);
$total_record_return = $this->form_results_model->TotalRecByCategoryFilter
($forms_list, $to_date, $from_date, $cat_filter_value, $filter_attribute_search,
$town_filter, $posted_filters, $search_text);
$pdata['app_id'] = $selected_form['app_id'];
$pdata['TotalRec'] = $total_record_return;
$pdata['perPage'] = $this->perPage;
Expand All @@ -266,7 +278,8 @@ public function get_data_ajax_category_filter() {
$pdata['form_list_filter'] = $form_list_filter;
$data['form_id'] = $slug;
$pdata['search_text'] = $search_text;
$data['paging_category_filter'] = $this->parser->parse('map/paging_category_filter', $pdata, TRUE);
$data['paging_category_filter'] = $this->parser->parse
('map/paging_category_filter', $pdata, TRUE);
$data['all_form_results'] = $data['form'];
$data['total_record_return'] = $total_record_return;
$data['page_variable'] = $page_variable;
Expand Down Expand Up @@ -310,7 +323,8 @@ public function paginated_ajax_data_posted() {
} else {
$data['selected_filters'] = '';
}
$cat_filter_value = isset($_GET['cat_filter_value']) ? $_GET['cat_filter_value'] : array();
$cat_filter_value = isset($_GET['cat_filter_value'])
? $_GET['cat_filter_value'] : array();
$filter_attribute_search = $_GET['filter_attribute_search'];
$search_text = $_GET['search_text'];
$form_list_filter = $_GET['form_list_filter'];
Expand Down Expand Up @@ -1719,7 +1733,8 @@ public function moreMarker() {
$exist_alpha[$first_char] = '1';
$pin_name = $first_char . '1';
}
$pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name));
$pin_exist_for_cat = array_merge($pin_exist_for_cat,
array($valueforarray => $pin_name));
} else {
if (array_key_exists($valueforarray, $pin_exist_for_cat)) {
$pin_name = $pin_exist_for_cat[$valueforarray];
Expand Down