Skip to content
Snippets Groups Projects
Commit 098834b7 authored by Julian's avatar Julian
Browse files

Replace validityRange with timeGrid in Mini plans

parent f2032a84
No related branches found
No related tags found
Loading
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import { slots } from "../../breaks_and_slots/slot.graphql"; import { slots } from "../../breaks_and_slots/slot.graphql";
import LessonCard from "../LessonCard.vue"; import LessonCard from "../LessonCard.vue";
import MessageBox from "aleksis.core/components/generic/MessageBox.vue";
export default defineComponent({ export default defineComponent({
name: "MiniTimeTable", name: "MiniTimeTable",
components: { LessonCard }, components: { LessonCard, MessageBox },
props: { props: {
validityRange: { timeGrid: {
type: Object, type: Object,
required: true, required: true,
}, },
...@@ -24,12 +25,12 @@ export default defineComponent({ ...@@ -24,12 +25,12 @@ export default defineComponent({
variables() { variables() {
return { return {
filters: JSON.stringify({ filters: JSON.stringify({
validity_range: this.validityRange.id, time_grid: this.timeGrid.id,
}), }),
}; };
}, },
skip() { skip() {
return this.validityRange === null; return this.timeGrid === null;
}, },
update: (data) => data.items, update: (data) => data.items,
result({ data: { items } }) { result({ data: { items } }) {
...@@ -79,6 +80,8 @@ export default defineComponent({ ...@@ -79,6 +80,8 @@ export default defineComponent({
<template> <template>
<div class="timetable"> <div class="timetable">
<!-- Empty div to fill top-left corner -->
<div></div>
<v-card <v-card
v-for="period in periods" v-for="period in periods"
:style="{ :style="{
...@@ -102,6 +105,13 @@ export default defineComponent({ ...@@ -102,6 +105,13 @@ export default defineComponent({
:style="styleForLesson(lesson)" :style="styleForLesson(lesson)"
:key="lesson.id" :key="lesson.id"
/> />
<message-box type="info" v-if="!lessons || lessons.length === 0">
{{ $t("lesrooster.timetable_management.no_lessons") }}
</message-box>
<message-box type="warning" v-if="!slots || slots.length === 0">
{{ $t("lesrooster.timetable_management.no_slots") }}
</message-box>
</div> </div>
</template> </template>
......
...@@ -22,12 +22,12 @@ export default defineComponent({ ...@@ -22,12 +22,12 @@ export default defineComponent({
query: lessonsRoom, query: lessonsRoom,
variables() { variables() {
return { return {
validityRange: this.validityRange.id, timeGrid: this.timeGrid.id,
room: this.roomId, room: this.roomId,
}; };
}, },
skip() { skip() {
return this.validityRange === null; return this.timeGrid === null;
}, },
}, },
}, },
......
...@@ -22,12 +22,12 @@ export default defineComponent({ ...@@ -22,12 +22,12 @@ export default defineComponent({
query: lessonsTeacher, query: lessonsTeacher,
variables() { variables() {
return { return {
validityRange: this.validityRange.id, timeGrid: this.timeGrid.id,
teacher: this.teacherId, teacher: this.teacherId,
}; };
}, },
skip() { skip() {
return this.validityRange === null; return this.timeGrid === null;
}, },
}, },
}, },
......
query lessonsTeacher($teacher: ID!, $validityRange: ID!) { query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
lessonsTeacher: lessonObjectsForTeacher( lessonsTeacher: lessonObjectsForTeacher(
teacher: $teacher teacher: $teacher
validityRange: $validityRange timeGrid: $timeGrid
) { ) {
id id
slotStart { slotStart {
...@@ -56,10 +56,10 @@ query lessonsTeacher($teacher: ID!, $validityRange: ID!) { ...@@ -56,10 +56,10 @@ query lessonsTeacher($teacher: ID!, $validityRange: ID!) {
} }
} }
query lessonsRoom($room: ID!, $validityRange: ID!) { query lessonsRoom($room: ID!, $timeGrid: ID!) {
lessonsRoom: lessonObjectsForRoom( lessonsRoom: lessonObjectsForRoom(
room: $room room: $room
validityRange: $validityRange timeGrid: $timeGrid
) { ) {
id id
slotStart { slotStart {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment