tonitch/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Merge master part1

Browse Source
This commit is contained in:
Wawilski
2024-04-21 00:10:33 +02:00
parent 7cdbf6de74 c15ddccbb0
commit bc87748b31
106 changed files with 4878 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/Apps/Schedule.vue
View File

@ -1,11 +1,10 @@
<script setup>
import { ref } from 'vue'
import {getDifferenceTime,lastDateOfMonth,formatDate,getFirstDay,sortByDate,matrixFromList,sundayToTheEnd,getMarginTop,getHoursMinutes, monthFromList} from '../scheduleFunctions.js'
import {getAllSchedule, getOwnSchedule, getCurriculumSchedule} from "@/rest/scheduleRest.js";
import {getLessons, getOwnedLessons } from "@/rest/lessonSchedule.js"
import {getAllSchedule} from "@/rest/scheduleRest.js";
import {getOnesLessons, getOwnedLessons } from "@/rest/lessonSchedule.js"
import {isLogged, getSelf,getTeachers} from "@/rest/Users.js"
import {getAllCurriculums, getcurriculum} from "@/rest/curriculum.js"
const trueSchedule = ref()
const log = await isLogged();
const schedule = ref();
@ -42,9 +41,7 @@
}
if(user.role == "Student"){
trueSchedule.value = await getOwnSchedule();
ownSchedule.value = trueSchedule.value.lessons;
curriculum.value = trueSchedule.value.curriculum;}
ownSchedule.value = await getOnesLessons();}
schedule.value = ownSchedule.value;
@ -507,7 +504,7 @@
<div class="settings">
<div class="body" style="background-color:rgb(50,50,50);margin:5% 0 5% 0;">Settings</div>
<select @change="changeSchedule()" v-model="trueSchedule">
<option v-for="item in allSchedules" :value='item'>{{item.curriculum.option}}</option>
<option v-for="item in allSchedules" :value='item'>{{item.curriculum.option}}-{{item.curriculum.year}}</option>
</select>
<button v-if="display=='Week'" @click="display='Month'">Week</button>
<button v-if="display=='Month'" @click="display='Week'; value=1;">Month</button>