filter secretary so only active functions are shown

lblod · Mar 26, 2021 · fce0691 · fce0691
1 parent b217dbe
commit fce0691
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/components/participation-list/functionaris-selector.hbs b/app/components/participation-list/functionaris-selector.hbs
@@ -7,6 +7,6 @@
   @onchange={{@onSelect}}
   as |functionaris| >
   {{functionaris.isBestuurlijkeAliasVan.gebruikteVoornaam}} {{functionaris.isBestuurlijkeAliasVan.achternaam}},
-  {{functionaris.bekleedt.rol.label}}
+  {{functionaris.bekleedt.rol.label}} (periode {{moment-format functionaris.start "MM/DD/YYYY"}}  - {{moment-format functionaris.einde "MM/DD/YYYY"}})
 </PowerSelect>
 {{/if}}
diff --git a/app/components/participation-list/functionaris-selector.js b/app/components/participation-list/functionaris-selector.js
@@ -34,10 +34,13 @@ export default class ParticipationListFunctionarisSelectorComponent extends Comp
         }
       }
     });
+    const startOfMeeting = this.args.meeting.gestartOpTijdstip ? this.args.meeting.gestartOpTijdstip : this.args.meeting.geplandeStart;
     let queryParams = {
       sort: 'is-bestuurlijke-alias-van.achternaam',
       'filter[bekleedt][bevat-in][:id:]': bestuursorganen.map((b) => b.id).join(','),
+      'filter[:lte:start]': startOfMeeting.toISOString()
     };
-    this.options = yield this.store.query('functionaris', queryParams);
+    const candidateOptions = yield this.store.query('functionaris', queryParams);
+    this.options = candidateOptions.reject((functionaris) => functionaris.einde && functionaris.einde < startOfMeeting);
   }
 }
diff --git a/app/components/participation-list/modal.hbs b/app/components/participation-list/modal.hbs
@@ -26,6 +26,7 @@
               <ParticipationList::FunctionarisSelector
                 @onSelect={{this.selectSecretaris}}
                 @functionaris={{this.secretaris}}
+                @meeting={{@meeting}}
               />
             </div>
             <div>