PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Final commit of the extension
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m23s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
Details

Browse Source
This commit is contained in:
LeoMoulin
2024-04-21 18:24:58 +02:00
parent 43f3d66eb9
commit 9a5115f7fe
21 changed files with 162 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/src/Apps/Inscription/AboutRequest.vue
View File

@ -1,20 +1,23 @@
<script setup>
import i18n from "@/i18n.js"
import {getSelf, getUser} from '../../rest/Users.js'
import {getcurriculum} from "@/rest/curriculum.js";
import {getSelf} from '../../rest/Users.js'
import {getAllCurriculums, getcurriculum} from "@/rest/curriculum.js";
import {getRegisters} from "@/rest/ServiceInscription.js";
import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
import {ref} from "vue";
import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
import {editEquivalenceState} from "@/rest/requests.js";
import {editEquivalenceState, imposeCurriculum} from "@/rest/requests.js";
const curriculums = await getAllCurriculums()
const props = defineProps(['target']);
const request = await getRegisters(props.target);
const cursus = await getcurriculum(request.curriculum);
const user = await getSelf();
const list = ref(false);
const externalCurriculum = await getExternalCurriculumByInscrReq(request.id)
const impose = ref(false)
const imposeCurr = ref(0)
const imposed = ref(false)
//Get the parent page windowState to display the correct button
const windowState = defineModel("windowState")
@ -28,6 +31,10 @@ function getPP(){
async function editEquivalence(id, newstate){
await editEquivalenceState(id, newstate)
}
async function refreshCursus(){
cursus.value = await getcurriculum(request.curriculum)
}
</script>
<template>
@ -57,10 +64,10 @@ async function editEquivalence(id, newstate){
{{ i18n("WantedCursus") }} : BAB {{cursus.year}} {{cursus.option}}
</div>
<div style="margin-top: 3%">
<a :href="request.identityCard">{{ i18n("dlidentitycard") }}</a>
<button v-if="request.admissionDocUrl != null">{{ i18n("dladmissiondoc") }}</button>
<button><a :href="request.identityCard">{{ i18n("dlidentitycard") }}</a></button>
<button v-if="request.admissionDocUrl != null"><a :href="request.admissionDocUrl">{{ i18n("dladmissiondoc") }}</a></button>
</div>
<div v-if="cursus.year > 1">
<div v-if="externalCurriculum.length !== 0">
<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>
@ -73,9 +80,20 @@ async function editEquivalence(id, newstate){
<div v-if="list==true">
<ExternalCurriculumList :ext-curr-list="externalCurriculum" :mode="0"></ExternalCurriculumList>
<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'">{{i18n("acceptequiv")}}</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%" v-if="request.equivalenceState === 'Pending' && !impose" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">{{i18n("acceptequiv")}}</button>
<button style="margin-left: 2%;margin-right: 3%" v-if="request.equivalenceState === 'Pending' && !impose" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">{{i18n("refuseequiv")}}</button>
<div v-if="!imposed && request.equivalenceState !== 'Accepted'" style="margin-top: 3%;margin-left: 1%">
{{i18n("imposecurriculum")}}
<input type="checkbox" v-model="impose" v-if="!imposed">
<select v-if="impose" v-model="imposeCurr">
<option v-for="item in curriculums" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option>
</select>
</div>
<button v-if="impose && !imposed" style="margin-left: 2%" @click="imposeCurriculum(request.id, imposeCurr);request.equivalenceState='Accepted';imposed=true;">{{ i18n("impose") }}</button>
<div v-if="imposed">
{{ i18n("gotimposed") }}
</div>
<button style="margin-left: 2%" @click="list=false;refreshCursus()">{{ i18n("courses.back") }}</button>
</div>
</div>
</template>