Compare commits
No commits in common. "38480a1eec2c45fb6ede7fb27166e6f47b5e97fc" and "252072df573477e640adb141abbd15e588594a48" have entirely different histories.
38480a1eec
...
252072df57
|
@ -1,6 +1,6 @@
|
|||
[metadata]
|
||||
license = MIT
|
||||
version = 1.0.0-alpha.9
|
||||
version = 1.0.0-alpha.8
|
||||
name = flaschengeist-events
|
||||
description = Events plugin for Flaschengeist
|
||||
url = https://flaschengeist.dev/Flaschengeist/flaschengeist-schedule
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"license": "MIT",
|
||||
"version": "1.0.0-alpha.9",
|
||||
"version": "1.0.0-alpha.8",
|
||||
"name": "@flaschengeist/schedule",
|
||||
"author": "Ferdinand Thiessen <rpm@fthiessen.de>",
|
||||
"homepage": "https://flaschengeist.dev/Flaschengeist",
|
||||
|
|
|
@ -30,17 +30,10 @@
|
|||
|
||||
<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
|
||||
filled
|
||||
placeholder="Neuer Typ"
|
||||
>
|
||||
<template #after
|
||||
><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" round @click="addType"
|
||||
/></template>
|
||||
<q-input ref="input" v-model="actualType.name" :rules="rules" dense placeholder="Neuer Typ">
|
||||
<slot name="after"
|
||||
><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" @click="addType"
|
||||
/></slot>
|
||||
</q-input>
|
||||
</template>
|
||||
<template #body-cell-actions="props">
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
<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';
|
||||
|
@ -68,8 +67,6 @@ 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;
|
||||
|
@ -158,12 +155,7 @@ export default defineComponent({
|
|||
.finally(() => (loading.value = false));
|
||||
};
|
||||
|
||||
onBeforeMount(async () => {
|
||||
|
||||
if (route.query.sent === 'true') {
|
||||
showSent.value = true;
|
||||
}
|
||||
|
||||
onBeforeMount(() => {
|
||||
void Promise.allSettled([
|
||||
userStore.getUsers(),
|
||||
store.getInvitations(),
|
||||
|
@ -173,13 +165,10 @@ export default defineComponent({
|
|||
);
|
||||
});
|
||||
|
||||
watch(showSent, async () => {
|
||||
watch(showSent, () => {
|
||||
onRequest({ pagination: pagination.value, filter: () => [], getCellValue: () => [] });
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue