Skip to content

Commit

Permalink
Merge pull request #86 from ConductionNL/feature/PC108-109/medewerker…
Browse files Browse the repository at this point in the history
…-contact-info

added more fields to medewerker
  • Loading branch information
SudoThijn authored Dec 12, 2024
2 parents d727c28 + 2e8223d commit 95e8007
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 34 deletions.
1 change: 1 addition & 0 deletions src/entities/medewerkers/medewerkers.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const mockMedewerkerData = (): TMedewerker[] => [
tussenvoegsel: 'de',
achternaam: 'Doe',
email: '[email protected]',
telefoonnummer: '0612345678',
},
]

Expand Down
4 changes: 3 additions & 1 deletion src/entities/medewerkers/medewerkers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ export class Medewerker implements TMedewerker {
public tussenvoegsel: string
public achternaam: string
public email: string
public telefoonnummer: string

constructor(source: TMedewerker) {
this.id = source.id || ''
this.voornaam = source.voornaam || ''
this.tussenvoegsel = source.tussenvoegsel || ''
this.achternaam = source.achternaam || ''
this.email = source.email || ''

this.telefoonnummer = source.telefoonnummer || ''
}

public validate(): SafeParseReturnType<TMedewerker, unknown> {
Expand All @@ -25,6 +26,7 @@ export class Medewerker implements TMedewerker {
tussenvoegsel: z.string(),
achternaam: z.string(),
email: z.string().email(),
telefoonnummer: z.string().min(1),
})

return schema.safeParse(this)
Expand Down
1 change: 1 addition & 0 deletions src/entities/medewerkers/medewerkers.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export type TMedewerker = {
tussenvoegsel: string;
achternaam: string;
email: string;
telefoonnummer: string;
}
43 changes: 10 additions & 33 deletions src/modals/medewerkers/EditMedewerker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { medewerkerStore, navigationStore } from '../../store/store.js'
</script>

<template>
<NcDialog v-if="navigationStore.modal === 'editMedewerker'"
name="Medewerker"
<NcDialog name="Medewerker"
size="normal"
:can-close="false">
<NcNoteCard v-if="success" type="success">
Expand Down Expand Up @@ -34,6 +33,13 @@ import { medewerkerStore, navigationStore } from '../../store/store.js'
label="Email adres"
maxlength="255"
:value.sync="medewerkerItem.email" />

<NcTextField :disabled="loading"
label="Telefoonnummer"
minlength="10"
maxlength="11"
placeholder="06 12345678"
:value.sync="medewerkerItem.telefoonnummer" />
</div>

<template #actions>
Expand Down Expand Up @@ -99,7 +105,6 @@ export default {
success: false,
loading: false,
error: false,
hasUpdated: false,
countryOptions: {
options: countries.map((country) => ({
id: country.code,
Expand All @@ -111,14 +116,10 @@ export default {
tussenvoegsel: '',
achternaam: '',
email: '',
telefoonnummer: '',
},
}
},
computed: {
items() {
return this.medewerkerItems
},
},
mounted() {
if (medewerkerStore.medewerkerItem?.id) {
this.medewerkerItem = {
Expand All @@ -127,37 +128,13 @@ export default {
tussenvoegsel: medewerkerStore.medewerkerItem.tussenvoegsel || '',
achternaam: medewerkerStore.medewerkerItem.achternaam || '',
email: medewerkerStore.medewerkerItem.email || '',
telefoonnummer: medewerkerStore.medewerkerItem.telefoonnummer || '',
}
}
},
updated() {
if (navigationStore.modal === 'editMedewerker' && !this.hasUpdated) {
if (medewerkerStore.medewerkerItem?.id) {
this.medewerkerItem = {
...medewerkerStore.medewerkerItem,
voornaam: medewerkerStore.medewerkerItem.voornaam || '',
tussenvoegsel: medewerkerStore.medewerkerItem.tussenvoegsel || '',
achternaam: medewerkerStore.medewerkerItem.achternaam || '',
email: medewerkerStore.medewerkerItem.email || '',
}
}
this.hasUpdated = true
}
},
methods: {
closeModal() {
navigationStore.setModal(false)
this.success = false
this.loading = false
this.error = false
this.hasUpdated = false
this.medewerkerItem = {
voornaam: '',
tussenvoegsel: '',
achternaam: '',
email: '',
}
},
async editMedewerker() {
this.loading = true
Expand Down
4 changes: 4 additions & 0 deletions src/views/medewerkers/MedewerkerDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ import { navigationStore, medewerkerStore, taakStore, berichtStore, zaakStore }
<b>Email adres:</b>
<p>{{ medewerkerStore.medewerkerItem.email }}</p>
</div>
<div>
<b>Telefoonnummer:</b>
<p>{{ medewerkerStore.medewerkerItem.telefoonnummer }}</p>
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 95e8007

Please sign in to comment.