Requests Functionnal

This commit is contained in:
2024-04-19 23:59:30 +02:00
parent bd1c236635
commit 0ffc8077db
8 changed files with 85 additions and 29 deletions

View File

@ -83,7 +83,7 @@ async function setMoreInfos(item){
</select>
<button @click="AcceptMod = !AcceptMod;upPage(item.id,{local: chosenLocal, state:'Accepted'})"></button>
</div>
<template v-if="moreInfosMod" v-for="key,value in moreInfos">
<template v-if="moreInfosMod" v-for="(key,value) in moreInfos">
<div class="container" v-if="key != null" style="align-self:center;">
<div style="margin:0 auto 0 auto">

View File

@ -64,15 +64,15 @@ const pattern = {
const patternRequest ={
"user": user,
"user": user.regNo,
"state": "Pending",
"requestType": null,
"requestType": 0,
"lessonId":null,
"lessonType":null,
"lessonStart":null,
"lessonEnd":null,
"color":null,
"course":null,}
"course":0,}
const toModify = ref(Object.assign({}, pattern));
const requestBuffer = ref(Object.assign({},patternRequest));
@ -90,6 +90,7 @@ async function createLessonRequest(){
//modify
requestBuffer.value.color = colors[toModify.value.lessonType] ;
requestBuffer.value.requestType = requestType.value;
requestBuffer.value.course = toModify.value.course;
let start = createLessonEvent(toModify.value.day,toModify.value.lessonStart)
let end = createLessonEvent(toModify.value.day,toModify.value.lessonEnd)
for (let element in toModify.value){
@ -103,8 +104,9 @@ async function createLessonRequest(){
requestBuffer.value.lessonEnd = end;
}
}
}
else if(requestType.value === 2) {
else if(requestType.value === 2 || requestType.value === 1) {
//delete
requestBuffer.value.lessonId = editElementID;
requestBuffer.value.requestType = requestType.value;
@ -136,7 +138,7 @@ async function askChanges(i){
<div style="margin-bottom:20px;">
Lesson :
<select v-if="curriculum != null" v-model="toModify.course">
<option v-for="item in courses" :value='item'>{{item.title}}</option>
<option v-for="item in courses" :value='item.courseId'>{{item.title}}</option>
</select>
</div>
<div style="margin-bottom:20px;">
@ -160,7 +162,7 @@ async function askChanges(i){
<button class="create" @click="createMod=!createMod; askChanges(1);"> {{i18n("courses.confirm")}} </button>
<button class="create" @click="createMod=!createMod; askChanges(0);"> {{i18n("courses.confirm")}} </button>
<button style="float:right;" @click="createMod=!createMod">{{i18n("courses.back")}}</button>
</form>
</div>
@ -174,7 +176,7 @@ async function askChanges(i){
</button>
</div>
<div v-else>
<button @click="askChanges(0);"> {{i18n("courses.confirm")}} </button>
<button @click="askChanges(1);"> {{i18n("courses.confirm")}} </button>
<button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
</div>
<div class="listElement">

View File

@ -15,6 +15,8 @@ export async function createRequest(request){
}
export async function changeRequestState(id, infos){
console.log(infos)
console.log(await getLessonRequest(id))
return restPatch("/requests/lessonRequest/" + id, infos);
}