Skip to content
Snippets Groups Projects

Resolve "Frontend for Models"

Merged Julian requested to merge 1-frontend-for-models into master
Compare and Show latest version
14 files
+ 298
73
Compare changes
  • Side-by-side
  • Inline
Files
14
@@ -55,7 +55,10 @@
<v-hover
v-for="weekday in weekdays"
<<<<<<< HEAD
:key="weekday"
=======
>>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
:style="{
gridColumn: weekday,
}"
@@ -146,10 +149,14 @@
</v-card>
</v-hover>
<div v-for="slot in slots" :key="slot.id">
<template v-for="slot in slots">
<v-menu offset-y>
<template #activator="{ on, attrs }">
<slot-card
<<<<<<< HEAD
:key="slot.id"
=======
>>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
:item="slot"
:disabled="$apollo.queries.items.loading"
@click:delete="deleteSingularSlot"
@@ -171,7 +178,7 @@
</v-list-item>
</v-list>
</v-menu>
</div>
</template>
<delete-dialog
:gql-mutation="deleteMutation"
@@ -215,6 +222,10 @@
</template>
<script>
<<<<<<< HEAD
=======
import { createBreakSlot, deleteBreakSlots } from "../break.graphql";
>>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
import {
carryOverSlots,
slots,
@@ -235,6 +246,10 @@ export default {
DeleteDialog,
DeleteMultipleDialog,
SlotCard,
<<<<<<< HEAD
=======
SecondaryActionButton,
>>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
ValidityRangeField,
},
apollo: {
Loading