diff --git a/dashboard/app/Services/DashboardService.php b/dashboard/app/Services/DashboardService.php index bcd085b..d663747 100644 --- a/dashboard/app/Services/DashboardService.php +++ b/dashboard/app/Services/DashboardService.php @@ -684,11 +684,12 @@ class DashboardService return SurveillanceCase::selectRaw(" CASE - WHEN patient_age_inday < 365 THEN '0-1y' - WHEN patient_age_inday < 1825 THEN '1-5y' - WHEN patient_age_inday < 6570 THEN '5-18y' - WHEN patient_age_inday < 21900 THEN '18-60y' - ELSE '60+y' + WHEN patient_age_inday < 365 THEN '<1 year' + WHEN patient_age_inday < 1825 THEN '1–4 years' + WHEN patient_age_inday < 6570 THEN '5–17 years' + WHEN patient_age_inday < 16425 THEN '18–44 years' + WHEN patient_age_inday < 23725 THEN '45–64 years' + ELSE '65+ years' END as age_group, COUNT(*) as total ") diff --git a/dashboard/resources/views/layouts/app.blade.php b/dashboard/resources/views/layouts/app.blade.php index e5e5662..b75af29 100644 --- a/dashboard/resources/views/layouts/app.blade.php +++ b/dashboard/resources/views/layouts/app.blade.php @@ -7,10 +7,10 @@ - + - - + + @@ -41,6 +41,11 @@ background: white; border-bottom: 1px solid #dcdcdc; padding-left: 15px; + position: sticky; + top: 0; + z-index: 1000; + background: white; + border-bottom: 1px solid #dcdcdc; } /* NAV ITEMS */ @@ -57,14 +62,12 @@ background: #cce0d4; } - /* ACTIVE TAB */ .active-tab { color: #0B8F3C; border-bottom: 3px solid #0B8F3C; background: #e5efe8; } - /* CONTENT */ .content-area { padding: 25px; }