update to version 1.1.0

required services have to be >= 1

backend/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 license = MIT
-version = 1.0.0-alpha.8
+version = 1.0.0
 name = flaschengeist-events
 description = Events plugin for Flaschengeist
 url = https://flaschengeist.dev/Flaschengeist/flaschengeist-schedule
@@ -24,7 +24,7 @@ python_requires = >=3.8
 packages =
     flaschengeist_events
 install_requires =
-    flaschengeist >= 2.0.0.dev0
+    flaschengeist >= 2.0.0
 
 [options.package_data]
 * = *.toml, script.py.mako, *.ini, migrations/*.py

package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "1.0.0-alpha.8",
+  "version": "1.1.0",
   "name": "@flaschengeist/schedule",
   "author": "Ferdinand Thiessen <rpm@fthiessen.de>",
   "homepage": "https://flaschengeist.dev/Flaschengeist",
@@ -22,8 +22,8 @@
     "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11"
   },
   "devDependencies": {
-    "@flaschengeist/api": "^1.0.0-alpha.8",
+    "@flaschengeist/api": "^1.0.0",
-    "@flaschengeist/types": "^1.0.0-alpha.10",
+    "@flaschengeist/types": "^1.0.0",
     "@quasar/app-webpack": "^3.7.2",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "@typescript-eslint/parser": "^5.8.0",
@@ -38,8 +38,8 @@
     "typescript": "^4.5.4"
   },
   "peerDependencies": {
-    "@flaschengeist/api": "^1.0.0-alpha.8",
+    "@flaschengeist/api": "^1.0.0",
-    "@flaschengeist/users": "^1.0.0-alpha.4"
+    "@flaschengeist/users": "^1.0.0"
   },
   "prettier": {
     "singleQuote": true,

src/components/management/EditEvent.vue

@@ -183,7 +183,7 @@ export default defineComponent({
     }
 
     function fromTemplate(tpl: FG.Event) {
-      const today = new Date();
+      const today = props.modelValue?.start || new Date();
       template.value = tpl;
 
       event.value = Object.assign({}, tpl, { id: undefined });
@@ -199,9 +199,16 @@ export default defineComponent({
       if (event.value.end) event.value.end.setTime(event.value.end.getTime() + diff);
       event.value.jobs = [];
       tpl.jobs.forEach((job) => {
-        const copied_job: FG.Job = Object.assign({}, job, { id: NaN });
+        const copied_job: FG.Job = Object.assign({}, job, {
-        copied_job.start.setTime(copied_job.start.getTime() + diff);
+          id: NaN,
-        if (copied_job.end) copied_job.end.setTime(copied_job.end.getTime() + diff);
+          start: new Date(),
+          end: undefined,
+        });
+        copied_job.start.setTime(job.start.getTime() + diff);
+        if (job.end) {
+          copied_job.end = new Date();
+          copied_job.end.setTime(job.end.getTime() + diff);
+        }
         event.value.jobs.push(<Job>copied_job);
       });
     }
@@ -292,6 +299,7 @@ export default defineComponent({
       const diff = newValue.getTime() - oldValue.getTime();
       event.value?.jobs.forEach((job) => {
         job.start.setTime(job.start.getTime() + diff);
+        job.end?.setTime(job.end.getTime() + diff);
       });
       computed_end.value?.setTime(computed_end.value?.getTime() + diff);
       setTimeout(() => {

src/components/management/EditJobSlot.vue

@@ -40,12 +40,12 @@
           :rules="[notEmpty]"
         />
         <q-input
-          v-model="job.required_services"
+          v-model.number="job.required_services"
           filled
           class="col-xs-12 col-sm-6 q-pa-sm"
           label="Dienstanzahl"
           type="number"
-          :rules="[notEmpty]"
+          :rules="[minOneService, notEmpty]"
         />
         <q-input
           v-model="job.comment"
@@ -134,6 +134,10 @@ export default defineComponent({
       validate: () => form.value?.validate() || Promise.resolve(true),
     });
 
+    function minOneService(val: number) {
+      return parseInt(val) > 0 || 'Mindestens ein Dienst nötig';
+    }
+
     return {
       form,
       formatStartEnd,
@@ -141,6 +145,7 @@ export default defineComponent({
       job,
       jobtypes,
       notEmpty,
+      minOneService,
       typeName,
     };
   },

src/components/management/ManageTypes.vue

@@ -30,10 +30,17 @@
 
     <q-table :title="title" :rows="rows" row-key="id" :columns="columns">
       <template #top-right>
-        <q-input ref="input" v-model="actualType.name" :rules="rules" dense placeholder="Neuer Typ">
+        <q-input
-          <slot name="after"
+          ref="input"
-            ><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" @click="addType"
+          v-model="actualType.name"
-          /></slot>
+          :rules="rules"
+          dense
+          filled
+          placeholder="Neuer Typ"
+        >
+          <template #after
+            ><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" round @click="addType"
+          /></template>
         </q-input>
       </template>
       <template #body-cell-actions="props">

src/components/overview/AgendaView.vue

@@ -235,7 +235,7 @@ export default defineComponent({
         'November',
         'Dezember',
         '-',
-      ][value?.getMonth() || 12];
+      ][value?.getMonth() === 0 ? 0 : value?.getMonth() || 12];
     }
     function asYear(value?: Date) {
       return value?.getFullYear() || '-';

src/components/overview/slots/JobSlot.vue

@@ -101,6 +101,7 @@ import { PERMISSIONS } from '../../../permissions';
 import TransferInviteDialog from './TransferInviteDialog.vue';
 import ServiceUserChip from './ServiceUserChip.vue';
 import { UserAvatar } from '@flaschengeist/api/components';
+import { DisplayNameMode } from '@flaschengeist/users';
 
 export default defineComponent({
   name: 'JobSlot',
@@ -123,11 +124,34 @@ export default defineComponent({
     const quasar = useQuasar();
 
     // Make sure users are loaded if we can assign them
-    onBeforeMount(() => void userStore.getUsers());
+    onBeforeMount(() => {
+      void userStore.getUsers();
+      void userStore.getDisplayNameModeSetting(true);
+    });
 
     /* Stuff used for general display */
     // Get displayname of user
     function userDisplay(id: string) {
+      switch (userStore.userSettings.display_name) {
+        case DisplayNameMode.FIRSTNAME:
+          return userStore.findUser(id)?.firstname || id;
+        case DisplayNameMode.LASTNAME:
+          return userStore.findUser(id)?.lastname || id;
+        case DisplayNameMode.DISPLAYNAME:
+          return userStore.findUser(id)?.display_name || id;
+        case DisplayNameMode.FIRSTNAME_LASTNAME:
+          return (
+            `${<string>userStore.findUser(id)?.firstname} ${<string>(
+              userStore.findUser(id)?.lastname
+            )}` || id
+          );
+        case DisplayNameMode.LASTNAME_FIRSTNAME:
+          return (
+            `${<string>userStore.findUser(id)?.lastname}, ${<string>(
+              userStore.findUser(id)?.firstname
+            )}` || id
+          );
+      }
       return userStore.findUser(id)?.display_name || id;
     }
 

