Translation of the student inscription extension and profile
This commit is contained in:
		| @ -13,6 +13,13 @@ login.guest.lastpage=Last Page | |||||||
| login.guest.submit=Submit | login.guest.submit=Submit | ||||||
| login.guest.birthday=BIRTHDAY | login.guest.birthday=BIRTHDAY | ||||||
| login.guest.confirm=CONFIRM | login.guest.confirm=CONFIRM | ||||||
|  | login.guest.browse=Browse... | ||||||
|  | login.guest.disclaimer=If you are already registered please connect to your account and use the change cursus/reregister function if not continue here. | ||||||
|  | login.guest.identityCard=Identity Card : | ||||||
|  | login.guest.attestationdisclaimer=This curriculum requires an entrance exam attestation | ||||||
|  | login.guest.formationdisclaimer=Please add your old formations with the associated degree/attestation,your case will be check by a member of the inscription service. | ||||||
|  | login.guest.managecareer=Manage your external formations | ||||||
|  | login.guest.sendRegReq=Send register request | ||||||
| login.cPassword=Confirm Password | login.cPassword=Confirm Password | ||||||
| login.password=Password | login.password=Password | ||||||
| app.home=Home | app.home=Home | ||||||
| @ -53,3 +60,84 @@ Curriculum=curriculum | |||||||
| Credits=Credits | Credits=Credits | ||||||
| InscriptionService=I.S. | InscriptionService=I.S. | ||||||
| faculty=Faculty | faculty=Faculty | ||||||
|  | firstname/name=Firstname/Name | ||||||
|  | regNo=regNo | ||||||
|  | From=From | ||||||
|  | To=To | ||||||
|  | WantedCursus=Wanted Cursus | ||||||
|  | seeprofile=See profile | ||||||
|  | acceptequiv=Accept equivalence | ||||||
|  | refuseequiv=Refuse equivalence | ||||||
|  | course=course | ||||||
|  | state=state | ||||||
|  | dljustifdoc=Download justification document | ||||||
|  | backtoreq=Back to request | ||||||
|  | dlidentitycard=Download identity card | ||||||
|  | dladmissiondoc=Download admission document | ||||||
|  | seeextcur=See external curriculums | ||||||
|  | dltaxdoc=Download tax justification document | ||||||
|  | dlresidency=Download residency justification document | ||||||
|  | enteramount=Please enter the amount to provide : | ||||||
|  | oldcursus=Old curriculums | ||||||
|  | newcursus = New curriculums | ||||||
|  | year=Year | ||||||
|  | reason=Reason : | ||||||
|  | selectedcursus=Selected curriculum : | ||||||
|  | askexemp=Ask exemption | ||||||
|  | exemp=Exempted | ||||||
|  | uploadjustifdoc=Please upload the justification document | ||||||
|  | subexemreq=Submit exemption request | ||||||
|  | addextcurr=Add external curriculum | ||||||
|  | dldoc=Download document | ||||||
|  | edit=Edit | ||||||
|  | delete=Delete | ||||||
|  | school=School | ||||||
|  | checkifnotcompleted=Check the box if you didn't complete the formation | ||||||
|  | wichyearstop=In which year did you stop (ex: 3rd year) ? | ||||||
|  | startyear=Start year | ||||||
|  | endyear=End year | ||||||
|  | giveextcurdoc=Please upload a document that proves this formation | ||||||
|  | uploadcurr=Upload curriculum | ||||||
|  | editcurr=Edit curriculum | ||||||
|  | reqtype=Request type : | ||||||
|  | inscription=register | ||||||
|  | scholarship=scholarship | ||||||
|  | exemption=exemption | ||||||
|  | unregister=unregister | ||||||
|  | curriculumch=curriculum change | ||||||
|  | filter=Filter : | ||||||
|  | approval=Approval : | ||||||
|  | teacherapproval=Teacher approval : | ||||||
|  | surreq=Are you sure that you want to accept this request ? | ||||||
|  | validate=Validate | ||||||
|  | amount=Amount | ||||||
|  | role=Role | ||||||
|  | manageextcur=Manage external curriculum | ||||||
|  | managecourse=Manage courses | ||||||
|  | manageminerval=Manage school fees | ||||||
|  | enterreason=Please enter the reason you leave | ||||||
|  | onlycursus=I only want to unregister from a specific cursus | ||||||
|  | plsselectcurs=Please select that cursus | ||||||
|  | sureunreg=Are you sure that you want to unregister ? | ||||||
|  | no=No | ||||||
|  | yes=Yes | ||||||
|  | reqsend=Your request has been send ! | ||||||
|  | payment=Payment | ||||||
|  | lefttopay=left to pay | ||||||
|  | paydeposit=Pay deposit | ||||||
|  | payrest=Pay all the rest | ||||||
|  | alreadypaid=Payment : School fees have already been paid this year | ||||||
|  | askscholarship=Ask scholarship | ||||||
|  | uploaddocs=Please upload the required documents | ||||||
|  | taxjustdoc=Tax justification document : | ||||||
|  | residencydoc=Residency justification document : | ||||||
|  | reqsent=Your request has been sent to the inscription service. | ||||||
|  | backprofile=Go back to profile | ||||||
|  | procpayment=Proceed to payment of | ||||||
|  | procpaybutton=Process payment | ||||||
|  | rereg=Reregister in the next year of one of my cursus | ||||||
|  | reregsup=Register in a supplementary cursus | ||||||
|  | chcur=Change from a cursus to another | ||||||
|  | iwouldlike=I would like to : | ||||||
|  | newcurr=New curriculum | ||||||
|  | cursusprereq=The cursus you selected has some prerequisites ensure that your external curriculum data is updated in your profile | ||||||
|  | |||||||
| @ -13,6 +13,13 @@ login.guest.lastpage=Derniere Page | |||||||
| login.guest.submit=Envoyer | login.guest.submit=Envoyer | ||||||
| login.guest.birthday=DATE DE NAISSANCE | login.guest.birthday=DATE DE NAISSANCE | ||||||
| login.guest.confirm=CONFIRMER | login.guest.confirm=CONFIRMER | ||||||
|  | login.guest.browse=Parcourir... | ||||||
|  | login.guest.disclaimer=Si vous êtes déja inscrits dans cette université veuillez vous connecter a votre compte et utilisez les fonctions changer de cursus/réinscription sinon continuez ici. | ||||||
|  | login.guest.identityCard=Carte d'identité : | ||||||
|  | login.guest.attestationdisclaimer=Ce cursus requiert une attestation de réussite d'un examen d'entrée | ||||||
|  | login.guest.formationdisclaimer=Veuillez ajouter vos formations antérieures en y joignant les attestations/diplomes, votre dossier sera vérifié par un membre du service d'inscription. | ||||||
|  | login.guest.managecareer=Gèrer mon parcours extérieur | ||||||
|  | login.guest.sendRegReq=Envoyer la demande d'inscription | ||||||
| login.cPassword=Confirmer mot de passe | login.cPassword=Confirmer mot de passe | ||||||
| login.password=Mot de passe | login.password=Mot de passe | ||||||
| app.home=Home | app.home=Home | ||||||
| @ -53,4 +60,84 @@ Curriculum=Cursus | |||||||
| Credits=Credits | Credits=Credits | ||||||
| InscriptionService=S.I. | InscriptionService=S.I. | ||||||
| faculty=Faculté | faculty=Faculté | ||||||
|  | firstname/name=Prénom/Nom | ||||||
|  | regNo=Matricule | ||||||
|  | From=De | ||||||
|  | To=A | ||||||
|  | WantedCursus=Cursus voulu | ||||||
|  | seeprofile=Voir le profil | ||||||
|  | acceptequiv=Accepter l'équivalence | ||||||
|  | refuseequiv=Refuser l'équivalence | ||||||
|  | course=cours | ||||||
|  | state=état | ||||||
|  | dljustifdoc=Télécharger le justificatif | ||||||
|  | backtoreq=Retour a la requête | ||||||
|  | dlidentitycard=Télécharger la carte d'identité | ||||||
|  | dladmissiondoc=Télécharger le certificat d'admission | ||||||
|  | seeextcur=Voir le parcours extérieur | ||||||
|  | dltaxdoc=Télécharger le justificatif d'impot | ||||||
|  | dlresidency=Télécharger le justificatif de résidence | ||||||
|  | enteramount=Veuillez entrer le montant alloué : | ||||||
|  | oldcursus=Anciens cursus | ||||||
|  | newcursus=Nouveaux cursus | ||||||
|  | year=Année | ||||||
|  | reason=Raison : | ||||||
|  | selectedcursus=Cursus selectionné : | ||||||
|  | askexemp=Demander une dispense | ||||||
|  | exemp=Dispensé | ||||||
|  | uploadjustifdoc=Veuillez soumettre le justificatif | ||||||
|  | subexemreq=Envoyer la demande de dispense | ||||||
|  | addextcurr=Ajouter une formation | ||||||
|  | dldoc=Télécharger le document | ||||||
|  | edit=Modifier | ||||||
|  | delete=Supprimer | ||||||
|  | school=Ecole | ||||||
|  | checkifnotcompleted=Cochez la case si vous n'avez terminé cette formation | ||||||
|  | wichyearstop=En quelle année de la formation vous êtes vous arrété (exemple: 3ème) ? | ||||||
|  | startyear=Année de début | ||||||
|  | endyear=Année de fin | ||||||
|  | giveextcurdoc=Veuillez soumettre un document attestant de ce parcours | ||||||
|  | uploadcurr=Ajouter la formation | ||||||
|  | editcurr=Modifier la formation | ||||||
|  | reqtype=Type de requête : | ||||||
|  | inscription=inscription | ||||||
|  | scholarship=bourse | ||||||
|  | exemption=dispense | ||||||
|  | unregister=désinscription | ||||||
|  | curriculumch=changement de cursus | ||||||
|  | filer=Filtre : | ||||||
|  | approval=Approbation : | ||||||
|  | teacherapproval=Approbation d'un prof : | ||||||
|  | surreq=Etes vous sur de vouloir accepter cette demande ? | ||||||
|  | validate=Valider | ||||||
|  | amount=Montant | ||||||
|  | role=Role | ||||||
|  | manageextcur=Gérer les formations | ||||||
|  | managecourse=Gérer les cours | ||||||
|  | manageminerval=Gérer le minerval | ||||||
|  | enterreason=Veuillez entrer la raison de votre départ | ||||||
|  | onlycursus=Je veux uniquement me désinscrire d'un seul cursus | ||||||
|  | plsselectcurs=Veuillez sélectionner ce cursus | ||||||
|  | sureunreg=Etes-vous sur de vouloir vous désinscrire ? | ||||||
|  | no=Non | ||||||
|  | yes=Oui | ||||||
|  | reqsend=Votre requête a été envoyée ! | ||||||
|  | payment=Payement | ||||||
|  | lefttopay=restants a payer | ||||||
|  | paydeposit=Payer l'acompte | ||||||
|  | payrest=Payer le reste | ||||||
|  | alreadypaid=Payement : les frais ont déja été payés cette année | ||||||
|  | askscholarship=Demander une bourse | ||||||
|  | uploaddocs=Veuillez soumettre les documents requis | ||||||
|  | taxjustdoc=Justificatif d'impôts : | ||||||
|  | residencydoc=Justificatif de résidence : | ||||||
|  | reqsent=Votre requête a été envoyée au service d'inscription. | ||||||
|  | backprofile=Retour au profil | ||||||
|  | procpayment=Procéder au payement de | ||||||
|  | procpaybutton=Procéder au payement | ||||||
|  | rereg=Me réinscrire dans l'année supérieure | ||||||
|  | reregsup=M'inscrire dans un cursus supplémentaire | ||||||
|  | chcur=Changer d'un cursus vers un autre | ||||||
|  | iwouldlike=Je voudrais : | ||||||
|  | newcurr=Nouveau cursus | ||||||
|  | cursusprereq=Le cursus que vous avez selectionné a des prérequis assurez vous que votre dossier de parcours est a jour dans votre profil | ||||||
| @ -39,39 +39,39 @@ async function editChangeCurrReqTeacherApproval(state){ | |||||||
|       <div class="globalInfos"> |       <div class="globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             Firstname/Name : {{req.user.firstName}} {{req.user.lastName}} |             {{i18n("firstname/name")}} : {{req.user.firstName}} {{req.user.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             regNo : {{req.user.regNo}} |             {{i18n("regNo")}} : {{req.user.regNo}} | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="req.actualCurriculum !== null"> |           <div v-if="req.actualCurriculum !== null"> | ||||||
|             From : Bac {{req.actualCurriculum.year}} {{req.actualCurriculum.option}} |             {{i18n("From")}} : Bac {{req.actualCurriculum.year}} {{req.actualCurriculum.option}} | ||||||
|             To : Bac {{req.destinationCurriculum.year}} {{req.destinationCurriculum.option}} |             {{i18n("To")}} : Bac {{req.destinationCurriculum.year}} {{req.destinationCurriculum.option}} | ||||||
|           </div> |           </div> | ||||||
|           <div v-else> |           <div v-else> | ||||||
|             Wanted cursus : Bac {{req.destinationCurriculum.year}} {{req.destinationCurriculum.option}} |             {{i18n("WantedCursus")}} : Bac {{req.destinationCurriculum.year}} {{req.destinationCurriculum.option}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="localwindowstate++"> See profile </button> |             <button @click="localwindowstate++"> {{ i18n("seeprofile") }} </button> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">Accept</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">{{ i18n("request.accept") }}</button> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshChangeRequest('Refused')" style="margin-left: 2%;">Refuse</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshChangeRequest('Refused')" style="margin-left: 2%;">{{i18n("request.refuse")}}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="user.role === 'Teacher' || user.role === 'Admin'"> |           <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='Accepted';editChangeCurrReqTeacherApproval('Accepted')">{{i18n("acceptequiv")}}</button> | ||||||
|             <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Refused';editChangeCurrReqTeacherApproval('Refused')">Refuse equivalence</button> |             <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Refused';editChangeCurrReqTeacherApproval('Refused')">{{i18n("refuseequiv")}}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="localwindowstate === 0" style="margin-left: 23%"> |   <div v-if="localwindowstate === 0" style="margin-left: 23%"> | ||||||
|     <button @click="windowState = 0" style="margin-left: 10%">Back</button> |     <button @click="windowState = 0" style="margin-left: 10%">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="localwindowstate === 1"> |   <div v-if="localwindowstate === 1"> | ||||||
|     <AboutStudent :target="tag"></AboutStudent> |     <AboutStudent :target="tag"></AboutStudent> | ||||||
|     <button @click="localwindowstate--;" style="margin-left: 10%">Back</button> |     <button @click="localwindowstate--;" style="margin-left: 10%">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
|  | |||||||
| @ -32,23 +32,23 @@ async function editExemp(newstate){ | |||||||
|       <div class="globalInfos"> |       <div class="globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             Firstname/Name : {{req.user.firstName}} {{req.user.lastName}} |             {{ i18n("firstname/name") }} : {{req.user.firstName}} {{req.user.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Course: {{req.course.title}} |             {{ i18n("course") }}: {{req.course.title}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             State : {{req.state}} |             {{ i18n("state") }} : {{req.state}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="profile = !profile">Voir le profil</button> |             <button @click="profile = !profile">{{ i18n("seeprofile") }}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button>Download justification document</button> |             <button>{{ i18n("dljustifdoc") }}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';editExemp('Accepted')">Accept</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';editExemp('Accepted')">{{ i18n("request.accept") }}</button> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Refused';editExemp('Refused')" style="margin-left: 2%;">Refuse</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Refused';editExemp('Refused')" style="margin-left: 2%;">{{ i18n("request.refuse") }}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
| @ -56,10 +56,10 @@ async function editExemp(newstate){ | |||||||
|   </div> |   </div> | ||||||
|   <div v-else> |   <div v-else> | ||||||
|     <AboutStudent :target="req.user.regNo"></AboutStudent> |     <AboutStudent :target="req.user.regNo"></AboutStudent> | ||||||
|     <button @click="profile=!profile" style="margin-left: 17%;margin-top: 3%">Back to request</button> |     <button @click="profile=!profile" style="margin-left: 17%;margin-top: 3%">{{ i18n("backtoreq") }}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div> |   <div> | ||||||
|     <button v-if="profile===false" @click="windowState = 0" style="margin-left: 31%">Back</button> |     <button v-if="profile===false" @click="windowState = 0" style="margin-left: 31%">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| <script setup> | <script setup> | ||||||
| import i18n from "@/i18n.js" | import i18n from "@/i18n.js" | ||||||
| import {getSelf, getUser} from '../../rest/Users.js' | import {getSelf, getUser} from '../../rest/Users.js' | ||||||
| import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js"; | import {getcurriculum} from "@/rest/curriculum.js"; | ||||||
| import {getRegisters} from "@/rest/ServiceInscription.js"; | import {getRegisters} from "@/rest/ServiceInscription.js"; | ||||||
| import {get} from "jsdom/lib/jsdom/named-properties-tracker.js"; | import {get} from "jsdom/lib/jsdom/named-properties-tracker.js"; | ||||||
| import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js"; | import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js"; | ||||||
| @ -39,42 +39,42 @@ async function editEquivalence(id, newstate){ | |||||||
|       <div class = "globalInfos"> |       <div class = "globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             FirstName/Name : {{request.firstName}} {{request.lastName}} |             {{ i18n("firstname/name") }} : {{request.firstName}} {{request.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail: {{request.email}} |             {{ i18n("login.guest.email") }}: {{request.email}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Adresse : {{request.address}} |             {{ i18n("login.guest.address") }} : {{request.address}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Pays : {{request.country}} |             {{ i18n("login.guest.country") }} : {{request.country}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Date de naissance : {{request.birthDate}} |             {{ i18n("login.guest.birthday") }} : {{request.birthDate}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Cursus voulu : BAB {{cursus.year}} {{cursus.option}} |             {{ i18n("WantedCursus") }} : BAB {{cursus.year}} {{cursus.option}} | ||||||
|           </div> |           </div> | ||||||
|           <div style="margin-top: 3%"> |           <div style="margin-top: 3%"> | ||||||
|             <a :href="request.identityCard">Download identity card</a> |             <a :href="request.identityCard">{{ i18n("dlidentitycard") }}</a> | ||||||
|             <button v-if="request.admissionDocUrl != null">Download admission document</button> |             <button v-if="request.admissionDocUrl != null">{{ i18n("dladmissiondoc") }}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="cursus.year > 1"> |           <div v-if="cursus.year > 1"> | ||||||
|             <button style="background-color:rgb(105,05,105);margin-top: 3%" @click="list=!list" v-if="(user.role == 'Teacher' || user.role == 'Admin')">See external curriculums</button> |             <button style="background-color:rgb(105,05,105);margin-top: 3%" @click="list=!list" v-if="(user.role == 'Teacher' || user.role == 'Admin')">{{ i18n("seeextcur") }}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="list == false" style="margin-left: 30%; margin-top: 5%"> |   <div v-if="list == false" style="margin-left: 30%; margin-top: 5%"> | ||||||
|     <button @click="windowState = 0">Back</button> |     <button @click="windowState = 0">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="list==true"> |   <div v-if="list==true"> | ||||||
|     <ExternalCurriculumList :ext-curr-list="externalCurriculum" :mode="0"></ExternalCurriculumList> |     <ExternalCurriculumList :ext-curr-list="externalCurriculum" :mode="0"></ExternalCurriculumList> | ||||||
|     <div style="margin-left: 15%;margin-top: 5%;"> |     <div style="margin-left: 15%;margin-top: 5%;"> | ||||||
|       <button style="margin-left: 2%" v-if="request.equivalenceState === 'Pending'" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button> |       <button style="margin-left: 2%" v-if="request.equivalenceState === 'Pending'" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">{{i18n("acceptequiv")}}</button> | ||||||
|       <button style="margin-left: 2%" v-if="request.equivalenceState === 'Pending'" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button> |       <button style="margin-left: 2%" v-if="request.equivalenceState === 'Pending'" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">{{i18n("refuseequiv")}}</button> | ||||||
|       <button style="margin-left: 2%" @click="list=false">Back</button> |       <button style="margin-left: 2%" @click="list=false">Back</button> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|  | |||||||
| @ -39,31 +39,31 @@ async function uploadandrefreshScholarshipRequest(){ | |||||||
|       <div class="globalInfos"> |       <div class="globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             Firstname/Name : {{user.firstName}} {{user.lastName}} |             {{ i18n("firstname/name") }} : {{user.firstName}} {{user.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail: {{user.email}} |             {{ i18n("login.guest.email") }}: {{user.email}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Adresse : {{user.address}} |             {{ i18n("login.guest.address") }} : {{user.address}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Country : {{user.country}} |             {{ i18n("login.guest.country") }} : {{user.country}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Birthdate : {{user.birthDate.slice(0,10)}} |             {{ i18n("login.guest.birthday") }} : {{user.birthDate.slice(0,10)}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="">Download tax justif document</button> |             <button @click="">{{ i18n("dltaxdoc") }}</button> | ||||||
|             <button style="margin-left: 2%">Download residency justif document</button> |             <button style="margin-left: 2%">{{ i18n("dlresidency") }}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="req.state == 'Pending'" style="margin-top: 2%; margin-bottom: 2%;"> |           <div v-if="req.state == 'Pending'" style="margin-top: 2%; margin-bottom: 2%;"> | ||||||
|             Please enter the amount to provide : |             {{i18n("enteramount")}} | ||||||
|             <input type="number" v-model="scholarshipData.amount"> |             <input type="number" v-model="scholarshipData.amount"> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button v-if="req.state === 'Pending'" @click="scholarshipData.state='Accepted';uploadandrefreshScholarshipRequest()">Accept</button> |             <button v-if="req.state === 'Pending'" @click="scholarshipData.state='Accepted';uploadandrefreshScholarshipRequest()">{{i18n("request.accept")}}</button> | ||||||
|             <button v-if="req.state === 'Pending'" @click="scholarshipData.state='Refused';uploadandrefreshScholarshipRequest()" style="margin-left: 2%;">Refuse</button> |             <button v-if="req.state === 'Pending'" @click="scholarshipData.state='Refused';uploadandrefreshScholarshipRequest()" style="margin-left: 2%;">{{i18n("request.refuse")}}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -41,50 +41,50 @@ | |||||||
|       <div class = "globalInfos"> |       <div class = "globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             FirstName/Name : {{user.firstName}} {{user.lastName}} |             {{ i18n("firstname/name") }} : {{user.firstName}} {{user.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail: {{user.email}} |             {{ i18n("login.guest.email") }}: {{user.email}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Adresse : {{user.address}} |             {{ i18n("login.guest.address") }} : {{user.address}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Pays : {{user.country}} |             {{ i18n("login.guest.country") }} : {{user.country}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Date de naissance : {{user.birthDate}} |             {{ i18n("login.guest.birthday") }} : {{user.birthDate}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button v-if="watchingUser.role === 'Admin' || watchingUser.role === 'InscriptionService' || watchingUser.role === 'Secretary' || watchingUser.regNo === user.regNo">Download identity card</button> |             <button v-if="watchingUser.role === 'Admin' || watchingUser.role === 'InscriptionService' || watchingUser.role === 'Secretary' || watchingUser.regNo === user.regNo">{{i18n("dlidentitycard")}}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="extercurrlist=!extercurrlist">See external curriculums</button> |             <button @click="extercurrlist=!extercurrlist">{{i18n("seeextcur")}}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|       <div class="moreInfos" style="margin-top: 15%"> |       <div class="moreInfos" style="margin-top: 15%"> | ||||||
|         <div class = "oldcursus"> |         <div class = "oldcursus"> | ||||||
|           <div class="listTitle"> |           <div class="listTitle"> | ||||||
|             Anciens Cursus |             {{ i18n("oldcursus") }} | ||||||
|           </div> |           </div> | ||||||
|           <div  class="listElement"> |           <div  class="listElement"> | ||||||
|             <div class=" containerElement" v-for="item in UserCurriculum.curriculumList"> |             <div class=" containerElement" v-for="item in UserCurriculum.curriculumList"> | ||||||
|               <div class="year" v-if="item.actual === false">Bac {{item.year}}</div> |               <div class="year" v-if="item.actual === false">Bac {{item.year}}</div> | ||||||
|               <div class="option" v-if="item.actual === false">{{item.option}}</div> |               <div class="option" v-if="item.actual === false">{{item.option}}</div> | ||||||
|               <div class="dateyear" v-if="item.actual === false">Année {{item.dateyear}}-{{item.dateyear+1}}</div> |               <div class="dateyear" v-if="item.actual === false">{{ i18n("year") }} {{item.dateyear}}-{{item.dateyear+1}}</div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|         <div class="newcursus"> |         <div class="newcursus"> | ||||||
|           <div class="listTitle"> |           <div class="listTitle"> | ||||||
|             Cursus Actuel |             {{ i18n("newcursus") }} | ||||||
|           </div> |           </div> | ||||||
|           <div  class="listElement"> |           <div  class="listElement"> | ||||||
|             <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" > |             <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" > | ||||||
|                 <div class="year" v-if="item.actual === true">Bac {{item.year}}</div> |                 <div class="year" v-if="item.actual === true">Bac {{item.year}}</div> | ||||||
|                 <div class="option" v-if="item.actual === true">{{item.option}}</div> |                 <div class="option" v-if="item.actual === true">{{item.option}}</div> | ||||||
|                 <div class="dateyear" v-if="item.actual === true">Année {{item.dateyear}}-{{item.dateyear+1}}</div> |                 <div class="dateyear" v-if="item.actual === true">{{ i18n("year") }} {{item.dateyear}}-{{item.dateyear+1}}</div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|  | |||||||
| @ -34,21 +34,21 @@ async function uploadandrefreshUnregRequest(state){ | |||||||
|       <div class="globalInfos"> |       <div class="globalInfos"> | ||||||
|         <div class="infosContainer"> |         <div class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             Firstname/Name : {{req.firstName}} {{req.lastName}} |             {{ i18n("firstname/name") }} : {{req.firstName}} {{req.lastName}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail: {{req.email}} |             {{ i18n("login.guest.email") }}: {{req.email}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             regNo : {{req.regNo}} |             {{ i18n("regNo") }} : {{req.regNo}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Reason : |             {{ i18n("reason") }} | ||||||
|             <input type="text" v-model="req.reason" readonly/> |             <input type="text" v-model="req.reason" readonly/> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshUnregRequest('Accepted')">Accept</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshUnregRequest('Accepted')">{{i18n("request.accept")}}</button> | ||||||
|             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshUnregRequest('Refused')" style="margin-left: 2%;">Refuse</button> |             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshUnregRequest('Refused')" style="margin-left: 2%;">{{i18n("request.refuse")}}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -46,7 +46,7 @@ function isExempted(course){ | |||||||
|  |  | ||||||
| <template style="margin-top:5%;"> | <template style="margin-top:5%;"> | ||||||
|   <div v-if="list == true"> |   <div v-if="list == true"> | ||||||
|     <span>Selected Cursus :   </span> |     <span>{{i18n("selectedcursus")}} :   </span> | ||||||
|     <select v-model="selectedCurriculum" @change="updateCourseList"> |     <select v-model="selectedCurriculum" @change="updateCourseList"> | ||||||
|       <option v-for="item in props.cursuslist" :value="item">Bac {{item.year}} {{item.option}}</option> |       <option v-for="item in props.cursuslist" :value="item">Bac {{item.year}} {{item.option}}</option> | ||||||
|     </select> |     </select> | ||||||
| @ -57,28 +57,28 @@ function isExempted(course){ | |||||||
|           <div class="firstname">{{item.owner.firstName}}</div> |           <div class="firstname">{{item.owner.firstName}}</div> | ||||||
|           <div class="lastname">{{item.owner.lastName}}</div> |           <div class="lastname">{{item.owner.lastName}}</div> | ||||||
|           <div class="credits">credits : {{item.credits}}</div> |           <div class="credits">credits : {{item.credits}}</div> | ||||||
|           <div class="askexemption" v-if="!isExempted(item)"><button style="background-color:rgb(105,0,0);" @click="list= !list;exemptReq.courseId=item.courseId">Ask exemption</button></div> |           <div class="askexemption" v-if="!isExempted(item)"><button style="background-color:rgb(105,0,0);" @click="list= !list;exemptReq.courseId=item.courseId">{{i18n("askexemp")}}</button></div> | ||||||
|           <div v-else class="askexemption" style="font-size: 50%">Exempted</div> |           <div v-else class="askexemption" style="font-size: 50%">{{ i18n("exemp") }}</div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|     <div> |     <div> | ||||||
|       <button @click="windowState = 0">Back</button> |       <button @click="windowState = 0">{{ i18n("courses.back")}}</button> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="list === false" class="infosContainer"> |   <div v-if="list === false" class="infosContainer"> | ||||||
|       <p>Please upload the justification document for the exemption </p> |       <p>{{ i18n("uploadjustifdoc") }} </p> | ||||||
|     <div> |     <div> | ||||||
|     <label class="browser"> |     <label class="browser"> | ||||||
|       <input  type="file" @change="ppData.value = $event.target.files" accept="image/*" ref="filepath"> |       <input  type="file" @change="ppData.value = $event.target.files" accept="image/*" ref="filepath"> | ||||||
|     </label> |     </label> | ||||||
|     </div> |     </div> | ||||||
|     <button style="margin-top: 3%" @click="postExemptionRequest(ppData.value, 'JustificationDocument');"> |     <button style="margin-top: 3%" @click="postExemptionRequest(ppData.value, 'JustificationDocument');"> | ||||||
|       Submit exemption request |       {{ i18n("subexemreq") }} | ||||||
|     </button> |     </button> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="list === false"> |   <div v-if="list === false"> | ||||||
|     <button @click="list=!list">Back</button> |     <button @click="list=!list">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
|  | |||||||
| @ -77,7 +77,7 @@ | |||||||
| <template style="margin-top:5%;"> | <template style="margin-top:5%;"> | ||||||
|   <div v-if="list"> |   <div v-if="list"> | ||||||
|     <div v-if="props.mode === 2||User.regNo === externalCurr.userRegNo" style="margin-left: 2%;margin-top: 2%"> |     <div v-if="props.mode === 2||User.regNo === externalCurr.userRegNo" style="margin-left: 2%;margin-top: 2%"> | ||||||
|       <button @click="list = !list" style="margin-left:15%;">Add external curriculum</button> |       <button @click="list = !list" style="margin-left:15%;">{{ i18n("addextcurr") }}</button> | ||||||
|     </div> |     </div> | ||||||
|     <div style="display:flex; justify-content:center;" v-for="(item, index) in extCurrList"> |     <div style="display:flex; justify-content:center;" v-for="(item, index) in extCurrList"> | ||||||
|       <div class="bodu"> |       <div class="bodu"> | ||||||
| @ -86,9 +86,9 @@ | |||||||
|           <div class="school"><a>{{item.school}}</a></div> |           <div class="school"><a>{{item.school}}</a></div> | ||||||
|           <div class="formation"><a>{{item.formation}}</a></div> |           <div class="formation"><a>{{item.formation}}</a></div> | ||||||
|           <div class="completion"><a>{{item.completion}}</a></div> |           <div class="completion"><a>{{item.completion}}</a></div> | ||||||
|           <div class="download"><button>Download document</button></div> |           <div class="download"><button>{{ i18n("dldoc") }}</button></div> | ||||||
|           <div class="edit" v-if="props.mode === 2"><button @click="list=!list;externalCurr.justifdocUrl=item.justifDocUrl; externalCurr.endYear = item.endYear; externalCurr.startYear = item.startYear; externalCurr.school = item.school;externalCurr.completion = item.completion;externalCurr.formation=item.formation;editmode=!editmode;extNum=index">Edit</button></div> |           <div class="edit" v-if="props.mode === 2"><button @click="list=!list;externalCurr.justifdocUrl=item.justifDocUrl; externalCurr.endYear = item.endYear; externalCurr.startYear = item.startYear; externalCurr.school = item.school;externalCurr.completion = item.completion;externalCurr.formation=item.formation;editmode=!editmode;extNum=index">{{i18n("edit")}}</button></div> | ||||||
|           <div class="delete" v-if="props.mode === 2"><button @click="deleteExtCursus(item)">Delete</button></div> |           <div class="delete" v-if="props.mode === 2"><button @click="deleteExtCursus(item)">{{ i18n("delete") }}</button></div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
| @ -96,7 +96,7 @@ | |||||||
|   <div v-else class="loginbox" style="margin-left: 35%; margin-top: 3%"> |   <div v-else class="loginbox" style="margin-left: 35%; margin-top: 3%"> | ||||||
|     <form class="form"> |     <form class="form"> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
|         <p>Ecole</p> |         <p>{{ i18n("school") }}</p> | ||||||
|         <input type="text" v-model="externalCurr.school"> |         <input type="text" v-model="externalCurr.school"> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
| @ -104,28 +104,28 @@ | |||||||
|         <input type="text" v-model="externalCurr.formation"> |         <input type="text" v-model="externalCurr.formation"> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
|         <p>Cochez la case si vous n'avez terminé cette formation</p> |         <p>{{i18n("checkifnotcompleted")}}</p> | ||||||
|         <input v-model="notcompletedCheck" type="checkbox" id="checkboxformation"> |         <input v-model="notcompletedCheck" type="checkbox" id="checkboxformation"> | ||||||
|         <div v-if="notcompletedCheck"> |         <div v-if="notcompletedCheck"> | ||||||
|           <p>En quelle année de la formation vous êtes vous arrété (exemple: 3ème) ?</p> |           <p>{{i18n("wichyearstop")}}</p> | ||||||
|           <input type="text" v-model="externalCurr.completion"> |           <input type="text" v-model="externalCurr.completion"> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
|         <p>Année de début</p> |         <p>{{ i18n("startyear") }}</p> | ||||||
|         <input type="number" v-model="externalCurr.startYear"> |         <input type="number" v-model="externalCurr.startYear"> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
|         <p>Année de fin</p> |         <p>{{ i18n("endyear") }}</p> | ||||||
|         <input type="number" v-model="externalCurr.endYear"> |         <input type="number" v-model="externalCurr.endYear"> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox"> |       <div class="inputBox"> | ||||||
|         <p>Veuillez soumettre un document attestant de ce parcours</p> |         <p>{{i18n("giveextcurdoc")}}</p> | ||||||
|         <input type="file" @change="externalCurr.justifdocUrl = $event.target.files"> |         <input type="file" @change="externalCurr.justifdocUrl = $event.target.files"> | ||||||
|       </div> |       </div> | ||||||
|       <div class="inputBox" style="margin-top: 3%; margin-bottom: 3%"> |       <div class="inputBox" style="margin-top: 3%; margin-bottom: 3%"> | ||||||
|         <input v-if="!editmode" type="submit" value="Upload curriculum" @click="postExternalCurr()"> |         <input v-if="!editmode" type="submit" value="upload" @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"> |         <input v-else type="submit" value="edit" @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"> | ||||||
|       </div> |       </div> | ||||||
|     </form> |     </form> | ||||||
|   </div> |   </div> | ||||||
|  | |||||||
| @ -32,19 +32,19 @@ | |||||||
|  |  | ||||||
|   async function loadRequests(){ |   async function loadRequests(){ | ||||||
|     switch (requestType.value){ |     switch (requestType.value){ | ||||||
|       case "inscription": |       case i18n("inscription"): | ||||||
|         requests.value = await getAllRegisters(); |         requests.value = await getAllRegisters(); | ||||||
|         break; |         break; | ||||||
|       case "scholarship": |       case i18n("scholarship"): | ||||||
|         requests.value = await getAllScholarShipsRequest(); |         requests.value = await getAllScholarShipsRequest(); | ||||||
|         break; |         break; | ||||||
|       case "exemption": |       case i18n("exemption"): | ||||||
|         requests.value = await getAllExemptionsRequest(); |         requests.value = await getAllExemptionsRequest(); | ||||||
|         break; |         break; | ||||||
|       case "unregister": |       case i18n("unregister"): | ||||||
|         requests.value = await getAllUnregisters(); |         requests.value = await getAllUnregisters(); | ||||||
|         break; |         break; | ||||||
|       case "curriculum change": |       case i18n("curriculumch"): | ||||||
|         requests.value = await getAllChangeCurrReq(); |         requests.value = await getAllChangeCurrReq(); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| @ -65,16 +65,16 @@ | |||||||
|   </div> |   </div> | ||||||
|   <div v-if="windowsState === 0"> |   <div v-if="windowsState === 0"> | ||||||
|     <div style="margin-top: 2%;margin-left: 2%"> |     <div style="margin-top: 2%;margin-left: 2%"> | ||||||
|       <span>Request type :   </span> |       <span>{{ i18n("reqtype") }} :   </span> | ||||||
|       <select v-model="requestType" @change="loadRequests()"> |       <select v-model="requestType" @change="loadRequests()"> | ||||||
|         <option>inscription</option> |         <option>{{ i18n("inscription") }}</option> | ||||||
|         <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">scholarship</option> |         <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">{{ i18n("scholarship") }}</option> | ||||||
|         <option v-if="user.role === 'Admin' || user.role === 'Teacher'">exemption</option> |         <option v-if="user.role === 'Admin' || user.role === 'Teacher'">{{ i18n("exemption") }}</option> | ||||||
|         <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">unregister</option> |         <option v-if="user.role === 'Admin' || user.role === 'InscriptionService'">{{ i18n("unregister") }}</option> | ||||||
|         <option>curriculum change</option> |         <option>{{ i18n("curriculumch") }}</option> | ||||||
|       </select> |       </select> | ||||||
|       <span style="margin-left: 5%"> |       <span style="margin-left: 5%"> | ||||||
|         Filter : |         {{ i18n("filter") }} | ||||||
|         <select v-model="filterType"> |         <select v-model="filterType"> | ||||||
|           <option>None</option> |           <option>None</option> | ||||||
|           <option>Pending</option> |           <option>Pending</option> | ||||||
| @ -84,67 +84,67 @@ | |||||||
|       </span> |       </span> | ||||||
|     </div> |     </div> | ||||||
|     <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests"> |     <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) && requestType !== 'exemption'"> |       <div class="bodu" style="width: 95%" v-if="(filterType == 'None' || filterType == item.state) && requestType !== i18n('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'"> |         <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 === i18n('inscription')"> | ||||||
|           <div class="date" v-if="item.submissionDate !== undefined">{{item.submissionDate.slice(0, 10)}}</div> |           <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="state" style="font-size: 80%">{{ i18n("approval") }} {{item.state}}</div> | ||||||
|           <div class="equivalencestate" style="font-size: 80%">Teacher approval : {{item.equivalenceState}}</div> |           <div class="equivalencestate" style="font-size: 80%">{{ i18n("teacherapproval") }} {{item.equivalenceState}}</div> | ||||||
|           <div class="surname">{{item.lastName}}</div> |           <div class="surname">{{item.lastName}}</div> | ||||||
|           <div class="firstname">{{item.firstName}}</div> |           <div class="firstname">{{item.firstName}}</div> | ||||||
|           <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div> |           <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div> | ||||||
|           <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div> |           <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div> | ||||||
|           <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div> |           <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div> | ||||||
|         </div> |         </div> | ||||||
|         <div class="container" style="grid-template-columns:25% 15% 15% 25% 14.2%;grid-template-areas:'date reqState studentfirstname studentlastname  infos';" v-if="requestType === 'scholarship'"> |         <div class="container" style="grid-template-columns:25% 15% 15% 25% 14.2%;grid-template-areas:'date reqState studentfirstname studentlastname  infos';" v-if="requestType === i18n('scholarship')"> | ||||||
|           <div class="date" v-if="item.date !== undefined"> {{item.date.slice(0,10)}}</div> |           <div class="date" v-if="item.date !== undefined"> {{item.date.slice(0,10)}}</div> | ||||||
|           <div class="studentfirstname">{{item.user.firstName}}</div> |           <div class="studentfirstname">{{item.user.firstName}}</div> | ||||||
|           <div class="studentlastname">{{item.user.lastName}}</div> |           <div class="studentlastname">{{item.user.lastName}}</div> | ||||||
|           <div class="reqState">{{item.state}}</div> |           <div class="reqState">{{item.state}}</div> | ||||||
|           <div class="infos" @click="windowsState = 3; targetId=item.id;"><button>More infos</button></div> |           <div class="infos" @click="windowsState = 3; targetId=item.id;"><button>{{ i18n("request.moreInfos") }}</button></div> | ||||||
|         </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="container" v-if="requestType === i18n('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="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div> | ||||||
|           <div class="studentfirstname">{{item.firstName}}</div> |           <div class="studentfirstname">{{item.firstName}}</div> | ||||||
|           <div class="studentlastname">{{item.lastName}}</div> |           <div class="studentlastname">{{item.lastName}}</div> | ||||||
|           <div class="regno">id : {{item.regNo}}</div> |           <div class="regno">id : {{item.regNo}}</div> | ||||||
|           <div class="reqState">{{item.state}}</div> |           <div class="reqState">{{item.state}}</div> | ||||||
|           <div class="infos"><button @click="windowsState=4;targetId=item.id">More infos</button></div> |           <div class="infos"><button @click="windowsState=4;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div> | ||||||
|         </div> |         </div> | ||||||
|         <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="container" v-if="requestType === i18n('curriculumch')" 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="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div> | ||||||
|           <div class="studentfirstname">{{item.user.firstName}}</div> |           <div class="studentfirstname">{{item.user.firstName}}</div> | ||||||
|           <div class="studentlastname">{{item.user.lastName}}</div> |           <div class="studentlastname">{{item.user.lastName}}</div> | ||||||
|           <div class="reqState">IS approval : {{item.state}}</div> |           <div class="reqState">{{ i18n("approval")}}{{item.state}}</div> | ||||||
|           <div class="teacherApproval">Teacher approval : {{item.teacherApprovalState}}</div> |           <div class="teacherApproval">{{ i18n("teacherapproval") }} : {{item.teacherApprovalState}}</div> | ||||||
|           <div class="infos"><button @click="windowsState=5;targetId=item.id">More infos</button></div> |           <div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div> | ||||||
|         </div> |         </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="bodu" v-if="(filterType == 'None' || filterType == item.state) && requestType === i18n('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="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="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div> | ||||||
|           <div class="studentfirstname">{{item.user.firstName}}</div> |           <div class="studentfirstname">{{item.user.firstName}}</div> | ||||||
|           <div class="studentlastname">{{item.user.lastName}}</div> |           <div class="studentlastname">{{item.user.lastName}}</div> | ||||||
|           <div class="course">{{item.course.title}}</div> |           <div class="course">{{item.course.title}}</div> | ||||||
|           <div class="reqState">{{item.state}}</div> |           <div class="reqState">{{item.state}}</div> | ||||||
|           <div class="infos"><button @click="windowsState=6;targetId=item.id">More infos</button></div> |           <div class="infos"><button @click="windowsState=6;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div> | ||||||
|         </div> |         </div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2"> |   <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2"> | ||||||
|     <p>Etes vous sur de vouloir accepter cette demande ?</p> |     <p>{{ i18n("surreq") }}</p> | ||||||
|     <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button> |     <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">{{ i18n("validate") }}</button> | ||||||
|     <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button> |     <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">{{ i18n("courses.back")}}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="windowsState === 3"> |   <div v-if="windowsState === 3"> | ||||||
|     <AboutScholarship :req-id="targetId"></AboutScholarship> |     <AboutScholarship :req-id="targetId"></AboutScholarship> | ||||||
|     <div> |     <div> | ||||||
|       <button style="margin-left: 31%; margin-top: 5%" @click="windowsState=0">Back</button> |       <button style="margin-left: 31%; margin-top: 5%" @click="windowsState=0">{{ i18n("courses.back")}}</button> | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="windowsState === 4"> |   <div v-if="windowsState === 4"> | ||||||
|     <AboutUnregister :req-id="targetId"></AboutUnregister> |     <AboutUnregister :req-id="targetId"></AboutUnregister> | ||||||
|     <button @click="windowsState=0">Back</button> |     <button @click="windowsState=0" style="margin-left: 31%">{{ i18n("courses.back")}}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div v-if="windowsState === 5"> |   <div v-if="windowsState === 5"> | ||||||
|     <AboutChangeCurriculum :req-id="targetId" v-model:window-state="windowsState"></AboutChangeCurriculum> |     <AboutChangeCurriculum :req-id="targetId" v-model:window-state="windowsState"></AboutChangeCurriculum> | ||||||
|  | |||||||
| @ -11,9 +11,9 @@ const paymentsList = await getAllPayments() | |||||||
|   <div style="display:flex; justify-content:center; " v-for="item in paymentsList"> |   <div style="display:flex; justify-content:center; " v-for="item in paymentsList"> | ||||||
|     <div class="bodu"> |     <div class="bodu"> | ||||||
|       <div class="container"> |       <div class="container"> | ||||||
|         <div class="regNo"><a style="margin-left:30px">RegNo : {{item.studentRegNo}}</a></div> |         <div class="regNo"><a style="margin-left:30px">{{ i18n("regNo") }} : {{item.studentRegNo}}</a></div> | ||||||
|         <div class="client"><a>Client : {{item.client}}</a></div> |         <div class="client"><a>Client : {{item.client}}</a></div> | ||||||
|         <div class="amount"><a>Amount : {{item.amount}}€</a></div> |         <div class="amount"><a>{{ i18n("amount")}} : {{item.amount}}€</a></div> | ||||||
|         <div class="date" style="margin-left: 10%">{{item.date.slice(0,10)}}</div> |         <div class="date" style="margin-left: 10%">{{item.date.slice(0,10)}}</div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ | |||||||
|   import {toast} from 'vue3-toastify' |   import {toast} from 'vue3-toastify' | ||||||
|   import 'vue3-toastify/dist/index.css'; |   import 'vue3-toastify/dist/index.css'; | ||||||
|   import {createExternalCurriculum} from "@/rest/externalCurriculum.js"; |   import {createExternalCurriculum} from "@/rest/externalCurriculum.js"; | ||||||
|   import ManageCourses from "@/Apps/ManageCourses.vue"; |  | ||||||
|   import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue"; |   import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue"; | ||||||
|  |  | ||||||
|   const loginPage= ref(true) |   const loginPage= ref(true) | ||||||
| @ -120,7 +119,7 @@ | |||||||
|               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a> |               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a> | ||||||
|             </div> |             </div> | ||||||
|             <div class="inputBox" style="margin-bottom:35px;"> |             <div class="inputBox" style="margin-bottom:35px;"> | ||||||
|               <input type="submit" v-model="submitValue"> |               <input v-model="submitValue" type="submit"> | ||||||
|             </div> |             </div> | ||||||
|           </form> |           </form> | ||||||
|         </div> |         </div> | ||||||
| @ -178,11 +177,10 @@ | |||||||
|               	<p>{{i18n("profile.picture").toUpperCase()}}</p> |               	<p>{{i18n("profile.picture").toUpperCase()}}</p> | ||||||
|               </form> |               </form> | ||||||
|               <label class="browser"> |               <label class="browser"> | ||||||
|                 Parcourir . . . |                 {{i18n("login.guest.browse")}} | ||||||
| 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*"> | 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*"> | ||||||
|               </label> |               </label> | ||||||
|               <form novalidate enctype="multipart/form-data" class="inputBox"> |               <form novalidate enctype="multipart/form-data" class="inputBox"> | ||||||
|               	<p>{{i18n("profile.picture").toUpperCase()}}</p> |  | ||||||
| 				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*"> | 				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*"> | ||||||
|               </form> |               </form> | ||||||
|               <div class="inputBox"> |               <div class="inputBox"> | ||||||
| @ -192,8 +190,7 @@ | |||||||
|                   </select> |                   </select> | ||||||
|               </div> |               </div> | ||||||
|               <p style="color:rgb(239,60,168);"> |               <p style="color:rgb(239,60,168);"> | ||||||
|                 Si vous êtes déja inscrits dans cette université veuillez vous connecter a votre compte et utilisez les fonctions |                 {{i18n("login.guest.disclaimer")}} | ||||||
|                 changer de cursus/réinscription sinon continuez ici. |  | ||||||
|               </p> |               </p> | ||||||
|               <div style="align-self:center;" class="inputBox"> |               <div style="align-self:center;" class="inputBox"> | ||||||
|                 <button style="margin-top:25px;" @click="page++;"> |                 <button style="margin-top:25px;" @click="page++;"> | ||||||
| @ -208,31 +205,30 @@ | |||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|             <div v-if="page === 2"> |             <div v-if="page === 2"> | ||||||
|               <p style="color:rgb(239,60,168);">Carte d'indentité :</p> |               <p style="color:rgb(239,60,168);">{{i18n("login.guest.identityCard")}}</p> | ||||||
|               <label class="browser"> |               <label class="browser"> | ||||||
|                 Parcourir . . . |                 {{i18n("login.guest.browse")}} | ||||||
|                 <input  type="file" @change="idcardfile = $event.target.files"> |                 <input  type="file" @change="idcardfile = $event.target.files"> | ||||||
|               </label> |               </label> | ||||||
|               <div v-if="curricula[outputs.curriculum-1].requireCertificate === true" style="margin-top: 3%; margin-bottom: 4%"> |               <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> |                 <p style="color:rgb(239,60,168);">{{ i18n("login.guest.attestationdisclaimer") }}</p> | ||||||
|                 <div style="margin-top: 2%"> |                 <div style="margin-top: 2%"> | ||||||
|                   <p style="color:rgb(239,60,168);">Attestation:</p> |                   <p style="color:rgb(239,60,168);">Attestation:</p> | ||||||
|                   <label class="browser"> |                   <label class="browser"> | ||||||
|                     Parcourir . . . |                     {{i18n("login.guest.browse")}} | ||||||
|                     <input  type="file" @change="justifcardfile = $event.target.files"> |                     <input  type="file" @change="justifcardfile = $event.target.files"> | ||||||
|                   </label> |                   </label> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <button @click="page++;">{{i18n("login.guest.nextpage")}}</button> |               <button @click="page++;" style="margin-top: 10%">{{i18n("login.guest.nextpage")}}</button> | ||||||
|  |  | ||||||
|             </div> |             </div> | ||||||
|             <div v-if="page === 3"> |             <div v-if="page === 3"> | ||||||
|               <p> |               <p style="color:rgb(239,60,168);margin-bottom: 5%"> | ||||||
|                 Vous avez séléctionné un cursus qui possède des prérequis veuillez ajouter vos formations antérieures |                 {{i18n("login.guest.formationdisclaimer")}} | ||||||
|                 dans l'enseignement supérieur, votre dossier sera vérifié par un membre du service d'inscription. |  | ||||||
|               </p> |               </p> | ||||||
|               <button @click="page++">Gèrer mon parcours extérieur</button> |               <button @click="page++">{{i18n("login.guest.managecareer")}}</button> | ||||||
|               <button @click="postRegisterReq();">Envoyer la demande d'inscription</button> |               <button @click="postRegisterReq();">{{ i18n("login.guest.sendRegReq") }}</button> | ||||||
|             </div> |             </div> | ||||||
|           </form> |           </form> | ||||||
|          </div> |          </div> | ||||||
| @ -240,7 +236,7 @@ | |||||||
|   </div> |   </div> | ||||||
|   <div v-if="page===4"> |   <div v-if="page===4"> | ||||||
|     <ExternalCurriculumList v-model="externalCurrTab" :mode="2"></ExternalCurriculumList> |     <ExternalCurriculumList v-model="externalCurrTab" :mode="2"></ExternalCurriculumList> | ||||||
|     <button style="margin-top: 2%;width: 5%; margin-left: 2%" @click="page--">Back</button> |     <button style="margin-top: 2%;width: 5%; margin-left: 2%" @click="page--">{{i18n("courses.back")}}</button> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
|  | |||||||
| @ -208,13 +208,13 @@ | |||||||
|             {{user.firstName}} {{user.lastName}}    |             {{user.firstName}} {{user.lastName}}    | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail: {{user.email}}       |             {{ i18n("login.guest.email") }}: {{user.email}} | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="user.role==='Student'"> |           <div v-if="user.role==='Student'"> | ||||||
|             RegNo :  {{user.regNo}} |             {{ i18n("regNo") }} :  {{user.regNo}} | ||||||
|           </div> |           </div> | ||||||
|           <div v-else> |           <div v-else> | ||||||
|             Role:  {{i18n((user.role))}}  |             {{ i18n("role") }}:  {{i18n((user.role))}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="windowState=1; setModify(user)"> {{i18n("profile.modify.data")}} </button> |             <button @click="windowState=1; setModify(user)"> {{i18n("profile.modify.data")}} </button> | ||||||
| @ -224,82 +224,84 @@ | |||||||
|           </div> |           </div> | ||||||
|           <div v-if="(user.role==='Student')"> |           <div v-if="(user.role==='Student')"> | ||||||
|             <button @click="windowState=2">{{i18n("profile.change.curriculum")}}</button> |             <button @click="windowState=2">{{i18n("profile.change.curriculum")}}</button> | ||||||
|             <button @click="windowState=12;refreshExtCurrList();" style="margin-left: 2%">Manage external curriculums</button> |             <button @click="windowState=12;refreshExtCurrList();" style="margin-left: 2%">{{ i18n("manageextcur") }}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="(user.role==='Student')"> |           <div v-if="(user.role==='Student')"> | ||||||
|             <button @click="windowState=4">Manage Courses</button> |             <button @click="windowState=4">{{ i18n("managecourse") }}</button> | ||||||
|             <button @click="windowState=5" style="margin-left: 2%">Manage minerval</button> |             <button @click="windowState=5" style="margin-left: 2%">{{ i18n("manageminerval") }}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 9" class="infosContainer"> |         <div v-else-if="windowState === 9" class="infosContainer"> | ||||||
|             <div v-if="sure !== 2">Please enter the reason you leave</div> |             <div v-if="sure !== 2">{{ i18n("enterreason") }}</div> | ||||||
|             <textarea v-if="sure !== 2" v-model="uninscriptionData.reason"></textarea> |             <textarea v-if="sure !== 2" v-model="uninscriptionData.reason"></textarea> | ||||||
|             <div v-if="sure !== 2"> |             <div v-if="sure !== 2"> | ||||||
|             I only want to unregister from a specific cursus |               {{i18n("onlycursus")}} | ||||||
|             <input type="checkbox" v-model="isChecked"> |             <input type="checkbox" v-model="isChecked"> | ||||||
|             </div> |             </div> | ||||||
|             <div v-if="sure !== 2 && isChecked"> |             <div v-if="sure !== 2 && isChecked"> | ||||||
|               Please select that cursus |               {{ i18n("plsselectcurs") }} | ||||||
|               <select v-model="uninscriptionData.curriculumId"> |               <select v-model="uninscriptionData.curriculumId"> | ||||||
|                 <option v-for="item in getActualCurriculumList()" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> |                 <option v-for="item in getActualCurriculumList()" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> | ||||||
|               </select> |               </select> | ||||||
|             </div> |             </div> | ||||||
|             <div v-if="sure !== 2"> |             <div v-if="sure !== 2"> | ||||||
|               <button @click="sure++">Submit</button> |               <button @click="sure++">{{ i18n("login.guest.submit") }}</button> | ||||||
|             </div> |             </div> | ||||||
|             <div v-if="sure==1"> |             <div v-if="sure==1"> | ||||||
|               Are you sure that you want to unregister ? |               {{ i18n("sureunreg") }} | ||||||
|               <button @click="addUninscReq(uninscriptionData.userId, uninscriptionData.reason, uninscriptionData.curriculumId);sure++">Yes</button> |               <button @click="addUninscReq(uninscriptionData.userId, uninscriptionData.reason, uninscriptionData.curriculumId);sure++">{{i18n("yes")}}</button> | ||||||
|               <button @click="sure=0">No</button> |               <button @click="sure=0">{{ i18n("no") }}</button> | ||||||
|             </div> |             </div> | ||||||
|             <p v-if="sure==2">You request has been send !</p> |             <p v-if="sure==2">{{ i18n("reqsend") }}</p> | ||||||
|  |         </div> | ||||||
|  |         <div v-if="windowState === 9"> | ||||||
|  |           <button @click="windowState=0">{{i18n("courses.back")}}</button> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 5" class="infosContainer"> |         <div v-else-if="windowState === 5" class="infosContainer"> | ||||||
|           <div v-if="minerv.value.toPay !== 0"> |           <div v-if="minerv.value.toPay !== 0"> | ||||||
|             Payment : {{minerv.value.toPay}}€ left to pay |             {{ i18n("payment") }} : {{minerv.value.toPay}}€ {{ i18n("lefttopay") }} | ||||||
|             <div v-if="minerv.value.paidAmount <= 50"> |             <div v-if="minerv.value.paidAmount <= 50"> | ||||||
|               <button @click="windowState=6; paymentAmount = 50">Pay deposit (50€)</button> |               <button @click="windowState=6; paymentAmount = 50">{{ i18n("paydeposit") }} (50€)</button> | ||||||
|             </div> |             </div> | ||||||
|             <div> |             <div> | ||||||
|               <button @click="windowState=6; paymentAmount = minerv.value.toPay">Pay all the rest ({{minerv.value.toPay}}€)</button> |               <button @click="windowState=6; paymentAmount = minerv.value.toPay">{{ i18n("payrest") }} ({{minerv.value.toPay}}€)</button> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
|           <div v-else> |           <div v-else> | ||||||
|             Payment : School fees have already been paid this year |             {{ i18n("alreadypaid") }} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="windowState=7">Ask for a scholarship</button> |             <button @click="windowState=7">{{ i18n("askscholarship") }}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|         <div v-if="windowState === 5"> |         <div v-if="windowState === 5"> | ||||||
|           <button @click="windowState=0">Back</button> |           <button @click="windowState=0">{{ i18n("courses.back") }}</button> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 7" class="infosContainer"> |         <div v-else-if="windowState === 7" class="infosContainer"> | ||||||
|           <p>Please upload the required documents</p> |           <p>{{i18n("uploaddocs")}}</p> | ||||||
|           <div> |           <div> | ||||||
|             Tax justification document : |             {{ i18n("taxjustdoc") }} | ||||||
|             <input type="file" @change="scholarshipData.taxDocUrl = $event.target.files"> |             <input type="file" @change="scholarshipData.taxDocUrl = $event.target.files"> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             Residency justification document : |             {{i18n("residencydoc")}} | ||||||
|             <input type="file" style="margin-top:2%" @change="scholarshipData.residencyDocUrl = $event.target.files"> |             <input type="file" style="margin-top:2%" @change="scholarshipData.residencyDocUrl = $event.target.files"> | ||||||
|           </div> |           </div> | ||||||
|           <button style="margin-top: 5%" @click="windowState=8;postScholarshipRequest(scholarshipData.taxDocUrl, 'JustificationDocument',scholarshipData.residencyDocUrl, 'JustificationDocument');">Submit scholarship request</button> |           <button style="margin-top: 5%" @click="windowState=8;postScholarshipRequest(scholarshipData.taxDocUrl, 'JustificationDocument',scholarshipData.residencyDocUrl, 'JustificationDocument');">{{i18n("login.guest.submit")}}</button> | ||||||
|         </div> |         </div> | ||||||
|         <div v-if="windowState === 7"> |         <div v-if="windowState === 7"> | ||||||
|           <button @click="windowState = 5">Back</button> |           <button @click="windowState = 5">{{ i18n("courses.back") }}</button> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 8" class="infosContainer"> |         <div v-else-if="windowState === 8" class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             Your request has been sent to the inscription service you will get notified when |             {{i18n("reqsent")}} | ||||||
|             the request is reviewed. |  | ||||||
|           </div> |           </div> | ||||||
|           <button @click="windowState = 0"> |           <button @click="windowState = 0"> | ||||||
|             Go back to profile |             {{ i18n("backprofile") }} | ||||||
|           </button> |           </button> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 6" class="infosContainer"> |         <div v-else-if="windowState === 6" class="infosContainer"> | ||||||
|           Proceed to payment of {{paymentAmount}}€ |           {{ i18n("procpayment") }} {{paymentAmount}}€ | ||||||
|           <div style="margin-top: 1%"> |           <div style="margin-top: 1%"> | ||||||
|             Client: |             Client: | ||||||
|             <input type="text" v-model="paymentData.client"> |             <input type="text" v-model="paymentData.client"> | ||||||
| @ -313,10 +315,10 @@ | |||||||
|             <input type="date" v-model="paymentData.expDate"> |             <input type="date" v-model="paymentData.expDate"> | ||||||
|           </div> |           </div> | ||||||
|           <div style="margin-top: 1%"> |           <div style="margin-top: 1%"> | ||||||
|             <button @click="windowState=5;paymentData.amount=paymentAmount;paymentData.date=new Date();postPayment(paymentData);minerv.value.toPay -= paymentAmount; minerv.value.paidAmount += paymentAmount; editMinerval(minerv.value)">Process Payment</button> |             <button @click="windowState=5;paymentData.amount=paymentAmount;paymentData.date=new Date();postPayment(paymentData);minerv.value.toPay -= paymentAmount; minerv.value.paidAmount += paymentAmount; editMinerval(minerv.value)">{{i18n("procpaybutton")}}</button> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click="windowState = 5">Back</button> |             <button @click="windowState = 5">{{ i18n("courses.back") }}</button> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 1" class="infosContainer"> |         <div v-else-if="windowState === 1" class="infosContainer"> | ||||||
| @ -325,7 +327,7 @@ | |||||||
|             <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*"> |             <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*"> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             E-mail:   |             {{ i18n("login.guest.email")}} | ||||||
|             <input type="email" v-model="toModify.email" /> |             <input type="email" v-model="toModify.email" /> | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
| @ -347,11 +349,11 @@ | |||||||
|         </div> |         </div> | ||||||
|         <div v-else-if="windowState === 2" class="infosContainer"> |         <div v-else-if="windowState === 2" class="infosContainer"> | ||||||
|           <div> |           <div> | ||||||
|             I would like to : |             {{ i18n("iwouldlike") }} | ||||||
|             <select v-model="reRegState"> |             <select v-model="reRegState"> | ||||||
|               <option :value="1">Reregister in the next year of one of my cursus</option> |               <option :value="1">{{ i18n("rereg") }}</option> | ||||||
|               <option :value="2">Register for a supplementary cursus</option> |               <option :value="2">{{ i18n("reregsup") }}</option> | ||||||
|               <option :value="3">Change from a cursus to another</option> |               <option :value="3">{{ i18n("chcur") }}</option> | ||||||
|             </select> |             </select> | ||||||
|           </div> |           </div> | ||||||
|           <div style="height:40px;" v-if="reRegState === 3"> |           <div style="height:40px;" v-if="reRegState === 3"> | ||||||
| @ -359,25 +361,25 @@ | |||||||
|             <select v-model="changecurrdata.actualcursus" style="margin-right: 3%"> |             <select v-model="changecurrdata.actualcursus" style="margin-right: 3%"> | ||||||
|               <option v-for="item in getActualCurriculumList()" style="font-size:20px;" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> |               <option v-for="item in getActualCurriculumList()" style="font-size:20px;" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> | ||||||
|             </select> |             </select> | ||||||
|             New Curriculum : |             {{ i18n("newcurr") }} : | ||||||
|             <select v-model="changecurrdata.newcursus"> |             <select v-model="changecurrdata.newcursus"> | ||||||
|               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> |               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> | ||||||
|             </select> |             </select> | ||||||
|           </div> |           </div> | ||||||
|           <div style="height:40px;" v-if="reRegState === 2"> |           <div style="height:40px;" v-if="reRegState === 2"> | ||||||
|             New Curriculum : |             {{ i18n("newcurr") }} : | ||||||
|             <select v-model="changecurrdata.newcursus"> |             <select v-model="changecurrdata.newcursus"> | ||||||
|               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> |               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> | ||||||
|             </select> |             </select> | ||||||
|           </div> |           </div> | ||||||
|           <div style="height:40px;" v-if="reRegState === 1"> |           <div style="height:40px;" v-if="reRegState === 1"> | ||||||
|             New Curriculum : |             {{ i18n("newcurr") }} : | ||||||
|             <select v-model="changecurrdata.newcursus" @change="getActualCurr(changecurrdata.newcursus);"> |             <select v-model="changecurrdata.newcursus" @change="getActualCurr(changecurrdata.newcursus);"> | ||||||
|               <option v-for="item in getCurriculumsNextYear()" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> |               <option v-for="item in getCurriculumsNextYear()" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option> | ||||||
|             </select> |             </select> | ||||||
|           </div> |           </div> | ||||||
|           <div v-if="curricula[changecurrdata.newcursus-1].year > 1 && reRegState !== 1"> |           <div v-if="curricula[changecurrdata.newcursus-1].year > 1 && reRegState !== 1"> | ||||||
|             The cursus you selected has some prerequisites |             {{i18n("cursusprereq")}} | ||||||
|           </div> |           </div> | ||||||
|           <div> |           <div> | ||||||
|             <button @click=" windowState = 0;postChangeCurrReq(changecurrdata);changecurrdata.actualcursus=null;changecurrdata.newcursus=1">{{i18n("courses.confirm")}}</button> |             <button @click=" windowState = 0;postChangeCurrReq(changecurrdata);changecurrdata.actualcursus=null;changecurrdata.newcursus=1">{{i18n("courses.confirm")}}</button> | ||||||
| @ -388,25 +390,25 @@ | |||||||
|       <div v-if="windowState === 0" class="moreInfos"> |       <div v-if="windowState === 0" class="moreInfos"> | ||||||
|         <div class = "oldcursus"> |         <div class = "oldcursus"> | ||||||
|             <div class="listTitle"> |             <div class="listTitle"> | ||||||
|               Anciens Cursus |               {{ i18n("oldcursus") }} | ||||||
|             </div> |             </div> | ||||||
|             <div  class="listElement"> |             <div  class="listElement"> | ||||||
|               <div class=" containerElement" v-for="item in UserCurriculum.curriculumList"> |               <div class=" containerElement" v-for="item in UserCurriculum.curriculumList"> | ||||||
|                 <div class="year" v-if="item.actual === false">Bac {{item.year}}</div> |                 <div class="year" v-if="item.actual === false">Bac {{item.year}}</div> | ||||||
|                 <div class="option" v-if="item.actual === false">{{item.option}}</div> |                 <div class="option" v-if="item.actual === false">{{item.option}}</div> | ||||||
|                 <div class="dateyear" v-if="item.actual === false">Année {{item.dateyear}}-{{item.dateyear+1}}</div> |                 <div class="dateyear" v-if="item.actual === false">{{ i18n("year") }} {{item.dateyear}}-{{item.dateyear+1}}</div> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
|           <div class="actualcursus"> |           <div class="actualcursus"> | ||||||
|             <div class="listTitle"> |             <div class="listTitle"> | ||||||
|               Cursus Actuel |               {{ i18n("newcurr") }} | ||||||
|             </div> |             </div> | ||||||
|             <div  class="listElement"> |             <div  class="listElement"> | ||||||
|               <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" > |               <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" > | ||||||
|                 <div class="year" v-if="item.actual === true">Bac {{item.year}}</div> |                 <div class="year" v-if="item.actual === true">Bac {{item.year}}</div> | ||||||
|                 <div class="option" v-if="item.actual === true">{{item.option}}</div> |                 <div class="option" v-if="item.actual === true">{{item.option}}</div> | ||||||
|                 <div class="dateyear" v-if="item.actual === true">Année {{item.dateyear}}-{{item.dateyear+1}}</div> |                 <div class="dateyear" v-if="item.actual === true">{{ i18n("year") }} {{item.dateyear}}-{{item.dateyear+1}}</div> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
| @ -418,7 +420,7 @@ | |||||||
|   </div> |   </div> | ||||||
|   <div v-if="windowState === 12"> |   <div v-if="windowState === 12"> | ||||||
|     <ExternalCurriculumList :ext-curr-list="extcurrlist" :mode="1"></ExternalCurriculumList> |     <ExternalCurriculumList :ext-curr-list="extcurrlist" :mode="1"></ExternalCurriculumList> | ||||||
|     <button @click="windowState = 0;refreshExtCurrList()" style="margin-left: 17%;margin-top: 3%">Back to profile</button> |     <button @click="windowState = 0;refreshExtCurrList()" style="margin-left: 17%;margin-top: 3%">{{ i18n("backprofile") }}</button> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
| <style scoped> | <style scoped> | ||||||
|  | |||||||
| @ -12,7 +12,7 @@ | |||||||
| <template style="margin-top:5%;"> | <template style="margin-top:5%;"> | ||||||
|   <div v-if="list === false"> |   <div v-if="list === false"> | ||||||
|     <AboutStudent :target=targetRegNo /> |     <AboutStudent :target=targetRegNo /> | ||||||
|     <button style="background-color:rgb(105,05,105);width:5%; margin-left: 10%;" @click="list = true;">Back</button> |     <button style="background-color:rgb(105,05,105);width:5%; margin-left: 10%;" @click="list = true;">{{ i18n("courses.back") }}</button> | ||||||
|   </div> |   </div> | ||||||
|   <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true"> |   <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true"> | ||||||
|     <div class="bodu"> |     <div class="bodu"> | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user