diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2b0449c88..e11e03d3d 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -39,7 +39,12 @@ export default { //console.log('%cHey %c' + $cookies.get('gdd_u') + '', 'font-weight:bold', 'color: orange') this.$store.commit('session_id', $cookies.get('gdd_session_id')) this.$store.commit('email', $cookies.get('gdd_u')) - this.$store.commit('language', $cookies.get('gdd_lang')) + if ($cookies.get('gdd_lang') != 'de' || $cookies.get('gdd_lang') != 'de') { + this.$store.commit('language', 'de') + } else { + this.$store.commit('language', $cookies.get('gdd_lang')) + } + this.$i18n.locale = $cookies.get('gdd_lang') this.$router.push('overview') } else { diff --git a/frontend/src/views/KontoOverview/GddAddWork.vue b/frontend/src/views/KontoOverview/GddAddWork.vue deleted file mode 100644 index b1be964aa..000000000 --- a/frontend/src/views/KontoOverview/GddAddWork.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - diff --git a/frontend/src/views/KontoOverview/GddAddWork2.vue b/frontend/src/views/KontoOverview/GddAddWork2.vue index 85cb3ffb3..2e328cc9a 100644 --- a/frontend/src/views/KontoOverview/GddAddWork2.vue +++ b/frontend/src/views/KontoOverview/GddAddWork2.vue @@ -17,7 +17,7 @@ class="form-control" v-model="date" :config="config" - style="font-size: xx-large; padding-left: 20px" + style="font-size: x-large; padding-left: 20px" > @@ -43,83 +43,9 @@ - - - - - - - - - - - - - - - - - - - - + weiteren Report hinzufügen - - - - Einreichen, absenden - - -
- 
Selected date is - {{ date }}
-

{{ days.lastMonth }} Days in {{ names.lastMonth }}

+ -

- Du hast diesen Monat - {{ stundenSumme > 0 ? 'schon ' : 'noch keine' }} - {{ stundenSumme > 0 ? '' + stundenSumme : '' }} - Stunden eingetragen -

- - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- 
Selected date is - {{ date }}
-

{{ days.beforLastMonth }} Days in {{ names.beforLastMonth }}

-

Du hast noch keine Einträge

- + @@ -141,32 +67,6 @@ export default { maxDate: this.$moment().format('DD.MM.YYYY'), mode: 'range', }, - lastConfig: { - altInput: false, - dateFormat: 'd-m-Y', - minDate: this.$moment() - .month(this.$moment().month() - 1) - .startOf('month') - .format('DD.MM.YYYY'), - maxDate: this.$moment() - .month(this.$moment().month() - 1) - .endOf('month') - .format('DD.MM.YYYY'), - mode: 'range', - }, - beforLastConfig: { - altInput: false, - dateFormat: 'd-m-Y', - minDate: this.$moment() - .month(this.$moment().month() - 2) - .startOf('month') - .format('DD.MM.YYYY'), - maxDate: this.$moment() - .month(this.$moment().month() - 2) - .endOf('month') - .format('DD.MM.YYYY'), - mode: 'range', - }, index: 0, form: [], stundenSumme: 0, @@ -199,20 +99,10 @@ export default { }, }, methods: { - getTR(m, i) { - //console.log(m + '-' + i) - }, stunden(hour, i, mon) { let n = 0 - //console.log('stunden(form)=>', hour) - //console.log('stunden(i)=>', i) - //console.log('stunden(mon)=>', mon) - - //console.log('this.stundenSumme start=> ', this.stundenSumme) this.stundenSumme = 0 - //console.log('arr.length => ', this.form.length) for (n; n < this.form.length; n++) { - //console.log('>arr[n]=> ', this.form[n]) if (this.form[n] > 0) { this.stundenSumme += parseInt(this.form[n]) } @@ -226,7 +116,6 @@ export default { TextDecoded: '', }) this.index++ - //console.log('this.stundenSumme ende=> ', this.stundenSumme) }, addNewMessage: function () { this.messages.push({ @@ -235,24 +124,15 @@ export default { }) }, deleteNewMessage: function (event) { - //console.log('deleteNewMessage:event) => ', event) - //console.log("deleteNewMessage:this.events.splice(this.event) => ", this.events.splice(this.event)) this.form.splice(event, null) this.messages.splice(index, 1) this.index-- }, submitForm: function (e) { - //console.log(this.messages) - + //console.log('submitForm') this.messages = [{ DaysNumber: '', TextDecoded: '' }] this.submitted = true }, - submitForm2() { - //console.log('submitForm2 TODO') - }, - submitForm3() { - //console.log('submitForm3 TODO') - }, textFocus() { //console.log('textFocus TODO') }, diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index 038aa0f6b..7dc36efc7 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -7,7 +7,7 @@ Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden. - + QR Code Scanner @@ -230,10 +230,9 @@ export default { const arr = JSON.parse(decodedString) //console.log('qr-email', arr[0].email) //console.log('qr-amount', arr[0].amount) - - this.$store.state.row_form = false - this.$store.state.row_check = true - this.$store.state.row_thx = false + this.form.email = arr[0].email + this.form.amount = arr[0].amount + this.scan = false }, async onSubmit() { //event.preventDefault() diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index b22c273fc..53972ddd5 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -2,12 +2,22 @@
- + {{ $n($store.state.user.balance) }} GDD - + {{ $n($store.state.user.balance_gdt) }} GDT diff --git a/frontend/src/views/Pages/UserProfile/EditProfileForm.vue b/frontend/src/views/Pages/UserProfile/EditProfileForm.vue index e8981f8e8..dbf9a3064 100755 --- a/frontend/src/views/Pages/UserProfile/EditProfileForm.vue +++ b/frontend/src/views/Pages/UserProfile/EditProfileForm.vue @@ -1,10 +1,5 @@