khantey/nrml_dashboard
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change layout, update content, and change database

Browse Source
This commit is contained in:
khantey1998
2026-03-05 14:58:36 +07:00
parent 16dfb43530
commit 519d0924c8
9 changed files with 119613 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
dashboard/app/Http/Controllers/Api/DashboardController.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Services\DashboardService;
use Carbon\Carbon;
use App\Models\SurveillanceCase;
class DashboardController extends Controller
{
@@ -27,8 +28,23 @@ class DashboardController extends Controller
*/
public function summary(Request $request)
{
$dateFrom = $request->query('date_from', Carbon::now()->subDays(7)->toDateString());
$dateTo = $request->query('date_to', Carbon::now()->toDateString());
if ($request->has('start_year')) {
$startYear = $request->query('start_year');
$startWeek = $request->query('start_week');
$endYear = $request->query('end_year');
$endWeek = $request->query('end_week');
$dateFrom = Carbon::now()->setISODate($startYear, $startWeek)->startOfWeek()->toDateString();
$dateTo = Carbon::now()->setISODate($endYear, $endWeek)->endOfWeek()->toDateString();
} else {
$dateFrom = $request->query('date_from', Carbon::now()->subDays(7)->toDateString());
$dateTo = $request->query('date_to', Carbon::now()->toDateString());
}
$data = $this->service->summaryCards($dateFrom, $dateTo);
@@ -42,8 +58,24 @@ class DashboardController extends Controller
public function trend(Request $request)
{
$periodType = $request->query('period_type', 'week');
$dateFrom = $request->query('date_from');
$dateTo = $request->query('date_to');
if ($request->has('start_year')) {
$startYear = $request->query('start_year');
$startWeek = $request->query('start_week');
$endYear = $request->query('end_year');
$endWeek = $request->query('end_week');
$dateFrom = Carbon::now()->setISODate($startYear, $startWeek)->startOfWeek()->toDateString();
$dateTo = Carbon::now()->setISODate($endYear, $endWeek)->endOfWeek()->toDateString();
} else {
$dateFrom = $request->query('date_from');
$dateTo = $request->query('date_to');
}
$data = $this->service->aggregateAllPrograms(
$periodType,
@@ -59,19 +91,71 @@ class DashboardController extends Controller
*/
public function province(Request $request)
{
$surveillanceId = $request->query('surveillance_id');
$dateFrom = $request->query('date_from');
$dateTo = $request->query('date_to');
if ($request->has('start_year')) {
$data = $this->service->provinceDistribution(
$surveillanceId,
$dateFrom,
$dateTo
);
$startYear = $request->query('start_year');
$startWeek = $request->query('start_week');
$endYear = $request->query('end_year');
$endWeek = $request->query('end_week');
$dateFrom = Carbon::now()
->setISODate($startYear, $startWeek)
->startOfWeek()
->toDateString();
$dateTo = Carbon::now()
->setISODate($endYear, $endWeek)
->endOfWeek()
->toDateString();
} else {
$dateFrom = $request->query('date_from');
$dateTo = $request->query('date_to');
}
$rows = $this->service->provinceDistribution($dateFrom, $dateTo);
$result = [];
foreach ($rows as $row) {
$result[$row->site_province_name] = $row->total;
}
return response()->json($result);
}
public function sentinelMap(Request $request)
{
$startYear = $request->query('start_year');
$startWeek = $request->query('start_week');
$endYear = $request->query('end_year');
$endWeek = $request->query('end_week');
$dateFrom = Carbon::now()->setISODate($startYear, $startWeek)->startOfWeek();
$dateTo = Carbon::now()->setISODate($endYear, $endWeek)->endOfWeek();
$data = $this->service->sentinelMap($dateFrom, $dateTo);
return response()->json($data);
}
public function provinceCircles(Request $request)
{
$startYear = $request->query('start_year');
$startWeek = $request->query('start_week');
$endYear = $request->query('end_year');
$endWeek = $request->query('end_week');
$dateFrom = Carbon::now()->setISODate($startYear, $startWeek)->startOfWeek();
$dateTo = Carbon::now()->setISODate($endYear, $endWeek)->endOfWeek();
$data = $this->service->provinceCircles($dateFrom, $dateTo);
return response()->json($data);
}
/**
* Pathogen distribution
*/

66
dashboard/app/Services/DashboardService.php
View File

@@ -158,18 +158,72 @@ class DashboardService
/**
* Province distribution
*/
public function provinceDistribution($surveillanceId, $dateFrom, $dateTo)
public function provinceDistribution($dateFrom, $dateTo)
{
return SurveillanceCase::selectRaw("
site_province_name,
COUNT(*) as total
")
->where('surveillance_id', $surveillanceId)
->whereBetween('case_date', [$dateFrom, $dateTo])
site_province_name,
COUNT(*) as total
")
->join('case_lab_results', 'surveillance_cases.lab_code', '=', 'case_lab_results.lab_code')
->whereIn('surveillance_cases.surveillance_id', [1, 2, 3]) // SARI ILI LBM
->where('case_lab_results.is_positive', 1)
->whereBetween('surveillance_cases.case_date', [$dateFrom, $dateTo])
->groupBy('site_province_name')
->orderByDesc('total')
->get();
}
public function sentinelMap($dateFrom, $dateTo)
{
return SurveillanceCase::selectRaw("
sentinel_site_id,
sentinel_site_name,
site_province_name,
surveillance_id,
COUNT(*) as total
")
->join('case_lab_results', 'surveillance_cases.lab_code', '=', 'case_lab_results.lab_code')
->whereIn('surveillance_cases.surveillance_id', [1, 2, 3])
->where('case_lab_results.is_positive', 1)
->whereBetween('surveillance_cases.case_date', [$dateFrom, $dateTo])
->groupBy(
'sentinel_site_id',
'sentinel_site_name',
'site_province_name',
'surveillance_id'
)
->get();
}
public function provinceCircles($dateFrom, $dateTo)
{
return SurveillanceCase::selectRaw("
surveillance_cases.site_province_name,
surveillance_cases.surveillance_id,
COUNT(*) as total
")
->join(
'case_lab_results',
'surveillance_cases.lab_code',
'=',
'case_lab_results.lab_code'
)
->whereIn('surveillance_cases.surveillance_id', [1, 2, 3])
->where('case_lab_results.is_positive', 1)
->whereBetween('surveillance_cases.case_date', [$dateFrom, $dateTo])
->groupBy(
'surveillance_cases.site_province_name',
'surveillance_cases.surveillance_id'
)
->get();
}
/**
* Pathogen distribution (positive only)