oversu/Globinours
oversu/Globinours
Watch
1
0
Fork
You've already forked Globinours
 0
Code Issues 2 Pull requests Projects Releases 13 Packages Wiki Activity

Corriger les dossiers animaux et le suivi médical

Browse source
This commit is contained in:
Alexandre NOEL 2026-10-01 15:22:09 +02:00
commit 7b89fd5dfa
34 changed files with 440 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/Controllers/DashboardController.php
View file

@ -119,7 +119,7 @@ final class DashboardController
JOIN ref_vaccines rv ON rv.id = v.vaccine_id
WHERE v.due_date IS NOT NULL
AND a.deleted_at IS NULL AND a.archived_at IS NULL
AND lower(a.status) NOT IN ('decede','décédé')
AND lower(a.status) NOT IN ('decede','décédé','adopte','adopté')
AND date(v.due_date) < date('now')
ORDER BY date(v.due_date) ASC
LIMIT 50
@ -135,7 +135,7 @@ final class DashboardController
JOIN ref_vaccines rv ON rv.id = v.vaccine_id
WHERE v.due_date IS NOT NULL
AND a.deleted_at IS NULL AND a.archived_at IS NULL
AND lower(a.status) NOT IN ('decede','décédé')
AND lower(a.status) NOT IN ('decede','décédé','adopte','adopté')
AND date(v.due_date) >= date('now')
AND date(v.due_date) <= date('now', '+7 day')
ORDER BY date(v.due_date) ASC
@ -152,7 +152,7 @@ final class DashboardController
JOIN ref_vaccines rv ON rv.id = v.vaccine_id
WHERE v.due_date IS NOT NULL
AND a.deleted_at IS NULL AND a.archived_at IS NULL
AND lower(a.status) NOT IN ('decede','décédé')
AND lower(a.status) NOT IN ('decede','décédé','adopte','adopté')
AND date(v.due_date) > date('now', '+7 day')
AND date(v.due_date) <= date('now', '+30 day')
ORDER BY date(v.due_date) ASC
@ -162,7 +162,7 @@ final class DashboardController
$vaccines_30d = $stmt->fetchAll();
// Traitements en cours
$stmt = $db->prepare('
$stmt = $db->prepare("
SELECT a.id, a.name, a.internal_code AS code,
m.name AS medication_name,
t.start_date, t.end_date, t.dose_text, t.route
@ -171,9 +171,10 @@ final class DashboardController
JOIN ref_medications m ON m.id = t.medication_id
WHERE t.ongoing = 1
AND a.deleted_at IS NULL AND a.archived_at IS NULL
AND lower(a.status) NOT IN ('decede','décédé','adopte','adopté')
ORDER BY date(t.start_date) DESC, a.name ASC
LIMIT 50
');
");
$stmt->execute();
$treatments = $stmt->fetchAll();
@ -185,6 +186,7 @@ final class DashboardController
JOIN ref_medications m ON m.id = t.medication_id
WHERE t.ongoing = 1
AND a.deleted_at IS NULL AND a.archived_at IS NULL
AND lower(a.status) NOT IN ('decede','décédé','adopte','adopté')
AND t.end_date IS NOT NULL
AND date(t.end_date) < date('now')
ORDER BY date(t.end_date) ASC