From cdc3772384c748f652280acad911f3767f39533f Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sat, 20 Apr 2024 12:42:41 +0200
Subject: [PATCH] Small changes

---
 frontend/src/Apps/Inscription/AboutRequest.vue           | 5 +++++
 frontend/src/Apps/Inscription/AboutScholarship.vue       | 2 +-
 frontend/src/Apps/Inscription/AboutStudent.vue           | 6 +++++-
 frontend/src/Apps/Inscription/ExternalCurriculumList.vue | 9 +++++++--
 frontend/src/Apps/Login.vue                              | 4 ++--
 frontend/src/rest/uploads.js                             | 4 ++--
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Apps/Inscription/AboutRequest.vue b/frontend/src/Apps/Inscription/AboutRequest.vue
index c6d15df..767e310 100644
--- a/frontend/src/Apps/Inscription/AboutRequest.vue
+++ b/frontend/src/Apps/Inscription/AboutRequest.vue
@@ -8,6 +8,7 @@ import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
 import {ref} from "vue";
 import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
 import {editEquivalenceState} from "@/rest/requests.js";
+import {downloadPdf} from "@/rest/uploads.js";
 
 const props = defineProps(['target']);
 const request = await getRegisters(props.target);
@@ -56,6 +57,10 @@ async function editEquivalence(id, newstate){
           <div>
             Cursus voulu : BAB {{cursus.year}} {{cursus.option}}
           </div>
+          <div>
+            <a :href="downloadPdf(request.identityCard)">Download identity card</a>
+            <button v-if="request.admissionDocUrl != null">Download admission document</button>
+          </div>
           <div v-if="cursus.year > 1">
             <button style="background-color:rgb(105,05,105);margin-left: 5%" @click="list=!list" v-if="(user.role == 'Teacher' || user.role == 'Admin')&& request.equivalenceState == 'Pending'">See external curriculums</button>
           </div>
diff --git a/frontend/src/Apps/Inscription/AboutScholarship.vue b/frontend/src/Apps/Inscription/AboutScholarship.vue
index c48cf90..3131785 100644
--- a/frontend/src/Apps/Inscription/AboutScholarship.vue
+++ b/frontend/src/Apps/Inscription/AboutScholarship.vue
@@ -54,7 +54,7 @@ async function uploadandrefreshScholarshipRequest(){
             Birthdate : {{user.birthDate.slice(0,10)}}
           </div>
           <div>
-            <button>Download tax justif document</button>
+            <button @click="">Download tax justif document</button>
             <button style="margin-left: 2%">Download residency justif document</button>
           </div>
           <div v-if="req.state == 'Pending'">
diff --git a/frontend/src/Apps/Inscription/AboutStudent.vue b/frontend/src/Apps/Inscription/AboutStudent.vue
index 91fb89f..d9bde36 100644
--- a/frontend/src/Apps/Inscription/AboutStudent.vue
+++ b/frontend/src/Apps/Inscription/AboutStudent.vue
@@ -1,6 +1,6 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {getUser} from '../../rest/Users.js'
+  import {getSelf, getUser} from '../../rest/Users.js'
   import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
   import {ref} from "vue";
   import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
@@ -12,6 +12,7 @@
   const externalcurrlist = await getExternalCurriculumByUser(user.regNo)
   const extercurrlist = ref(false)
 
+  const watchingUser = await getSelf()
   function getPP(){
     if(user.profilePictureUrl === null){
       return "/Clyde.png"
@@ -54,6 +55,9 @@
           <div>
             Date de naissance : {{user.birthDate}}
           </div>
+          <div>
+            <button v-if="watchingUser.role === 'Admin' || watchingUser.role === 'InscriptionService' || watchingUser.role === 'Secretary' || watchingUser.regNo === user.regNo">Download identity card</button>
+          </div>
           <div>
             <button @click="extercurrlist=!extercurrlist">See external curriculums</button>
           </div>
diff --git a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
index c467853..88fefbb 100644
--- a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
+++ b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
@@ -3,6 +3,7 @@
   import {reactive, ref} from "vue";
   import {getSelf} from "@/rest/Users.js";
   import {createExternalCurriculum, getExternalCurriculumByUser} from "@/rest/externalCurriculum.js";
+  import {uploadFile} from "@/rest/uploads.js";
 
   //mode 0 = externalcurr related to inscrreq, 1 = externalcurr related to user, 2 inscription procedure
   const props = defineProps(["extCurrList", "mode"])
@@ -51,7 +52,8 @@
 
   async function postExternalCurr(){
     if (props.mode === 1){
-      await createExternalCurriculum(externalCurr.inscriptionRequestId, externalCurr.school, externalCurr.formation, externalCurr.completion, externalCurr.startYear, externalCurr.endYear, externalCurr.justifdocUrl, externalCurr.userRegNo);
+      const temp = await uploadFile(externalCurr.justifdocUrl, "JustificationDocument")
+      await createExternalCurriculum(externalCurr.inscriptionRequestId, externalCurr.school, externalCurr.formation, externalCurr.completion, externalCurr.startYear, externalCurr.endYear, temp.value.url, externalCurr.userRegNo);
       //We refresh the list
       extCurrList.value = await getExternalCurriculumByUser(externalCurr.userRegNo);
       list.value = !list.value;
@@ -68,7 +70,6 @@
       });
       extCurrList.value = externalCurrTab.value
       list.value = !list.value;
-      console.log(externalCurrTab.value)
     }
   }
 </script>
@@ -118,6 +119,10 @@
         <p>Année de fin</p>
         <input type="number" v-model="externalCurr.endYear">
       </div>
+      <div class="inputBox">
+        <p>Veuillez soumettre un document attestant de ce parcours</p>
+        <input type="file" @change="externalCurr.justifdocUrl = $event.target.files">
+      </div>
       <div class="inputBox" style="margin-top: 3%; margin-bottom: 3%">
         <input v-if="!editmode" type="submit" value="Upload curriculum" @click="postExternalCurr()">
         <input v-else type="submit" value="Edit curriculum" @click="externalCurrTab[extNum] = {inscriptionRequestId : externalCurr.inscriptionRequestId,school:externalCurr.school,formation :externalCurr.formation,completion : externalCurr.completion,startYear : externalCurr.startYear,endYear: externalCurr.endYear,justifdocUrl : externalCurr.justifdocUrl,userRegNo : externalCurr.userRegNo};editmode=!editmode;list=!list">
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index 531259b..7080f26 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -108,13 +108,13 @@
     const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, identityCardFile.url, new Date(), outputs.equivalenceState, justif);
 
     for (let item in externalCurrTab.value){
-      await createExternalCurriculum(val.id, externalCurrTab.value[item].school, externalCurrTab.value[item].formation, externalCurrTab.value[item].completion, externalCurrTab.value[item].startYear, externalCurrTab.value[item].endYear, externalCurrTab.value[item].justifdocUrl);
+      const temp = await uploadFile(externalCurrTab.value[item].justifdocUrl, "JustificationDocument")
+      await createExternalCurriculum(val.id, externalCurrTab.value[item].school, externalCurrTab.value[item].formation, externalCurrTab.value[item].completion, externalCurrTab.value[item].startYear, externalCurrTab.value[item].endYear, temp.value.url);
     }
   }
 
 </script>
 
-
 <template>
     <div class="setup" v-if="page !== 4">
       <div v-if="loginPage">
diff --git a/frontend/src/rest/uploads.js b/frontend/src/rest/uploads.js
index 856024d..a3c1ed7 100644
--- a/frontend/src/rest/uploads.js
+++ b/frontend/src/rest/uploads.js
@@ -13,11 +13,11 @@ export async function uploadProfilePicture(file){
 
 
 /**
- * More generic version of the upload method
+ * More generic version of the uploadProfilePicture method
  */
 
 export async function uploadFile(file, type){
 	const formData = new FormData();
 	formData.append("file", file[0]);
 	return restPostFile("/upload/"+type, formData)
-}
\ No newline at end of file
+}