From 2f260555cb60786d7be8510f20f5b5ce6a14f630 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Mon, 11 Mar 2024 09:10:02 +0100 Subject: [PATCH] add month name to monthlytable --- app/Http/Controllers/RainfallController.php | 2 +- resources/js/components/rainfall/YearRainfaill.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/RainfallController.php b/app/Http/Controllers/RainfallController.php index ff86f35..011a1cd 100644 --- a/app/Http/Controllers/RainfallController.php +++ b/app/Http/Controllers/RainfallController.php @@ -138,7 +138,7 @@ class RainfallController extends Controller $result[$month][] = [ 'year' => $date->year, 'month' => $date->month, - 'label' => $date->monthName.' '.$date->year, + 'label' => $date->monthName, 'values' => (int) $rainfalls, ]; } diff --git a/resources/js/components/rainfall/YearRainfaill.tsx b/resources/js/components/rainfall/YearRainfaill.tsx index ad6e646..988c99f 100644 --- a/resources/js/components/rainfall/YearRainfaill.tsx +++ b/resources/js/components/rainfall/YearRainfaill.tsx @@ -49,7 +49,7 @@ const YearRainfall = () => { {Object.entries(data) .map(([month, months]) => { return - {month} + {months[0].label} {months.find(m => m.year === (new Date).getFullYear() && m.month === Number(month))?.values} {months.find(m => m.year === ((new Date).getFullYear() - 1) && m.month === Number(month))?.values}