From 2d444b030001f2c47bac0681578056d86b78319b Mon Sep 17 00:00:00 2001 From: veenm Date: Sat, 15 Mar 2025 13:44:26 +0100 Subject: [PATCH] id's toegevoegd pt 2 + fix mattermost pipeline --- .github/workflows/deploy-docker-to-tst.yml | 14 +++++-- .../components/details/details.component.html | 4 ++ .../edit-item/edit-item.component.html | 37 +++++++++++-------- .../edit-item/edit-item.component.ts | 10 ++++- src/app/components/modal/modal.component.html | 1 + src/app/pages/agenda/agenda.component.html | 8 +++- src/app/pages/klanten/klanten.component.html | 7 +++- 7 files changed, 58 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy-docker-to-tst.yml b/.github/workflows/deploy-docker-to-tst.yml index 8651236..9f06598 100644 --- a/.github/workflows/deploy-docker-to-tst.yml +++ b/.github/workflows/deploy-docker-to-tst.yml @@ -25,15 +25,21 @@ jobs: name: version path: version.txt - name: Notify Mattermost via Bot + env: + VERSION: ${{ VERSION }} + REPO: ${{ gitea.repository }} + BRANCH: ${{ gitea.ref }} + MATTERMOST_BOT_TOKEN: ${{ secrets.MATTERMOST_BOT_TOKEN }} run: | - curl --fail -X POST -H "Authorization: Bearer tspcwdn5rbdk8kkmnex6h1nfha" \ + curl --fail -X POST -H "Authorization: Bearer $MATTERMOST_BOT_TOKEN" \ -H 'Content-Type: application/json' \ -d '{ "channel_id": "9a8obynkd7rctk6qf8rfe6oppy", - "message": "@all \nšŸš€ *Build gestart!* Een nieuwe build [${{VERSION}}-SNAPSHOT] is begonnen voor de repository *${{ gitea.repository }}* op branch *${{ gitea.ref }}*." + "message": "@all šŸš€ *Build gestart!* Een nieuwe build ['"$VERSION"'-SNAPSHOT] is begonnen voor de repository *'"$REPO"'* op branch *'"$BRANCH"'*." }' \ https://mattermost.melvanveen.nl/api/v4/posts + # Stap 3: Inloggen bij Docker Hub - name: Log in to Docker Hub uses: docker/login-action@v2 @@ -94,11 +100,13 @@ jobs: docker image prune -f - name: Notify Mattermost via Bot + env: + VERSION: ${{ VERSION }} run: | curl --fail -X POST -H "Authorization: Bearer tspcwdn5rbdk8kkmnex6h1nfha" \ -H 'Content-Type: application/json' \ -d '{ "channel_id": "9a8obynkd7rctk6qf8rfe6oppy", - "message": "@all \nāœ… *Build is geslaagd!* Er staat een nieuwe versie klaar op https://test-paypoint.melvanveen.nl" + "message": "@all āœ… *Build is geslaagd!* Versie '"$VERSION"'-SNAPSHOT staat klaar op https://test-paypoint.melvanveen.nl" }' \ https://mattermost.melvanveen.nl/api/v4/posts diff --git a/src/app/components/details/details.component.html b/src/app/components/details/details.component.html index 9e1380a..fc0edc0 100644 --- a/src/app/components/details/details.component.html +++ b/src/app/components/details/details.component.html @@ -32,6 +32,7 @@ tuiButton iconStart="@tui.pencil" size="s" + id="bewerkAfspraak" (click)="showEditModal = true" type="button"> Bewerken @@ -41,6 +42,7 @@ tuiButton iconStart="@tui.trash-2" size="s" + id="verwijderAfspraak" (click)="showDeleteModal = true" type="button"> Verwijderen @@ -59,6 +61,7 @@ appearance="outline" tuiButton size="s" + id="bevestigAfspraakVerwijderen" (click)="deleteAppointment()" type="button"> Ja, afspraak verwijderen @@ -67,6 +70,7 @@ appearance="outline" tuiButton size="s" + id="annuleerAfspraakVerwijderen" (click)="showDeleteModal = false" type="button"> Nee, ga terug diff --git a/src/app/components/edit-item/edit-item.component.html b/src/app/components/edit-item/edit-item.component.html index 1737078..b289940 100644 --- a/src/app/components/edit-item/edit-item.component.html +++ b/src/app/components/edit-item/edit-item.component.html @@ -5,6 +5,7 @@ tuiTextfieldLegacy formControlName="title" type="text" + id="titelBewerken" />
{{ action }} @@ -27,6 +29,7 @@ Klant @@ -53,6 +57,7 @@ formControlName="date" tuiTextfieldSize="m" class="tui-space_vertical-4" + id="datumBewerken" [tuiTextfieldLabelOutside]="false" > Datum @@ -63,6 +68,7 @@ formControlName="startTime" tuiTextfieldSize="m" class="tui-space_top-2" + id="vanBewerken" [tuiTextfieldLabelOutside]="false"> Van @@ -72,6 +78,7 @@ formControlName="endTime" tuiTextfieldSize="m" class="tui-space_top-2" + id="totBewerken" [tuiTextfieldLabelOutside]="false" > Tot @@ -79,12 +86,13 @@

