From 8074ac4f4861177b038143bb9ccfa6f1306bc162 Mon Sep 17 00:00:00 2001 From: nyavokevin Date: Thu, 5 Mar 2026 17:00:32 +0300 Subject: [PATCH] FIX: Creation demande, client on clique show --- .../Controllers/Api/ClientGroupController.php | 42 + .../Requests/AssignClientsToGroupRequest.php | 42 + thanasoft-back/app/Models/ClientGroup.php | 13 + thanasoft-back/app/Models/PriceList.php | 36 + thanasoft-back/app/Models/Product.php | 11 + ..._03_04_140000_create_price_lists_table.php | 31 + ...d_price_list_id_to_client_groups_table.php | 33 + ...140200_create_product_price_list_table.php | 32 + thanasoft-back/routes/api.php | 1 + .../Agenda/InterventionMultiStepModal.vue | 1914 +++++++++-------- .../Organism/CRM/FournisseurPresentation.vue | 2 - .../ClientGroupListPresentation.vue | 28 +- .../Commande/CommandeDetailPresentation.vue | 3 +- .../Planning/PlanningNewRequestModal.vue | 26 +- .../Stock/ReceptionDetailPresentation.vue | 46 +- .../Planning/PlanningCreationTypeSelector.vue | 24 +- .../molecules/Planning/PlanningEventForm.vue | 9 +- .../molecules/Planning/PlanningKanban.vue | 776 +++++-- .../Planning/PlanningLeaveRequestForm.vue | 33 +- .../molecules/Planning/PlanningWeekGrid.vue | 682 +++++- .../Tables/ClientGroup/ClientGroupTable.vue | 353 ++- thanasoft-front/src/views/pages/Planning.vue | 287 ++- 22 files changed, 2982 insertions(+), 1442 deletions(-) create mode 100644 thanasoft-back/app/Http/Requests/AssignClientsToGroupRequest.php create mode 100644 thanasoft-back/app/Models/PriceList.php create mode 100644 thanasoft-back/database/migrations/2026_03_04_140000_create_price_lists_table.php create mode 100644 thanasoft-back/database/migrations/2026_03_04_140100_add_price_list_id_to_client_groups_table.php create mode 100644 thanasoft-back/database/migrations/2026_03_04_140200_create_product_price_list_table.php diff --git a/thanasoft-back/app/Http/Controllers/Api/ClientGroupController.php b/thanasoft-back/app/Http/Controllers/Api/ClientGroupController.php index 8f34a93..14dde48 100644 --- a/thanasoft-back/app/Http/Controllers/Api/ClientGroupController.php +++ b/thanasoft-back/app/Http/Controllers/Api/ClientGroupController.php @@ -5,9 +5,11 @@ declare(strict_types=1); namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; +use App\Http\Requests\AssignClientsToGroupRequest; use App\Http\Requests\StoreClientGroupRequest; use App\Http\Requests\UpdateClientGroupRequest; use App\Http\Resources\Client\ClientGroupResource; +use App\Models\Client; use App\Repositories\ClientGroupRepositoryInterface; use Illuminate\Http\JsonResponse; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; @@ -153,4 +155,44 @@ class ClientGroupController extends Controller ], 500); } } + + /** + * Assign many clients to one client group. + */ + public function assignClients(AssignClientsToGroupRequest $request, string $id): JsonResponse + { + try { + $clientGroup = $this->clientGroupRepository->find($id); + + if (!$clientGroup) { + return response()->json([ + 'message' => 'Groupe de clients non trouvé.', + ], 404); + } + + $clientIds = $request->validated('client_ids'); + + $updatedCount = Client::query() + ->whereIn('id', $clientIds) + ->update(['group_id' => $clientGroup->id]); + + return response()->json([ + 'message' => 'Clients assignés au groupe avec succès.', + 'assigned_count' => $updatedCount, + 'group' => new ClientGroupResource($clientGroup), + ]); + } catch (\Exception $e) { + Log::error('Error assigning clients to group: ' . $e->getMessage(), [ + 'exception' => $e, + 'trace' => $e->getTraceAsString(), + 'client_group_id' => $id, + 'data' => $request->validated(), + ]); + + return response()->json([ + 'message' => 'Une erreur est survenue lors de l’assignation des clients au groupe.', + 'error' => config('app.debug') ? $e->getMessage() : null, + ], 500); + } + } } diff --git a/thanasoft-back/app/Http/Requests/AssignClientsToGroupRequest.php b/thanasoft-back/app/Http/Requests/AssignClientsToGroupRequest.php new file mode 100644 index 0000000..f8fc207 --- /dev/null +++ b/thanasoft-back/app/Http/Requests/AssignClientsToGroupRequest.php @@ -0,0 +1,42 @@ +|string> + */ + public function rules(): array + { + return [ + 'client_ids' => 'required|array|min:1', + 'client_ids.*' => 'integer|distinct|exists:clients,id', + ]; + } + + public function messages(): array + { + return [ + 'client_ids.required' => 'La liste des clients est obligatoire.', + 'client_ids.array' => 'La liste des clients doit être un tableau.', + 'client_ids.min' => 'Veuillez sélectionner au moins un client.', + 'client_ids.*.integer' => 'Chaque ID client doit être un entier.', + 'client_ids.*.distinct' => 'Un client ne peut pas être envoyé plusieurs fois.', + 'client_ids.*.exists' => 'Un ou plusieurs clients sélectionnés sont introuvables.', + ]; + } +} + diff --git a/thanasoft-back/app/Models/ClientGroup.php b/thanasoft-back/app/Models/ClientGroup.php index 3cc69a8..c45b017 100644 --- a/thanasoft-back/app/Models/ClientGroup.php +++ b/thanasoft-back/app/Models/ClientGroup.php @@ -3,11 +3,24 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; class ClientGroup extends Model { protected $fillable = [ 'name', 'description', + 'price_list_id', ]; + + public function priceList(): BelongsTo + { + return $this->belongsTo(PriceList::class, 'price_list_id'); + } + + public function clients(): HasMany + { + return $this->hasMany(Client::class, 'group_id'); + } } diff --git a/thanasoft-back/app/Models/PriceList.php b/thanasoft-back/app/Models/PriceList.php new file mode 100644 index 0000000..735d341 --- /dev/null +++ b/thanasoft-back/app/Models/PriceList.php @@ -0,0 +1,36 @@ + 'date', + 'valid_to' => 'date', + 'is_default' => 'boolean', + ]; + + public function clientGroups(): HasMany + { + return $this->hasMany(ClientGroup::class, 'price_list_id'); + } + + public function products(): BelongsToMany + { + return $this->belongsToMany(Product::class, 'product_price_list') + ->withPivot('price') + ->withTimestamps(); + } +} + diff --git a/thanasoft-back/app/Models/Product.php b/thanasoft-back/app/Models/Product.php index 0f46b60..758c50e 100644 --- a/thanasoft-back/app/Models/Product.php +++ b/thanasoft-back/app/Models/Product.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Facades\Storage; class Product extends Model @@ -131,6 +132,16 @@ class Product extends Model return $this->hasMany(GoodsReceiptLine::class); } + /** + * Price lists attached to this product with custom price. + */ + public function priceLists(): BelongsToMany + { + return $this->belongsToMany(PriceList::class, 'product_price_list') + ->withPivot('price') + ->withTimestamps(); + } + /** * Boot the model */ diff --git a/thanasoft-back/database/migrations/2026_03_04_140000_create_price_lists_table.php b/thanasoft-back/database/migrations/2026_03_04_140000_create_price_lists_table.php new file mode 100644 index 0000000..d8c5065 --- /dev/null +++ b/thanasoft-back/database/migrations/2026_03_04_140000_create_price_lists_table.php @@ -0,0 +1,31 @@ +id(); + $table->string('name', 191); + $table->date('valid_from')->nullable(); + $table->date('valid_to')->nullable(); + $table->boolean('is_default')->default(false); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('price_lists'); + } +}; + diff --git a/thanasoft-back/database/migrations/2026_03_04_140100_add_price_list_id_to_client_groups_table.php b/thanasoft-back/database/migrations/2026_03_04_140100_add_price_list_id_to_client_groups_table.php new file mode 100644 index 0000000..09fdd35 --- /dev/null +++ b/thanasoft-back/database/migrations/2026_03_04_140100_add_price_list_id_to_client_groups_table.php @@ -0,0 +1,33 @@ +foreignId('price_list_id') + ->nullable() + ->after('description') + ->constrained('price_lists') + ->nullOnDelete(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('client_groups', function (Blueprint $table) { + $table->dropForeign(['price_list_id']); + $table->dropColumn('price_list_id'); + }); + } +}; + diff --git a/thanasoft-back/database/migrations/2026_03_04_140200_create_product_price_list_table.php b/thanasoft-back/database/migrations/2026_03_04_140200_create_product_price_list_table.php new file mode 100644 index 0000000..859cc1c --- /dev/null +++ b/thanasoft-back/database/migrations/2026_03_04_140200_create_product_price_list_table.php @@ -0,0 +1,32 @@ +id(); + $table->foreignId('product_id')->constrained('products')->cascadeOnDelete(); + $table->foreignId('price_list_id')->constrained('price_lists')->cascadeOnDelete(); + $table->decimal('price', 10, 2); + $table->timestamps(); + + $table->unique(['product_id', 'price_list_id']); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('product_price_list'); + } +}; + diff --git a/thanasoft-back/routes/api.php b/thanasoft-back/routes/api.php index 57a96b1..f9af2fa 100644 --- a/thanasoft-back/routes/api.php +++ b/thanasoft-back/routes/api.php @@ -55,6 +55,7 @@ Route::middleware('auth:sanctum')->group(function () { Route::get('/clients/searchBy', [ClientController::class, 'searchBy']); Route::apiResource('clients', ClientController::class); + Route::post('client-groups/{id}/assign-clients', [ClientGroupController::class, 'assignClients']); Route::apiResource('client-groups', ClientGroupController::class); Route::apiResource('client-locations', ClientLocationController::class); diff --git a/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue b/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue index a4c7370..2093973 100644 --- a/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue +++ b/thanasoft-front/src/components/Organism/Agenda/InterventionMultiStepModal.vue @@ -7,576 +7,440 @@ aria-labelledby="interventionModalLabel" aria-hidden="true" > -
-
-
- - +
+
+ + +
+
+
+ +

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

+
+
+
-
-
- -
-
    -
  • - {{ err }} -
    • -
-
+
- -
-
-
- - + +
+ + {{ err }} +
+ + +
+ + +
+
+ 1 + Personnes concernées
- -
-
- - - +
+ +
+
+ + +
+ + +
+
+ + + +
+ + {{ getFieldError("deceased_id") }} + +
+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + {{ getFieldError("deceased.last_name") }} + +
+
+ + +
+
+ +
+
+
+ + + +
+ + {{ getFieldError("client") }} + +
+ +
+ Aucun client trouvé +
+
+ Écrire le nom du client pour rechercher +
+
+
+
+
+
+ +
+ + +
+
+ 2 + Planification +
+ +
+ +
+ - -
-
- {{ getFieldError("deceased_id") }} -
- -
- -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- {{ - getFieldError("deceased.last_name") - }} -
-
-
-
-
- - -
-
- -
- - - - - -
-
- {{ getFieldError("client") }} -
- -
- -
-
-
- - -
-
- - -
- {{ getFieldError("scheduled_at") }} -
-
-
- -
- - - - - -
-
- {{ getFieldError("product_id") }} -
- -
- -
-
-
- - -
-
- -
-
- - -
- {{ getFieldError("assigned_practitioner_id") }} -
-
-
- - -
-
- - -
-
- -
- - - - - -
-

- 📋 Optionnel - À ajouter si fourni par la famille ou dans les - documents reçus -

-
-
- - -
-
-
- - -
- - -
-
- - + + {{ getFieldError("scheduled_at") }} - -
- -
-
- + + {{ getFieldError("product_id") }} + +
+ +
+
-
- {{ getFieldError("location.name") }} + + +
+ +
+ + +
- -
-
-
- +
+
+ +
+ -
- {{ getFieldError("location.name") }} -
+ + + +
-
- - + + {{ getFieldError("assigned_practitioner_id") }} + +
+
+ +
+ +
-
- -
-
- - -
-
+
- -
-
- -
- - - - - + +
+
+ 3 + Lieu & Documents +
+ +
+ +
+
+ + +
+ +
+
+ + + +
+ + {{ getFieldError("location.name") }} + +
+ +
+
+ +
+
+
+ + +
+
+ + +
+
+ + {{ getFieldError("location.name") }} + +
+
+ + +
+ +
+ + +
+

+ Optionnel – si fourni par la famille +

+
+ +
+ + +
+
+ 4 + Observations +
+
+ +
+ + +
+
+
+
- -
- -
- - +
+
@@ -586,33 +450,19 @@ diff --git a/thanasoft-front/src/components/Organism/CRM/FournisseurPresentation.vue b/thanasoft-front/src/components/Organism/CRM/FournisseurPresentation.vue index 93058f1..7b21c0b 100644 --- a/thanasoft-front/src/components/Organism/CRM/FournisseurPresentation.vue +++ b/thanasoft-front/src/components/Organism/CRM/FournisseurPresentation.vue @@ -1,7 +1,5 @@ @@ -58,4 +78,3 @@ const updateField = (field, value) => { emit("update:form", { field, value }); }; - diff --git a/thanasoft-front/src/components/molecules/Planning/PlanningWeekGrid.vue b/thanasoft-front/src/components/molecules/Planning/PlanningWeekGrid.vue index 00a2daf..4c23389 100644 --- a/thanasoft-front/src/components/molecules/Planning/PlanningWeekGrid.vue +++ b/thanasoft-front/src/components/molecules/Planning/PlanningWeekGrid.vue @@ -1,27 +1,84 @@ + +:deep(.fc-col-header-cell) { + padding: 10px 4px !important; + border-bottom: 2px solid #e5e7eb !important; +} + +:deep(.fc-col-header-cell-cushion) { + font-size: 0.78rem; + font-weight: 700; + color: #374151; + text-transform: capitalize; + text-decoration: none !important; + letter-spacing: 0.01em; +} + +/* Today column highlight */ +:deep(.fc-day-today) { + background: #fafbff !important; +} + +:deep(.fc-day-today .fc-col-header-cell-cushion) { + color: #2d4a6e; +} + +:deep(.fc-day-today .fc-col-header-cell) { + border-bottom-color: #2d4a6e !important; +} + +/* Time labels */ +:deep(.fc-timegrid-slot-label-cushion) { + font-size: 0.7rem; + font-weight: 600; + color: #9ca3af; + padding-right: 10px; +} + +:deep(.fc-timegrid-slot) { + height: 3rem !important; +} + +:deep(.fc-timegrid-slot-minor) { + border-top-style: dashed !important; + border-color: #f3f4f6 !important; +} + +/* Now indicator */ +:deep(.fc-timegrid-now-indicator-line) { + border-color: #ef4444 !important; + border-width: 2px !important; +} + +:deep(.fc-timegrid-now-indicator-arrow) { + border-top-color: #ef4444 !important; + border-bottom-color: #ef4444 !important; +} + +/* Events */ +:deep(.fc-event) { + border-radius: 7px !important; + border-width: 0 0 0 3px !important; + cursor: pointer; + transition: transform 0.15s, box-shadow 0.15s !important; + padding: 0 !important; + margin: 1px 2px !important; + box-shadow: 0 1px 4px rgba(0,0,0,0.1) !important; +} + +:deep(.fc-event:hover) { + transform: scale(1.02); + box-shadow: 0 4px 12px rgba(0,0,0,0.15) !important; + z-index: 10 !important; +} + +/* Custom event content */ +:deep(.fc-event-custom) { + padding: 5px 7px; + height: 100%; + display: flex; + flex-direction: column; + gap: 2px; + overflow: hidden; +} + +:deep(.fce-header) { + display: flex; + align-items: center; + gap: 5px; +} + +:deep(.fce-icon) { + font-size: 0.62rem; + opacity: 0.85; +} + +:deep(.fce-time) { + font-size: 0.68rem; + font-weight: 700; + opacity: 0.9; + letter-spacing: 0.02em; +} + +:deep(.fce-title) { + font-size: 0.75rem; + font-weight: 700; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + line-height: 1.2; +} + +:deep(.fce-sub) { + font-size: 0.65rem; + opacity: 0.8; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +/* ─── Popover ─── */ +.event-popover { + position: absolute; + width: 260px; + background: #fff; + border-radius: 12px; + box-shadow: 0 16px 40px rgba(0,0,0,0.14), 0 4px 12px rgba(0,0,0,0.08); + z-index: 200; + overflow: hidden; + border: 1px solid #e5e7eb; +} + +.popover-backdrop { + position: absolute; + inset: 0; + z-index: 199; +} + +.popover-strip { + height: 4px; + width: 100%; +} + +.popover-body { + padding: 14px 16px; + display: flex; + flex-direction: column; + gap: 8px; +} + +.popover-top { + display: flex; + align-items: center; + justify-content: space-between; +} + +.popover-type { + font-size: 0.72rem; + font-weight: 700; + border-radius: 5px; + padding: 2px 8px; + text-transform: uppercase; + letter-spacing: 0.04em; +} + +.popover-close { + background: none; + border: none; + font-size: 0.8rem; + color: #9ca3af; + cursor: pointer; + padding: 2px 4px; + border-radius: 5px; + transition: color 0.15s; +} +.popover-close:hover { color: #374151; } + +.popover-deceased { + font-size: 0.9rem; + font-weight: 700; + color: #111827; + line-height: 1.3; +} + +.popover-meta { + display: flex; + flex-direction: column; + gap: 4px; + font-size: 0.77rem; + color: #6b7280; +} + +.popover-meta i { + font-size: 0.7rem; + width: 14px; +} + +.popover-status { + display: flex; +} + +.status-pill { + font-size: 0.72rem; + font-weight: 600; + border-radius: 20px; + padding: 2px 10px; +} + +.popover-edit-btn { + background: #1a2e4a; + color: #fff; + border: none; + border-radius: 8px; + padding: 8px 14px; + font-size: 0.8rem; + font-weight: 600; + cursor: pointer; + width: 100%; + display: flex; + align-items: center; + justify-content: center; + transition: background 0.15s; + margin-top: 2px; +} +.popover-edit-btn:hover { background: #2d4a6e; } + +/* ─── Popover animation ─── */ +.popover-fade-enter-active, +.popover-fade-leave-active { + transition: opacity 0.18s ease, transform 0.18s ease; +} +.popover-fade-enter-from { + opacity: 0; + transform: scale(0.94) translateY(-6px); +} +.popover-fade-leave-to { + opacity: 0; + transform: scale(0.96); +} + \ No newline at end of file diff --git a/thanasoft-front/src/components/molecules/Tables/ClientGroup/ClientGroupTable.vue b/thanasoft-front/src/components/molecules/Tables/ClientGroup/ClientGroupTable.vue index 20391c0..07bc1fb 100644 --- a/thanasoft-front/src/components/molecules/Tables/ClientGroup/ClientGroupTable.vue +++ b/thanasoft-front/src/components/molecules/Tables/ClientGroup/ClientGroupTable.vue @@ -1,7 +1,43 @@ diff --git a/thanasoft-front/src/views/pages/Planning.vue b/thanasoft-front/src/views/pages/Planning.vue index 3bd7816..39b172a 100644 --- a/thanasoft-front/src/views/pages/Planning.vue +++ b/thanasoft-front/src/views/pages/Planning.vue @@ -46,16 +46,24 @@ import { ref, onMounted, computed } from "vue"; import PlanningPresentation from "@/components/Organism/Planning/PlanningPresentation.vue"; import PlanningNewRequestModal from "@/components/Organism/Planning/PlanningNewRequestModal.vue"; import InterventionMultiStepModal from "@/components/Organism/Agenda/InterventionMultiStepModal.vue"; +import { useInterventionStore } from "@/stores/interventionStore"; +import { useThanatopractitionerStore } from "@/stores/thanatopractitionerStore"; +import { useNotificationStore } from "@/stores/notification"; // State -const interventions = ref([]); -const collaborators = ref([]); +const monthBuckets = ref({}); +const monthVersions = ref({}); +const monthRequestIds = ref({}); +const localPlanningItems = ref([]); const currentDate = ref(new Date()); const activeView = ref("grille"); const showNewRequestModal = ref(false); const creationType = ref(""); const interventionModalRef = ref(null); const initialInterventionDate = ref(""); +const interventionStore = useInterventionStore(); +const thanatopractitionerStore = useThanatopractitionerStore(); +const notificationStore = useNotificationStore(); const leaveForm = ref({ employee: "", @@ -78,88 +86,136 @@ const creationTypeTitle = computed(() => { return "Nouvelle demande"; }); -const practitioners = computed(() => - collaborators.value.map((collab) => { - const [firstName = collab.name, ...rest] = collab.name.split(" "); - return { - id: collab.id, - employee: { - first_name: firstName, - last_name: rest.join(" "), - }, - }; - }) +const practitioners = computed( + () => thanatopractitionerStore.thanatopractitioners || [] ); +const collaborators = computed(() => + practitioners.value.map((p) => ({ + id: p.id, + name: `${p.employee?.first_name || ""} ${p.employee?.last_name || ""}`.trim() || + `Collaborateur #${p.id}`, + })) +); + +const backendToUiStatus = { + demande: "En attente", + planifie: "Confirmé", + en_cours: "En cours", + terminee: "Terminé", + facturee: "Terminé", + annule: "Annulé", +}; + +const uiToBackendStatus = { + "En attente": "demande", + Confirmé: "planifie", + "En cours": "en_cours", + Terminé: "terminee", + Annulé: "annule", +}; + +const mapInterventionToPlanning = (item) => { + const practitioner = + item.principal_practitioner || item.assigned_practitioner || item.practitioners?.[0]; + const collaborator = `${practitioner?.employee?.first_name || ""} ${ + practitioner?.employee?.last_name || "" + }`.trim(); + + return { + id: item.id, + date: item.scheduled_at || item.date || item.created_at, + end: item.estimated_end_at || item.end, + type: + item.product?.nom || item.product_name || item.type_label || item.type || "Intervention", + deceased: + item.deceased_name || + `${item.deceased?.first_name || ""} ${item.deceased?.last_name || ""}`.trim() || + "Non spécifié", + client: item.client_name || item.client?.name || "-", + collaborator: collaborator || "-", + status: backendToUiStatus[item.status] || item.status || "En attente", + rawStatus: item.status, + }; +}; + +const weekRange = computed(() => { + const start = getMonday(currentDate.value); + start.setHours(0, 0, 0, 0); + const end = new Date(start); + end.setDate(end.getDate() + 6); + end.setHours(23, 59, 59, 999); + return { start, end }; +}); + +const apiInterventions = computed(() => + Object.values(monthBuckets.value) + .flat() + .map(mapInterventionToPlanning) +); + +const interventions = computed(() => { + const { start, end } = weekRange.value; + return [...apiInterventions.value, ...localPlanningItems.value] + .filter((i) => { + if (!i.date) return false; + const d = new Date(i.date); + return d >= start && d <= end; + }) + .sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime()); +}); + // Lifecycle onMounted(async () => { - await fetchData(); + await Promise.all([fetchData(), thanatopractitionerStore.fetchThanatopractitioners()]); }); // Methods -const fetchData = async () => { - // Mock data for demonstration - collaborators.value = [ - { id: 1, name: "Jean Dupont" }, - { id: 2, name: "Marie Curie" }, - { id: 3, name: "Lucas Martin" }, - ]; +const getMonthKey = (d) => `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`; - // Generate some random interventions around current date - const baseDate = new Date(currentDate.value); - const startOfWeek = getMonday(baseDate); +const bumpMonthVersion = (key) => { + monthVersions.value[key] = (monthVersions.value[key] || 0) + 1; +}; - interventions.value = [ - { - id: 101, - date: addDays(startOfWeek, 0, 9, 30), // Monday 9:30 - type: "Soin", - deceased: "M. Martin", - client: "Pompes Funèbres Générales", - collaborator: "Jean Dupont", - status: "Confirmé", - }, - { - id: 102, - date: addDays(startOfWeek, 1, 14, 0), // Tuesday 14:00 - type: "Transport", - deceased: "Mme. Dubois", - client: "Roc Eclerc", - collaborator: "Marie Curie", - status: "En cours", - }, - { - id: 103, - date: addDays(startOfWeek, 2, 10, 0), // Wednesday 10:00 - type: "Mise en bière", - deceased: "M. Lefebvre", - client: "PF Locales", - collaborator: "Lucas Martin", - status: "En attente", - }, - { - id: 104, - date: addDays(startOfWeek, 3, 16, 30), // Thursday 16:30 - type: "Cérémonie", - deceased: "Mme. Petit", - client: "Famille Petit", - collaborator: "Jean Dupont", - status: "Terminé", - }, - { - id: 105, - date: addDays(startOfWeek, 4, 11, 0), // Friday 11:00 - type: "Soin", - deceased: "Inconnu", - client: "Police", - collaborator: "Marie Curie", - status: "Annulé", - }, - ]; +const setMonthBucket = (key, items) => { + bumpMonthVersion(key); + monthBuckets.value[key] = items; +}; + +const fetchMonth = async (date, force = false) => { + const key = getMonthKey(date); + if (!force && monthBuckets.value[key]) return; + + const requestId = (monthRequestIds.value[key] || 0) + 1; + monthRequestIds.value[key] = requestId; + const startedVersion = monthVersions.value[key] || 0; + + const year = date.getFullYear(); + const month = date.getMonth() + 1; + const response = await interventionStore.fetchInterventionsByMonth(year, month); + + // Guard against stale async responses overriding newer local/server updates + if (monthRequestIds.value[key] !== requestId) return; + if ((monthVersions.value[key] || 0) !== startedVersion) return; + + setMonthBucket(key, Array.isArray(response?.data) ? response.data : []); +}; + +const fetchData = async (force = false) => { + try { + const { start, end } = weekRange.value; + await Promise.all([fetchMonth(start, force), fetchMonth(end, force)]); + } catch (error) { + console.error("Error loading planning interventions:", error); + notificationStore.error( + "Erreur", + "Impossible de charger les interventions du planning" + ); + } }; const handleRefresh = async () => { - await fetchData(); + await fetchData(true); }; const handleNewRequest = () => { @@ -190,28 +246,20 @@ const resetType = () => { creationType.value = ""; }; -const handleInterventionSubmit = (formData) => { - const practitioner = practitioners.value.find( - (p) => p.id?.toString() === formData.assigned_practitioner_id?.toString() - ); - - const collaboratorName = practitioner - ? `${practitioner.employee?.first_name || ""} ${ - practitioner.employee?.last_name || "" - }`.trim() - : collaborators.value[0]?.name || "-"; - - interventions.value.unshift({ - id: Date.now(), - date: formData.scheduled_at - ? new Date(formData.scheduled_at).toISOString() - : new Date().toISOString(), - type: formData.product_name || formData.type || "Intervention", - deceased: formData.deceased_name || "Défunt", - client: formData.client_name || "Client", - collaborator: collaboratorName, - status: "En attente", - }); +const handleInterventionSubmit = async (formData) => { + try { + await interventionStore.createInterventionWithAllData(formData); + interventionModalRef.value?.hide(); + await fetchData(true); + notificationStore.created("Intervention"); + } catch (error) { + console.error("Error saving intervention:", error); + const errorMessage = + error.response?.data?.message || + error.message || + "Erreur lors de l'enregistrement de l'intervention"; + notificationStore.error("Erreur", errorMessage); + } }; const submitLeave = () => { @@ -220,7 +268,7 @@ const submitLeave = () => { return; } - interventions.value.unshift({ + localPlanningItems.value.unshift({ id: Date.now() + 1, date: new Date(`${leaveForm.value.startDate}T09:00`).toISOString(), type: "Congé", @@ -252,12 +300,15 @@ const submitEvent = () => { return; } - interventions.value.unshift({ + localPlanningItems.value.unshift({ id: Date.now() + 2, date: new Date(eventForm.value.date).toISOString(), type: "Événement", deceased: eventForm.value.title, - client: eventForm.value.location || eventForm.value.description || "Événement interne", + client: + eventForm.value.location || + eventForm.value.description || + "Événement interne", collaborator: "Équipe", status: "Confirmé", }); @@ -293,16 +344,25 @@ const handlePrevWeek = () => { fetchData(); // Refresh data for new week }; -const handleUpdateStatus = (payload) => { - const intervention = interventions.value.find( - (i) => i.id.toString() === payload.id - ); - if (intervention) { - intervention.status = payload.status; - // In a real app, we would make an API call here to persist the change - console.log( - `Updated status of intervention ${payload.id} to ${payload.status}` - ); +const handleUpdateStatus = async (payload) => { + const interventionId = Number(payload.id); + const status = uiToBackendStatus[payload.status] || payload.status; + + try { + const updated = await interventionStore.updateInterventionStatus(interventionId, status); + const monthKey = getMonthKey(new Date(updated.scheduled_at || updated.date || currentDate.value)); + const monthItems = monthBuckets.value[monthKey] || []; + const idx = monthItems.findIndex((i) => i.id === interventionId); + if (idx !== -1) { + const nextItems = [...monthItems]; + nextItems[idx] = updated; + setMonthBucket(monthKey, nextItems); + } else { + await fetchData(true); + } + } catch (error) { + console.error("Error updating intervention status:", error); + notificationStore.error("Erreur", "Échec de la mise à jour du statut"); } }; @@ -310,21 +370,14 @@ const handleNextWeek = () => { const newDate = new Date(currentDate.value); newDate.setDate(newDate.getDate() + 7); currentDate.value = newDate; - fetchData(); // Refresh data for new week + fetchData(); }; // Utilities function getMonday(d) { d = new Date(d); - var day = d.getDay(), - diff = d.getDate() - day + (day == 0 ? -6 : 1); // adjust when day is sunday + const day = d.getDay(); + const diff = d.getDate() - day + (day === 0 ? -6 : 1); return new Date(d.setDate(diff)); } - -function addDays(date, days, hours, minutes) { - const result = new Date(date); - result.setDate(result.getDate() + days); - result.setHours(hours, minutes, 0, 0); - return result.toISOString(); -}