Merge pull request #465 from lblod/ben/lmb-1288-end-date-mandatarissen

Ben/lmb 1288 end date mandatarissen
lblod · Jan 28, 2025 · 9ae75f5 · 9ae75f5
2 parents 09070d8 + 670c0ca
commit 9ae75f5
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 22 deletions.
diff --git a/app/components/date-input.js b/app/components/date-input.js
@@ -8,6 +8,10 @@ import moment from 'moment';
 
 import { INPUT_DEBOUNCE, NULL_DATE } from 'frontend-lmb/utils/constants';
 import { action } from '@ember/object';
+import {
+  displayEndOfDay,
+  endOfDay,
+} from 'frontend-lmb/utils/date-manipulation';
 
 export default class DateInputComponent extends Component {
   elementId = `date-${guidFor(this)}`;
@@ -56,6 +60,9 @@ export default class DateInputComponent extends Component {
   }
 
   processDate(date) {
+    if (this.args?.endOfDay) {
+      date = endOfDay(date);
+    }
     if (!isValidDate(date)) {
       this.invalidErrorMessage = `Datum is ongeldig.`;
       this.errorMessage = null;
@@ -110,8 +117,15 @@ export default class DateInputComponent extends Component {
   @action
   setupDateValue() {
     if (this.args.value && isValidDate(this.args.value)) {
-      this.dateInputString = moment(this.args.value).format('DD-MM-YYYY');
-      this.processDate(this.args.value);
+      let date;
+      if (this.args?.endOfDay) {
+        date = displayEndOfDay(this.args.value);
+        this.dateInputString = moment(date).format('DD-MM-YYYY');
+      } else {
+        date = moment(this.args.value).toDate();
+        this.dateInputString = moment(this.args.value).format('DD-MM-YYYY');
+      }
+      this.processDate(date);
     }
   }
 

diff --git a/app/components/mandatarissen/history-row.hbs b/app/components/mandatarissen/history-row.hbs
@@ -3,7 +3,7 @@
     {{moment-format @mandataris.start "DD-MM-YYYY"}}
   </td>
   <td>
-    {{moment-format @mandataris.einde "DD-MM-YYYY"}}
+    {{moment-format @mandataris.displayEinde "DD-MM-YYYY"}}
   </td>
   <td>
     {{@mandataris.status.label}}

diff --git a/app/components/mandatarissen/mandataris-card.hbs b/app/components/mandatarissen/mandataris-card.hbs
@@ -85,7 +85,7 @@
       <div class="au-c-description-label">Einde periode</div>
       <div class="au-c-description-value au-u-margin-top-tiny">
         {{#if @mandataris.einde}}
-          {{moment-format @mandataris.einde "DD-MM-YYYY"}}
+          {{moment-format @mandataris.displayEinde "DD-MM-YYYY"}}
         {{else}}
           heden
         {{/if}}

diff --git a/app/components/mandatarissen/mandataris-summary.hbs b/app/components/mandatarissen/mandataris-summary.hbs
@@ -19,7 +19,7 @@
         {{moment-format @mandataris.start "DD-MM-YYYY"}}
         —
         {{#if @mandataris.einde}}
-          {{moment-format @mandataris.einde "DD-MM-YYYY"}}
+          {{moment-format @mandataris.displayEinde "DD-MM-YYYY"}}
         {{else}}
           heden
         {{/if}}

diff --git a/app/components/mandatarissen/replacement-select.hbs b/app/components/mandatarissen/replacement-select.hbs
@@ -17,7 +17,7 @@
         this.overlappingMandate.einde
         (concat
           " en einddatum "
-          (moment-format this.overlappingMandate.einde "DD-MM-YYYY")
+          (moment-format this.overlappingMandate.displayEinde "DD-MM-YYYY")
         )
       }}. Door verder te gaan zal dit mandaat aangeduid worden als vervanging
       van het huidige mandaat.

diff --git a/app/components/mandatarissen/update-state.hbs b/app/components/mandatarissen/update-state.hbs
@@ -22,7 +22,7 @@
         {{moment-format @mandataris.start "DD-MM-YYYY"}}
         {{#if @mandataris.einde}}
           tot
-          {{moment-format @mandataris.einde "DD-MM-YYYY"}}
+          {{moment-format @mandataris.displayEinde "DD-MM-YYYY"}}
         {{/if}}
       </div>
     </div>

diff --git a/app/components/mandatarissen/update-state.js b/app/components/mandatarissen/update-state.js
@@ -16,6 +16,7 @@ import {
   notBurgemeesterStates,
 } from 'frontend-lmb/utils/well-known-uris';
 import { isRequiredForBestuursorgaan } from 'frontend-lmb/utils/is-fractie-selector-required';
+import { endOfDay } from 'frontend-lmb/utils/date-manipulation';
 
 export default class MandatarissenUpdateState extends Component {
   @tracked newStatus = null;
@@ -104,7 +105,7 @@ export default class MandatarissenUpdateState extends Component {
     if (!this.args.mandataris.einde) {
       return this.args.mandataris.status;
     }
-    if (this.args.mandataris.einde.getTime() < new Date().getTime()) {
+    if (this.args.mandataris.einde.getTime() <= new Date().getTime()) {
       return this.mandatarisStatus.endedState;
     }
     return this.args.mandataris.status;
@@ -163,12 +164,13 @@ export default class MandatarissenUpdateState extends Component {
 
   async changeMandatarisState() {
     const endDate = this.args.mandataris.einde;
+    const dateOfAction = endOfDay(this.date);
 
     const newMandatarisProps = await this.mandatarisService.createNewProps(
       this.args.mandataris,
       {
         rangorde: this.rangorde,
-        start: this.date,
+        start: dateOfAction,
         einde: endDate,
         status: this.newStatus,
         publicationStatus: await getDraftPublicationStatus(this.store),
@@ -197,7 +199,7 @@ export default class MandatarissenUpdateState extends Component {
         (await this.args.mandataris.vervangerVan) || [];
     }
 
-    this.args.mandataris.einde = this.date;
+    this.args.mandataris.einde = dateOfAction;
     await Promise.all([newMandataris.save(), this.args.mandataris.save()]);
 
     await this.mandatarisService.createNewLidmaatschap(
@@ -218,8 +220,7 @@ export default class MandatarissenUpdateState extends Component {
   }
 
   async endMandataris() {
-    this.args.mandataris.einde = this.date;
-
+    this.args.mandataris.einde = endOfDay(this.date);
     return await this.args.mandataris.save();
   }
 

diff --git a/app/components/organen/bekrachtig-mandataris-table.hbs b/app/components/organen/bekrachtig-mandataris-table.hbs
@@ -83,10 +83,10 @@
       <td>
         <Mandaat::MandatarisStatusPill @mandataris={{row.mandataris}} />
       </td>
-      <td class={{if (is-in-past row.mandataris.einde) "au-u-muted"}}>
+      <td class={{if (is-in-past row.mandataris.displayEinde) "au-u-muted"}}>
         {{moment-format row.mandataris.start "DD-MM-YYYY"}}</td>
-      <td class={{if (is-in-past row.mandataris.einde) "au-u-muted"}}>
-        {{moment-format row.mandataris.einde "DD-MM-YYYY"}}</td>
+      <td class={{if (is-in-past row.mandataris.displayEinde) "au-u-muted"}}>
+        {{moment-format row.mandataris.displayEinde "DD-MM-YYYY"}}</td>
       <td>
         <Mandaat::PublicatieStatusPill
           @mandataris={{row.mandataris}}

diff --git a/app/components/rdf-input-fields/mandataris-replacement-selector.hbs b/app/components/rdf-input-fields/mandataris-replacement-selector.hbs
@@ -23,7 +23,7 @@
           {{moment-format mandataris.start "DD-MM-YYYY"}}
           {{#if mandataris.einde}}
             -
-            {{moment-format mandataris.einde "DD-MM-YYYY"}}
+            {{moment-format mandataris.displayEinde "DD-MM-YYYY"}}
           {{/if}}
         </span>
       </PowerSelectMultiple>

diff --git a/app/components/rdf-input-fields/rdf-date-input.hbs b/app/components/rdf-input-fields/rdf-date-input.hbs
@@ -14,6 +14,7 @@
   @from={{this.from}}
   @to={{this.to}}
   @showFormatHelpText={{@show}}
+  @endOfDay={{this.endOfDay}}
 />
 
 {{#each this.errors as |error|}}

diff --git a/app/components/rdf-input-fields/rdf-date-input.js b/app/components/rdf-input-fields/rdf-date-input.js
@@ -11,7 +11,7 @@ import {
 } from '@lblod/submission-form-helpers';
 
 import { replaceSingleFormValue } from 'frontend-lmb/utils/replaceSingleFormValue';
-import { EXT, SHACL } from 'frontend-lmb/rdf/namespaces';
+import { EXT, FIELD_OPTION, SHACL } from 'frontend-lmb/rdf/namespaces';
 import { loadBestuursorgaanPeriodFromContext } from 'frontend-lmb/utils/form-context/application-context-meta-ttl';
 
 export default class RdfDateInputComponent extends InputFieldComponent {
@@ -21,10 +21,12 @@ export default class RdfDateInputComponent extends InputFieldComponent {
   @tracked date;
   @tracked from;
   @tracked to;
+  @tracked endOfDay;
 
   constructor() {
     super(...arguments);
     this.loadProvidedValue();
+    this.loadOptions();
   }
 
   async loadProvidedValue() {
@@ -56,6 +58,15 @@ export default class RdfDateInputComponent extends InputFieldComponent {
     }
   }
 
+  loadOptions() {
+    this.endOfDay = !!this.args.formStore.any(
+      this.args.field.uri,
+      FIELD_OPTION('endOfDay'),
+      undefined,
+      this.args.graphs.formGraph
+    );
+  }
+
   @action
   onUpdate(date) {
     replaceSingleFormValue(this.storeOptions, date);

diff --git a/app/components/verkiezingen/draft-mandataris-list.hbs b/app/components/verkiezingen/draft-mandataris-list.hbs
@@ -80,7 +80,7 @@
               {{moment-format row.start "DD-MM-YYYY"}}
             </td>
             <td>
-              {{moment-format row.einde "DD-MM-YYYY"}}
+              {{moment-format row.displayEinde "DD-MM-YYYY"}}
             </td>
           {{/if}}
           {{#unless @readOnly}}

diff --git a/app/controllers/mandatarissen/persoon/mandaten.js b/app/controllers/mandatarissen/persoon/mandaten.js
@@ -8,6 +8,8 @@ import { task } from 'ember-concurrency';
 import { getDraftPublicationStatus } from 'frontend-lmb/utils/get-mandataris-status';
 import { showSuccessToast } from 'frontend-lmb/utils/toasts';
 
+import { endOfDay } from 'frontend-lmb/utils/date-manipulation';
+
 export default class MandatarissenPersoonMandatenController extends Controller {
   @service router;
   @service toaster;
@@ -125,7 +127,7 @@ export default class MandatarissenPersoonMandatenController extends Controller {
         newMandataris.id
       );
 
-      mandataris.einde = dateNow;
+      mandataris.einde = endOfDay(dateNow);
       await mandataris.save();
     }
 

diff --git a/app/models/mandataris.js b/app/models/mandataris.js
@@ -3,6 +3,7 @@ import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import moment from 'moment';
 import { MANDATARIS_EDIT_FORM_ID } from 'frontend-lmb/utils/well-known-ids';
 import { JSON_API_TYPE } from 'frontend-lmb/utils/constants';
+import { displayEndOfDay } from 'frontend-lmb/utils/date-manipulation';
 
 export default class MandatarisModel extends Model {
   @attr rangorde;
@@ -92,6 +93,13 @@ export default class MandatarisModel extends Model {
     );
   }
 
+  get displayEinde() {
+    if (!this.einde) {
+      return this.einde;
+    }
+    return displayEndOfDay(this.einde);
+  }
+
   get isActive() {
     if (!this.einde) {
       return true;

diff --git a/app/rdf/namespaces.js b/app/rdf/namespaces.js
@@ -14,3 +14,7 @@ export const PROV = new Namespace('http://www.w3.org/ns/prov#');
 export const ORG = new Namespace('http://www.w3.org/ns/org#');
 export const MANDAAT = new Namespace('http://data.vlaanderen.be/ns/mandaat#');
 export const LMB = new Namespace('http://lblod.data.gift/vocabularies/lmb/');
+
+export const FIELD_OPTION = new Namespace(
+  'http://lblod.data.gift/vocabularies/form-field-options/'
+);
diff --git a/app/utils/date-manipulation.js b/app/utils/date-manipulation.js
@@ -0,0 +1,13 @@
+import moment from 'moment';
+
+export function endOfDay(date) {
+  if (date) {
+    return moment(date).add(1, 'days').startOf('day').utc().toDate();
+  } else {
+    return moment().add(1, 'days').startOf('day').utc().toDate();
+  }
+}
+
+export function displayEndOfDay(date) {
+  return moment(date).subtract(1, 'days').toDate();
+}
diff --git a/app/utils/fold-mandatarisses.js b/app/utils/fold-mandatarisses.js
@@ -102,7 +102,7 @@ function updateFoldedMandataris(mandataris, foldedMandataris) {
 function buildFoldedMandataris(mandataris) {
   return {
     foldedStart: mandataris.start,
-    foldedEnd: mandataris.einde,
+    foldedEnd: mandataris.displayEinde,
     mandataris,
   };
 }
@@ -124,7 +124,7 @@ function updateFoldedEnd(mandataris, foldedMandataris) {
   } else {
     foldedMandataris.foldedEnd = moment.max(
       moment(foldedMandataris.foldedEnd),
-      moment(mandataris.einde)
+      moment(mandataris.displayEinde)
     );
   }
 }
@@ -133,7 +133,7 @@ function updateMandataris(mandataris, foldedMandataris) {
   // Keep the one with the latest end date. If the end date is null,
   // we assume this is the latest one.
   if (
-    moment(mandataris.einde).isSame(foldedMandataris.foldedEnd) ||
+    moment(mandataris.displayEinde).isSame(foldedMandataris.foldedEnd) ||
     !mandataris.einde
   ) {
     foldedMandataris.mandataris = mandataris;