package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "1.1.0",
+  "version": "1.0.0",
   "name": "@flaschengeist/schedule",
   "author": "Ferdinand Thiessen <rpm@fthiessen.de>",
   "homepage": "https://flaschengeist.dev/Flaschengeist",

src/components/overview/slots/JobSlot.vue

@@ -101,7 +101,6 @@ 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',
@@ -124,34 +123,11 @@ export default defineComponent({
     const quasar = useQuasar();
 
     // Make sure users are loaded if we can assign them
-    onBeforeMount(() => {
+    onBeforeMount(() => void userStore.getUsers());
-      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

@@ -159,6 +159,7 @@ export default defineComponent({
     };
 
     onBeforeMount(async () => {
+
       if (route.query.sent === 'true') {
         showSent.value = true;
       }
@@ -177,6 +178,8 @@ export default defineComponent({
       await router.replace({ query: { sent: showSent.value ? 'true' : 'false' } });
     });
 
+
+
     function getType(row: RowData) {
       var idx = row.transferee === undefined ? 0 : 1;
       if (row.inviter.userid === mainStore.currentUser.userid) idx += 2;