IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints

Browse Source
This commit is contained in:
clauspeterhuebner 2023-01-18 15:09:01 +01:00 committed by GitHub
commit f0f0937609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/Contributions/ContributionForm.vue
View File

@ -17,6 +17,7 @@
:label-no-date-selected="$t('contribution.noDateSelected')" :label-no-date-selected="$t('contribution.noDateSelected')"
required required
:disabled="this.form.id !== null" :disabled="this.form.id !== null"
:dropleft="true"
> >
<template #nav-prev-year><span></span></template> <template #nav-prev-year><span></span></template>
<template #nav-next-year><span></span></template> <template #nav-next-year><span></span></template>

2
frontend/src/components/Inputs/InputHour.vue
View File

@ -15,7 +15,7 @@
:placeholder="placeholder" :placeholder="placeholder"
type="number" type="number"
:state="validated ? valid : false" :state="validated ? valid : false"
step="0.5" step="0.25"
min="0" min="0"
:max="validMaxTime" :max="validMaxTime"
class="bg-248" class="bg-248"

6
frontend/src/layouts/DashboardLayout.vue
View File

@ -125,14 +125,13 @@
:transactions="transactions" :transactions="transactions"
:transactionCount="transactionCount" :transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
@set-tunneled-email="setTunneledEmail"
> >
<template #transactions> <template #transactions>
<last-transactions <last-transactions
:transactions="transactions" :transactions="transactions"
:transactionCount="transactionCount" :transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
v-on="$listeners" @set-tunneled-email="setTunneledEmail"
/> />
</template> </template>
<template #community> <template #community>
@ -167,14 +166,13 @@
:transactions="transactions" :transactions="transactions"
:transactionCount="transactionCount" :transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
@set-tunneled-email="setTunneledEmail"
> >
<template #transactions> <template #transactions>
<last-transactions <last-transactions
:transactions="transactions" :transactions="transactions"
:transactionCount="transactionCount" :transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
v-on="$listeners" @set-tunneled-email="setTunneledEmail"
/> />
</template> </template>
<template #community> <template #community>

6
frontend/src/pages/Transactions.vue
View File

@ -15,6 +15,7 @@
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
:transactions="transactions" :transactions="transactions"
:showPagination="true" :showPagination="true"
:pageSize="pageSize"
@update-transactions="updateTransactions" @update-transactions="updateTransactions"
v-on="$listeners" v-on="$listeners"
/> />
@ -90,6 +91,11 @@ export default {
this.updateGdt() this.updateGdt()
} }
}, },
gdt() {
if (this.gdt) {
this.updateGdt()
}
},
}, },
} }
</script> </script>