From 12d8cba08f69d2c5ce32bd7e33b0e43a9cbbf9d3 Mon Sep 17 00:00:00 2001
From: florimondmanca <florimond.manca@fairness.coop>
Date: Fri, 27 Sep 2024 15:33:01 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Remet=20en=20place=20le=20lien=20d'abonneme?=
 =?UTF-8?q?nt=20au=20calendrier=20des=20cong=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Leave/Controller/ListLeaveRequestsController.ts    |  5 ++++-
 src/templates/pages/leave_requests/list.njk            | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
index 36fc147c..ef4213e2 100644
--- a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
+++ b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
@@ -54,11 +54,14 @@ export class ListLeaveRequestsController {
       userId
     );
 
+    const calendarToken = process.env.CALENDAR_TOKEN;
+
     return {
       table,
       overviewTable,
       pagination,
-      currentPage: dto.page
+      currentPage: dto.page,
+      calendarToken,
     };
   }
 }
diff --git a/src/templates/pages/leave_requests/list.njk b/src/templates/pages/leave_requests/list.njk
index 41e7e67a..db56dbb9 100644
--- a/src/templates/pages/leave_requests/list.njk
+++ b/src/templates/pages/leave_requests/list.njk
@@ -15,6 +15,16 @@
         {{ links.add(path('people_leave_requests_add'), text='leave-requests-add-title'|trans) }}
     </div>
 
+    <div class="pc-cluster pc-gap" style="--cluster-align: center">
+        <label for="calendarUrl">{{ 'leaves-calendar-url-title'|trans }}</label>
+        <input id="calendarUrl" class="pc-input" style="--input-width: fit-content" type="text" readonly value="{{ url('people_leaves_calendar') }}?token={{ calendarToken }}">
+        <pc-clipboard-button class="pc-js-only" data-source="#calendarUrl">
+            <button class="pc-btn pc-btn--muted" title="{{ 'clipboard-copy'|trans }}">
+                {{ icons.clipboard() }}
+            </button>
+        </pc-clipboard-button>
+    </div>
+
     <div class="pc-cluster" style="--cluster-gap: calc(3 * var(--w))">
         <div class="pc-stack">
             <h2>{{ 'leaves-summary-title'|trans }}</h2>

From 49bdd6ee591bd2e292d096de21579e7d5efef60b Mon Sep 17 00:00:00 2001
From: florimondmanca <florimond.manca@fairness.coop>
Date: Fri, 27 Sep 2024 15:37:30 +0200
Subject: [PATCH 2/2] Fix docker-compose -> docker compose

---
 .github/workflows/ci.yml                                      | 2 +-
 Makefile                                                      | 4 +++-
 .../Leave/Controller/ListLeaveRequestsController.ts           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b181320b..e7f19ad8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
 
       - name: Tests
-        run: make ci
+        run: make ci BIN_DOCKER_COMPOSE="docker compose"
 
       - uses: codecov/codecov-action@v1
         with:
diff --git a/Makefile b/Makefile
index 5387166d..205f33cc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-compose = docker-compose -p permacoop
+BIN_DOCKER_COMPOSE=docker-compose
+
+compose = ${BIN_DOCKER_COMPOSE} -p permacoop
 
 run_server = ./tools/colorize_prefix.sh [server] 31
 run_watch = ./tools/colorize_prefix.sh [watch] 36
diff --git a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
index ef4213e2..0e591589 100644
--- a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
+++ b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
@@ -61,7 +61,7 @@ export class ListLeaveRequestsController {
       overviewTable,
       pagination,
       currentPage: dto.page,
-      calendarToken,
+      calendarToken
     };
   }
 }