- Notities + Notities
diff --git a/src/app/components/edit-item/edit-item.component.ts b/src/app/components/edit-item/edit-item.component.ts index f33a41d..84ef2a9 100644 --- a/src/app/components/edit-item/edit-item.component.ts +++ b/src/app/components/edit-item/edit-item.component.ts @@ -13,7 +13,12 @@ import { import {Appointment} from '../../models/appointment'; import {TuiDay, TuiTime} from '@taiga-ui/cdk'; import {AppointmentService} from '../../services/appointment.service'; -import {TuiDataListWrapperComponent, TuiFilterByInputPipe, TuiStringifyContentPipe} from '@taiga-ui/kit'; +import { + TuiButtonLoading, + TuiDataListWrapperComponent, + TuiFilterByInputPipe, + TuiStringifyContentPipe +} from '@taiga-ui/kit'; import {Customer} from '../../models/customer'; import {CustomerService} from '../../services/customer.service'; import {ModalComponent} from '../modal/modal.component'; @@ -36,7 +41,8 @@ import {ModalComponent} from '../modal/modal.component'; TuiStringifyContentPipe, TuiFilterByInputPipe, ModalComponent, - TuiIcon + TuiIcon, + TuiButtonLoading ], templateUrl: './edit-item.component.html', styleUrl: './edit-item.component.scss' diff --git a/src/app/components/modal/modal.component.html b/src/app/components/modal/modal.component.html index 93e0209..72ad70e 100644 --- a/src/app/components/modal/modal.component.html +++ b/src/app/components/modal/modal.component.html @@ -8,6 +8,7 @@ size="xs" tuiIconButton type="button" + id="sluitModal" [style.border-radius.%]="100" (click)="closeModal()" > diff --git a/src/app/pages/agenda/agenda.component.html b/src/app/pages/agenda/agenda.component.html index d94ae96..b992259 100644 --- a/src/app/pages/agenda/agenda.component.html +++ b/src/app/pages/agenda/agenda.component.html @@ -5,21 +5,24 @@ iconStart="@tui.chevron-left" size="m" tuiIconButton + id="vorigeDag" (click)="previousDay()" type="button"> -

{{ getDate() }}

+

{{ getDate() }}

@@ -30,6 +33,7 @@ appearance="secondary" size="m" tuiButton + id="vandaag" (click)="setToday()" type="button"> Vandaag @@ -38,6 +42,7 @@ appearance="secondary" size="m" tuiButton + id="afspraakMaken" (click)="isModalOpen = true" type="button"> diff --git a/src/app/pages/klanten/klanten.component.html b/src/app/pages/klanten/klanten.component.html index 5186ace..41ec7ce 100644 --- a/src/app/pages/klanten/klanten.component.html +++ b/src/app/pages/klanten/klanten.component.html @@ -8,6 +8,7 @@ size="m" tuiButton appearance="secondary" + id="klantToevoegen" type="button" (click)="toggleCustomerModal()" > @@ -26,7 +27,7 @@ - + {{ customer.firstName }} {{ customer.lastName }} {{ customer.email }} @@ -47,6 +48,7 @@ @@ -61,6 +63,7 @@ @@ -74,6 +77,7 @@ @@ -83,6 +87,7 @@ appearance="secondary" size="m" tuiButton + id="opslaanKlant" (click)="saveCustomer()" [disabled]="customerForm.invalid" type="button">