diff --git a/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue b/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue index 1f5a411..ba571b5 100644 --- a/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue +++ b/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue @@ -10,617 +10,594 @@
-
- -
-
-
- -

- {{ - isEditing - ? "Mettez à jour les informations ci-dessous" - : "Renseignez les informations de la prise en charge" - }} -

-
+
+
+
+ +

+ {{ + isEditing + ? "Mettez à jour les informations ci-dessous" + : "Renseignez les informations de la prise en charge" + }} +

+ >
-
- -
- - {{ err }} +
+
+
{{ err }}
-
- -
-
- Personnes concernées -
- -
- -
-
- +
+
+

+ 1. Personnes concernées +

+
+
+
+
+
+
- -
-
- +
+
- - {{ getFieldError("deceased_id") }} - +
- +
+ +
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
- - - {{ getFieldError("deceased.last_name") }} -
+ + {{ getFieldError("deceased.last_name") }} +
- -
-
- -
-
-
- +
+ +
+
- - + {{ getFieldError("client") }} - -
- +
+ Aucun client trouvé
-
- {{ c.name }} - {{ c.email }} +
+ Écrire le nom du client pour rechercher
- -
- Aucun client trouvé -
-
- Écrire le nom du client pour rechercher
+
-
- - -
-
- Planification -
- -
- -
- +
+
+

+ 2. Planification +

+
+
+
+
+ - - {{ getFieldError("scheduled_at") }} - +
- -
- -
-
- +
+ +
+
- - {{ getFieldError("product_id") }} - +
-
- + +
- -
- -
- - -
-
-
- - -
-
- -
- - -
- + +
-
- -
- - + +
+ +
+
+ + +
+ + {{ getFieldError("assigned_practitioner_id") }} + +
+
+ +
+ Aucun employé trouvé +
+
+ Saisir au moins 2 caractères +
+
+
+ + {{ getFieldError("assigned_practitioner_id") }} + +
+ +
+ +
+
-
- - -
-
- Lieu & Documents -
- -
- -
-
- +
+
+

+ 3. Lieu & Documents +

+
+
+
+
+
+
-
-
- +
+
- - {{ getFieldError("location.name") }} - +
- +
+ +
-
-
-
- - -
-
- - -
+
+
+ + +
+
+ +
- - - {{ getFieldError("location.name") }} -
- -
- -
+
+ +
-

- Optionnel – si - fourni par la famille -

-
-
-
- -
- - -
-
- Observations -
-
- -
- - + + Optionnel - si fourni par la famille +
- -
- - Récupérer docs emails - -
+
+
+

+ 4. Observations +

+
+
+ +
+ + +
+
+
+ +
+
+

+ Action rapide +

+

+ Vérifiez le client, le soin et l'intervenant avant validation. +

+
+
- {{ isEditing ? "Mettre à jour" : "Créer l'intervention" }}
@@ -670,6 +646,7 @@ import DeceasedService from "@/services/deceased"; import ProductService from "@/services/product"; import ClientLocationService from "@/services/client_location"; import { ClientService } from "@/services/client"; +import ThanatopractitionerService from "@/services/thanatopractitioner"; import SoftButton from "@/components/SoftButton.vue"; const props = defineProps({ @@ -713,6 +690,11 @@ const allProducts = ref([]); const showProductResults = ref(false); let productSearchTimeout; +const practitionerSearchQuery = ref(""); +const practitionerSearchResults = ref([]); +const showPractitionerResults = ref(false); +let practitionerSearchTimeout; + const locationForm = ref({ id: null, is_existing: true, name: "", city: "" }); const locationSearchQuery = ref(""); const locationSearchResults = ref([]); @@ -918,6 +900,63 @@ const clearProductSelection = () => { errors.value = errors.value.filter((e) => e.field !== "product_id"); }; +const getPractitionerName = (practitioner) => { + const firstName = practitioner?.employee?.first_name || ""; + const lastName = practitioner?.employee?.last_name || ""; + return `${firstName} ${lastName}`.trim() || `#${practitioner?.id || ""}`; +}; + +const handlePractitionerSearch = () => { + if (practitionerSearchTimeout) clearTimeout(practitionerSearchTimeout); + + if (interventionForm.value.assigned_practitioner_id) { + interventionForm.value.assigned_practitioner_id = ""; + } + + if (practitionerSearchQuery.value.trim().length < 2) { + practitionerSearchResults.value = []; + showPractitionerResults.value = true; + return; + } + + showPractitionerResults.value = true; + practitionerSearchTimeout = setTimeout(async () => { + try { + practitionerSearchResults.value = await ThanatopractitionerService.searchThanatopractitioners( + practitionerSearchQuery.value.trim() + ); + } catch (error) { + console.error("Failed to search practitioners", error); + practitionerSearchResults.value = []; + } + }, 300); +}; + +const handlePractitionerFocus = () => { + showPractitionerResults.value = !interventionForm.value + .assigned_practitioner_id; +}; + +const selectPractitioner = (practitioner) => { + interventionForm.value.assigned_practitioner_id = practitioner.id; + practitionerSearchQuery.value = getPractitionerName(practitioner); + showPractitionerResults.value = false; + practitionerSearchResults.value = []; + errors.value = errors.value.filter( + (e) => e.field !== "assigned_practitioner_id" + ); +}; + +const clearPractitionerSelection = () => { + interventionForm.value.assigned_practitioner_id = ""; + practitionerSearchQuery.value = ""; + practitionerSearchResults.value = []; + showPractitionerResults.value = false; + errors.value = errors.value.filter( + (e) => e.field !== "assigned_practitioner_id" + ); +}; + const toggleLocationMode = () => { locationForm.value.is_existing = !locationForm.value.is_existing; if (!locationForm.value.is_existing) clearLocationSelection(); @@ -1137,587 +1176,18 @@ watch( errors.value = errors.value.filter( (e) => e.field !== "assigned_practitioner_id" ); + + const practitioner = props.practitioners.find( + (item) => item.id === interventionForm.value.assigned_practitioner_id + ); + + if (practitioner) { + practitionerSearchQuery.value = getPractitionerName(practitioner); + } else if (!interventionForm.value.assigned_practitioner_id) { + practitionerSearchQuery.value = ""; + } } ); defineExpose({ show, hide }); - - diff --git a/thanasoft-front/src/components/Organism/Interventions/AddInterventionPresentation.vue b/thanasoft-front/src/components/Organism/Interventions/AddInterventionPresentation.vue index a9cf64a..fe8cb66 100644 --- a/thanasoft-front/src/components/Organism/Interventions/AddInterventionPresentation.vue +++ b/thanasoft-front/src/components/Organism/Interventions/AddInterventionPresentation.vue @@ -1,6 +1,97 @@