Merge branch 'master' into tonitch/front/manageCourses/LinkToBackend
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 1m56s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s

This commit is contained in:
2024-03-16 12:01:44 +01:00
25 changed files with 319 additions and 327 deletions

View File

@ -4,7 +4,7 @@
import { getCourses } from "@/rest/courses.js"
import { getTeachers } from "@/rest/Users.js"
const cursus = await getCourses()
const curriculum = await getCourses()
const profList = getTeachers()
@ -31,8 +31,8 @@
let toAdd = Object.assign({}, pattern);
function addToCourse (){
if (cursus.length>0){
toAdd.id=(cursus[cursus.length-1].id)-1;}
if (curriculum.length>0){
toAdd.id=(curriculum[curriculum.length-1].id)-1;}
else{
toAdd.id=0;
}
@ -43,7 +43,7 @@
}
}
if (!isnull){
cursus.push(toAdd);
curriculum.push(toAdd);
}
toAdd= Object.assign({},pattern);
}
@ -56,7 +56,7 @@
console.log("ok");
console.log(toRemove);
let rem=-1;
for(const [key, value] of Object.entries(cursus)){
for(const [key, value] of Object.entries(curriculum)){
console.log(key);
console.log(value)
if(value.name === toRemove){
@ -66,8 +66,8 @@
}
console.log(rem)
if (rem > -1){
cursus.splice(rem, 1);}
console.log(cursus);
curriculum.splice(rem, 1);}
console.log(curriculum);
}
</script>
@ -110,7 +110,7 @@
<div style="margin-bottom:20px;">
{{i18n("courses.toDelete")}} :
<select style="max-width:200px;" class="teacher" v-model="toRemove">
<option v-for="item in cursus">{{item.name}}</option>
<option v-for="item in curriculum">{{item.name}}</option>
</select>
</div>
@ -127,7 +127,7 @@
</form>
</div>
<div v-if="!createMod && !deleteMod" v-for="item in cursus" :key="item.name">
<div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.name">
<div style ="padding:15px 15px 15px 15px;">
<button v-if="editElementID !== item.name" @click="editElementID = item.name">
{{i18n("courses.modify")}}