release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
2 changed files with 39 additions and 14 deletions
Showing only changes of commit 04237246fa - Show all commits

View File

@ -6,15 +6,22 @@
<q-separator /> <q-separator />
<q-card-section class="row q-col-gutter-md" v-if="shortCuts"> <q-card-section class="row q-col-gutter-md" v-if="shortCuts">
<div v-for="(amount, index) in shortCuts" v-bind:key="index" class="col-4"> <div :key="index" v-for="(shortcut, index) in shortCuts" class="col-4">
<q-btn <q-btn
push
v-if="shortcut"
color="primary" color="primary"
style="width: 100%" style="width: 100%"
:label="amount.toFixed(2).toString() + ' €'" :label="shortcut.toFixed(2).toString() + ' €'"
@click="changeBalance(amount)" @click="changeBalance(shortcut)"
/> >
</div> <q-popup-proxy context-menu>
</q-card-section> <q-btn label="Entfernen" @click="removeShortcut(shortcut)" />
</q-popup-proxy>
<q-tooltip>Rechtsklick um Verknüpfung zu entfernen</q-tooltip>
</q-btn>
</div></q-card-section
>
<q-card-section class="row q-col-gutter-md items-center"> <q-card-section class="row q-col-gutter-md items-center">
<div class="col-sm-4 col-xs-12"> <div class="col-sm-4 col-xs-12">
<q-input <q-input
@ -34,8 +41,9 @@
@click="changeBalance(amount * -1)" @click="changeBalance(amount * -1)"
><q-tooltip>Rechtsklick um Betrag als Verknüpfung hinzuzufügen</q-tooltip> ><q-tooltip>Rechtsklick um Betrag als Verknüpfung hinzuzufügen</q-tooltip>
<q-popup-proxy context-menu v-model="showAddShortcut"> <q-popup-proxy context-menu v-model="showAddShortcut">
<q-btn label="neue Verknüpfung" @click="addShortcut" /></q-popup-proxy <q-btn label="neue Verknüpfung" @click="addShortcut"></q-btn>
></q-btn> </q-popup-proxy>
</q-btn>
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<q-btn <q-btn
@ -55,8 +63,6 @@
</template> </template>
<script lang="ts"> <script lang="ts">
// TODO: Shortcuts are not displayed when first loaded
import { computed, ref, defineComponent, onBeforeMount } from '@vue/composition-api'; import { computed, ref, defineComponent, onBeforeMount } from '@vue/composition-api';
import { hasPermission } from 'src/utils/permission'; import { hasPermission } from 'src/utils/permission';
import { StateInterfaceBalance } from '../store/balance'; import { StateInterfaceBalance } from '../store/balance';
@ -83,9 +89,10 @@ export default defineComponent({
); );
function addShortcut() { function addShortcut() {
// TODO: Save shortcuts on backend void store.dispatch('balance/addShortcut', amount.value * -1);
showAddShortcut.value = false; }
console.log(amount); function removeShortcut(shortcut: number) {
void store.dispatch('balance/removeShortcut', shortcut);
} }
function userUpdated(selectedUser: FG.User) { function userUpdated(selectedUser: FG.User) {
user.value = selectedUser; user.value = selectedUser;
@ -109,6 +116,7 @@ export default defineComponent({
return { return {
user, user,
addShortcut, addShortcut,
removeShortcut,
showAddShortcut, showAddShortcut,
changeBalance, changeBalance,
transactions, transactions,

View File

@ -52,11 +52,28 @@ const mutations: MutationTree<BalanceInterface> = {
else state.loading -= 1; else state.loading -= 1;
}, },
setShortcuts(state, data: Array<number>) { setShortcuts(state, data: Array<number>) {
state.shortcuts = data.sort().reverse(); state.shortcuts.splice(0, state.shortcuts.length, ...data);
} }
}; };
const actions: ActionTree<BalanceInterface, StateInterface> = { const actions: ActionTree<BalanceInterface, StateInterface> = {
addShortcut({ commit, state, rootState }, shortcut) {
const sc = [...state.shortcuts, shortcut];
sc.sort().reverse();
const user = <FG.User>rootState.user.currentUser;
return axios.put(`/users/${user.userid}/balance/shortcuts`, sc).then(() => {
commit('setShortcuts', sc);
});
},
removeShortcut({ commit, state, rootState }, shortcut) {
const sc = state.shortcuts.filter((value: number) => value != shortcut);
const user = <FG.User>rootState.user.currentUser;
return axios.put(`/users/${user.userid}/balance/shortcuts`, sc).then(() => {
commit('setShortcuts', sc);
});
},
getShortcuts({ commit, state, rootState }, force = false) { getShortcuts({ commit, state, rootState }, force = false) {
if (force || state.shortcuts.length == 0) { if (force || state.shortcuts.length == 0) {
commit('setLoading'); commit('setLoading');