Reworking, patching and cleaning the extension

frontend/src/Apps/Inscription/ManageRequests.vue

@@ -1,6 +1,6 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {ref, vModelSelect} from 'vue'
+  import {ref, vModelSelect, watch} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
   import AboutRequest from "@/Apps/Inscription/AboutRequest.vue";
   import {
@@ -13,10 +13,11 @@
   import AboutUnregister from "@/Apps/Inscription/AboutUnregister.vue";
   import AboutChangeCurriculum from "@/Apps/Inscription/AboutChangeCurriculum.vue";
   import AboutExemption from "@/Apps/Inscription/AboutExemption.vue";
+  import {getSelf} from "@/rest/Users.js";
 
   const requests = ref(await getAllRegisters());
   let targetId = "";
-
+  const user = await getSelf()
   const requestType = ref("inscription");
   const filterType = ref("None");
 
@@ -47,6 +48,13 @@
         requests.value = await getAllChangeCurrReq();
     }
   }
+
+  //When we come back to the list we need to reload the list
+  watch(windowsState, () => {
+    if (windowsState.value === 0){
+      loadRequests();
+    }
+  })
 </script>
 
 
@@ -60,9 +68,9 @@
       <span>Request type :   </span>
       <select v-model="requestType" @change="loadRequests()">
         <option>inscription</option>
-        <option>scholarship</option>
-        <option>exemption</option>
-        <option>unregister</option>
+        <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">scholarship</option>
+        <option v-if="user.role === 'Admin' || user.role === 'Teacher'">exemption</option>
+        <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">unregister</option>
         <option>curriculum change</option>
       </select>
       <span style="margin-left: 5%">
@@ -76,13 +84,8 @@
       </span>
     </div>
     <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-      <div class="bodu" style="width: 95%" v-if="filterType == 'None' || filterType == item.state">
+      <div class="bodu" style="width: 95%" v-if="(filterType == 'None' || filterType == item.state) && requestType !== 'exemption'">
         <div class="container" style="grid-template-columns:11% 15% 20% 10% 10% 9% 9%;grid-template-areas:'date state equivalencestate surname firstname accept refuse infos';" v-if="requestType === 'inscription'">
-          <!--
-            The condition below avoids an error occuring because loadRequests() finishes after the vue refresh
-            then submissionDate is undefined an it triggers an error in the console despite the fact that it is working
-            properly at the end.
-           -->
           <div class="date" v-if="item.submissionDate !== undefined">{{item.submissionDate.slice(0, 10)}}</div>
           <div class="state" style="font-size: 80%">Approval : {{item.state}}</div>
           <div class="equivalencestate" style="font-size: 80%">Teacher approval : {{item.equivalenceState}}</div>
@@ -99,14 +102,6 @@
           <div class="reqState">{{item.state}}</div>
           <div class="infos" @click="windowsState = 3; targetId=item.id;"><button>More infos</button></div>
         </div>
-        <div class="container" style="grid-template-columns:17% 15% 12% 15% 25%;grid-template-areas:'date reqState studentfirstname studentlastname course infos';"v-if="requestType === 'exemption'">
-          <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
-          <div class="studentfirstname">{{item.user.firstName}}</div>
-          <div class="studentlastname">{{item.user.lastName}}</div>
-          <div class="course">{{item.course.title}}</div>
-          <div class="reqState">{{item.state}}</div>
-          <div class="infos"><button @click="windowsState=6;targetId=item.id">More infos</button></div>
-        </div>
         <div class="container" v-if="requestType === 'unregister'" style="grid-template-columns:17% 15% 12% 15%;grid-template-areas:'date reqState regno studentfirstname studentlastname infos';">
           <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
           <div class="studentfirstname">{{item.firstName}}</div>
@@ -124,6 +119,16 @@
           <div class="infos"><button @click="windowsState=5;targetId=item.id">More infos</button></div>
         </div>
       </div>
+      <div class="bodu" v-if="(filterType == 'None' || filterType == item.state) && requestType === 'exemption' && (item.course.owner.regNo === user.regNo || user.role === 'Admin')">
+        <div class="container" style="grid-template-columns:17% 15% 12% 15% 25%;grid-template-areas:'date reqState studentfirstname studentlastname course infos';">
+          <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
+          <div class="studentfirstname">{{item.user.firstName}}</div>
+          <div class="studentlastname">{{item.user.lastName}}</div>
+          <div class="course">{{item.course.title}}</div>
+          <div class="reqState">{{item.state}}</div>
+          <div class="infos"><button @click="windowsState=6;targetId=item.id">More infos</button></div>
+        </div>
+      </div>
     </div>
   </div>
   <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2">
@@ -134,7 +139,7 @@
   <div v-if="windowsState === 3">
     <AboutScholarship :req-id="targetId"></AboutScholarship>
     <div>
-      <button style="margin-left: 30%" @click="loadRequests();windowsState=0">Back</button>
+      <button style="margin-left: 31%; margin-top: 5%" @click="windowsState=0">Back</button>
     </div>
   </div>
   <div v-if="windowsState === 4">
@@ -233,12 +238,11 @@
   }
 
   button{
-    font-size:15px;
-     height:50px;
-     width:100px;
     border:none;
-    border-radius:20px;
-
+    background-color:rgb(239, 60, 168);
+    border-radius:10px;
+    height: 35px;
+    margin-top:10px;
   }
 
   .bodu {