Compare commits
No commits in common. "38480a1eec2c45fb6ede7fb27166e6f47b5e97fc" and "252072df573477e640adb141abbd15e588594a48" have entirely different histories.
38480a1eec
...
252072df57
|
@ -1,6 +1,6 @@
|
||||||
[metadata]
|
[metadata]
|
||||||
license = MIT
|
license = MIT
|
||||||
version = 1.0.0-alpha.9
|
version = 1.0.0-alpha.8
|
||||||
name = flaschengeist-events
|
name = flaschengeist-events
|
||||||
description = Events plugin for Flaschengeist
|
description = Events plugin for Flaschengeist
|
||||||
url = https://flaschengeist.dev/Flaschengeist/flaschengeist-schedule
|
url = https://flaschengeist.dev/Flaschengeist/flaschengeist-schedule
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "1.0.0-alpha.9",
|
"version": "1.0.0-alpha.8",
|
||||||
"name": "@flaschengeist/schedule",
|
"name": "@flaschengeist/schedule",
|
||||||
"author": "Ferdinand Thiessen <rpm@fthiessen.de>",
|
"author": "Ferdinand Thiessen <rpm@fthiessen.de>",
|
||||||
"homepage": "https://flaschengeist.dev/Flaschengeist",
|
"homepage": "https://flaschengeist.dev/Flaschengeist",
|
||||||
|
|
|
@ -30,17 +30,10 @@
|
||||||
|
|
||||||
<q-table :title="title" :rows="rows" row-key="id" :columns="columns">
|
<q-table :title="title" :rows="rows" row-key="id" :columns="columns">
|
||||||
<template #top-right>
|
<template #top-right>
|
||||||
<q-input
|
<q-input ref="input" v-model="actualType.name" :rules="rules" dense placeholder="Neuer Typ">
|
||||||
ref="input"
|
<slot name="after"
|
||||||
v-model="actualType.name"
|
><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" @click="addType"
|
||||||
:rules="rules"
|
/></slot>
|
||||||
dense
|
|
||||||
filled
|
|
||||||
placeholder="Neuer Typ"
|
|
||||||
>
|
|
||||||
<template #after
|
|
||||||
><q-btn color="primary" icon="mdi-plus" title="Hinzufügen" round @click="addType"
|
|
||||||
/></template>
|
|
||||||
</q-input>
|
</q-input>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-actions="props">
|
<template #body-cell-actions="props">
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { formatStartEnd, useMainStore, useUserStore } from '@flaschengeist/api';
|
import { formatStartEnd, useMainStore, useUserStore } from '@flaschengeist/api';
|
||||||
import { computed, defineComponent, ref, onBeforeMount, watch } from 'vue';
|
import { computed, defineComponent, ref, onBeforeMount, watch } from 'vue';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
|
||||||
import { QTableProps } from 'quasar';
|
import { QTableProps } from 'quasar';
|
||||||
import { Job } from '../store/models';
|
import { Job } from '../store/models';
|
||||||
import { useEventStore } from '../store';
|
import { useEventStore } from '../store';
|
||||||
|
@ -68,8 +67,6 @@ export default defineComponent({
|
||||||
const store = useEventStore();
|
const store = useEventStore();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
const mainStore = useMainStore();
|
const mainStore = useMainStore();
|
||||||
const router = useRouter();
|
|
||||||
const route = useRoute();
|
|
||||||
|
|
||||||
interface RowData extends FG.Invitation {
|
interface RowData extends FG.Invitation {
|
||||||
inviter: FG.User;
|
inviter: FG.User;
|
||||||
|
@ -158,12 +155,7 @@ export default defineComponent({
|
||||||
.finally(() => (loading.value = false));
|
.finally(() => (loading.value = false));
|
||||||
};
|
};
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(() => {
|
||||||
|
|
||||||
if (route.query.sent === 'true') {
|
|
||||||
showSent.value = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Promise.allSettled([
|
void Promise.allSettled([
|
||||||
userStore.getUsers(),
|
userStore.getUsers(),
|
||||||
store.getInvitations(),
|
store.getInvitations(),
|
||||||
|
@ -173,13 +165,10 @@ export default defineComponent({
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(showSent, async () => {
|
watch(showSent, () => {
|
||||||
onRequest({ pagination: pagination.value, filter: () => [], getCellValue: () => [] });
|
onRequest({ pagination: pagination.value, filter: () => [], getCellValue: () => [] });
|
||||||
await router.replace({ query: { sent: showSent.value ? 'true' : 'false' } });
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function getType(row: RowData) {
|
function getType(row: RowData) {
|
||||||
var idx = row.transferee === undefined ? 0 : 1;
|
var idx = row.transferee === undefined ? 0 : 1;
|
||||||
if (row.inviter.userid === mainStore.currentUser.userid) idx += 2;
|
if (row.inviter.userid === mainStore.currentUser.userid) idx += 2;
|
||||||
|
|
Loading…
Reference in New Issue