Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 12 Pull requests Projects Releases 25 Packages Wiki Activity Actions

enhancement syncing & protocol presence absence

Browse source
This commit is contained in:
Julian Krauser 2025-01-05 12:12:21 +01:00
parent 5050011f29
commit b106ea6396
17 changed files with 95 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/views/admin/club/newsletter/NewsletterDates.vue
View file

@ -140,7 +140,7 @@ export default defineComponent({
},
},
mounted() {
this.fetchNewsletterDates();
// this.fetchNewsletterDates();
this.fetchCalendars();
},
methods: {

2
src/views/admin/club/newsletter/NewsletterOverview.vue
View file

@ -58,7 +58,7 @@ export default defineComponent({
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchNewsletterByActiveId();
// this.fetchNewsletterByActiveId();
},
methods: {
...mapActions(useNewsletterStore, ["fetchNewsletterByActiveId"]),

4
src/views/admin/club/newsletter/NewsletterRecipients.vue
View file

@ -205,8 +205,8 @@ export default defineComponent({
},
},
mounted() {
this.fetchMembers(0, 1000, true);
this.fetchNewsletterRecipients();
this.fetchMembers(0, 1000, "", true);
// this.fetchNewsletterRecipients();
this.fetchQueries();
this.loadQuery();
},

2
src/views/admin/club/protocol/ProtocolAgenda.vue
View file

@ -73,7 +73,7 @@ export default defineComponent({
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchProtocolAgenda();
// this.fetchProtocolAgenda();
},
methods: {
...mapActions(useProtocolAgendaStore, ["fetchProtocolAgenda", "createProtocolAgenda"]),

2
src/views/admin/club/protocol/ProtocolDecisions.vue
View file

@ -73,7 +73,7 @@ export default defineComponent({
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchProtocolDecision();
// this.fetchProtocolDecision();
},
methods: {
...mapActions(useProtocolDecisionStore, ["fetchProtocolDecision", "createProtocolDecision"]),

2
src/views/admin/club/protocol/ProtocolOverview.vue
View file

@ -80,7 +80,7 @@ export default defineComponent({
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchProtocolByActiveId();
// this.fetchProtocolByActiveId();
},
methods: {
...mapActions(useProtocolStore, ["fetchProtocolByActiveId"]),

53
src/views/admin/club/protocol/ProtocolPresence.vue
View file

@ -6,7 +6,7 @@
</p>
<div class="w-full">
<Combobox v-model="presence" :disabled="!can('create', 'club', 'protocol')" multiple>
<Combobox v-model="presence" :disabled="!can('create', 'club', 'protocol')" multiple by="memberId">
<ComboboxLabel>Anwesende suchen</ComboboxLabel>
<div class="relative mt-1">
<ComboboxInput
@ -34,8 +34,8 @@
<ComboboxOption
v-for="member in filtered"
as="template"
:key="member.id"
:value="member.id"
:key="member.memberId"
:value="member"
v-slot="{ selected, active }"
>
<li
@ -46,7 +46,7 @@
}"
>
<span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
{{ member.firstname }} {{ member.lastname }} {{ member.nameaffix }}
{{ getMember(member.memberId)?.firstname }} {{ getMember(member.memberId)?.lastname }} {{ getMember(member.memberId)?.nameaffix }}
</span>
<span
v-if="selected"
@ -63,18 +63,24 @@
</Combobox>
</div>
<br />
<p>Ausgewählte Anwesende</p>
<p>Anwesenheit</p>
<div class="flex flex-col gap-2 grow overflow-y-auto">
<div
v-for="member in selected"
:key="member.id"
v-for="member in presence"
:key="member.memberId"
class="flex flex-row h-fit w-full border border-primary rounded-md bg-primary p-2 text-white justify-between items-center"
>
<p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
<div class="flex flex-col items-start">
<p>{{ getMember(member.memberId)?.lastname }}, {{ getMember(member.memberId)?.firstname }} {{ getMember(member.memberId)?.nameaffix ? `- ${getMember(member.memberId)?.nameaffix}` : "" }}</p>
<label class="flex flex-row gap-2 items-center">
<input type="checkbox" v-model="member.absent" />
war abwesend
</label>
</div>
<TrashIcon
v-if="can('create', 'club', 'protocol')"
class="w-5 h-5 p-1 box-content cursor-pointer"
@click="removeSelected(member.id)"
@click="removeSelected(member.memberId)"
/>
</div>
</div>
@ -117,38 +123,31 @@ export default defineComponent({
...mapWritableState(useProtocolPresenceStore, ["presence", "loading"]),
...mapState(useMemberStore, ["members"]),
...mapState(useAbilityStore, ["can"]),
filtered(): Array<MemberViewModel> {
return this.query === ""
filtered(): Array<{memberId:number, absent:boolean; protocolId:number}> {
return (this.query === ""
? this.members
: this.members.filter((member) =>
(member.firstname + " " + member.lastname)
.toLowerCase()
.replace(/\s+/g, "")
.includes(this.query.toLowerCase().replace(/\s+/g, ""))
);
},
sorted(): Array<MemberViewModel> {
return this.selected.sort((a, b) => {
if (a.lastname < b.lastname) return -1;
if (a.lastname > b.lastname) return 1;
if (a.firstname < b.firstname) return -1;
if (a.firstname > b.firstname) return 1;
return 0;
});
},
selected(): Array<MemberViewModel> {
return this.members.filter((m) => this.presence.includes(m.id));
)).map(m =>({memberId: m.id, absent:false, protocolId:parseInt(this.protocolId ?? "")}));
},
getMember(){
return (memberId:number) => {
return this.members.find(m => memberId == m.id)
}
}
},
mounted() {
this.fetchMembers(0, 1000, true);
this.fetchProtocolPresence();
this.fetchMembers(0, 1000, "", true);
// this.fetchProtocolPresence();
},
methods: {
...mapActions(useMemberStore, ["fetchMembers"]),
...mapActions(useProtocolPresenceStore, ["fetchProtocolPresence"]),
removeSelected(id: number) {
let index = this.presence.findIndex((s) => s == id);
let index = this.presence.findIndex((s) => s.memberId == id);
if (index != -1) {
this.presence.splice(index, 1);
}

12
src/views/admin/club/protocol/ProtocolRouting.vue
View file

@ -53,6 +53,10 @@ import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
import { useModalStore } from "@/stores/modal";
import ProtocolSyncing from "@/components/admin/club/protocol/ProtocolSyncing.vue";
import { PrinterIcon } from "@heroicons/vue/24/outline";
import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAgenda";
import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
</script>
<script lang="ts">
@ -88,6 +92,10 @@ export default defineComponent({
},
mounted() {
this.fetchProtocolByActiveId();
this.fetchProtocolAgenda()
this.fetchProtocolDecision()
this.fetchProtocolPresence()
this.fetchProtocolVoting()
},
// this.syncState is undefined, so it will never work
// beforeRouteLeave(to, from, next) {
@ -108,6 +116,10 @@ export default defineComponent({
// },
methods: {
...mapActions(useProtocolStore, ["fetchProtocolByActiveId"]),
...mapActions(useProtocolAgendaStore, ["fetchProtocolAgenda"]),
...mapActions(useProtocolDecisionStore, ["fetchProtocolDecision"]),
...mapActions(useProtocolPresenceStore,["fetchProtocolPresence"]),
...mapActions(useProtocolVotingStore,["fetchProtocolVoting"]),
...mapActions(useModalStore, ["openModal"]),
openInfoModal() {
this.openModal(

2
src/views/admin/club/protocol/ProtocolVoting.vue
View file

@ -90,7 +90,7 @@ export default defineComponent({
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchProtocolVoting();
// this.fetchProtocolVoting();
},
methods: {
...mapActions(useProtocolVotingStore, ["fetchProtocolVoting", "createProtocolVoting"]),