From e78f3131c771057b0208aaf2b921969568863522 Mon Sep 17 00:00:00 2001 From: Philipp Metzner Date: Mon, 8 Dec 2025 13:20:19 +0100 Subject: [PATCH] Pre-select beneficiary in use_service --- include/people_edit.php | 2 +- include/use_service.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/people_edit.php b/include/people_edit.php index 6993c7739..ba1f5fe1b 100644 --- a/include/people_edit.php +++ b/include/people_edit.php @@ -568,7 +568,7 @@ 'allowedit' => false, 'allowadd' => true, 'add' => 'Register Usage', - 'addaction' => 'use_service', + 'addaction' => 'use_service&people_id='.intval($id), 'allowselect' => false, 'allowselectall' => false, 'action' => 'people_edit', diff --git a/include/use_service.php b/include/use_service.php index b6222a13a..46ab3ee3c 100644 --- a/include/use_service.php +++ b/include/use_service.php @@ -28,13 +28,14 @@ WHERE deleted IS NULL AND camp_id = :camp_id', ['camp_id' => $_SESSION['camp']['id']]); addfield('select', 'Service', 'service_id', ['placeholder' => 'Type to search', 'required' => true, 'options' => $serviceoptions]); +$people_id = $_GET['people_id'] ?? null; $beneficiaryoptions = db_array(' SELECT - id AS value, CONCAT(container, " ",firstname, " ", lastname) AS label + id AS value, CONCAT(container, " ",firstname, " ", lastname) AS label, IF(id = :people_id, 1, 0) AS selected FROM people WHERE - deleted IS NULL AND camp_id = :camp_id', ['camp_id' => $_SESSION['camp']['id']]); + deleted IS NULL AND camp_id = :camp_id', ['camp_id' => $_SESSION['camp']['id'], 'people_id' => $people_id]); addfield('select', 'Beneficiaries', 'people_id', ['placeholder' => 'Type to search', 'required' => true, 'multiple' => true, 'options' => $beneficiaryoptions]); $service_id = $_GET['service_id'];