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

Show dates and datetimes in absences table

parent 772e22a9
No related branches found
No related tags found
1 merge request!31Show dates and datetimes in absences table
Pipeline #190479 passed with warnings
......@@ -17,7 +17,11 @@ import DateTimeField from "aleksis.core/components/generic/forms/DateTimeField.v
:default-item="defaultItem"
>
<template #datetimeStart="{ item }">
{{ $d(new Date(item.datetimeStart), "shortDateTime") }}
{{
item.datetimeStart
? $d($parseISODate(item.datetimeStart), "shortDateTime")
: $d($parseISODate(item.dateStart), "short")
}}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #datetimeStart.field="{ attrs, on, item }">
......@@ -33,7 +37,11 @@ import DateTimeField from "aleksis.core/components/generic/forms/DateTimeField.v
</template>
<template #datetimeEnd="{ item }">
{{ $d(new Date(item.datetimeEnd), "shortDateTime") }}
{{
item.datetimeEnd
? $d($parseISODate(item.datetimeEnd), "shortDateTime")
: $d($parseISODate(item.dateEnd), "short")
}}
</template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #datetimeEnd.field="{ attrs, on, item }">
......
......@@ -15,6 +15,8 @@ query absences($orderBy: [String], $filters: JSONString) {
comment
datetimeStart
datetimeEnd
dateStart
dateEnd
canEdit
canDelete
}
......@@ -38,6 +40,8 @@ mutation createAbsences($input: [BatchCreateAbsenceInput]!) {
comment
datetimeStart
datetimeEnd
dateStart
dateEnd
canEdit
canDelete
}
......@@ -68,6 +72,8 @@ mutation updateAbsences($input: [BatchPatchAbsenceInput]!) {
comment
datetimeStart
datetimeEnd
dateStart
dateEnd
canEdit
canDelete
}
......
......@@ -36,7 +36,16 @@ class AbsenceReasonType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
class AbsenceType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectType):
class Meta:
model = Absence
fields = ("id", "person", "reason", "comment", "datetime_start", "datetime_end")
fields = (
"id",
"person",
"reason",
"comment",
"datetime_start",
"datetime_end",
"date_start",
"date_end",
)
filter_fields = {
"person__full_name": ["icontains", "exact"],
"comment": ["icontains", "exact"],
......@@ -50,7 +59,15 @@ class AbsenceType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectType):
class AbsenceBatchCreateMutation(BaseBatchCreateMutation):
class Meta:
model = Absence
fields = ("person", "reason", "comment", "datetime_start", "datetime_end")
fields = (
"person",
"reason",
"comment",
"datetime_start",
"datetime_end",
"date_start",
"date_end",
)
optional_fields = ("comment", "reason")
permissions = ("kolego.create_absence_rule",)
......@@ -80,7 +97,16 @@ class AbsenceBatchDeleteMutation(BaseBatchDeleteMutation):
class AbsenceBatchPatchMutation(BaseBatchPatchMutation):
class Meta:
model = Absence
fields = ("id", "person", "reason", "comment", "datetime_start", "datetime_end")
fields = (
"id",
"person",
"reason",
"comment",
"datetime_start",
"datetime_end",
"date_start",
"date_end",
)
permissions = ("kolego.edit_absence_rule",)
@classmethod
......
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