Add the Teacher approval for reregister requests

frontend/src/Apps/Inscription/AboutChangeCurriculum.vue

@@ -1,21 +1,21 @@
 <script setup>
 
 import {
-  addUninscReq, editChangeCurrReq,
+  addUninscReq, editChangeCurrReq, editChangeCurrReqTeacherState,
   editScholarshipReq,
   editUnregReq, getChangeCurrReqById,
   getScholarshipReqById,
   getUnregisterbyId
 } from "@/rest/requests.js";
 import i18n from "@/i18n.js";
-import {getUser} from "@/rest/Users.js";
+import {getSelf, getUser} from "@/rest/Users.js";
 import {reactive, ref} from "vue";
 import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 
 const props = defineProps(["reqId"])
 const req = ref(await getChangeCurrReqById(props.reqId))
 
-
+const user = await getSelf()
 //0 liste, 1 profil
 const windowstate = ref(0);
 
@@ -24,6 +24,10 @@ const tag = req.value.user.regNo
 async function uploadandrefreshChangeRequest(state){
     await editChangeCurrReq(req.value.id, state);
 }
+
+async function editChangeCurrReqTeacherApproval(state){
+    await editChangeCurrReqTeacherState(req.value.id, state)
+}
 </script>
 
 
@@ -52,6 +56,10 @@ async function uploadandrefreshChangeRequest(state){
             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">Accept</button>
             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshChangeRequest('Refused')" style="margin-left: 2%;">Refuse</button>
           </div>
+          <div v-if="user.role === 'Teacher' || user.role === 'Admin'">
+            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Accepted';editChangeCurrReqTeacherApproval('Accepted')">Accept equivalence</button>
+            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Refused';editChangeCurrReqTeacherApproval('Refused')">Refuse equivalence</button>
+          </div>
         </div>
       </div>
     </div>

frontend/src/Apps/Inscription/ManageRequests.vue

@@ -114,11 +114,12 @@
           <div class="reqState">{{item.state}}</div>
           <div class="infos"><button @click="windowsState=4;targetId=item.id">More infos</button></div>
         </div>
-        <div class="container" v-if="requestType === 'curriculum change'" style="grid-template-columns:17% 15% 12% 15%;grid-template-areas:'date reqState regno studentfirstname studentlastname infos';">
+        <div class="container" v-if="requestType === 'curriculum change'" style="grid-template-columns:17% 20% 15% 5%;grid-template-areas:'date reqState teacherApproval regno studentfirstname studentlastname 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="reqState">{{item.state}}</div>
+          <div class="reqState">IS approval : {{item.state}}</div>
+          <div class="teacherApproval">Teacher approval : {{item.teacherApprovalState}}</div>
           <div class="infos"><button @click="windowsState=5;targetId=item.id">More infos</button></div>
         </div>
       </div>
@@ -156,6 +157,11 @@
     grid-area: equivalencestate;
     align-self: center;
   }
+
+  .teacherApproval{
+    grid-area: teacherApproval;
+    align-self: center;
+  }
   .studentfirstname{
     grid-area: studentfirstname;
     align-self: center;