From 18634417fd89481d2bbe702fa27f4453ea83e54e Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:20:04 -0700 Subject: [PATCH] Dashboard Edit - Correctly display the chart type options (#7465) * Dashboard Edit - Correctly display the chart type options * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php * Update config.php --- .../resources/dashboard/config.php | 1 + app/call_block/resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 2 + .../resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 2 +- .../resources/dashboard/config.php | 1 + app/devices/resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 1 + app/extensions/resources/dashboard/config.php | 1 + app/fax/resources/dashboard/config.php | 1 + app/ivr_menus/resources/dashboard/config.php | 1 + app/recordings/resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 1 + .../resources/dashboard/config.php | 2 + app/switch/resources/dashboard/config.php | 1 + app/system/resources/dashboard/config.php | 5 ++ .../resources/dashboard/config.php | 1 + app/voicemails/resources/dashboard/config.php | 2 +- app/xml_cdr/resources/dashboard/config.php | 3 ++ core/contacts/resources/dashboard/config.php | 1 + core/dashboard/dashboard_edit.php | 50 +++++++++++++------ core/domains/resources/dashboard/config.php | 1 + core/users/resources/dashboard/config.php | 3 ++ 25 files changed, 70 insertions(+), 16 deletions(-) diff --git a/app/active_calls/resources/dashboard/config.php b/app/active_calls/resources/dashboard/config.php index 13da26f72..8eb531ddf 100644 --- a/app/active_calls/resources/dashboard/config.php +++ b/app/active_calls/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['icon']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/call_block/resources/dashboard/config.php b/app/call_block/resources/dashboard/config.php index 17a619860..93c6da952 100644 --- a/app/call_block/resources/dashboard/config.php +++ b/app/call_block/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/call_centers/resources/dashboard/config.php b/app/call_centers/resources/dashboard/config.php index 085f674c0..47b0f48e5 100644 --- a/app/call_centers/resources/dashboard/config.php +++ b/app/call_centers/resources/dashboard/config.php @@ -13,6 +13,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#3164AD'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/call_forward/resources/dashboard/config.php b/app/call_forward/resources/dashboard/config.php index fac0499b9..a6e7e5cbc 100644 --- a/app/call_forward/resources/dashboard/config.php +++ b/app/call_forward/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = ''; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -58,6 +59,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = ''; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/conference_centers/resources/dashboard/config.php b/app/conference_centers/resources/dashboard/config.php index 378181907..2d48a3b9d 100644 --- a/app/conference_centers/resources/dashboard/config.php +++ b/app/conference_centers/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/conferences/resources/dashboard/config.php b/app/conferences/resources/dashboard/config.php index 7dd4ae49f..a4704b352 100644 --- a/app/conferences/resources/dashboard/config.php +++ b/app/conferences/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -42,4 +43,3 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin'; $y++; ?> - diff --git a/app/destinations/resources/dashboard/config.php b/app/destinations/resources/dashboard/config.php index d0df83170..5988877eb 100644 --- a/app/destinations/resources/dashboard/config.php +++ b/app/destinations/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/devices/resources/dashboard/config.php b/app/devices/resources/dashboard/config.php index a173fcc40..f13afafb7 100644 --- a/app/devices/resources/dashboard/config.php +++ b/app/devices/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/domain_limits/resources/dashboard/config.php b/app/domain_limits/resources/dashboard/config.php index 790f8764f..aa9b544bb 100644 --- a/app/domain_limits/resources/dashboard/config.php +++ b/app/domain_limits/resources/dashboard/config.php @@ -13,6 +13,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/event_guard/resources/dashboard/config.php b/app/event_guard/resources/dashboard/config.php index 94656404e..3ff6ca606 100644 --- a/app/event_guard/resources/dashboard/config.php +++ b/app/event_guard/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/extensions/resources/dashboard/config.php b/app/extensions/resources/dashboard/config.php index 148da782e..69c867f20 100644 --- a/app/extensions/resources/dashboard/config.php +++ b/app/extensions/resources/dashboard/config.php @@ -13,6 +13,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/fax/resources/dashboard/config.php b/app/fax/resources/dashboard/config.php index 6f2ddf592..dc32ccfdd 100644 --- a/app/fax/resources/dashboard/config.php +++ b/app/fax/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/ivr_menus/resources/dashboard/config.php b/app/ivr_menus/resources/dashboard/config.php index 8283f38b3..644fae81c 100644 --- a/app/ivr_menus/resources/dashboard/config.php +++ b/app/ivr_menus/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/recordings/resources/dashboard/config.php b/app/recordings/resources/dashboard/config.php index 3b8af5554..43a1a81c8 100644 --- a/app/recordings/resources/dashboard/config.php +++ b/app/recordings/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/registrations/resources/dashboard/config.php b/app/registrations/resources/dashboard/config.php index 589d29602..147ac4815 100644 --- a/app/registrations/resources/dashboard/config.php +++ b/app/registrations/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['icon']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/ring_groups/resources/dashboard/config.php b/app/ring_groups/resources/dashboard/config.php index b176cfe07..cb16ff639 100644 --- a/app/ring_groups/resources/dashboard/config.php +++ b/app/ring_groups/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -58,6 +59,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/switch/resources/dashboard/config.php b/app/switch/resources/dashboard/config.php index 516af4dd8..14568929c 100644 --- a/app/switch/resources/dashboard/config.php +++ b/app/switch/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/system/resources/dashboard/config.php b/app/system/resources/dashboard/config.php index 87320987a..0ef22902f 100644 --- a/app/system/resources/dashboard/config.php +++ b/app/system/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'progress_bar'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut', 'progress_bar']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -50,6 +51,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -86,6 +88,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut', 'line']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -122,6 +125,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -158,6 +162,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'doughnut'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/time_conditions/resources/dashboard/config.php b/app/time_conditions/resources/dashboard/config.php index ae260efa5..69ebf6f60 100644 --- a/app/time_conditions/resources/dashboard/config.php +++ b/app/time_conditions/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/app/voicemails/resources/dashboard/config.php b/app/voicemails/resources/dashboard/config.php index ebeeedde6..4ac90363c 100644 --- a/app/voicemails/resources/dashboard/config.php +++ b/app/voicemails/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut', 'icon']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -90,4 +91,3 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user'; $y++; ?> - diff --git a/app/xml_cdr/resources/dashboard/config.php b/app/xml_cdr/resources/dashboard/config.php index 6ed5fe6a1..abb366497 100644 --- a/app/xml_cdr/resources/dashboard/config.php +++ b/app/xml_cdr/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut', 'icon']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -59,6 +60,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; +$array['dashboard'][$x]['dashboard_chart_type_options'] = ['number', 'doughnut', 'icon']; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -104,6 +106,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/core/contacts/resources/dashboard/config.php b/core/contacts/resources/dashboard/config.php index 114bf4fbc..92b27cfb6 100644 --- a/core/contacts/resources/dashboard/config.php +++ b/core/contacts/resources/dashboard/config.php @@ -14,6 +14,7 @@ $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; $array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type_options'] = []; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = '#444444'; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index cd371954f..1d28f32fa 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -55,12 +55,12 @@ $dashboard_content = ''; $dashboard_content_text_align = ''; $dashboard_content_details = ''; + $dashboard_groups = []; $dashboard_label_enabled = 'true'; $dashboard_label_text_color = ''; $dashboard_label_background_color = ''; $dashboard_number_text_color = ''; $dashboard_number_background_color = ''; - $dashboard_groups = []; $dashboard_column_span = ''; $dashboard_row_span = ''; $dashboard_details_state = ''; @@ -416,6 +416,24 @@ unset($sql, $parameters, $row); } +//find the application and widget + $dashboard_path_array = explode('/', $dashboard_path); + $application_name = $dashboard_path_array[0]; + $widget_name = $dashboard_path_array[1]; + $path_array = glob(dirname(__DIR__, 2).'/*/'.$application_name.'/resources/dashboard/config.php'); + if (!empty($path_array)) { + include($path_array[0]); + } + +//find the chart type options + $dashboard_chart_type_options = null; + foreach ($array['dashboard'] as $index => $widget) { + if ($widget['dashboard_path'] === "$application_name/$widget_name") { + $dashboard_chart_type_options = $widget['dashboard_chart_type_options']; + break; + } + } + //get the child data if (!empty($dashboard_uuid) && is_uuid($dashboard_uuid)) { $sql = "select "; @@ -625,7 +643,7 @@ echo "\n"; if ($action == "add" || $dashboard_path == "dashboard/icon" || $dashboard_chart_type == "icon") { - echo "