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

PC-836 contactverzoek email medewerker #1033

Merged
merged 2 commits into from
Jan 23, 2025
Merged

PC-836 contactverzoek email medewerker #1033

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
707f5e9
emailadres opslaan in actoridentificator.objectId
nijmra Jan 23, 2025
48bd8ba
Merge branch 'main' into pc-836-contactverzoek-email-medewerker
nijmra Jan 23, 2025
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
6 changes: 4 additions & 2 deletions src/features/contact/contactmoment/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ export function mapContactverzoekData({
actor = {
naam: data.medewerker.achternaam || data.medewerker.emailadres || "",
soortActor: "medewerker",
identificatie: data.medewerker?.identificatie || "",
identificatie:
data.medewerker.identificatie || data.medewerker.emailadres || "",
typeOrganisatorischeEenheid: TypeOrganisatorischeEenheid.Groep,
naamOrganisatorischeEenheid: data.groep?.naam || "",
identificatieOrganisatorischeEenheid: data.groep?.identificatie || "",
Expand All @@ -356,7 +357,8 @@ export function mapContactverzoekData({
actor = {
naam: data.medewerker.achternaam || data.medewerker.emailadres || "",
soortActor: "medewerker",
identificatie: data.medewerker?.identificatie || "",
identificatie:
data.medewerker.identificatie || data.medewerker.emailadres || "",
typeOrganisatorischeEenheid: TypeOrganisatorischeEenheid.Afdeling,
naamOrganisatorischeEenheid: data.afdeling?.naam || "",
identificatieOrganisatorischeEenheid:
Expand Down
4 changes: 2 additions & 2 deletions src/features/contact/contactverzoek/formulier/ContactverzoekFormulier.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@
]"
>
<span class="">{{
useMedewerkeremail ? "Emailadres medewerker" : "Medewerker"
useMedewerkeremail ? "E-mailadres medewerker" : "Medewerker"
}}</span>

<input
v-if="useMedewerkeremail"
v-model="medewerkeremail"
name="Emailadres medewerker"
name="E-mailadres medewerker"
type="email"
class="utrecht-textbox utrecht-textbox--html-input"
:disabled="
Expand Down Expand Up @@ -432,7 +432,7 @@
const organisatorischeEenheid = await fetchAfdelingen(undefined, false);
if (organisatorischeEenheid.page) {
const items = organisatorischeEenheid.page.map(
(item: { id: any; identificatie: any; naam: string }) => ({

Check warning on line 435 in src/features/contact/contactverzoek/formulier/ContactverzoekFormulier.vue

View workflow job for this annotation

GitHub Actions / Lint Code Base 

Unexpected any. Specify a different type

Check warning on line 435 in src/features/contact/contactverzoek/formulier/ContactverzoekFormulier.vue

View workflow job for this annotation

GitHub Actions / Lint Code Base 

Unexpected any. Specify a different type
id: item.id,
identificatie: item.identificatie,
naam: "Afdeling: " + item.naam,
Expand Down Expand Up @@ -461,7 +461,7 @@
if (organisatorischeEenheid.page) {
const items = organisatorischeEenheid.page
.filter((x: { naam: string }) => x.naam === naam)
.map((item: { id: any; identificatie: any; naam: string }) => ({

Check warning on line 464 in src/features/contact/contactverzoek/formulier/ContactverzoekFormulier.vue

View workflow job for this annotation

GitHub Actions / Lint Code Base 

Unexpected any. Specify a different type

Check warning on line 464 in src/features/contact/contactverzoek/formulier/ContactverzoekFormulier.vue

View workflow job for this annotation

GitHub Actions / Lint Code Base 

Unexpected any. Specify a different type
id: item.id,
identificatie: item.identificatie,
naam: "Afdeling: " + item.naam,
Expand Down
Loading