fix bugs
This commit is contained in:
@@ -96,21 +96,21 @@ class DashboardService
|
||||
|
||||
$q->whereRaw(
|
||||
"(year_data > ?
|
||||
OR (
|
||||
year_data = ?
|
||||
AND week_data >= ?
|
||||
)
|
||||
)",
|
||||
[$startYear, $startYear, $startWeek]
|
||||
)
|
||||
OR (
|
||||
year_data = ?
|
||||
AND week_data >= ?
|
||||
)
|
||||
)",
|
||||
[$startYear, $startYear, $startWeek]
|
||||
)
|
||||
|
||||
->whereRaw(
|
||||
"(year_data < ?
|
||||
OR (
|
||||
year_data = ?
|
||||
AND week_data <= ?
|
||||
)
|
||||
)",
|
||||
OR (
|
||||
year_data = ?
|
||||
AND week_data <= ?
|
||||
)
|
||||
)",
|
||||
[$endYear, $endYear, $endWeek]
|
||||
);
|
||||
})
|
||||
@@ -121,38 +121,38 @@ class DashboardService
|
||||
|
||||
->selectRaw("
|
||||
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
|
||||
case_lab_results.pathogen_name as pathogen,
|
||||
case_lab_results.subtype,
|
||||
case_lab_results.pathogen_name as pathogen,
|
||||
case_lab_results.subtype,
|
||||
|
||||
CASE
|
||||
CASE
|
||||
|
||||
WHEN LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%influenza%'
|
||||
WHEN LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%influenza%'
|
||||
|
||||
OR LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%covid%'
|
||||
OR LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%covid%'
|
||||
|
||||
OR LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%sars-cov%'
|
||||
OR LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%sars-cov%'
|
||||
|
||||
THEN 'section_1'
|
||||
THEN 'section_1'
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%serum%'
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%serum%'
|
||||
|
||||
THEN 'section_3'
|
||||
THEN 'section_3'
|
||||
|
||||
ELSE 'section_2'
|
||||
ELSE 'section_2'
|
||||
|
||||
END as afi_section,
|
||||
END as afi_section,
|
||||
|
||||
COUNT(DISTINCT surveillance_cases.lab_code)
|
||||
as total_positive
|
||||
COUNT(DISTINCT surveillance_cases.lab_code)
|
||||
as total_positive
|
||||
|
||||
")
|
||||
")
|
||||
|
||||
->groupBy(
|
||||
'surveillance_cases.year_data',
|
||||
@@ -184,6 +184,7 @@ class DashboardService
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
public function afiCaseTrend(
|
||||
$surveillanceId,
|
||||
$startYear,
|
||||
@@ -194,14 +195,42 @@ class DashboardService
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| TOTAL CASES BY SECTION
|
||||
| AFI SECTION SQL
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
$afiSectionSql = "
|
||||
|
||||
CASE
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%influenza%'
|
||||
|
||||
OR LOWER(case_lab_results.indicator)
|
||||
LIKE '%covid%'
|
||||
|
||||
THEN 'section_1'
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%serum%'
|
||||
|
||||
THEN 'section_3'
|
||||
|
||||
ELSE 'section_2'
|
||||
|
||||
END
|
||||
|
||||
";
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| ALL TESTED CASES
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Count DISTINCT lab_code PER SECTION
|
||||
|
|
||||
| section_1 = Influenza / Covid
|
||||
| section_2 = PCR
|
||||
| section_3 = Serum
|
||||
| THIS MUST INCLUDE:
|
||||
| - positive
|
||||
| - negative
|
||||
| - weeks with no positives
|
||||
|
|
||||
*/
|
||||
|
||||
@@ -226,7 +255,11 @@ class DashboardService
|
||||
AND week_data >= ?
|
||||
)
|
||||
)",
|
||||
[$startYear, $startYear, $startWeek]
|
||||
[
|
||||
$startYear,
|
||||
$startYear,
|
||||
$startWeek
|
||||
]
|
||||
)
|
||||
|
||||
->whereRaw(
|
||||
@@ -236,38 +269,27 @@ class DashboardService
|
||||
AND week_data <= ?
|
||||
)
|
||||
)",
|
||||
[$endYear, $endYear, $endWeek]
|
||||
[
|
||||
$endYear,
|
||||
$endYear,
|
||||
$endWeek
|
||||
]
|
||||
);
|
||||
|
||||
})
|
||||
|
||||
->selectRaw("
|
||||
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
|
||||
CASE
|
||||
{$afiSectionSql}
|
||||
as afi_section,
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%influenza%'
|
||||
COUNT(DISTINCT case_lab_results.lab_code)
|
||||
as total_cases
|
||||
|
||||
OR LOWER(case_lab_results.indicator)
|
||||
LIKE '%covid%'
|
||||
|
||||
THEN 'section_1'
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%serum%'
|
||||
|
||||
THEN 'section_3'
|
||||
|
||||
ELSE 'section_2'
|
||||
|
||||
END as afi_section,
|
||||
|
||||
COUNT(DISTINCT case_lab_results.lab_code)
|
||||
as total_cases
|
||||
|
||||
")
|
||||
")
|
||||
|
||||
->groupBy(
|
||||
'surveillance_cases.year_data',
|
||||
@@ -275,16 +297,29 @@ class DashboardService
|
||||
'afi_section'
|
||||
)
|
||||
|
||||
->get()
|
||||
->orderBy('surveillance_cases.year_data')
|
||||
|
||||
->keyBy(
|
||||
fn($r) =>
|
||||
$r->year .
|
||||
'-' .
|
||||
$r->period .
|
||||
'-' .
|
||||
$r->afi_section
|
||||
);
|
||||
->orderBy('surveillance_cases.week_data')
|
||||
|
||||
->get();
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| KEYED TOTALS
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
$totalCasesKeyed = $totalCases->keyBy(
|
||||
|
||||
fn($r) =>
|
||||
|
||||
$r->year .
|
||||
'-' .
|
||||
$r->period .
|
||||
'-' .
|
||||
$r->afi_section
|
||||
|
||||
);
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -313,7 +348,11 @@ class DashboardService
|
||||
AND week_data >= ?
|
||||
)
|
||||
)",
|
||||
[$startYear, $startYear, $startWeek]
|
||||
[
|
||||
$startYear,
|
||||
$startYear,
|
||||
$startWeek
|
||||
]
|
||||
)
|
||||
|
||||
->whereRaw(
|
||||
@@ -323,54 +362,52 @@ class DashboardService
|
||||
AND week_data <= ?
|
||||
)
|
||||
)",
|
||||
[$endYear, $endYear, $endWeek]
|
||||
[
|
||||
$endYear,
|
||||
$endYear,
|
||||
$endWeek
|
||||
]
|
||||
);
|
||||
|
||||
})
|
||||
|
||||
->where('case_lab_results.is_positive', 1)
|
||||
|
||||
->whereNotNull('case_lab_results.pathogen_name')
|
||||
->whereNotNull(
|
||||
'case_lab_results.pathogen_name'
|
||||
)
|
||||
|
||||
->where(
|
||||
'case_lab_results.pathogen_name',
|
||||
'!=',
|
||||
''
|
||||
)
|
||||
|
||||
->selectRaw("
|
||||
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
surveillance_cases.year_data as year,
|
||||
surveillance_cases.week_data as period,
|
||||
|
||||
CASE
|
||||
CASE
|
||||
|
||||
WHEN LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%influenza%'
|
||||
THEN 'Influenza'
|
||||
WHEN LOWER(case_lab_results.pathogen_name)
|
||||
LIKE '%influenza%'
|
||||
|
||||
ELSE case_lab_results.pathogen_name
|
||||
THEN 'Influenza'
|
||||
|
||||
END as pathogen,
|
||||
ELSE case_lab_results.pathogen_name
|
||||
|
||||
case_lab_results.subtype,
|
||||
END as pathogen,
|
||||
|
||||
CASE
|
||||
case_lab_results.subtype,
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%influenza%'
|
||||
{$afiSectionSql}
|
||||
as afi_section,
|
||||
|
||||
OR LOWER(case_lab_results.indicator)
|
||||
LIKE '%covid%'
|
||||
COUNT(DISTINCT case_lab_results.lab_code)
|
||||
as total_positive
|
||||
|
||||
THEN 'section_1'
|
||||
|
||||
WHEN LOWER(case_lab_results.indicator)
|
||||
LIKE '%serum%'
|
||||
|
||||
THEN 'section_3'
|
||||
|
||||
ELSE 'section_2'
|
||||
|
||||
END as afi_section,
|
||||
|
||||
COUNT(DISTINCT case_lab_results.lab_code)
|
||||
as total_positive
|
||||
|
||||
")
|
||||
")
|
||||
|
||||
->groupBy(
|
||||
'surveillance_cases.year_data',
|
||||
@@ -386,9 +423,10 @@ class DashboardService
|
||||
|
||||
->get()
|
||||
|
||||
->map(function ($r) use ($totalCases) {
|
||||
->map(function ($r) use ($totalCasesKeyed) {
|
||||
|
||||
$key =
|
||||
|
||||
$r->year .
|
||||
'-' .
|
||||
$r->period .
|
||||
@@ -396,36 +434,92 @@ class DashboardService
|
||||
$r->afi_section;
|
||||
|
||||
$r->total_cases =
|
||||
$totalCases[$key]->total_cases ?? 0;
|
||||
|
||||
$totalCasesKeyed[$key]
|
||||
->total_cases ?? 0;
|
||||
|
||||
$r->positivity_rate =
|
||||
|
||||
$r->total_cases > 0
|
||||
|
||||
? round(
|
||||
($r->total_positive / $r->total_cases) * 100,
|
||||
(
|
||||
$r->total_positive
|
||||
/ $r->total_cases
|
||||
) * 100,
|
||||
1
|
||||
)
|
||||
|
||||
: 0;
|
||||
|
||||
return $r;
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| RETURN
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
'section_1' => $rows
|
||||
->where('afi_section', 'section_1')
|
||||
->values(),
|
||||
'section_1' => [
|
||||
|
||||
'section_2' => $rows
|
||||
->where('afi_section', 'section_2')
|
||||
->values(),
|
||||
'rows' => $rows
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_1'
|
||||
)
|
||||
->values(),
|
||||
|
||||
'section_3' => $rows
|
||||
->where('afi_section', 'section_3')
|
||||
->values()
|
||||
'totals' => $totalCases
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_1'
|
||||
)
|
||||
->values()
|
||||
|
||||
],
|
||||
|
||||
'section_2' => [
|
||||
|
||||
'rows' => $rows
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_2'
|
||||
)
|
||||
->values(),
|
||||
|
||||
'totals' => $totalCases
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_2'
|
||||
)
|
||||
->values()
|
||||
|
||||
],
|
||||
|
||||
'section_3' => [
|
||||
|
||||
'rows' => $rows
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_3'
|
||||
)
|
||||
->values(),
|
||||
|
||||
'totals' => $totalCases
|
||||
->where(
|
||||
'afi_section',
|
||||
'section_3'
|
||||
)
|
||||
->values()
|
||||
|
||||
]
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
public function programSummaryFast($surveillanceId, $year = null, $week = null, $dateFrom = null, $dateTo = null)
|
||||
{
|
||||
@@ -445,29 +539,29 @@ class DashboardService
|
||||
}
|
||||
|
||||
$row = $query->selectRaw("
|
||||
COUNT(DISTINCT surveillance_cases.lab_code) as total_cases,
|
||||
COUNT(DISTINCT surveillance_cases.lab_code) as total_cases,
|
||||
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as overall_positive,
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as overall_positive,
|
||||
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
AND (
|
||||
LOWER(case_lab_results.pathogen_name) LIKE '%influenza%'
|
||||
)
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as influenza_positive,
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
AND (
|
||||
LOWER(case_lab_results.pathogen_name) LIKE '%influenza%'
|
||||
)
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as influenza_positive,
|
||||
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
AND (
|
||||
LOWER(case_lab_results.pathogen_name) LIKE '%covid%'
|
||||
)
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as covid_positive
|
||||
")->first();
|
||||
COUNT(DISTINCT CASE
|
||||
WHEN case_lab_results.is_positive = 1
|
||||
AND (
|
||||
LOWER(case_lab_results.pathogen_name) LIKE '%covid%'
|
||||
)
|
||||
THEN surveillance_cases.lab_code
|
||||
END) as covid_positive
|
||||
")->first();
|
||||
|
||||
if (!$row || $row->total_cases == 0) {
|
||||
return [
|
||||
|
||||
@@ -318,7 +318,7 @@ function buildMixedTrendChart(canvasId, labels, samples, lines) {
|
||||
type: 'bar',
|
||||
label: 'Total Cases',
|
||||
data: samples,
|
||||
backgroundColor: '#d34646',
|
||||
backgroundColor: '#007ce8',
|
||||
maxBarThickness: 60,
|
||||
yAxisID: 'y',
|
||||
|
||||
|
||||
@@ -242,7 +242,7 @@ function prepareMapForExport() {
|
||||
[14.7, 107.6]
|
||||
]);
|
||||
|
||||
map.fitBounds(bounds);
|
||||
window.map.fitBounds(bounds);
|
||||
|
||||
}
|
||||
async function exportFullDashboard() {
|
||||
@@ -273,7 +273,7 @@ async function exportFullDashboard() {
|
||||
|
||||
if (mapEl && originalMapHTML !== null) {
|
||||
mapEl.innerHTML = originalMapHTML;
|
||||
map.invalidateSize();
|
||||
window.map.invalidateSize();
|
||||
}
|
||||
|
||||
const img = canvas.toDataURL("image/jpeg", 0.95);
|
||||
@@ -329,8 +329,8 @@ async function getMapImage() {
|
||||
ctx.fillStyle = "#ffffff";
|
||||
ctx.fillRect(0, 0, width, height);
|
||||
|
||||
const zoom = map.getZoom();
|
||||
const projection = map.options.crs;
|
||||
const zoom = window.map.getZoom();
|
||||
const projection = window.map.options.crs;
|
||||
|
||||
const projectedRings = [];
|
||||
|
||||
@@ -341,8 +341,7 @@ async function getMapImage() {
|
||||
const rows = window.latestProvinceData || [];
|
||||
|
||||
rows.forEach(r => {
|
||||
const province = normalizeProvince(r.patient_province, window.validProvinces);
|
||||
console.log(province, totals[province]);
|
||||
const province = window.normalizeProvince(r.patient_province, window.validProvinces);
|
||||
if (!province) return;
|
||||
|
||||
if (!totals[province]) {
|
||||
@@ -360,7 +359,7 @@ async function getMapImage() {
|
||||
return "#f3f4f600";
|
||||
}
|
||||
|
||||
map.eachLayer(layer => {
|
||||
window.map.eachLayer(layer => {
|
||||
if (!layer.toGeoJSON) return;
|
||||
if (layer instanceof L.CircleMarker) {
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export const COLORS = [
|
||||
|
||||
'#2563eb', // blue
|
||||
'#ef4444', // blue
|
||||
'#10b981', // emerald
|
||||
'#f59e0b', // amber
|
||||
'#ef4444', // red
|
||||
|
||||
@@ -93,7 +93,8 @@ function renderTrend(valueId, changeId, current, previous, suffix = '') {
|
||||
function getSubtypeColor(label, index = 0) {
|
||||
|
||||
const specialColors = {
|
||||
'A/H5N1': '#dc2626'
|
||||
'A/H5N1': '#dc2626',
|
||||
'Influenza': '#b90c00'
|
||||
};
|
||||
|
||||
return specialColors[label]
|
||||
@@ -131,7 +132,10 @@ function renderDashboard(data = {}) {
|
||||
'doughnut',
|
||||
(data.pathogen_distribution || [])
|
||||
.sort((a, b) => b.total - a.total),
|
||||
'pathogen'
|
||||
'pathogen',
|
||||
'total',
|
||||
getSubtypeColor
|
||||
|
||||
);
|
||||
|
||||
buildDistributionChart(
|
||||
@@ -254,6 +258,8 @@ function normalizeProvince(name, validSet) {
|
||||
|
||||
return match || null;
|
||||
}
|
||||
window.normalizeProvince = normalizeProvince;
|
||||
|
||||
function renderProvinceHeatmap(rows = []) {
|
||||
|
||||
window.latestProvinceData = rows;
|
||||
@@ -264,7 +270,7 @@ function renderProvinceHeatmap(rows = []) {
|
||||
|
||||
map = L.map('provinceMap')
|
||||
.setView([12.7, 104.9], 7);
|
||||
|
||||
window.map = map;
|
||||
L.tileLayer(
|
||||
'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||
{
|
||||
@@ -593,7 +599,7 @@ function renderProgramTrend(rows = []) {
|
||||
|
||||
}),
|
||||
|
||||
color: '#1976D2'
|
||||
color: '#d21919'
|
||||
},
|
||||
|
||||
{
|
||||
@@ -722,20 +728,33 @@ function renderProgramTrend(rows = []) {
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
function renderAFITrend(
|
||||
rows = [],
|
||||
data = {},
|
||||
canvasId,
|
||||
COLORS,
|
||||
type = 'trend'
|
||||
) {
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| DATA
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
const rows =
|
||||
data.rows || [];
|
||||
|
||||
const totals =
|
||||
data.totals || [];
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| EMPTY
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
if (!rows.length) {
|
||||
if (!totals.length) {
|
||||
|
||||
if (type === 'donut') {
|
||||
|
||||
@@ -761,6 +780,57 @@ function renderAFITrend(
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| LABELS
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
const labels = [...new Set(
|
||||
|
||||
totals.map(r =>
|
||||
|
||||
`${r.year}-W${r.period}`
|
||||
|
||||
)
|
||||
|
||||
)].sort((a, b) => {
|
||||
|
||||
const [yearA, weekA] =
|
||||
a.split('-W').map(Number);
|
||||
|
||||
const [yearB, weekB] =
|
||||
b.split('-W').map(Number);
|
||||
|
||||
if (yearA !== yearB) {
|
||||
return yearA - yearB;
|
||||
}
|
||||
|
||||
return weekA - weekB;
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| TOTAL CASES (BLUE BARS)
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
const totalCases = labels.map(label => {
|
||||
|
||||
const row = totals.find(r =>
|
||||
|
||||
`${r.year}-W${r.period}`
|
||||
=== label
|
||||
|
||||
);
|
||||
|
||||
return Number(
|
||||
row?.total_cases || 0
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| DONUT
|
||||
@@ -800,16 +870,26 @@ function renderAFITrend(
|
||||
'total'
|
||||
);
|
||||
|
||||
if (charts[canvasId]) {
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| DONUT CENTER TOTAL
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| MUST MATCH SUM OF BLUE BARS
|
||||
|
|
||||
*/
|
||||
|
||||
const totalCases = rows.reduce(
|
||||
(sum, r) =>
|
||||
sum + Number(r.total_cases || 0),
|
||||
const donutTotal =
|
||||
|
||||
totalCases.reduce(
|
||||
(a, b) => a + b,
|
||||
0
|
||||
);
|
||||
|
||||
if (charts[canvasId]) {
|
||||
|
||||
charts[canvasId].$afiTotalCases =
|
||||
totalCases;
|
||||
donutTotal;
|
||||
|
||||
charts[canvasId].update();
|
||||
|
||||
@@ -818,90 +898,6 @@ function renderAFITrend(
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| YEARLY VIEW
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
const years = [...new Set(
|
||||
rows.map(r => Number(r.year))
|
||||
)];
|
||||
|
||||
const totalYears =
|
||||
Math.max(...years) - Math.min(...years);
|
||||
|
||||
const useYearlyView =
|
||||
totalYears >= 5;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| LABELS
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
let labels;
|
||||
|
||||
if (useYearlyView) {
|
||||
|
||||
labels = [...new Set(
|
||||
rows.map(r => String(r.year))
|
||||
)].sort();
|
||||
|
||||
} else {
|
||||
|
||||
labels = [...new Set(
|
||||
rows.map(r =>
|
||||
`${r.year}-W${r.period}`
|
||||
)
|
||||
)].sort((a, b) => {
|
||||
|
||||
const [yearA, weekA] =
|
||||
a.split('-W').map(Number);
|
||||
|
||||
const [yearB, weekB] =
|
||||
b.split('-W').map(Number);
|
||||
|
||||
if (yearA !== yearB) {
|
||||
return yearA - yearB;
|
||||
}
|
||||
|
||||
return weekA - weekB;
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| TOTAL CASES
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
const totalCases = labels.map(label => {
|
||||
|
||||
if (useYearlyView) {
|
||||
|
||||
return rows
|
||||
.filter(r =>
|
||||
String(r.year) === label
|
||||
)
|
||||
.reduce(
|
||||
(sum, r) =>
|
||||
sum + Number(r.total_cases || 0),
|
||||
0
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
const row = rows.find(r =>
|
||||
`${r.year}-W${r.period}` === label
|
||||
);
|
||||
|
||||
return row?.total_cases || 0;
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| PATHOGENS
|
||||
@@ -929,26 +925,6 @@ function renderAFITrend(
|
||||
|
||||
data: labels.map(label => {
|
||||
|
||||
if (useYearlyView) {
|
||||
|
||||
const filtered = rows.filter(r =>
|
||||
String(r.year) === label &&
|
||||
r.pathogen === pathogen
|
||||
);
|
||||
|
||||
const total =
|
||||
filtered.reduce(
|
||||
(sum, r) =>
|
||||
sum + Number(r.positivity_rate || 0),
|
||||
0
|
||||
);
|
||||
|
||||
return filtered.length
|
||||
? total / filtered.length
|
||||
: 0;
|
||||
|
||||
}
|
||||
|
||||
const row = rows.find(r =>
|
||||
|
||||
`${r.year}-W${r.period}`
|
||||
@@ -958,7 +934,9 @@ function renderAFITrend(
|
||||
|
||||
);
|
||||
|
||||
return row?.positivity_rate || 0;
|
||||
return Number(
|
||||
row?.positivity_rate || 0
|
||||
);
|
||||
|
||||
}),
|
||||
|
||||
@@ -970,6 +948,12 @@ function renderAFITrend(
|
||||
})
|
||||
);
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| BUILD
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
buildMixedTrendChart(
|
||||
canvasId,
|
||||
labels,
|
||||
@@ -978,6 +962,8 @@ function renderAFITrend(
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
||||
function renderPathogenChart(rows = []) {
|
||||
buildDistributionChart(
|
||||
'pathogenChart',
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {{ $attributes }}>
|
||||
<!-- <svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {{ $attributes }}>
|
||||
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
|
||||
</svg>
|
||||
</svg> -->
|
||||
<img src="{{ asset('images/nrml-logo.png') }}"
|
||||
alt="Logo"
|
||||
class="h-10 w-auto">
|
||||
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.1 KiB |
@@ -4,6 +4,7 @@
|
||||
<head>
|
||||
<title>NRML Dashboard</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="icon" type="image/png" href="{{ asset('images/nrml-logo.png') }}">
|
||||
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js@3.9.1"></script>
|
||||
|
||||
Reference in New Issue
Block a user