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

moved from v-html to computed

Browse Source
This commit is contained in:
ogerly 2022-07-13 08:54:28 +02:00
parent 0ddd732da6
commit 910ba6bbdf
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@
<h3>{{ $t('contribution.formText.h3') }}</h3>
{{ $t('contribution.formText.text1') }}
<ul class="my-3">
<li v-html="$t('contribution.formText.lastMonth', lastMonthObject)"></li>
<li v-html="$t('contribution.formText.thisMonth', thisMonthObject)"></li>
<li v-html="lastMonthObject"></li>
<li v-html="thisMonthObject"></li>
</ul>
<div class="my-3">
@ -39,7 +39,6 @@
class="text-right"
:class="form.memo.length < minlength ? 'text-danger' : 'text-success'"
>
{{ form.memo.length }}
<span v-if="form.memo.length < minlength">{{ $t('math.equalTo') }} {{ minlength }}</span>
<span v-else>{{ $t('math.divide') }} {{ maxlength }}</span>
</div>
@ -65,10 +64,10 @@
</template>
<script>
/*
* data.lastMonth = The date set back by one month.
* data.min = The date is reset by one month to the 1st of the previous month.
*
*/
* data.lastMonth = The date set back by one month.
* data.min = The date is reset by one month to the 1st of the previous month.
*
*/
export default {
name: 'ContributionForm',
data() {
@ -102,28 +101,30 @@ export default {
return true
return false
},
lastMonthObject(){
lastMonthObject() {
let obj = {
month: new Date(this.lastMonth).toLocaleString(this.$i18n.locale, { month: 'long' }),
year: new Date().getFullYear(),
creation: this.$store.state.creation[1],
}
// If the current month is January then the current year must be counted back by -1.
if (new Date().getMonth === 1) {
return {
month: new Date(this.lastMonth).toLocaleString(this.$i18n.locale, { month: "long" }),
year: new Date().getFullYear() - 1,
creation: this.$store.state.creation[1]
obj = {
month: new Date(this.lastMonth).toLocaleString(this.$i18n.locale, { month: 'long' }),
year: new Date().getFullYear() - 1,
creation: this.$store.state.creation[1],
}
}
return {
month: new Date(this.lastMonth).toLocaleString(this.$i18n.locale, { month: "long" }),
year: new Date().getFullYear(),
creation: this.$store.state.creation[1]
}
return this.$t('contribution.formText.lastMonth', obj)
},
thisMonthObject() {
return {
month: new Date().toLocaleString(this.$i18n.locale, { month: "long" }),
year: new Date().getFullYear(),
creation: this.$store.state.creation[2]
const obj = {
month: new Date().toLocaleString(this.$i18n.locale, { month: 'long' }),
year: new Date().getFullYear(),
creation: this.$store.state.creation[2],
}
}
return this.$t('contribution.formText.thisMonth', obj)
},
},
}
</script>