src/pages/EventRequests.vue

@@ -56,6 +56,7 @@
 <script lang="ts">
 import { formatStartEnd, useMainStore, useUserStore } from '@flaschengeist/api';
 import { computed, defineComponent, ref, onBeforeMount, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { QTableProps } from 'quasar';
 import { Job } from '../store/models';
 import { useEventStore } from '../store';
@@ -67,6 +68,8 @@ export default defineComponent({
     const store = useEventStore();
     const userStore = useUserStore();
     const mainStore = useMainStore();
+    const router = useRouter();
+    const route = useRoute();
 
     interface RowData extends FG.Invitation {
       inviter: FG.User;
@@ -155,7 +158,11 @@ export default defineComponent({
         .finally(() => (loading.value = false));
     };
 
-    onBeforeMount(() => {
+    onBeforeMount(async () => {
+      if (route.query.sent === 'true') {
+        showSent.value = true;
+      }
+
       void Promise.allSettled([
         userStore.getUsers(),
         store.getInvitations(),
@@ -165,8 +172,9 @@ export default defineComponent({
       );
     });
 
-    watch(showSent, () => {
+    watch(showSent, async () => {
       onRequest({ pagination: pagination.value, filter: () => [], getCellValue: () => [] });
+      await router.replace({ query: { sent: showSent.value ? 'true' : 'false' } });
     });
 
     function getType(row: RowData) {