This commit is contained in:
ogerly 2021-03-25 12:28:50 +01:00
parent db3f0066f5
commit 2350f4f39b
3 changed files with 50 additions and 65 deletions

View File

@ -1,39 +1,46 @@
<template> <template>
<div class="pt-4 pb-4"> <div class="pt-4 pb-4">
<b-tabs content-class="mt-3" class="display-4" fill> <b-tabs content-class="mt-3" class="display-4" fill>
<b-tab :title="names.thisMonth" active > <b-tab :title="names.thisMonth" active>
<b-row > <b-row>
<b-col lg="3"> <b-col lg="3">
<base-input label="Stunden"> <base-input label="Stunden">
<b-form-input type="number" size="lg" placeholder="23" style="font-size: xx-large; padding-left: 20px"/> <b-form-input
type="number"
size="lg"
placeholder="23"
style="font-size: xx-large; padding-left: 20px"
/>
</base-input> </base-input>
<base-input label="Datum / Zeitraum" > <base-input label="Datum / Zeitraum">
<flat-pickr class="form-control" v-model="date" :config="config" style="font-size: xx-large; padding-left: 20px" ></flat-pickr> <flat-pickr
class="form-control"
v-model="date"
:config="config"
style="font-size: xx-large; padding-left: 20px"
></flat-pickr>
</base-input> </base-input>
</b-col> </b-col>
<b-col lg="9"> <b-col lg="9">
<base-input label="Arbeitsreport"> <base-input label="Arbeitsreport">
<textarea class="form-control" rows="5" @focus="textFocus" style="font-size: x-large; padding-left: 20px"></textarea> <textarea
class="form-control"
rows="5"
@focus="textFocus"
style="font-size: x-large; padding-left: 20px"
></textarea>
</base-input> </base-input>
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row>
<b-col md="6"> <b-col md="6">
<b-button @click.prevent="newWorkForm" variant="warning">+ weitere Stunden</b-button>
<b-button @click.prevent="newWorkForm" variant="warning">
+ weitere Stunden
</b-button>
</b-col> </b-col>
<b-col md="6" class="text-right" > <b-col md="6" class="text-right">
<b-button variant="success" @click.prevent="submitForm2">Einreichen, absenden</b-button>
<b-button variant="success" @click.prevent="submitForm2">
Einreichen, absenden
</b-button>
</b-col> </b-col>
</b-row> </b-row>
</b-tab> </b-tab>
<b-tab :title="names.lastMonth"> <b-tab :title="names.lastMonth">
@ -54,17 +61,12 @@
</b-row> </b-row>
<b-row> <b-row>
<b-col md="12"> <b-col md="12">
<b-button @click.prevent="newWorkForm" variant="warning">
<b-button @click.prevent="newWorkForm" variant="warning"> + weiteren Report hinzufügen
+ weiteren Report hinzufügen </b-button>
</b-button>
</b-col> </b-col>
<b-col md="12" class="text-right"> <b-col md="12" class="text-right">
<b-button variant="success">Einreichen, absenden</b-button>
<b-button variant="success">
Einreichen, absenden
</b-button>
</b-col> </b-col>
</b-row> </b-row>
<hr /> <hr />
@ -255,7 +257,7 @@ export default {
//console.log('textFocus TODO') //console.log('textFocus TODO')
}, },
newWorkForm() { newWorkForm() {
console.log('newWorkForm TODO') //console.log('newWorkForm TODO')
}, },
}, },
} }

View File

@ -18,15 +18,11 @@
</div> </div>
</b-list-group-item> </b-list-group-item>
</b-list-group> </b-list-group>
<hr> <hr />
<b-icon <b-icon icon="clock-history" class="m-1" font-scale="2" style="color: orange"></b-icon>
Wartet auf Bestätigung |
icon="clock-history" <b-icon icon="check2-all" class="m-1" font-scale="2" style="color: green"></b-icon>
class="m-1" bestätigt
font-scale="2"
style="color: orange"
> </b-icon>Wartet auf Bestätigung |
<b-icon icon="check2-all" class="m-1" font-scale="2" style="color: green"> </b-icon> bestätigt
</div> </div>
</template> </template>

View File

@ -1,50 +1,37 @@
<template> <template>
<div> <div>
<div <div class="header pb-7 pt-5"></div>
class="header pb-7 pt-5"
></div>
<b-container fluid class="mt--6"> <b-container fluid class="mt--6">
<div class="display-3 mb-3">Gemeinschaftsstunden Chart</div> <div class="display-3 mb-3">Gemeinschaftsstunden Chart</div>
<b-row> <b-row>
<b-col>
<b-col >
<div class="chart"> <div class="chart">
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart> <line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
<hr> <hr />
<div class="display-3 mt-6">Neue Gemeinschaftsstunden eintragen</div> <div class="display-3 mt-6">Neue Gemeinschaftsstunden eintragen</div>
<b-row> <b-row>
<b-col> <b-col>
<gdd-add-work-2 />
<gdd-add-work-2 />
</b-col> </b-col>
</b-row> </b-row>
<hr> <hr />
<div class="display-3 mb-3">Meine Gemeinschaftsstunden Liste</div> <div class="display-3 mb-3">Meine Gemeinschaftsstunden Liste</div>
<b-row> <b-row>
<b-col class="mb-5"> <b-col class="mb-5">
community community
<gdd-work-table></gdd-work-table> <gdd-work-table></gdd-work-table>
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>
</div> </div>
</template> </template>
<script> <script>
import GddTable from '../../views/KontoOverview/GddTable.vue' //import GddTable from '../../views/KontoOverview/GddTable.vue'
import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue' import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue'
import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue' import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue'
@ -53,7 +40,7 @@ import LineChart from '@/components/Charts/LineChart'
export default { export default {
components: { components: {
GddTable, // GddTable,
GddWorkTable, GddWorkTable,
LineChart, LineChart,
GddAddWork2, GddAddWork2,
@ -75,7 +62,7 @@ export default {
data: [30, 20, 10, 30, 65, 40, 20, 60, 70], data: [30, 20, 10, 30, 65, 40, 20, 60, 70],
}, },
], ],
labels: ['2020 Aug' ,'Sep' ,'Okt', 'Nov', 'Dez', 'Jan', 'Feb', 'Mär 2021'], labels: ['2020 Aug', 'Sep', 'Okt', 'Nov', 'Dez', 'Jan', 'Feb', 'Mär 2021'],
}, },
extraOptions: chartConfigs.blueChartOptions, extraOptions: chartConfigs.blueChartOptions,
}, },