mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
einenbeitrag zur schöpfung einreichen
This commit is contained in:
parent
527f5c0f37
commit
b00415a89d
@ -48,7 +48,8 @@
|
||||
"vue-router": "^3.0.6",
|
||||
"vue2-transitions": "^0.2.3",
|
||||
"vuex": "^3.6.0",
|
||||
"particles-bg-vue": "1.2.3"
|
||||
"particles-bg-vue": "1.2.3",
|
||||
"vue-moment": "^4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^3.7.0",
|
||||
|
||||
@ -34,6 +34,7 @@ import VueGoodTablePlugin from 'vue-good-table';
|
||||
// import the styles
|
||||
import 'vue-good-table/dist/vue-good-table.css';
|
||||
|
||||
import VueMoment from 'vue-moment';
|
||||
|
||||
Object.keys(rules).forEach(rule => {
|
||||
extend(rule, {
|
||||
@ -50,6 +51,7 @@ export default {
|
||||
Vue.use(BootstrapVue);
|
||||
Vue.use(IconsPlugin);
|
||||
Vue.use(VueGoodTablePlugin);
|
||||
Vue.use(VueMoment);
|
||||
Vue.use(VueQrcodeReader);
|
||||
Vue.use(VueQrcode);
|
||||
configure({
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
<gdd-sent />
|
||||
<hr>
|
||||
<gdd-table />
|
||||
<!--
|
||||
|
||||
<hr>
|
||||
<div>
|
||||
<gdd-add-work />
|
||||
</div>
|
||||
<br>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<div>
|
||||
<gdd-work-table />
|
||||
@ -26,7 +26,7 @@
|
||||
import GddStatus from './KontoOverview/GddStatus.vue';
|
||||
import GddSent from './KontoOverview/GddSent.vue';
|
||||
import GddTable from './KontoOverview/GddTable.vue';
|
||||
// import GddAddWork from './KontoOverview/GddAddWork.vue';
|
||||
import GddAddWork from './KontoOverview/GddAddWork.vue';
|
||||
// import GddWorkTable from './KontoOverview/GddWorkTable.vue';
|
||||
|
||||
export default {
|
||||
@ -34,8 +34,8 @@
|
||||
components: {
|
||||
GddStatus,
|
||||
GddSent,
|
||||
GddTable
|
||||
//GddAddWork
|
||||
GddTable,
|
||||
GddAddWork
|
||||
//GddWorkTable
|
||||
},
|
||||
created() {
|
||||
|
||||
@ -8,40 +8,51 @@
|
||||
</base-button>
|
||||
<b-collapse id="collapse-2" class="mt-2">
|
||||
<b-card>
|
||||
<p class="card-text">
|
||||
<div class="card-text">
|
||||
<b-row>
|
||||
<b-col>
|
||||
11111111
|
||||
|
||||
<h1>Neuer Beitrag</h1>
|
||||
<h3>{ Name der Community }</h3>
|
||||
</b-col>
|
||||
<b-col>
|
||||
2222222222
|
||||
<h3>Bitte trage jede arbeit einzeln ein.</h3>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<hr>
|
||||
<b-form @submit="onSubmit" @reset="onReset" v-if="show">
|
||||
|
||||
<div>
|
||||
|
||||
|
||||
<b-row class="form-group">
|
||||
<label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">Datetime</label>
|
||||
<label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">von</label>
|
||||
<b-col md="10">
|
||||
<base-input type="datetime-local" value="2018-11-23T10:30:00" id="example-datetime-local-input"/>
|
||||
<base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.from"/>
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
|
||||
<base-input label="Example textarea">
|
||||
<textarea class="form-control" id="exampleFormControlTextarea3" rows="3"></textarea>
|
||||
<b-row class="form-group">
|
||||
<label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">bis</label>
|
||||
<b-col md="10">
|
||||
<base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.to"/>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="form-group">
|
||||
<label class="col-md-2 col-form-label form-control-label">Ort</label>
|
||||
<b-col md="10">
|
||||
<base-input placeholder="Berlin" v-model="form.location"></base-input>
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
|
||||
<base-input label="Beitrag">
|
||||
<textarea class="form-control" id="exampleFormControlTextarea3" rows="3" v-model="form.text"></textarea>
|
||||
</base-input>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<br>
|
||||
<b-button type="submit" variant="success">jetzt einreichen</b-button>
|
||||
<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>
|
||||
</p>
|
||||
</div>
|
||||
</b-card>
|
||||
</b-collapse>
|
||||
</b-col>
|
||||
@ -56,13 +67,39 @@ export default {
|
||||
return {
|
||||
show: true,
|
||||
form: {
|
||||
|
||||
}
|
||||
};
|
||||
from:'',
|
||||
to: '',
|
||||
hours: 0,
|
||||
text: '',
|
||||
gdd: 0.00,
|
||||
location: '',
|
||||
text2: ''
|
||||
},
|
||||
timestamp: ""
|
||||
}
|
||||
},
|
||||
created() {
|
||||
setInterval(this.getNow, 2000);
|
||||
},
|
||||
methods: {
|
||||
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();
|
||||
},
|
||||
getHours: function (from,to) {
|
||||
const a = (to - from)
|
||||
console.log("(to - from)", (to - from))
|
||||
console.log("a summe", a)
|
||||
},
|
||||
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))
|
||||
alert(JSON.stringify(this.form))
|
||||
|
||||
},
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div>
|
||||
|
||||
<b-list-group >
|
||||
<b-list-group-item v-for="item in items" :key="item.id">
|
||||
<b-list-group-item v-for="item in filteredItems" :key="item.id">
|
||||
<div class="d-flex w-100 justify-content-between" @click="toogle(item)" >
|
||||
<b-icon v-if="item.type === 'send'" icon="box-arrow-left" class="m-1" font-scale="2" style="color:red"></b-icon>
|
||||
<b-icon v-else icon="box-arrow-right" class="m-1" font-scale="2" style="color:green" ></b-icon>
|
||||
@ -62,10 +62,10 @@ export default {
|
||||
|
||||
//console.log("result.count",result.data.count)
|
||||
// console.log("result.gdtSum",result.data.gdtSum)
|
||||
console.log("result.transactions",result.data.transactions)
|
||||
console.log("result.transactions",typeof(result.data.transactions))
|
||||
//commit('transactions', result.data.transactions)
|
||||
this.$store.state.user.balance_gdt = result.data.gdtSum
|
||||
this.items = result.data.transactions
|
||||
this.items = result.data.transactions
|
||||
this.count = result.data.count
|
||||
|
||||
}, (error) => {
|
||||
@ -74,7 +74,13 @@ export default {
|
||||
|
||||
|
||||
},
|
||||
|
||||
computed: {
|
||||
filteredItems(a) {
|
||||
console.log("filteredItems date",a.items)
|
||||
return a.items
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
rowClass(item, type) {
|
||||
if (!item || type !== 'row') return
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user