IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

activity user page step move

Browse Source
This commit is contained in:
ogerly 2021-03-25 12:22:37 +01:00
parent e676bb7da8
commit db3f0066f5
3 changed files with 82 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
frontend/src/views/KontoOverview/GddAddWork2.vue
View File

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

17
frontend/src/views/KontoOverview/GddWorkTable.vue
View File

@ -18,6 +18,15 @@
</div>
</b-list-group-item>
</b-list-group>
<hr>
<b-icon
icon="clock-history"
class="m-1"
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>
</template>
@ -30,25 +39,25 @@ export default {
items: [
{
id: 1,
text: 'Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',
text: 'Zwei Säcke Plastikmüll im Wald gesammelt',
datel: '12.12.2020 14:04',
status: 'submitted',
},
{
id: 2,
text: 'Larsen Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',
text: 'Frau Schmidt bei der Gartenarbeit geholfen.',
datel: '22.06.2020 22:23',
status: 'submitted',
},
{
id: 3,
text: 'Geneva Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',
text: 'Ein online Kurs für nachhaltiges Mülltrennen erstellt',
datel: '15.04.2020 12:55',
status: 'confirmed',
},
{
id: 4,
text: 'Community Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',
text: 'Gradido bei meinen Freunden vorgestellt',
datel: '10.03.2020 18:20',
status: 'confirmed',
},

63
frontend/src/views/Pages/UserProfileActivity.vue
View File

@ -1,42 +1,45 @@
<template>
<div>
<div
class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header"
style="max-height: 200px"
class="header pb-7 pt-5"
></div>
<b-container fluid class="mt--6">
<b-row>
<b-col>
<div>
<gdd-add-work-2 />
<div class="display-3 mb-3">Gemeinschaftsstunden Chart</div>
<b-row>
<b-col >
<div class="chart">
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div>
<br />
</b-col>
</b-row>
<hr />
<b-row>
<b-col xl="4" class="order-xl-2 mb-5">
<hr>
<div class="display-3 mt-6">Neue Gemeinschaftsstunden eintragen</div>
<b-row>
<b-col>
<gdd-add-work-2 />
</b-col>
</b-row>
<hr>
<div class="display-3 mb-3">Meine Gemeinschaftsstunden Liste</div>
<b-row>
<b-col class="mb-5">
community
<gdd-work-table></gdd-work-table>
</b-col>
<b-col xl="8" class="order-xl-1">
transactions
<gdd-table></gdd-table>
</b-col>
</b-row>
<b-row>
<b-col xl="6" S>
<div class="chart">
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div>
</b-col>
<b-col xl="6">
<div class="chart">
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div>
</b-col>
</b-row>
</b-container>
</div>
</template>
@ -47,7 +50,6 @@ import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue'
import * as chartConfigs from '@/components/Charts/config'
import LineChart from '@/components/Charts/LineChart'
//import BarChart from '@/components/Charts/BarChart';
export default {
components: {
@ -55,7 +57,6 @@ export default {
GddWorkTable,
LineChart,
GddAddWork2,
//BarChart
},
data() {
return {
@ -70,11 +71,11 @@ export default {
chartData: {
datasets: [
{
label: 'Performance',
data: [0, 20, 10, 30, 15, 40, 20, 60, 60],
label: 'Gemeinschaftsstunden',
data: [30, 20, 10, 30, 65, 40, 20, 60, 70],
},
],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
labels: ['2020 Aug' ,'Sep' ,'Okt', 'Nov', 'Dez', 'Jan', 'Feb', 'Mär 2021'],
},
extraOptions: chartConfigs.blueChartOptions,
},