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

chore: update annex meeting when updating normal meeting #2283

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
+25 −2
Open

chore: update annex meeting when updating normal meeting #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion app/components/meeting/edit-meeting-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export default class MeetingEditMeetingComponent extends Component {
@service mandatees;
@service decisionReportGeneration;
@service intl;
@service router;

@tracked isAnnexMeeting = false;
@tracked isEditingNumberRepresentation = false;
Expand Down Expand Up @@ -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
}
});

Expand Down Expand Up @@ -294,7 +295,28 @@ 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) {
annexMeeting.plannedStart = this.args.meeting.plannedStart;
saveActivities.push(annexMeeting.save());
Comment on lines +307 to +308
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I asked in the jira ticket.
Another thing we may want to change is the number.
that is also not editable on annex meetings

}

yield Promise.all(saveActivities);

if (annexMeeting?.id) {
this.toaster.success(this.intl.t('annex-meeting-was-saved', {
title: annexMeeting.numberRepresentation,
timeout: 10000,
}));
}
Comment on lines +314 to +318
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

longer timeout but closable? Like how we did the decisions updated pop-up maybe


if (!this.isPreKaleidos || !this.isNew) {
if (
currentMeetingSecretary?.uri !== this.secretary?.uri ||
Expand Down
3 changes: 2 additions & 1 deletion translations/nl-be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 nog up-to-date zijn."
}