Merge branch 'master' into manage-holidays

CHANGELOG.rst

@@ -9,6 +9,8 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Changes
+=======
 The "managed models" feature is mandatory for all models derived from `ExtensibleModel`
 and requires creating a migration for all downstream models to add the respective
 field.
@@ -17,10 +19,14 @@ Added
 ~~~~~
 
 * Frontend for managing rooms.
+* Global calendar system
+* Calendar for birthdays of persons
+* Holiday model to track information about holidays.
 * [Dev] Components for implementing standard CRUD operations in new frontend.
 * [Dev] Options for filtering and sorting of GraphQL queries at the server.
 * [Dev] Managed models for instances handled by other apps.
 * [Dev] Upload slot sytem for out-of-band uploads in GraphQL clients
+* Generic endpoint for retrieving objects as JSON
 
 Changed
 ~~~~~~~
@@ -34,6 +40,7 @@ Fixed
   in an incomplete AlekSIS frontend app.
 * GraphQL mutations did not return errors in case of exceptions.
 * Rendering of "simple" PDF templates failed when used with S3 storage.
+* Log messages on some loggers did not contain log message
 
 `3.1.2`_ - 2023-07-05
 ---------------------

aleksis/core/frontend/app/vuetify.js

@@ -28,7 +28,7 @@ const vuetifyOpts = {
       filterEmpty: "mdi-filter-outline",
       filterSet: "mdi-filter",
       send: "mdi-send-outline",
-      holidays: "mdi-calendar-weekend-outline"
+      holidays: "mdi-calendar-weekend-outline",
     },
   },
 };

aleksis/core/frontend/components/calendar/BaseCalendarFeedDetails.vue

@@ -3,7 +3,9 @@
     v-model="model"
     :close-on-content-click="false"
     :activator="selectedElement"
-    offset-x
+    :offset-x="calendarType !== 'day'"
+    min-width="350px"
+    :offset-y="calendarType === 'day'"
   >
     <v-card min-width="350px" flat>
       <v-toolbar :color="color || selectedEvent.color" dark dense>
@@ -26,13 +28,31 @@
           </v-list-item-icon>
           <v-list-item-content>
             <v-list-item-title>
-              <span v-if="selectedEvent.start !== selectedEvent.end">
+              <span
+                v-if="
+                  selectedEvent.allDay &&
+                  selectedEvent.start.getTime() === selectedEvent.end.getTime()
+                "
+              >
+                {{ $d(selectedEvent.start, "short") }}
+              </span>
+              <span v-else-if="selectedEvent.allDay">
+                {{ $d(selectedEvent.start, "short") }} –
+                {{ $d(selectedEvent.end, "short") }}
+              </span>
+              <span
+                v-else-if="
+                  dateWithoutTime(selectedEvent.start).getTime() ===
+                  dateWithoutTime(selectedEvent.end).getTime()
+                "
+              >
                 {{ $d(selectedEvent.start, "shortDateTime") }} –
-                {{ $d(selectedEvent.end, "shortDateTime") }}
+                {{ $d(selectedEvent.end, "shortTime") }}
               </span>
               <span v-else>
-                {{ $d(selectedEvent.start, "shortDateTime") }}</span
-              >
+                {{ $d(selectedEvent.start, "shortDateTime") }} –
+                {{ $d(selectedEvent.end, "shortDateTime") }}
+              </span>
             </v-list-item-title>
           </v-list-item-content>
         </v-list-item>
@@ -63,5 +83,12 @@ export default {
   name: "BaseCalendarFeedDetails",
   components: { CancelledCalendarStatusChip },
   mixins: [calendarFeedDetailsMixin],
+  methods: {
+    dateWithoutTime(d) {
+      d = new Date(d);
+      d.setHours(0, 0, 0, 0);
+      return d;
+    },
+  },
 };
 </script>

aleksis/core/frontend/components/calendar/BaseCalendarFeedEventBar.vue

 <template>
   <div
     class="text-truncate"
-    :class="{ 'text-decoration-line-through': event.status === 'CANCELLED', 'mx-1': withPadding }"
+    :class="{
+      'text-decoration-line-through': event.status === 'CANCELLED',
+      'mx-1': withPadding,
+    }"
     :style="{ height: '100%' }"
   >
     <slot name="time" v-bind="$props">
@@ -9,9 +12,10 @@
         v-if="
           calendarType === 'month' && eventParsed.start.hasTime && !withoutTime
         "
-        class="mr-1 font-weight-bold"
-        >{{ eventParsed.start.time }}</span
+        class="mr-1 font-weight-bold ml-1"
       >
+        {{ eventParsed.start.time }}
+      </span>
     </slot>
     <slot name="icon" v-bind="$props">
       <v-icon v-if="icon" x-small color="white" class="mx-1 left">
