mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge pull request #88 from gradido/fix-final-video-session
qrcode scanner fixed, datum in activitäten fixed, sprache not null fixed
This commit is contained in:
Alexander Friedland
GitHub
commit
6becd2192b
@ -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'))
|
||||
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 {
|
||||
|
||||
@ -1,210 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<b-row>
|
||||
<b-col xl="12" md="12">
|
||||
<base-button icon type="info" size="lg" v-b-toggle.collapse-2>
|
||||
<span class="btn-inner--icon"><i class="ni ni-fat-add"></i></span>
|
||||
<span class="btn-inner--text">
|
||||
{{ $t('site.overview.add_work') }}
|
||||
</span>
|
||||
</base-button>
|
||||
<b-collapse id="collapse-2" class="mt-2">
|
||||
<b-card>
|
||||
<div class="card-text">
|
||||
<b-row>
|
||||
<b-col>
|
||||
<h1>Neuer Beitrag</h1>
|
||||
<h3>{ Name der Community }</h3>
|
||||
</b-col>
|
||||
<b-col>
|
||||
<h3>Bitte trage jede arbeit einzeln ein.</h3>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<hr />
|
||||
<b-form @submit="onSubmit" @reset="onReset" v-if="show">
|
||||
<b-row class="form-group">
|
||||
<label
|
||||
for="example-datetime-local-input"
|
||||
class="col-md-2 col-form-label form-control-label form-control-lg"
|
||||
>
|
||||
von
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input
|
||||
type="datetime-local"
|
||||
value="2018-11-23T10:30:00"
|
||||
v-model="form.from"
|
||||
@change="dateDiff"
|
||||
/>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label
|
||||
for="example-datetime-local-input"
|
||||
class="col-md-2 col-form-label form-control-label form-control-lg"
|
||||
>
|
||||
bis
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input
|
||||
type="datetime-local"
|
||||
value="2018-11-23T10:30:00"
|
||||
v-model="form.to"
|
||||
@change="dateDiff"
|
||||
/>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label
|
||||
for="example-datetime-local-input"
|
||||
class="col-md-2 col-form-label form-control-label form-control-lg"
|
||||
>
|
||||
Stunden
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input type="text" v-model="form.hours" disabled class="form-control-lg" />
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label
|
||||
for="example-datetime-local-input"
|
||||
class="col-md-2 col-form-label form-control-label form-control-lg"
|
||||
>
|
||||
GDD Shöpfen
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input
|
||||
type="text"
|
||||
:value="form.hours * 20"
|
||||
disabled
|
||||
class="form-control-lg"
|
||||
/>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label class="col-md-2 col-form-label form-control-label form-control-lg">
|
||||
Ort
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input
|
||||
placeholder="Berlin"
|
||||
v-model="form.location"
|
||||
class="form-control-lg"
|
||||
></base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label class="col-md-2 col-form-label form-control-label form-control-lg">
|
||||
Kategorie
|
||||
</label>
|
||||
<b-col md="10">
|
||||
<base-input>
|
||||
<select class="form-control form-control-lg">
|
||||
<option>Umwelt</option>
|
||||
<option>Helfen</option>
|
||||
<option>Verein</option>
|
||||
</select>
|
||||
</base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
<base-input label="Beitrag">
|
||||
<textarea
|
||||
class="form-control form-control-lg"
|
||||
rows="3"
|
||||
v-model="form.text"
|
||||
></textarea>
|
||||
</base-input>
|
||||
<b-row class="form-group">
|
||||
<label class="col-md-2 col-form-label form-control-label form-control-lg">
|
||||
Tätigkeit
|
||||
</label>
|
||||
<b-col md="8">
|
||||
<base-input
|
||||
placeholder="Tätigkeit"
|
||||
v-model="form.location"
|
||||
class="form-control-lg"
|
||||
></base-input>
|
||||
</b-col>
|
||||
<b-col md="2">
|
||||
<base-input
|
||||
placeholder="Stunden"
|
||||
v-model="form.location"
|
||||
class="form-control-lg"
|
||||
></base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
<br />
|
||||
|
||||
<br />
|
||||
<b-button type="submit" variant="success">
|
||||
jetzt einreichen
|
||||
<small>{{ timestamp }}</small>
|
||||
</b-button>
|
||||
<b-button type="reset" variant="danger">Cancel</b-button>
|
||||
<br />
|
||||
</b-form>
|
||||
</div>
|
||||
</b-card>
|
||||
</b-collapse>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'GDDAddWork',
|
||||
data() {
|
||||
return {
|
||||
show: true,
|
||||
form: {
|
||||
from: '',
|
||||
to: '',
|
||||
hours: '',
|
||||
text: '',
|
||||
gdd: 0.0,
|
||||
location: '',
|
||||
text2: '',
|
||||
sendtime: '',
|
||||
},
|
||||
timestamp: '',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
setInterval(this.getNow, 2000)
|
||||
},
|
||||
methods: {
|
||||
dateDiff() {
|
||||
this.form.hours = (this.$moment(this.form.to) - this.$moment(this.form.from)) / 1000 / 3600
|
||||
},
|
||||
getNow: function () {
|
||||
//const today = new Date()
|
||||
//const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
|
||||
//const time = today.getHours() + ":" + today.getMinutes();
|
||||
//const dateTime = date +', '+ time;
|
||||
this.timestamp = new Date()
|
||||
},
|
||||
onSubmit(event) {
|
||||
event.preventDefault()
|
||||
//console.log('onSUBMIT this.form.from >>>>', this.form.from)
|
||||
//console.log('onSUBMIT this.form.from >>>>', this.$moment(this.form.from))
|
||||
//console.log('onSUBMIT this.form.to >>>>', this.form.to)
|
||||
// console.log("onSUBMIT >>>>", this.getHours(this.form.from, this.form.to))
|
||||
this.form.sendtime = new Date()
|
||||
alert(JSON.stringify(this.form))
|
||||
},
|
||||
onReset(event) {
|
||||
event.preventDefault()
|
||||
// Reset our form values
|
||||
|
||||
// Trick to reset/clear native browser form validation state
|
||||
this.show = false
|
||||
this.$nextTick(() => {
|
||||
this.show = true
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@ -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"
|
||||
></flat-pickr>
|
||||
</base-input>
|
||||
</b-col>
|
||||
@ -43,83 +43,9 @@
|
||||
</b-row>
|
||||
</b-tab>
|
||||
|
||||
<b-tab :title="names.lastMonth">
|
||||
<b-row>
|
||||
<b-col cols="3">
|
||||
<base-input label="Arbeitstunden">
|
||||
<b-form-input type="number" placeholder="23" />
|
||||
</base-input>
|
||||
<base-input label="Datum / Zeitraum">
|
||||
<flat-pickr class="form-control" v-model="date" :config="lastConfig"></flat-pickr>
|
||||
</base-input>
|
||||
</b-col>
|
||||
<b-col cols="9">
|
||||
<base-input label="Arbeitsreport">
|
||||
<textarea class="form-control" rows="5" @focus="textFocus"></textarea>
|
||||
</base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row>
|
||||
<b-col md="12">
|
||||
<b-button @click.prevent="newWorkForm" variant="warning">
|
||||
+ weiteren Report hinzufügen
|
||||
</b-button>
|
||||
</b-col>
|
||||
<b-col md="12" class="text-right">
|
||||
<b-button variant="success">Einreichen, absenden</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<hr />
|
||||
<pre>Selected date is - {{ date }}</pre>
|
||||
<p>{{ days.lastMonth }} Days in {{ names.lastMonth }}</p>
|
||||
<b-tab :title="names.lastMonth"></b-tab>
|
||||
|
||||
<p>
|
||||
Du hast diesen Monat
|
||||
{{ stundenSumme > 0 ? 'schon ' : 'noch keine' }}
|
||||
{{ stundenSumme > 0 ? '' + stundenSumme : '' }}
|
||||
Stunden eingetragen
|
||||
</p>
|
||||
</b-tab>
|
||||
|
||||
<b-tab :title="names.beforLastMonth">
|
||||
<b-row>
|
||||
<b-col cols="3">
|
||||
<base-input label="Arbeitstunden">
|
||||
<b-form-input type="number" placeholder="23" />
|
||||
</base-input>
|
||||
<base-input label="Datum / Zeitraum">
|
||||
<flat-pickr
|
||||
class="form-control"
|
||||
v-model="date"
|
||||
:config="beforLastConfig"
|
||||
></flat-pickr>
|
||||
</base-input>
|
||||
</b-col>
|
||||
<b-col cols="9">
|
||||
<base-input label="Arbeitsreport">
|
||||
<textarea class="form-control" rows="5" @focus="textFocus"></textarea>
|
||||
</base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row>
|
||||
<b-col>
|
||||
<button class="btn btn-warning text-right" @click.prevent="newWorkForm">
|
||||
+ weiteren Report hinzufügen
|
||||
</button>
|
||||
</b-col>
|
||||
<b-col>
|
||||
<div class="text-right">
|
||||
<button class="btn btn-info text-right" @click.prevent="submitForm3">
|
||||
save new Report
|
||||
</button>
|
||||
</div>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<hr />
|
||||
<pre>Selected date is - {{ date }}</pre>
|
||||
<p>{{ days.beforLastMonth }} Days in {{ names.beforLastMonth }}</p>
|
||||
<p>Du hast noch keine Einträge</p>
|
||||
</b-tab>
|
||||
<b-tab :title="names.beforLastMonth"></b-tab>
|
||||
</b-tabs>
|
||||
</div>
|
||||
</template>
|
||||
@ -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')
|
||||
},
|
||||
|
||||
@ -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.
|
||||
</b-alert>
|
||||
<b-card class="p-0 p-md-3">
|
||||
<b-card class="p-0 p-md-3" style="background-color: #ebebeba3 !important">
|
||||
<b-alert show variant="secondary">
|
||||
<span class="alert-text">
|
||||
<strong>QR Code Scanner</strong>
|
||||
@ -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()
|
||||
|
||||
@ -2,12 +2,22 @@
|
||||
<div>
|
||||
<b-row v-show="$store.state.row_form">
|
||||
<b-col xl="6" md="6">
|
||||
<stats-card type="gradient-red" sub-title="balance_gdd" class="mb-4 h1">
|
||||
<stats-card
|
||||
type="gradient-red"
|
||||
sub-title="balance_gdd"
|
||||
class="mb-4 h1"
|
||||
style="background-color: #ebebeba3 !important"
|
||||
>
|
||||
{{ $n($store.state.user.balance) }} GDD
|
||||
</stats-card>
|
||||
</b-col>
|
||||
<b-col xl="6" md="6">
|
||||
<stats-card type="gradient-orange" sub-title="balance_gdt" class="mb-4 h1">
|
||||
<stats-card
|
||||
type="gradient-orange"
|
||||
sub-title="balance_gdt"
|
||||
class="mb-4 h1"
|
||||
style="background-color: #ebebeba3 !important"
|
||||
>
|
||||
{{ $n($store.state.user.balance_gdt) }} GDT
|
||||
</stats-card>
|
||||
</b-col>
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
<template>
|
||||
<card>
|
||||
<b-row align-v="center" slot="header">
|
||||
<b-col cols="8"></b-col>
|
||||
<b-col cols="4" class="text-right"></b-col>
|
||||
</b-row>
|
||||
|
||||
<card style="background-color: #ebebeba3 !important">
|
||||
<b-form @submit.prevent="updateProfile">
|
||||
<h6 class="heading-small text-muted mb-4">User information</h6>
|
||||
|
||||
|
||||
@ -1,5 +1,11 @@
|
||||
<template>
|
||||
<b-card no-body class="card-profile" alt="Image placeholder" img-top>
|
||||
<b-card
|
||||
no-body
|
||||
class="card-profile"
|
||||
alt="Image placeholder"
|
||||
img-top
|
||||
style="background-color: #ebebeba3 !important"
|
||||
>
|
||||
<b-row class="justify-content-center">
|
||||
<b-col lg="3" class="order-lg-2">
|
||||
<div class="card-profile-image">
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
//import GddTable from '../../views/KontoOverview/GddTable.vue'
|
||||
import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue'
|
||||
import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue'
|
||||
|
||||
@ -40,7 +39,6 @@ import LineChart from '@/components/Charts/LineChart'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
// GddTable,
|
||||
GddWorkTable,
|
||||
LineChart,
|
||||
GddAddWork2,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user