Implements some files uploading in the inscription form and change inscriptionRequest and Curriculum for the cursus acceptance attestation feature

frontend/src/Apps/Login.vue

@@ -3,7 +3,7 @@
   import i18n from '@/i18n.js'
   import {login, register, disconnect, isLogged} from '@/rest/Users.js'
   import {getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
-  import { uploadProfilePicture } from '@/rest/uploads.js'
+  import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
   import {createExternalCurriculum} from "@/rest/externalCurriculum.js";
@@ -45,10 +45,13 @@
  
   const imageSaved = ref(false)
   let ppData = ""
-
+  let requiredCertif = false
   //Contains the id of the newly created request (useful to link the student's formations informations to the request)
   let requestId = ""
 
+  const idcardfile = ref({})
+  const justifcardfile = ref({})
+
   const curricula= await getAllCurriculums();
   
   function goBackHome(){
@@ -87,11 +90,28 @@
 
   //Post the register request and return the id of the newly created request and also post the external curriculum list in the database
   async function postRegisterReq(){
-    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date(), outputs.equivalenceState);
+    //We upload the two files and we get their paths on the server
+    const identityCardFile = await uploadFile(idcardfile.value, "IdentityCard")
+    const justifFile = ref(null)
+
+    if (curricula[outputs.curriculum-1].requireCertificate){
+      justifFile.value = await uploadFile(justifcardfile.value, "JustificationDocument")
+    }
+
+    let justif;
+    if (justifFile.value !== null){
+      justif = justifFile.value.url
+    }else{
+      justif = null
+    }
+
+    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);
     }
   }
+
 </script>
 
 
@@ -203,10 +223,23 @@
               </div>
             </div>
             <div v-if="page === 2">
-              <form novalidate enctype="multipart/form-data" class="inputBox">
-                Carte d'identité :
-              </form>
-              <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
+              <p style="color:rgb(239,60,168);">Carte d'indentité :</p>
+              <label class="browser">
+                Parcourir . . .
+                <input  type="file" @change="idcardfile = $event.target.files">
+              </label>
+              <div v-if="curricula[outputs.curriculum-1].requireCertificate === true" style="margin-top: 3%; margin-bottom: 4%">
+                <p style="color:rgb(239,60,168);">Ce cursus requiert une attestation de réussite d'un examen d'entrée</p>
+                <div style="margin-top: 2%">
+                  <p style="color:rgb(239,60,168);">Attestation:</p>
+                  <label class="browser">
+                    Parcourir . . .
+                    <input  type="file" @change="justifcardfile = $event.target.files">
+                  </label>
+                </div>
+              </div>
+              <button @click="page++;">{{i18n("login.guest.nextpage")}}</button>
+
             </div>
             <div v-if="page === 3">
               <p>

frontend/src/rest/Users.js

@@ -26,7 +26,7 @@ export function disconnect(){
  * @param curriculum 
  * @param imageId	id of the image in database returned when uploaded
  */
-export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate, equivalence){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate, equivalence,admissionDocUrl){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -39,7 +39,8 @@ export async function register(firstname, lastname, birthDate, password, email,
     	profilePicture: imageId,
 		identityCard : identityCardId,
 		submissionDate : submissionDate,
-		equivalenceState : equivalence
+		equivalenceState : equivalence,
+		admissionDocUrl: admissionDocUrl
 	});
 }