@@ -31,13 +35,13 @@ import calendarFeedEventBarMixin from "../../mixins/calendarFeedEventBar.js";
 export default {
   name: "BaseCalendarFeedEventBar",
   mixins: [calendarFeedEventBarMixin],
-    props: {
-      withPadding: {
-        required: false,
-        type: Boolean,
-        default: true,
+  props: {
+    withPadding: {
+      required: false,
+      type: Boolean,
+      default: true,
     },
-            icon: {
+    icon: {
       required: false,
       type: String,
       default: "",
@@ -47,6 +51,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    }
+  },
 };
 </script>

aleksis/core/frontend/components/calendar/CalendarControlBar.vue

+<script>
+export default {
+  name: "CalendarControlBar",
+  emits: ["prev", "next", "today"],
+};
+</script>
+
+<template>
+  <div class="d-flex justify-center">
+    <v-btn icon class="mx-2" @click="$emit('prev')">
+      <v-icon>mdi-chevron-left</v-icon>
+    </v-btn>
+    <v-btn outlined text class="mx-2" @click="$emit('today')">
+      <v-icon left>mdi-calendar-today-outline</v-icon>
+      {{ $t("calendar.today") }}
+    </v-btn>
+    <v-btn icon class="mx-2" @click="$emit('next')">
+      <v-icon>mdi-chevron-right</v-icon>
+    </v-btn>
+  </div>
+</template>

aleksis/core/frontend/components/calendar/CalendarOverview.vue

 <template>
   <div class="mt-4 mb-4">
     <v-skeleton-loader
-      v-if="$apollo.queries.calendarFeeds.loading && calendarFeeds.length === 0"
+      v-if="
+        $apollo.queries.calendar.loading && calendar.calendarFeeds.length === 0
+      "
       type="date-picker-options, actions"
     />
     <div v-else>
@@ -12,28 +14,21 @@
         {{ $refs.calendar.title }}
       </h1>
       <v-row align="stretch">
-        <v-col
-          cols="12"
-          sm="4"
-          lg="3"
-          xl="2"
-          align-self="center"
-          class="d-flex justify-center"
-        >
-          <v-btn icon class="mx-2" @click="$refs.calendar.prev()">
-            <v-icon>mdi-chevron-left</v-icon>
-          </v-btn>
-          <v-btn outlined text class="mx-2" @click="calendarFocus = ''">
-            <v-icon left>mdi-calendar-today-outline</v-icon>
-            {{ $t("calendar.today") }}
-          </v-btn>
-          <v-btn icon class="mx-2" @click="$refs.calendar.next()">
-            <v-icon>mdi-chevron-right</v-icon>
-          </v-btn>
+        <!-- Control bar with prev, next and today buttons -->
+        <v-col cols="12" sm="4" lg="3" xl="2" align-self="center">
+          <calendar-control-bar
+            @prev="$refs.calendar.prev()"
+            @next="$refs.calendar.next()"
+            @today="calendarFocus = new Date()"
+          />
         </v-col>
+
+        <!-- Calendar title with current calendar time range -->
         <v-col v-if="$vuetify.breakpoint.lgAndUp" align-self="center">
           <h1 class="mx-2" v-if="$refs.calendar">{{ $refs.calendar.title }}</h1>
         </v-col>
+
+        <!-- Button menu for selecting currently active calendars (only tablets/mobile) -->
         <v-col
           v-if="$vuetify.breakpoint.mdAndDown"
           cols="12"
@@ -47,11 +42,15 @@
           >
             <calendar-select
               v-model="selectedCalendarFeedNames"
-              :calendar-feeds="calendarFeeds"
+              :calendar-feeds="calendar.calendarFeeds"
+              @input="storeActivatedCalendars"
             />
           </button-menu>
         </v-col>
+
         <v-spacer v-if="$vuetify.breakpoint.lgAndUp" />
+
+        <!-- Calendar type select (month, week, day) -->
         <v-col
           cols="12"
           sm="4"
@@ -59,36 +58,43 @@
           align-self="center"
           :align="$vuetify.breakpoint.smAndUp ? 'right' : 'center'"
         >
-          <v-btn-toggle dense v-model="currentCalendarType" class="mx-2">
-            <v-btn
-              v-for="calendarType in availableCalendarTypes"
-              :value="calendarType.type"
-              :key="calendarType.type"
-            >
-              <span class="hidden-sm-and-down">{{
-                nameForMenu(calendarType)
-              }}</span>
-              <v-icon :right="$vuetify.breakpoint.mdAndUp">{{
-                "mdi-" + calendarType.icon
-              }}</v-icon>
-            </v-btn>
-          </v-btn-toggle>
+          <calendar-type-select v-model="currentCalendarType" />
         </v-col>
       </v-row>
       <v-row>
         <v-col v-if="$vuetify.breakpoint.lgAndUp" lg="3" xl="2">
-          <v-list flat>
+          <!-- Mini date picker -->
+          <v-date-picker
+            no-title
+            v-model="calendarFocus"
+            :style="{ margin: '0px -8px' }"
+            :first-day-of-week="1"
+          ></v-date-picker>
+
+          <!-- Calendar select (only desktop) -->
+          <v-list flat subheader>
+            <v-subheader>
+              {{ $t("calendar.my_calendars") }}
+            </v-subheader>
             <calendar-select
+              class="mb-4"
               v-model="selectedCalendarFeedNames"
-              :calendar-feeds="calendarFeeds"
+              :calendar-feeds="calendar.calendarFeeds"
+              @input="storeActivatedCalendars"
             />
+            <v-btn depressed block v-if="calendar" :href="calendar.allFeedsUrl">
+              <v-icon left>mdi-download-outline</v-icon>
+              {{ $t("calendar.download_all") }}
+            </v-btn>
           </v-list>
         </v-col>
+
+        <!-- Actual calendar -->
         <v-col lg="9" xl="10">
           <v-sheet height="600">
             <v-expand-transition>
               <v-progress-linear
-                v-if="$apollo.queries.calendarFeeds.loading"
+                v-if="$apollo.queries.calendar.loading"
                 indeterminate
               />
             </v-expand-transition>
@@ -115,11 +121,12 @@
               </template>
             </v-calendar>
             <component
-              v-if="calendarFeeds && selectedEvent"
+              v-if="calendar && calendar.calendarFeeds && selectedEvent"
               :is="detailComponentForFeed(selectedEvent.calendarFeedName)"
               v-model="selectedOpen"
               :selected-element="selectedElement"
               :selected-event="selectedEvent"
+              :calendar-type="currentCalendarType"
             />
           </v-sheet>
         </v-col>
@@ -140,51 +147,46 @@ import {
 } from "aleksisAppImporter";
 
 import gqlCalendarOverview from "./calendarOverview.graphql";
+import gqlSetCalendarStatus from "./setCalendarStatus.graphql";
+import CalendarControlBar from "./CalendarControlBar.vue";
+import CalendarTypeSelect from "./CalendarTypeSelect.vue";
 
 export default {
   name: "CalendarOverview",
   components: {
+    CalendarTypeSelect,
+    CalendarControlBar,
     ButtonMenu,
     CalendarSelect,
   },
   data() {
     return {
       calendarFocus: "",
-      calendarFeeds: [],
+      calendar: {
+        calendarFeeds: [],
+      },
       selectedCalendarFeedNames: [],
       currentCalendarType: "week",
       selectedEvent: {},
       selectedElement: null,
       selectedOpen: false,
-      availableCalendarTypes: [
-        {
-          type: "month",
-          translationKey: "calendar.month",
-          icon: "calendar-month-outline",
-        },
-        {
-          type: "week",
-          translationKey: "calendar.week",
-          icon: "calendar-week-outline",
-        },
-        {
-          type: "day",
-          translationKey: "calendar.day",
-          icon: "calendar-today-outline",
-        },
-      ],
       fetchedDateRange: { start: null, end: null },
     };
   },
   apollo: {
-    calendarFeeds: {
+    calendar: {
       query: gqlCalendarOverview,
       skip: true,
+      result({ data }) {
+        this.selectedCalendarFeedNames = data.calendar.calendarFeeds
+          .filter((c) => c.activated)
+          .map((c) => c.name);
+      },
     },
   },
   computed: {
     events() {
-      return this.calendarFeeds
+      return this.calendar.calendarFeeds
         .filter((c) => this.selectedCalendarFeedNames.includes(c.name))
         .flatMap((cf) =>
           cf.feed.events.map((event) => ({
@@ -201,9 +203,6 @@ export default {
     },
   },
   methods: {
-    nameForMenu: function (item) {
-      return this.$t(item.translationKey);
-    },
     viewDay({ date }) {
       this.calendarFocus = date;
       this.currentCalendarType = "day";
@@ -228,7 +227,7 @@ export default {
     },
     detailComponentForFeed(feedName) {
       if (
-        this.calendarFeeds &&
+        this.calendar.calendarFeeds &&
         feedName &&
         Object.keys(calendarFeedDetailComponents).includes(feedName + "details")
       ) {
@@ -238,7 +237,7 @@ export default {
     },
     eventBarComponentForFeed(feedName) {
       if (
-        this.calendarFeeds &&
+        this.calendar.calendarFeeds &&
         feedName &&
         Object.keys(calendarFeedEventBarComponents).includes(
           feedName + "eventbar"
@@ -251,6 +250,15 @@ export default {
     getColorForEvent(event) {
       return event.color;
     },
+    storeActivatedCalendars() {
+      // Store currently activated calendars in the backend
+      this.$apollo.mutate({
+        mutation: gqlSetCalendarStatus,
+        variables: {
+          calendars: this.selectedCalendarFeedNames,
+        },
+      });
+    },
     fetchMoreCalendarEvents({ start, end }) {
       // Get the start and end dates of the current date range shown in the calendar
       let extendedStart = this.$refs.calendar.getStartOfWeek(start).date;
@@ -259,15 +267,15 @@ export default {
       let olderStart = extendedStart < this.fetchedDateRange.start;
       let youngerEnd = extendedEnd > this.fetchedDateRange.end;
 
-      if (this.calendarFeeds.length === 0) {
+      if (this.calendar.calendarFeeds.length === 0) {
         // No calendar feeds have been fetched yet,
         // so fetch all events in the current date range
 
-        this.$apollo.queries.calendarFeeds.setVariables({
+        this.$apollo.queries.calendar.setVariables({
           start: extendedStart,
           end: extendedEnd,
         });
-        this.$apollo.queries.calendarFeeds.skip = false;
+        this.$apollo.queries.calendar.skip = false;
         this.fetchedDateRange = { start: extendedStart, end: extendedEnd };
       } else if (olderStart || youngerEnd) {
         // Define newly fetched date range
@@ -278,14 +286,14 @@ export default {
         let fetchStart = olderStart ? extendedStart : this.fetchedDateRange.end;
         let fetchEnd = youngerEnd ? extendedEnd : this.fetchedDateRange.start;
 
-        this.$apollo.queries.calendarFeeds.fetchMore({
+        this.$apollo.queries.calendar.fetchMore({
           variables: {
             start: fetchStart,
             end: fetchEnd,
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
-            let previousCalendarFeeds = previousResult.calendarFeeds;
-            let newCalendarFeeds = fetchMoreResult.calendarFeeds;
+            let previousCalendarFeeds = previousResult.calendar.calendarFeeds;
+            let newCalendarFeeds = fetchMoreResult.calendar.calendarFeeds;
 
             previousCalendarFeeds.forEach((calendarFeed, i, calendarFeeds) => {
               // Get all events except those that are updated
@@ -300,7 +308,10 @@ export default {
               ];
             });
             return {
-              calendarFeeds: previousCalendarFeeds,
+              calendar: {
+                ...previousResult.calendar,
+                calendarFeeds: previousCalendarFeeds,
+              },
             };
           },
         });

aleksis/core/frontend/components/calendar/CalendarSelect.vue

 <template>
   <v-list-item-group multiple v-model="model">
-    <v-subheader>
-      <v-checkbox
-        :label="$t('actions.select_all')"
-        :indeterminate="someSelected"
-        :input-value="allSelected"
-        @change="toggleAll"
-      />
-    </v-subheader>
     <v-list-item
       v-for="calendarFeed in calendarFeeds"
       :key="calendarFeed.name"
@@ -15,13 +7,12 @@
     >
       <template #default="{ active }">
         <v-list-item-action>
-          <v-checkbox :input-value="active"></v-checkbox>
+          <v-checkbox
+            :input-value="active"
+            :color="calendarFeed.color"
+          ></v-checkbox>
         </v-list-item-action>
 
-        <v-list-item-icon>
-          <v-icon class="mr-2" :color="calendarFeed.color"> mdi-circle </v-icon>
-        </v-list-item-icon>
-
         <v-list-item-content>
           <v-list-item-title>
             {{ calendarFeed.verboseName }}
@@ -29,10 +20,23 @@
         </v-list-item-content>
 
         <v-list-item-action>
-          <copy-to-clipboard-button
-            :text="calendarFeed.url"
-            :tooltip-help-text="$t('calendar.ics_to_clipboard')"
-          />
+          <v-menu bottom>
+            <template v-slot:activator="{ on, attrs }">
+              <v-btn fab x-small icon v-bind="attrs" v-on="on">
+                <v-icon>mdi-dots-vertical</v-icon>
+              </v-btn>
+            </template>
+            <v-list dense>
+              <v-list-item :href="calendarFeed.url">
+                <v-list-item-icon>
+                  <v-icon>mdi-calendar-export</v-icon>
+                </v-list-item-icon>
+                <v-list-item-title>
+                  {{ $t("calendar.download_ics") }}
+                </v-list-item-title>
+              </v-list-item>
+            </v-list>
+          </v-menu>
         </v-list-item-action>
       </template>
     </v-list-item>
@@ -40,8 +44,6 @@
 </template>
 
 <script>
-import CopyToClipboardButton from "../generic/CopyToClipboardButton.vue";
-
 export default {
   name: "CalendarSelect",
   props: {
@@ -54,9 +56,6 @@ export default {
       required: true,
     },
   },
-  components: {
-    CopyToClipboardButton,
-  },
   computed: {
     model: {
       get() {

aleksis/core/frontend/components/calendar/CalendarTypeSelect.vue

+<script>
+export default {
+  name: "CalendarTypeSelect",
+  props: {
+    value: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      innerValue: this.value,
+      availableCalendarTypes: [
+        {
+          type: "month",
+          translationKey: "calendar.month",
+          icon: "calendar-month-outline",
+        },
+        {
+          type: "week",
+          translationKey: "calendar.week",
+          icon: "calendar-week-outline",
+        },
+        {
+          type: "day",
+          translationKey: "calendar.day",
+          icon: "calendar-today-outline",
+        },
+      ],
+    };
+  },
+  watch: {
+    value(val) {
+      this.innerValue = val;
+    },
+    innerValue(val) {
+      this.$emit("input", val);
+    },
+  },
+  methods: {
+    nameForMenu(item) {
+      return this.$t(item.translationKey);
+    },
+  },
+};
+</script>
+
+<template>
+  <v-btn-toggle dense v-model="innerValue" class="mx-2">
+    <v-btn
+      v-for="calendarType in availableCalendarTypes"
+      :value="calendarType.type"
+      :key="calendarType.type"
+    >
+      <v-icon v-if="$vuetify.breakpoint.smAndDown">{{
+        "mdi-" + calendarType.icon
+      }}</v-icon>
+      <span class="hidden-sm-and-down">{{ nameForMenu(calendarType) }}</span>
+    </v-btn>
+  </v-btn-toggle>
+</template>

aleksis/core/frontend/components/calendar/GenericCalendarFeedDetails.vue

 <template>
-  <base-calendar-feed-details v-bind="$props" />
+  <div>
+    <base-calendar-feed-details v-bind="$props" />
+    <v-divider inset v-if="selectedEvent.location" />
+    <v-list-item v-if="selectedEvent.location">
+      <v-list-item-icon>
+        <v-icon color="primary">mdi-map-marker-outline</v-icon>
+      </v-list-item-icon>
+      <v-list-item-content>
+        {{ selectedEvent.location }}
+      </v-list-item-content>
+    </v-list-item>
+  </div>
 </template>
 
 <script>

aleksis/core/frontend/components/calendar/calendarOverview.graphql

 query ($start: Date, $end: Date) {
-  calendarFeeds {
-    name
-    verboseName
-    description
-    url
-    color
-    feed {
-      events(start: $start, end: $end) {
-        name
-        start
-        end
-        color
-        description
-        uid
-        allDay
-        status
-        meta
+  calendar {
+    allFeedsUrl
+    calendarFeeds {
+      name
+      verboseName
+      description
+      url
+      color
+      activated
+      feed {
+        events(start: $start, end: $end) {
+          name
+          start
+          end
+          color
+          description
+          location
+          uid
+          allDay
+          status
+          meta
+        }
       }
     }
   }

aleksis/core/frontend/components/calendar/setCalendarStatus.graphql

+mutation ($calendars: [String]!) {
+  setCalendarStatus(calendars: $calendars) {
+    ok
+  }
+}

aleksis/core/frontend/components/holiday/HolidayInlineList.vue

@@ -5,24 +5,24 @@ import DateField from "../generic/forms/DateField.vue";
 
 <template>
   <inline-c-r-u-d-list
-      :headers="headers"
-      :i18n-key="i18nKey"
-      create-item-i18n-key="holidays.create_holiday"
-      :gql-query="gqlQuery"
-      :gql-create-mutation="gqlCreateMutation"
-      :gql-patch-mutation="gqlPatchMutation"
-      :gql-delete-mutation="gqlDeleteMutation"
-      :gql-delete-multiple-mutation="gqlDeleteMultipleMutation"
-      :default-item="defaultItem"
-      ref="crudList"
+    :headers="headers"
+    :i18n-key="i18nKey"
+    create-item-i18n-key="holidays.create_holiday"
+    :gql-query="gqlQuery"
+    :gql-create-mutation="gqlCreateMutation"
+    :gql-patch-mutation="gqlPatchMutation"
+    :gql-delete-mutation="gqlDeleteMutation"
+    :gql-delete-multiple-mutation="gqlDeleteMultipleMutation"
+    :default-item="defaultItem"
+    ref="crudList"
   >
     <template #holidayName.field="{ attrs, on, isCreate }">
       <div aria-required="true">
         <v-text-field
-            v-bind="attrs"
-            v-on="on"
-            required
-            :rules="required"
+          v-bind="attrs"
+          v-on="on"
+          required
+          :rules="required"
         ></v-text-field>
       </div>
     </template>
@@ -33,11 +33,11 @@ import DateField from "../generic/forms/DateField.vue";
     <template #dateStart.field="{ attrs, on, item, isCreate }">
       <div aria-required="true">
         <date-field
-            v-bind="attrs"
-            v-on="on"
-            :rules="required"
-            :max="item ? item.dateEnd : undefined"
-            @input="updateEndDate($event, item, isCreate)"
+          v-bind="attrs"
+          v-on="on"
+          :rules="required"
+          :max="item ? item.dateEnd : undefined"
+          @input="updateEndDate($event, item, isCreate)"
         ></date-field>
       </div>
     </template>
@@ -48,11 +48,11 @@ import DateField from "../generic/forms/DateField.vue";
     <template #dateEnd.field="{ attrs, on, item }">
       <div aria-required="true">
         <date-field
-            v-bind="attrs"
-            v-on="on"
-            required
-            :rules="required"
-            :min="item ? item.dateStart : undefined"
+          v-bind="attrs"
+          v-on="on"
+          required
+          :rules="required"
+          :min="item ? item.dateStart : undefined"
         ></date-field>
       </div>
     </template>
@@ -60,7 +60,13 @@ import DateField from "../generic/forms/DateField.vue";
 </template>
 
 <script>
-import {holidays, createHoliday, deleteHoliday, deleteHolidays, updateHolidays} from "./holiday.graphql";
+import {
+  holidays,
+  createHoliday,
+  deleteHoliday,
+  deleteHolidays,
+  updateHolidays,
+} from "./holiday.graphql";
 
 export default {
   name: "HolidayInlineList",
@@ -96,21 +102,23 @@ export default {
   },
   methods: {
     updateEndDate(newStartDate, item, isCreate) {
-      console.log("method called", item)
+      console.log("method called", item);
       let start = new Date(newStartDate);
-      console.log(start)
+      console.log(start);
       if (!item.endDate) {
         if (isCreate) {
           this.$refs.crudList.createModel.dateEnd = newStartDate;
           console.log("Changed of createmodel");
         } else {
-          this.$refs.crudList.editableItems.find(holiday => holiday.id === item.id)[0].dateEnd = newStartDate;
+          this.$refs.crudList.editableItems.find(
+            (holiday) => holiday.id === item.id
+          )[0].dateEnd = newStartDate;
           console.log("Changed of editableitems");
         }
       } else {
         console.log(item, newStartDate);
       }
-    }
+    },
   },
 };
 </script>

aleksis/core/frontend/components/holiday/holiday.graphql

 query holidays($orderBy: [String], $filters: JSONString) {
-    items: holidays(orderBy: $orderBy, filters: $filters) {
-        id
-        holidayName
-        dateStart
-        dateEnd
-        canEdit
-        canDelete
-    }
+  items: holidays(orderBy: $orderBy, filters: $filters) {
+    id
+    holidayName
+    dateStart
+    dateEnd
+    canEdit
+    canDelete
+  }
 }
 
 mutation createHoliday($input: CreateHolidayInput!) {
-    createHoliday(input: $input) {
-        holiday {
-            id
-            holidayName
-            dateStart
-            dateEnd
-            canEdit
-            canDelete
-        }
+  createHoliday(input: $input) {
+    holiday {
+      id
+      holidayName
+      dateStart
+      dateEnd
+      canEdit
+      canDelete
     }
+  }
 }
 
 mutation deleteHoliday($id: ID!) {
-    deleteHoliday(id: $id) {
-        ok
-    }
+  deleteHoliday(id: $id) {
+    ok
+  }
 }
 
 mutation deleteHolidays($ids: [ID]!) {
-    deleteHolidays(ids: $ids) {
-        deletionCount
-    }
+  deleteHolidays(ids: $ids) {
+    deletionCount
+  }
 }
 
 mutation updateHolidays($input: [BatchPatchHolidayInput]!) {
-    batchMutation: updateHolidays(input: $input) {
-        items: holidays {
-            id
-            holidayName
-            dateStart
-            dateEnd
-            canEdit
-            canDelete
-        }
+  batchMutation: updateHolidays(input: $input) {
+    items: holidays {
+      id
+      holidayName
+      dateStart
+      dateEnd
+      canEdit
+      canDelete
     }
+  }
 }

aleksis/core/frontend/messages/en.json

@@ -256,19 +256,22 @@
     "new_version_available": "A new version of the app is available",
     "update": "Update"
   },
-  "graphql": {
-    "snackbar_error_message": "There was an error retrieving the page data. Please try again.",
-    "snackbar_success_message": "The operation has been finished successfully."
-  },
   "calendar": {
-    "menu_title_overview": "Calendar",
+    "menu_title": "Calendar",
     "month": "Month",
     "week": "Week",
     "day": "Day",
     "today": "Today",
     "select": "Select calendars",
     "ics_to_clipboard": "Copy link to calendar ICS to clipboard",
-    "cancelled": "Cancelled"
+    "cancelled": "Cancelled",
+    "download_ics": "Download ICS",
+    "my_calendars": "My Calendars",
+    "download_all": "Download all"
+  },
+  "graphql": {
+    "snackbar_error_message": "There was an error retrieving the page data. Please try again.",
+    "snackbar_success_message": "The operation has been finished successfully."
   },
   "status": {
     "changes": "You have unsaved changes.",

aleksis/core/frontend/mixins/calendarFeedDetails.js

@@ -32,6 +32,10 @@ const calendarFeedDetailsMixin = {
       type: String,
       default: null,
     },
+    calendarType: {
+      required: true,
+      type: String,
+    },
   },
   computed: {
     model: {

aleksis/core/frontend/routes.js

@@ -1061,14 +1061,15 @@ const routes = [
     name: "invitations.accept_invite",
   },
   {
-    path: "/calendar/overview",
+    path: "/calendar/",
     component: () => import("./components/calendar/CalendarOverview.vue"),
     name: "core.calendar_overview",
     meta: {
       inMenu: true,
       icon: "mdi-calendar",
-      titleKey: "calendar.menu_title_overview",
-      validators: [hasPersonValidator],
+      titleKey: "calendar.menu_title",
+      toolbarTitle: "calendar.menu_title",
+      permission: "core.view_calendar_feed_rule",
     },
   },
 ];

aleksis/core/migrations/0050_fix_amends.py

-# Generated by Django 4.1.7 on 2023-03-26 10:26
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("sites", "0002_alter_domain_unique"),
-        ("core", "0049_calendarevent"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="calendarevent",
-            old_name="ammends",
-            new_name="amends",
-        ),
-    ]

aleksis/core/migrations/0049_calendarevent.py → aleksis/core/migrations/0051_calendarevent_and_holiday.py

-# Generated by Django 4.1.5 on 2023-01-29 13:46
+# Generated by Django 4.1.10 on 2023-07-11 19:01
 
 import aleksis.core.managers
 import aleksis.core.mixins
 from django.db import migrations, models
 import django.db.models.deletion
 import recurrence.fields
+import timezone_field.fields
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("sites", "0002_alter_domain_unique"),
         ("contenttypes", "0002_remove_content_type_name"),
-        ("core", "0048_delete_personalicalurl"),
+        ("sites", "0002_alter_domain_unique"),
+        ("core", "0050_managed_by_app_label"),
     ]
 
     operations = [
@@ -25,9 +26,32 @@ class Migration(migrations.Migration):
                         auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
                     ),
                 ),
+                (
+                    "managed_by_app_label",
+                    models.CharField(
+                        blank=True,
+                        editable=False,
+                        max_length=255,
+                        verbose_name="App label of app responsible for managing this instance",
+                    ),
+                ),
                 ("extended_data", models.JSONField(default=dict, editable=False)),
-                ("start", models.DateTimeField(verbose_name="Start date and time")),
-                ("end", models.DateTimeField(verbose_name="End date and time")),
+                (
+                    "datetime_start",
+                    models.DateTimeField(blank=True, null=True, verbose_name="Start date and time"),
+                ),
+                (
+                    "datetime_end",
+                    models.DateTimeField(blank=True, null=True, verbose_name="End date and time"),
+                ),
+                (
+                    "timezone",
+                    timezone_field.fields.TimeZoneField(
+                        blank=True, null=True, verbose_name="Timezone"
+                    ),
+                ),
+                ("date_start", models.DateField(blank=True, null=True, verbose_name="Start date")),
+                ("date_end", models.DateField(blank=True, null=True, verbose_name="End date")),
                 (
                     "recurrences",
                     recurrence.fields.RecurrenceField(
@@ -35,13 +59,14 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 (
-                    "ammends",
+                    "amends",
                     models.ForeignKey(
                         blank=True,
                         null=True,
                         on_delete=django.db.models.deletion.CASCADE,
+                        related_name="amended_by",
                         to="core.calendarevent",
-                        verbose_name="Ammended base event",
+                        verbose_name="Amended base event",
                     ),
                 ),
                 (
@@ -60,6 +85,7 @@ class Migration(migrations.Migration):
                         default=1,
                         editable=False,
                         on_delete=django.db.models.deletion.CASCADE,
+                        related_name="+",
                         to="sites.site",
                     ),
                 ),
@@ -67,10 +93,72 @@ class Migration(migrations.Migration):
             options={
                 "verbose_name": "Calendar Event",
                 "verbose_name_plural": "Calendar Events",
+                "ordering": ["datetime_start", "date_start", "datetime_end", "date_end"],
             },
             bases=(aleksis.core.mixins.CalendarEventMixin, models.Model),
             managers=[
                 ("objects", aleksis.core.managers.PolymorphicCurrentSiteManager()),
             ],
         ),
+        migrations.CreateModel(
+            name="Holiday",
+            fields=[
+                (
+                    "calendarevent_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="core.calendarevent",
+                    ),
+                ),
+                ("holiday_name", models.CharField(max_length=255, verbose_name="Name")),
+            ],
+            options={
+                "verbose_name": "Holiday",
+                "verbose_name_plural": "Holidays",
+            },
+            bases=("core.calendarevent",),
+            managers=[
+                ("objects", aleksis.core.managers.PolymorphicCurrentSiteManager()),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name="calendarevent",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("date_start__isnull", True), ("datetime_start__isnull", True), _negated=True
+                ),
+                name="datetime_start_or_date_start",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="calendarevent",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("date_end__isnull", True), ("datetime_end__isnull", True), _negated=True
+                ),
+                name="datetime_end_or_date_end",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="calendarevent",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("datetime_start__isnull", False), ("timezone__isnull", True), _negated=True
+                ),
+                name="timezone_if_datetime_start",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="calendarevent",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("datetime_end__isnull", False), ("timezone__isnull", True), _negated=True
+                ),
+                name="timezone_if_datetime_end",
+            ),
+        ),
     ]

aleksis/core/migrations/0051_calendarevent_dates.py

-# Generated by Django 4.1.8 on 2023-04-08 15:25
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("sites", "0002_alter_domain_unique"),
-        ("core", "0050_fix_amends"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="calendarevent",
-            options={
-                "ordering": ["datetime_start", "date_start", "datetime_end", "date_end"],
-                "verbose_name": "Calendar Event",
-                "verbose_name_plural": "Calendar Events",
-            },
-        ),
-        migrations.RenameField(
-            model_name="calendarevent",
-            old_name="end",
-            new_name="datetime_end",
-        ),
-        migrations.RenameField(
-            model_name="calendarevent",
-            old_name="start",
-            new_name="datetime_start",
-        ),
-        migrations.AddField(
-            model_name="calendarevent",
-            name="date_end",
-            field=models.DateField(blank=True, null=True, verbose_name="End date"),
-        ),
-        migrations.AddField(
-            model_name="calendarevent",
-            name="date_start",
-            field=models.DateField(blank=True, null=True, verbose_name="Start date"),
-        ),
-        migrations.AlterField(
-            model_name="calendarevent",
-            name="amends",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                to="core.calendarevent",
-                verbose_name="Amended base event",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="calendarevent",
-            name="datetime_end",
-            field=models.DateTimeField(blank=True, null=True, verbose_name="End date and time"),
-        ),
-        migrations.AlterField(
-            model_name="calendarevent",
-            name="datetime_start",
-            field=models.DateTimeField(blank=True, null=True, verbose_name="Start date and time"),
-        ),
-        migrations.AlterField(
-            model_name="calendarevent",
-            name="site",
-            field=models.ForeignKey(
-                default=1,
-                editable=False,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="+",
-                to="sites.site",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="calendarevent",
-            constraint=models.CheckConstraint(
-                check=models.Q(
-                    ("date_start__isnull", True), ("datetime_start__isnull", True), _negated=True
-                ),
-                name="datetime_start_or_date_start",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="calendarevent",
-            constraint=models.CheckConstraint(
-                check=models.Q(
-                    ("date_end__isnull", True), ("datetime_end__isnull", True), _negated=True
-                ),
-                name="datetime_end_or_date_end",
-            ),
-        ),
-    ]

aleksis/core/migrations/0052_holiday.py

-# Generated by Django 4.1.8 on 2023-04-09 14:09
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("sites", "0002_alter_domain_unique"),
-        ("core", "0051_calendarevent_dates"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Holiday",
-            fields=[
-                (
-                    "calendarevent_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="core.calendarevent",
-                    ),
-                ),
-                ("holiday_name", models.CharField(max_length=255, verbose_name="Name")),
-            ],
-            options={
-                "verbose_name": "Holiday",
-                "verbose_name_plural": "Holidays",
-            },
-            bases=("core.calendarevent",),
-        ),
-    ]