Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remet en place le lien d'abonnement au calendrier des congés #445

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Remet en place le lien d'abonnement au calendrier des congés #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12d8cba
Remet en place le lien d'abonnement au calendrier des congés
florimondmanca Sep 27, 2024
49bdd6e
Fix docker-compose -> docker compose
florimondmanca Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}
}
10 changes: 10 additions & 0 deletions src/templates/pages/leave_requests/list.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading