working on detail page for sari, lil, amd lbm
This commit is contained in:
@@ -6,169 +6,160 @@ use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Services\DashboardService;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\SurveillanceCase;
|
||||
|
||||
class DashboardController extends Controller
|
||||
{
|
||||
protected $service;
|
||||
|
||||
public function index()
|
||||
{
|
||||
$programs = \App\Models\Surveillance::all();
|
||||
return view('dashboard.index', compact('programs'));
|
||||
}
|
||||
public function __construct(DashboardService $service)
|
||||
{
|
||||
$this->service = $service;
|
||||
}
|
||||
|
||||
/**
|
||||
* Summary cards
|
||||
* GET /api/dashboard/summary?date_from=2026-01-01&date_to=2026-03-01
|
||||
*/
|
||||
public function summary(Request $request)
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Helper: Resolve Epiweek Range
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
private function getEpiRange(Request $request)
|
||||
{
|
||||
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());
|
||||
$startYear = (int) $request->query('start_year');
|
||||
$startWeek = (int) $request->query('start_week');
|
||||
$endYear = (int) $request->query('end_year');
|
||||
$endWeek = (int) $request->query('end_week');
|
||||
|
||||
if (!$startYear || !$startWeek || !$endYear || !$endWeek) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
'startYear' => $startYear,
|
||||
'startWeek' => $startWeek,
|
||||
'endYear' => $endYear,
|
||||
'endWeek' => $endWeek
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Overview Summary Cards
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public function summary()
|
||||
{
|
||||
$dateFrom = Carbon::now()->subDays(7)->toDateString();
|
||||
$dateTo = Carbon::now()->toDateString();
|
||||
|
||||
$data = $this->service->summaryCards($dateFrom, $dateTo);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Trend chart
|
||||
* GET /api/dashboard/trend?surveillance_id=1&period_type=week&date_from=...&date_to=...
|
||||
*/
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Overview Trend Chart
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public function trend(Request $request)
|
||||
{
|
||||
$periodType = $request->query('period_type', 'week');
|
||||
|
||||
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');
|
||||
$range = $this->getEpiRange($request);
|
||||
|
||||
if (!$range) {
|
||||
return response()->json(['error' => 'Missing epiweek range'], 400);
|
||||
}
|
||||
|
||||
$data = $this->service->aggregateAllPrograms(
|
||||
$periodType,
|
||||
$dateFrom,
|
||||
$dateTo
|
||||
$range['startYear'],
|
||||
$range['startWeek'],
|
||||
$range['endYear'],
|
||||
$range['endWeek']
|
||||
);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Province distribution
|
||||
*/
|
||||
public function province(Request $request)
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Program Dashboard
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public function program(Request $request)
|
||||
{
|
||||
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');
|
||||
$surveillanceId = (int) $request->query('surveillance_id');
|
||||
|
||||
if (!$surveillanceId) {
|
||||
return response()->json(['error' => 'Missing surveillance_id'], 400);
|
||||
}
|
||||
|
||||
$rows = $this->service->provinceDistribution($dateFrom, $dateTo);
|
||||
$range = $this->getEpiRange($request);
|
||||
|
||||
$result = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$result[$row->site_province_name] = $row->total;
|
||||
if (!$range) {
|
||||
return response()->json(['error' => 'Missing epiweek range'], 400);
|
||||
}
|
||||
|
||||
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);
|
||||
$data = $this->service->programDashboardData(
|
||||
$surveillanceId,
|
||||
$range['startYear'],
|
||||
$range['startWeek'],
|
||||
$range['endYear'],
|
||||
$range['endWeek']
|
||||
);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Province Map (Overview)
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public function provinceCircles(Request $request)
|
||||
{
|
||||
$startYear = $request->query('start_year');
|
||||
$startWeek = $request->query('start_week');
|
||||
$range = $this->getEpiRange($request);
|
||||
|
||||
$endYear = $request->query('end_year');
|
||||
$endWeek = $request->query('end_week');
|
||||
if (!$range) {
|
||||
return response()->json(['error' => 'Missing epiweek range'], 400);
|
||||
}
|
||||
|
||||
$dateFrom = Carbon::now()->setISODate($startYear, $startWeek)->startOfWeek();
|
||||
$dateTo = Carbon::now()->setISODate($endYear, $endWeek)->endOfWeek();
|
||||
|
||||
$data = $this->service->provinceCircles($dateFrom, $dateTo);
|
||||
$data = $this->service->provinceCircles(
|
||||
$range['startYear'],
|
||||
$range['startWeek'],
|
||||
$range['endYear'],
|
||||
$range['endWeek']
|
||||
);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
/**
|
||||
* Pathogen distribution
|
||||
*/
|
||||
public function pathogen(Request $request)
|
||||
{
|
||||
$surveillanceId = $request->query('surveillance_id');
|
||||
$dateFrom = $request->query('date_from');
|
||||
$dateTo = $request->query('date_to');
|
||||
|
||||
$data = $this->service->pathogenDistribution(
|
||||
$surveillanceId,
|
||||
$dateFrom,
|
||||
$dateTo
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Sentinel Map
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
public function sentinelMap(Request $request)
|
||||
{
|
||||
$range = $this->getEpiRange($request);
|
||||
|
||||
if (!$range) {
|
||||
return response()->json(['error' => 'Missing epiweek range'], 400);
|
||||
}
|
||||
|
||||
$data = $this->service->sentinelMap(
|
||||
$range['startYear'],
|
||||
$range['startWeek'],
|
||||
$range['endYear'],
|
||||
$range['endWeek']
|
||||
);
|
||||
|
||||
return response()->json($data);
|
||||
|
||||
Reference in New Issue
Block a user