fix(network): fix problems with saving of the membership fee and chec…

…king SU organisation (#2207)
AEGEE · Sep 25, 2024 · 68d44d0 · 68d44d0
1 parent 917e597
commit 68d44d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/views/network/AntennaCriteriaCheck.vue b/src/views/network/AntennaCriteriaCheck.vue
@@ -4,6 +4,10 @@
       <article class="tile is-child">
         <h4 class="title">Antenna Criteria Check</h4>
 
+        <div class="notification is-warning">
+          The computation of the fulfilment of 'Events' is currently not working correctly. It does <strong>not</strong> yet take into account the Summer Universities organised. Please check these manually!
+        </div>
+
         <div class="field">
           <label class="label">Selected Agora</label>
           <div class="select">
@@ -308,7 +312,7 @@ export default {
       const promises = []
       promises.push(this.fetchEvents())
       promises.push(this.fetchStatutoryEvents())
-      promises.push(this.fetchSummerUniversities())
+      // promises.push(this.fetchSummerUniversities())
 
       await Promise.all(promises)
 
@@ -325,12 +329,12 @@ export default {
         body.latest_event = !body.latest_event || moment(event.latest_event).isAfter(moment(body.latest_event)) ? event.latest_event : body.latest_event
       }
 
-      for (const event of this.summerUniversities) {
-        for (const organizer of event.organizing_bodies) {
-          const body = this.bodies.find(x => x.id === organizer.body_id)
-          body.latest_event = !body.latest_event || moment(event.latest_event).isAfter(moment(body.latest_event)) ? event.latest_event : body.latest_event
-        }
-      }
+      // for (const event of this.summerUniversities) {
+      //   for (const organizer of event.organizing_bodies) {
+      //     const body = this.bodies.find(x => x.id === organizer.body_id)
+      //     body.latest_event = !body.latest_event || moment(event.latest_event).isAfter(moment(body.latest_event)) ? event.latest_event : body.latest_event
+      //   }
+      // }
       // ... until here
 
       for (const body in this.bodies) {

diff --git a/src/views/network/AntennaCriteriaModal.vue b/src/views/network/AntennaCriteriaModal.vue
@@ -13,7 +13,7 @@
             <option value="null">Not set</option>
             <option value="true">Yes</option>
             <option value="false">No</option>
-            <option v-if="can.giveExceptionCommunication" value="exception">Exception</option>
+            <option v-if="can.setCommunicationException" value="exception">Exception</option>
           </b-select>
 
           <b-input v-model="comments.communication" placeholder="Comment" expanded />
@@ -58,7 +58,7 @@
         </b-field>
       </template>
 
-      <template v-if="can.setMembershipFeePayement">
+      <template v-if="can.setMembershipFee">
         <b-field label="Membership fee (F)" />
         <b-field grouped>
           <b-select v-model="antennaCriteria.membershipFee">
@@ -170,10 +170,10 @@ export default {
       permissions: [],
       can: {
         setCommunication: false,
-        giveExceptionCommunication: false,
+        setCommunicationException: false,
         setBoardElection: false,
         setMembersList: false,
-        setMembershipFeePayement: false,
+        setMembershipFee: false,
         setEvents: false,
         setAgoraAttendance: false,
         setDevelopmentPlan: false,
@@ -228,10 +228,10 @@ export default {
     this.axios.get(this.services['core'] + '/my_permissions').then((permissionResponse) => {
       this.permissions = permissionResponse.data.data
       this.can.setCommunication = this.permissions.some(permission => permission.combined.endsWith('manage_network:communication'))
-      this.can.giveExceptionCommunication = this.permissions.some(permission => permission.combined.endsWith('manage_network:communication_exception'))
+      this.can.setCommunicationException = this.permissions.some(permission => permission.combined.endsWith('manage_network:communication_exception'))
       this.can.setBoardElection = this.permissions.some(permission => permission.combined.endsWith('manage_network:board_election'))
       this.can.setMembersList = this.permissions.some(permission => permission.combined.endsWith('manage_network:members_list'))
-      this.can.setMembershipFeePayement = this.permissions.some(permission => permission.combined.endsWith('manage_network:membership_fee'))
+      this.can.setMembershipFee = this.permissions.some(permission => permission.combined.endsWith('manage_network:membership_fee'))
       this.can.setEvents = this.permissions.some(permission => permission.combined.endsWith('manage_network:events'))
       this.can.setAgoraAttendance = this.permissions.some(permission => permission.combined.endsWith('manage_network:agora_attendance'))
       this.can.setDevelopmentPlan = this.permissions.some(permission => permission.combined.endsWith('manage_network:development_plan'))