diff --git a/app/components/meeting/edit-meeting-modal.js b/app/components/meeting/edit-meeting-modal.js index 411a7a4536..ee4ad6f953 100644 --- a/app/components/meeting/edit-meeting-modal.js +++ b/app/components/meeting/edit-meeting-modal.js @@ -29,6 +29,7 @@ export default class MeetingEditMeetingComponent extends Component { @service mandatees; @service decisionReportGeneration; @service intl; + @service router; @tracked isAnnexMeeting = false; @tracked isEditingNumberRepresentation = false; @@ -145,7 +146,7 @@ export default class MeetingEditMeetingComponent extends Component { await this.mandatees.getApplicationSecretary(); this.secretary = currentApplicationSecretary; } - // if a meeting had no secretary yet we don't set the current active default one automatically + // if a meeting had no secretary yet we don't set the current active default one automatically } }); @@ -294,7 +295,31 @@ export default class MeetingEditMeetingComponent extends Component { saveActivities.push(this.decisionPublicationActivity.save()); } + // Check if an annex meeting exists, if so update its planned start + const annexMeeting = yield this.store.queryOne('meeting', { + filter: { + 'main-meeting': { + ':id:': this.args.meeting.id, + } + } + }); + if (annexMeeting?.id) { + // these 2 properties cannot be changed on the annex meeting + annexMeeting.plannedStart = this.args.meeting.plannedStart; + annexMeeting.number = this.args.meeting.number; + // numberRepresentation still needs to be updated manually and will trigger new reports/minutes + saveActivities.push(annexMeeting.save()); + } + yield Promise.all(saveActivities); + + if (annexMeeting?.id) { + this.toaster.success(this.intl.t('annex-meeting-was-saved', { + title: annexMeeting.numberRepresentation, + timeout: 10000, + })); + } + if (!this.isPreKaleidos || !this.isNew) { if ( currentMeetingSecretary?.uri !== this.secretary?.uri || diff --git a/translations/nl-be.json b/translations/nl-be.json index e1bec5546e..8b34a1551f 100644 --- a/translations/nl-be.json +++ b/translations/nl-be.json @@ -1495,5 +1495,6 @@ "no-meeting-found-for-submission": "Er is geen geldige vergadering gevonden voor deze indiening", "show-definitive-cases-only": "Toon enkel dossiers zonder definitieve goedkeuring", "empty-internal-review": "Interne opmerkingen leegmaken", - "empty-internal-review-message": "Bent u zeker dat u alle interne opmerkingen voor de goedgekeurde agendapunten op deze agenda wil leegmaken?\nDeze actie kan niet ongedaan worden gemaakt.\nDe interne opmerkingen van nieuwe agendapunten blijven ongewijzigd." + "empty-internal-review-message": "Bent u zeker dat u alle interne opmerkingen voor de goedgekeurde agendapunten op deze agenda wil leegmaken?\nDeze actie kan niet ongedaan worden gemaakt.\nDe interne opmerkingen van nieuwe agendapunten blijven ongewijzigd.", + "annex-meeting-was-saved": "De annex vergadering {title} is aangepast. Verifieer of de beslissingen en notulen nog up-to-date zijn." }