From 3045a809b320ab46e322f96f3b21917aab6b2f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 30 Aug 2022 18:03:55 +0200 Subject: [PATCH 1/5] add missing LDC_STATUS_CHECKER_API_KEY in .env.example --- .env.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 86c4f3d..06ee163 100644 --- a/.env.example +++ b/.env.example @@ -29,4 +29,6 @@ MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS=noreply-sw@ldc.fr MAIL_FROM_NAME="${APP_NAME}" MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr -MAIL_ADMIN=equipe.web@ldc.fr \ No newline at end of file +MAIL_ADMIN=equipe.web@ldc.fr + +LDC_STATUS_CHECKER_API_KEY= From 74801fad1bc4f8c948885d25bcd91f30a4c5b31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 31 Aug 2022 12:06:30 +0200 Subject: [PATCH 2/5] Model Invoice : Add missing month on create --- app/Models/Invoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index aab0f39..9f113d6 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -251,7 +251,7 @@ class Invoice extends Model static::creating(function (self $model) { $model->ref = \sprintf( '%s_%s_%s', - Carbon::now()->isoFormat('YYYY'), + Carbon::now()->isoFormat('YYYY-MM'), Str::padLeft((Invoice::whereYear('created_at', Carbon::now()->isoFormat('YYYY')) ->whereMonth('created_at', Carbon::now()->isoFormat('MM')) ->count() + 1) ?: 1, 4, '0'), From c96b433d6977e197d07e874a29c1d9c372f0e0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 31 Aug 2022 12:23:47 +0200 Subject: [PATCH 3/5] Fix pagination On Schedule --- resources/ts/components/ScheduleComponent.vue | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/resources/ts/components/ScheduleComponent.vue b/resources/ts/components/ScheduleComponent.vue index 02b0258..f12995d 100644 --- a/resources/ts/components/ScheduleComponent.vue +++ b/resources/ts/components/ScheduleComponent.vue @@ -276,31 +276,27 @@ :searchable="true" @input="setSelected" > - + + + +
From b687509abd4391e2c00e4d0ea6338f7b6d98705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 31 Aug 2022 12:30:39 +0200 Subject: [PATCH 4/5] Schedule component Fix null message on new Modal cell --- resources/ts/components/ScheduleComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ts/components/ScheduleComponent.vue b/resources/ts/components/ScheduleComponent.vue index f12995d..bdf56c6 100644 --- a/resources/ts/components/ScheduleComponent.vue +++ b/resources/ts/components/ScheduleComponent.vue @@ -729,7 +729,7 @@ export default defineComponent({ value: "", }, currentModale: Modale = { - id: this.schedules[userid][slotkey][day as any]["id"], + id: this.schedules[userid][slotkey][day as any]["id"] ?? this.__("Nouveau"), userid: userid, slot: slotkey, day: day, From 6f9cec1b2d58ce964eaaf4a9dd61268afddf1901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 31 Aug 2022 12:44:18 +0200 Subject: [PATCH 5/5] Label select component Fixed label colors --- resources/ts/components/LabelSelectComponent.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/ts/components/LabelSelectComponent.vue b/resources/ts/components/LabelSelectComponent.vue index 8a2a3cb..d0c2b14 100644 --- a/resources/ts/components/LabelSelectComponent.vue +++ b/resources/ts/components/LabelSelectComponent.vue @@ -7,12 +7,12 @@ label="label" :options="labels" > -