Skip to content
Snippets Groups Projects
Verified Commit eea6bf35 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix lint

parent 6a97051f
No related branches found
No related tags found
2 merge requests!10Resolve "Add model for planning of courses (dependend on ValidityRange)",!2Resolve "Frontend for Models"
Showing
with 44 additions and 30 deletions
......@@ -24,6 +24,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #weekday="{ item }">
{{ $t("weekdays." + item.weekday) }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #weekday.field="{ attrs, on }">
<div aria-required="true">
<week-day-field v-bind="attrs" v-on="on" :rules="required" required />
......@@ -33,6 +34,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #validityRange="{ item }">
{{ item.validityRange?.name }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #validityRange.field="{ attrs, on }">
<div aria-required="true">
<validity-range-field
......@@ -44,6 +46,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
</div>
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #period.field="{ attrs, on }">
<positive-small-integer-field v-bind="attrs" v-on="on" />
</template>
......@@ -51,6 +54,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #timeStart="{ item }">
{{ $d(new Date("1970-01-01T" + item.timeStart), "shortTime") }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #timeStart.field="{ attrs, on }">
<div aria-required="true">
<time-field v-bind="attrs" v-on="on" :rules="required" required />
......@@ -60,6 +64,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #timeEnd="{ item }">
{{ $d(new Date("1970-01-01T" + item.timeEnd), "shortTime") }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #timeEnd.field="{ attrs, on }">
<div aria-required="true">
<time-field v-bind="attrs" v-on="on" :rules="required" required />
......
......@@ -23,7 +23,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #course="{ item }">
{{ item.course.name }}
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-chip
:color="item.course.subject.colourFg"
v-on="on"
......@@ -38,6 +38,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<span>{{ item.course.subject.name }}</span>
</v-tooltip>
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #course.field="{ attrs, on }">
<v-autocomplete
:items="courses"
......@@ -52,10 +53,12 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<template #validityRange="{ item }">
{{ item.validityRange?.name }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #validityRange.field="{ attrs, on }">
<validity-range-field v-bind="attrs" v-on="on" :rules="required" />
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #scheduledSlotCount.field="{ attrs, on }">
<positive-small-integer-field
v-bind="attrs"
......@@ -65,9 +68,12 @@ import ValidityRangeField from "./ValidityRangeField.vue";
</template>
<template #teachers="{ item }">
<v-chip v-for="teacher in item.teachers">{{ teacher.fullName }}</v-chip
<v-chip v-for="teacher in item.teachers" :key="teacher.id">{{
teacher.fullName
}}</v-chip
>&nbsp;
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #teachers.field="{ attrs, on }">
<v-autocomplete
multiple
......
<script setup>
import WeekDayField from "aleksis.core/components/generic/forms/WeekDayField.vue";
import PositiveSmallIntegerField from "aleksis.core/components/generic/forms/PositiveSmallIntegerField.vue";
import TimeField from "aleksis.core/components/generic/forms/TimeField.vue";
import SaveButton from "aleksis.core/components/generic/buttons/SaveButton.vue";
import ValidityRangeField from "./ValidityRangeField.vue";
</script>
......@@ -36,9 +34,10 @@ import ValidityRangeField from "./ValidityRangeField.vue";
</v-toolbar>
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #item.subject="{ item, value }">
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-chip :color="value.colourFg" v-on="on" v-bind="attrs" outlined>
{{ value.shortName }}
</v-chip>
......@@ -51,7 +50,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
v-for="header in groupHeaders"
#[tableItemSlotName(header)]="{ item, value }"
>
<template v-for="(course, index) in value">
<div v-for="(course, index) in value" :key="index">
<v-row class="mt-2">
<v-col cols="6">
<positive-small-integer-field
......@@ -94,25 +93,23 @@ import ValidityRangeField from "./ValidityRangeField.vue";
>
<template #item="data">
<template v-if="typeof data.item !== 'object'">
<v-list-item-content
v-text="data.item"
></v-list-item-content>
<v-list-item-content>{{ data.item }}</v-list-item-content>
</template>
<template v-else>
<v-list-item-action>
<v-checkbox v-model="data.attrs.inputValue" />
</v-list-item-action>
<v-list-item-content>
<v-list-item-title
v-html="data.item.fullName"
></v-list-item-title>
<v-list-item-title>{{
data.item.fullName
}}</v-list-item-title>
</v-list-item-content>
</template>
</template>
</v-autocomplete>
</v-col>
</v-row>
</template>
</div>
</template>
</v-data-table>
</div>
......@@ -121,9 +118,7 @@ import ValidityRangeField from "./ValidityRangeField.vue";
<script>
import {
subjects,
timeboundCourseConfigs,
batchCreateTimeboundCourseConfig,
deleteTimeboundCourseConfig,
updateTimeboundCourseConfigs,
} from "./timeboundCourseConfig.graphql";
......@@ -240,7 +235,7 @@ export default {
input: mutationCombination.data,
},
})
.catch((error) => {});
.catch((error) => {}); // FIXME Error Handling
}
}
......
......@@ -22,6 +22,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
<template #schoolTerm="{ item }">
{{ item.schoolTerm.name }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #schoolTerm.field="{ attrs, on }">
<div aria-required="true">
<school-term-field
......@@ -37,6 +38,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
<template #dateStart="{ item }">
{{ $d(new Date(item.dateStart), "short") }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #dateStart.field="{ attrs, on, item }">
<div aria-required="true">
<date-field
......@@ -52,6 +54,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
<template #dateEnd="{ item }">
{{ $d(new Date(item.dateEnd), "short") }}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #dateEnd.field="{ attrs, on, item }">
<div aria-required="true">
<date-field
......
......@@ -18,6 +18,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
:get-patch-data="getPatchData"
return-object
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #schoolTerm.field="{ attrs, on }">
<div aria-required="true">
<school-term-field
......@@ -30,6 +31,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
</div>
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #dateStart.field="{ attrs, on, item }">
<div aria-required="true">
<date-field
......@@ -41,6 +43,7 @@ import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField
</div>
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #dateEnd.field="{ attrs, on, item }">
<div aria-required="true">
<date-field
......
......@@ -55,6 +55,7 @@
<v-hover
v-for="weekday in weekdays"
:key="weekday"
:style="{
gridColumn: weekday,
}"
......@@ -145,7 +146,7 @@
</v-card>
</v-hover>
<template v-for="slot in slots">
<div v-for="slot in slots" :key="slot.id">
<v-menu offset-y>
<template #activator="{ on, attrs }">
<slot-card
......@@ -170,7 +171,7 @@
</v-list-item>
</v-list>
</v-menu>
</template>
</div>
<delete-dialog
:gql-mutation="deleteMutation"
......@@ -204,7 +205,7 @@
<template #body>
<ul class="text-body-1">
<li v-for="item in itemsToDelete">
<li v-for="item in itemsToDelete" :key="item.id">
{{ $t("lesrooster." + item.model.toLowerCase() + ".repr", item) }}
</li>
</ul>
......@@ -214,20 +215,16 @@
</template>
<script>
import { createBreakSlot, deleteBreakSlots } from "../break.graphql";
import {
carryOverSlots,
slots,
createSlot,
deleteSlot,
deleteSlots,
updateSlots,
} from "../slot.graphql";
import { currentValidityRange } from "../validityRange.graphql";
import ValidityRangeField from "../ValidityRangeField.vue";
import DeleteDialog from "aleksis.core/components/generic/dialogs/DeleteDialog.vue";
import DeleteMultipleDialog from "aleksis.core/components/generic/dialogs/DeleteMultipleDialog.vue";
import SecondaryActionButton from "aleksis.core/components/generic/buttons/SecondaryActionButton.vue";
import SlotCard from "./SlotCard.vue";
import SlotCreator from "./SlotCreator.vue";
......@@ -238,7 +235,6 @@ export default {
DeleteDialog,
DeleteMultipleDialog,
SlotCard,
SecondaryActionButton,
ValidityRangeField,
},
apollo: {
......@@ -329,6 +325,7 @@ export default {
.map((slot) => slot.id);
// As there is an error when deleting breaks and normal slots in one action, we delete them separately
// FIXME NO ACtion
let that = this;
......
......@@ -60,7 +60,7 @@ export default defineComponent({
{{ subject.name }}
</v-card-title>
<v-card-subtitle class="color">
<span v-for="(teacher, index) in teachers">
<span v-for="(teacher, index) in teachers" :key="teacher.id">
<v-chip
:color="background"
@click="$emit('click:teacher', teacher)"
......@@ -69,7 +69,8 @@ export default defineComponent({
</v-chip>
</span>
·
<span v-for="(room, index) in lesson.rooms">
<span v-for="(room, index) in lesson.rooms" :key="room.id">
<!-- eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
<span v-if="index !== 0">, </span>
<v-chip :color="background" @click="$emit('click:room', room)">
{{ room.shortName }}
......
......@@ -17,7 +17,7 @@ import ValidityRangeField from "../ValidityRangeField.vue";
import validityRange from "../ValidityRange.vue";
import LessonCard from "./LessonCard.vue";
import { datetime, RRule } from "rrule";
import { RRule } from "rrule";
import TeacherTimeTable from "./timetables/TeacherTimeTable.vue";
import RoomTimeTable from "./timetables/RoomTimeTable.vue";
......@@ -519,12 +519,12 @@ export default defineComponent({
<v-col cols="12" lg="8" xl="9" class="align-self-start" id="grid">
<div id="weekdays">
<v-card v-for="weekday in weekdays">
<v-card v-for="weekday in weekdays" :key="weekday">
<v-card-text>{{ $t("weekdays." + weekday) }}</v-card-text>
</v-card>
</div>
<div id="periods">
<v-card v-for="period in periods">
<v-card v-for="(period, index) in periods" :key="period">
<v-card-text>{{ period }}</v-card-text>
</v-card>
</div>
......@@ -639,6 +639,7 @@ export default defineComponent({
@click:teacher="teacherClick"
@click:room="roomClick"
>
<!-- eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
{{ lessonsUsed[item.data.id] || 0 }}/{{
item.data.lessonQuota
}}
......
......@@ -85,12 +85,14 @@ export default defineComponent({
gridColumn: 'legend-day',
gridRow: `period-${period} / span 1`,
}"
:key="period"
>
<v-card-text>{{ period }}</v-card-text>
</v-card>
<v-card
v-for="weekday in weekdays"
:style="{ gridRow: 'legend-row', gridColumn: `${weekday} / span 1` }"
:key="weekday"
>
<v-card-text>{{ $t("weekdays." + weekday) }}</v-card-text>
</v-card>
......@@ -98,6 +100,7 @@ export default defineComponent({
v-for="lesson in lessons"
:lesson="lesson"
:style="styleForLesson(lesson)"
:key="lesson.id"
/>
</div>
</template>
......
......@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
dependencies = [
("sites", "0002_alter_domain_unique"),
("core", "0052_site_related_name"),
("cursus", "0003_add_course_lesson_quota"),
("cursus", "0001_initial"),
("lesrooster", "0001_initial"),
]
......
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