Skip to content
Snippets Groups Projects
Verified Commit 0face6f9 authored by permcu's avatar permcu Committed by Jonathan Weth
Browse files

Implement time-field

parent f25e699b
No related branches found
No related tags found
1 merge request!373Resolve "Substitutions table for new data model"
......@@ -23,6 +23,22 @@ import CRUDList from "aleksis.core/components/generic/CRUDList.vue";
v-for="g in oldGroups"
> {{ g.shortName }} </span>
</template>
<template #time="{ item: { startSlot, endSlot, startTime, endTime } }">
<span v-if="startSlot && endSlot && startSlot === endSlot">
{{ startSlot }}.
</span>
<span v-else-if="startSlot && endSlot">
{{ startSlot }}.–{{ endSlot }}.
</span>
<span v-else-if="startTime && endTime">
{{ $d(new Date(startTime), "shortTime") }}
{{ $d(new Date(endTime), "shortTime")}}
</span>
<span v-else>
TODO 18n all day
</span>
</template>
</c-r-u-d-list>
</template>
......
......@@ -132,8 +132,8 @@ class SubstitutionType(graphene.ObjectType):
new_groups = graphene.List(GroupType)
start_slot = graphene.Int()
end_slot = graphene.Int()
start_time = graphene.Time()
end_time = graphene.Time()
start_time = graphene.DateTime()
end_time = graphene.DateTime()
old_teachers = graphene.List(PersonType)
new_teachers = graphene.List(PersonType)
old_subject = graphene.String()
......@@ -163,10 +163,10 @@ class SubstitutionType(graphene.ObjectType):
return root['REFERENCE_OBJECT'].slot_number_end
def resolve_start_time(root, info):
return root['DTSTART'].dt.time()
return root['DTSTART'].dt
def resolve_end_time(root, info):
return root['DTEND'].dt.time()
return root['DTEND'].dt
def resolve_old_teachers(root,info):
le = root['REFERENCE_OBJECT']
......
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