From 066d92be3216cd5d3427072cbc410c19bf53f400 Mon Sep 17 00:00:00 2001 From: kwarraich <111186505+kwarraich@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:32:25 +0300 Subject: Matching category colors across pie-charts (#7090) * Trying to implement linkace as a sharing method, related to issue 6698. it's in the files now and shows up but is not sharing properly now * creating a colour palette based on the number of categories, then making it into hex values to use later * assigning categories with specific colors to make sure the colors are consistent in the graph * adjusted pychart logic to account for unique assignments of each categoery with the colours * fixing redundant code blocks * removing extra uneeded code -an accidental commit * removed changes unrelated to PR * fixed linting errors * refactored color palette to use CSS native hsl() colors * Fix whitespace --------- Co-authored-by: rsharaf-dev Co-authored-by: roma2023 Co-authored-by: Alexandre Alapetite --- app/views/stats/index.phtml | 82 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 16 deletions(-) (limited to 'app/views') diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml index 0d144fcd5..3a5db2fb8 100644 --- a/app/views/stats/index.phtml +++ b/app/views/stats/index.phtml @@ -96,19 +96,68 @@ + An array of HSL color strings. + */ +function generateColorPalette(int $count): array { + $colors = []; + for ($i = 0; $i < $count; $i++) { + $hue = ($i / $count) * 360; // Distribute colors evenly around the color wheel + $saturation = 70; // Fixed saturation + $lightness = 50; // Fixed lightness + $colors[] = "hsl($hue, {$saturation}%, {$lightness}%)"; + } + return $colors; +} + +// 1. Get all unique category labels and sort them +$allLabels = array_unique(array_merge($this->feedByCategory['label'], $this->entryByCategory['label'])); +sort($allLabels); // Ensure consistent order + +// 2. Generate a color palette based on the number of unique categories +$colorPalette = generateColorPalette(count($allLabels)); + +// 3. Map categories to colors +$colorMap = array_combine($allLabels, $colorPalette); + +// 4. Align data and labels for both charts +$feedData = array_fill_keys($allLabels, 0); // Initialize data with all categories +foreach ($this->feedByCategory['label'] as $index => $label) { + $feedData[$label] = $this->feedByCategory['data'][$index]; +} +$entryData = array_fill_keys($allLabels, 0); // Initialize data with all categories +foreach ($this->entryByCategory['label'] as $index => $label) { + $entryData[$label] = $this->entryByCategory['data'][$index]; +} + +// Final data and labels +$feedLabels = array_keys($feedData); +$feedColors = array_map(fn($label) => $colorMap[$label], $feedLabels); +$feedValues = array_values($feedData); + +$entryLabels = array_keys($entryData); +$entryColors = array_map(fn($label) => $colorMap[$label], $entryLabels); +$entryValues = array_values($entryData); +?> +

+ 'statsFeedsPerCategory', + 'charttype' => 'doughnut', + 'data' => $feedValues, + 'labels' => $feedLabels, + 'backgroundColor' => $feedColors, + ], JSON_UNESCAPED_UNICODE); ?> +
@@ -117,16 +166,17 @@
+ 'statsEntriesPerCategory', + 'charttype' => 'doughnut', + 'data' => $entryValues, + 'labels' => $entryLabels, + 'backgroundColor' => $entryColors, + ], JSON_UNESCAPED_UNICODE); ?> +
+ -- cgit v1.2.3