Merge branch '27-enable-creation-and-editing-of-absencereason-s-count-as-absent-prop' into 'master'

Resolve "Enable creation and editing of AbsenceReason's count-as-absent-prop"

Closes #27

See merge request !51

aleksis/apps/kolego/frontend/components/AbsenceReasons.vue

@@ -49,6 +49,27 @@ import AbsenceReasonTagsField from "./AbsenceReasonTagsField.vue";
         <color-field v-bind="attrs" v-on="on" />
       </template>
 
+      <template #countAsAbsent="{ item }">
+        <v-switch
+          :input-value="item.countAsAbsent"
+          disabled
+          inset
+          :false-value="false"
+          :true-value="true"
+        />
+      </template>
+      <!-- eslint-disable-next-line vue/valid-v-slot -->
+      <template #countAsAbsent.field="{ attrs, on }">
+        <v-switch
+          v-bind="attrs"
+          v-on="on"
+          inset
+          :false-value="false"
+          :true-value="true"
+          persistent-hint
+        />
+      </template>
+
       <template #default="{ item }">
         <v-switch
           :input-value="item.default"
@@ -110,6 +131,10 @@ export default {
           text: this.$t("kolego.absence_reason.colour"),
           value: "colour",
         },
+        {
+          text: this.$t("kolego.absence_reason.count_as_absent"),
+          value: "countAsAbsent",
+        },
         {
           text: this.$t("kolego.absence_reason.default"),
           value: "default",
@@ -128,6 +153,7 @@ export default {
         shortName: "",
         name: "",
         colour: "",
+        countAsAbsent: true,
         default: false,
       },
       required: [(value) => !!value || this.$t("forms.errors.required")],

aleksis/apps/kolego/frontend/components/absenceReasons.graphql

@@ -4,6 +4,7 @@ query absenceReasons($orderBy: [String], $filters: JSONString) {
     shortName
     name
     colour
+    countAsAbsent
     default
     canEdit
     canDelete
@@ -22,6 +23,7 @@ mutation createAbsenceReasons($input: [BatchCreateAbsenceReasonInput]!) {
       shortName
       name
       colour
+      countAsAbsent
       default
       canEdit
       canDelete
@@ -47,6 +49,7 @@ mutation updateAbsenceReasons($input: [BatchPatchAbsenceReasonInput]!) {
       shortName
       name
       colour
+      countAsAbsent
       default
       canEdit
       canDelete

aleksis/apps/kolego/frontend/messages/de.json

@@ -10,6 +10,7 @@
     "absence_reason": {
       "colour": "Farbe",
       "create": "Abwesenheitsgrund erstellen",
+      "count_as_absent": "Als abwesend zählen",
       "default": "Standard-Abwesenheits-Grund",
       "default_helptext": "Wird vorherigen Standard deaktivieren, wenn aktiviert",
       "menu_title": "Abwesenheitsgründe",

aleksis/apps/kolego/frontend/messages/en.json

@@ -15,6 +15,7 @@
       "short_name": "Short name",
       "name": "Name",
       "colour": "Colour",
+      "count_as_absent": "Count as absent",
       "default": "Default Absence Reason",
       "default_helptext": "Will disable previous default when enabled",
       "present": "Present",

aleksis/apps/kolego/schema/absence.py

@@ -31,7 +31,7 @@ class AbsenceReasonTagType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObject
 class AbsenceReasonType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectType):
     class Meta:
         model = AbsenceReason
-        fields = ("id", "short_name", "name", "colour", "default", "tags")
+        fields = ("id", "short_name", "name", "colour", "count_as_absent", "default", "tags")
         filter_fields = {
             "short_name": ["icontains", "exact"],
             "name": ["icontains", "exact"],
@@ -113,7 +113,7 @@ class AbsenceBatchPatchMutation(BaseBatchPatchMutation):
 class AbsenceReasonBatchCreateMutation(BaseBatchCreateMutation):
     class Meta:
         model = AbsenceReason
-        fields = ("short_name", "name", "colour", "default", "tags")
+        fields = ("short_name", "name", "colour", "count_as_absent", "default", "tags")
         optional_fields = ("name",)
         permissions = ("kolego.create_absencereason_rule",)
 
@@ -135,7 +135,7 @@ class AbsenceReasonBatchDeleteMutation(BaseBatchDeleteMutation):
 class AbsenceReasonBatchPatchMutation(BaseBatchPatchMutation):
     class Meta:
         model = AbsenceReason
-        fields = ("id", "short_name", "name", "colour", "default", "tags")
+        fields = ("id", "short_name", "name", "colour", "count_as_absent", "default", "tags")
         permissions = ("kolego.edit_absencereason_rule",)
 
     @classmethod