diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 97cdb3155..0235f5053 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -57,6 +57,20 @@ services: - external-net volumes: - /sessions + + ######################################################### + ## skeema for updating dbs if changes happend ########### + ######################################################### + skeema: + build: + context: . + dockerfile: ./skeema/Dockerfile + target: skeema_run + container_name: skeema + depends_on: + - mariadb + networks: + - internal-net volumes: frontend_node_modules: 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/store/store.js b/frontend/src/store/store.js index 5dd321aac..c38f5f7be 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -13,6 +13,9 @@ export const store = new Vuex.Store({ sizeDE: 'normal', sizeGB: 'big', loginfail: false, + row_form: true, + row_check: false, + row_thx: false, user: { name: '', balance: 0, @@ -22,7 +25,7 @@ export const store = new Vuex.Store({ session_id: '', email: '', amount: 0, - target_date: '2021-02-19T13:25:36+00:00', + target_date: '', memo: '', auto_sign: true, }, @@ -141,8 +144,17 @@ export const store = new Vuex.Store({ }, ajaxCreate: async ({ dispatch, state }) => { //console.log('action: ajaxCreate') + state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000 - const result = await communityAPI.create($cookies.get('gdd_session_id', email, amount, memo)) + + const result = await communityAPI.send( + state.session_id, + state.ajaxCreateData.email, + state.ajaxCreateData.amount, + state.ajaxCreateData.memo, + ) + + return result //console.log(result) }, ajaxListTransactions: async ({ commit, dispatch, state }) => { @@ -157,8 +169,8 @@ export const store = new Vuex.Store({ // commit('session_id', $cookies.get("gdd_session_id")) // commit('email', $cookies.get("gdd_u")) const result = await communityAPI.balance($cookies.get('gdd_session_id')) - //console.log('accountBalance result', result) - //console.log('aresult.result.data.balance', result.result.data.balance) + //console.log("accountBalance result", result) + //console.log("aresult.result.data.balance", result.result.data.balance) if (result.success) { commit('user_balance', result.result.data.balance) } 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 5df29650a..749265b88 100644 --- a/frontend/src/views/KontoOverview/GddAddWork2.vue +++ b/frontend/src/views/KontoOverview/GddAddWork2.vue @@ -1,119 +1,53 @@ @@ -135,32 +69,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, @@ -184,6 +92,7 @@ export default { .month(this.$moment().month() - 2) .format('MMMM'), }, + formular: null, } }, created() {}, @@ -192,21 +101,12 @@ export default { stunden(this.form) }, }, + mounted() {}, 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]) } @@ -220,7 +120,6 @@ export default { TextDecoded: '', }) this.index++ - //console.log('this.stundenSumme ende=> ', this.stundenSumme) }, addNewMessage: function () { this.messages.push({ @@ -229,29 +128,55 @@ 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') }, newWorkForm() { - //console.log('newWorkForm TODO') + this.formular = ` + + + + + + + + + + + + + + ` + + // console.log('newWorkForm TODO') + const myElement = this.$refs.mydiv + myElement.append(this.formular) + this.$compile(myElement) + this.formular = null }, }, } diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index 9dab86ab4..7dc36efc7 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -1,13 +1,13 @@