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

open creation contribution table

Browse Source
This commit is contained in:
ogerly 2022-12-31 09:24:42 +01:00
parent 544261bac0
commit 34ec7602a5
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/assets/scss/custom/gradido-custom/_color.scss
View File

@ -16,6 +16,8 @@ $gradido-f5: #f5f5f5 !default;
$gradido-248: rgb(248 248 248) !default; $gradido-248: rgb(248 248 248) !default;
$gradido-140: rgb(140 66 5) !default; $gradido-140: rgb(140 66 5) !default;
$gradido-205: rgb(205 86 86) !default; $gradido-205: rgb(205 86 86) !default;
$gradido-197: rgb(197 141 56) !default;
$gradido-4: rgb(4 112 6) !default;
$black: #000 !default; $black: #000 !default;
$grays: () !default; $grays: () !default;
$grays: map.merge( $grays: map.merge(
@ -32,7 +34,9 @@ $grays: map.merge(
"f5": $gradido-f5, "f5": $gradido-f5,
"248": $gradido-248, "248": $gradido-248,
"140": $gradido-140, "140": $gradido-140,
"205": $gradido-205 "205": $gradido-205,
"197": $gradido-197,
"4": $gradido-4
), ),
$grays $grays
); );
@ -69,7 +73,9 @@ $colors: map.merge(
"f5": $gradido-f5, "f5": $gradido-f5,
"248": $gradido-248, "248": $gradido-248,
"140": $gradido-140, "140": $gradido-140,
"205": $gradido-205 "205": $gradido-205,
"197": $gradido-197,
"4": $gradido-4
), ),
$colors $colors
); );
@ -110,7 +116,9 @@ $theme-colors: map.merge(
"f5": $gradido-f5, "f5": $gradido-f5,
"248": $gradido-248, "248": $gradido-248,
"140": $gradido-140, "140": $gradido-140,
"205": $gradido-205 "205": $gradido-205,
"197": $gradido-197,
"4": $gradido-4
), ),
$theme-colors $theme-colors
); );

4
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -31,7 +31,7 @@
<div class="small">createdAt {{ createdAt }}</div> --> <div class="small">createdAt {{ createdAt }}</div> -->
</b-col> </b-col>
<b-col cols="12" lg="3" offset="3" offset-md="0" offset-lg="0"> <b-col cols="12" lg="3" offset="3" offset-md="0" offset-lg="0">
<div class="small">{{ $t('creation') }}</div> <div class="small">{{ $t('creation') }} ({{ amount / 20 }} h)</div>
<div class="font-weight-bold">{{ amount | GDD }}</div> <div class="font-weight-bold">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="12" md="1" lg="1" class="text-right align-items-center"> <b-col cols="12" md="1" lg="1" class="text-right align-items-center">
@ -69,7 +69,7 @@
" "
> >
<b-icon icon="pencil"></b-icon> <b-icon icon="pencil"></b-icon>
{{ $t('edit') }} <div>{{ $t('edit') }}</div>
</div> </div>
</b-col> </b-col>

24
frontend/src/components/Contributions/OpenCreationsAmount.vue
View File

@ -1,29 +1,33 @@
<template> <template>
<div class="px-2"> <div class="bg-white appBoxShadow gradido-border-radius p-3">
<div> <div class="pl-3">
<b-row class="small"> <b-row class="small">
<b-col>Monatsbeiträge</b-col> <b-col>Monatsbeiträge</b-col>
<b-col class="d-none d-md-inline">Status</b-col> <b-col class="d-none d-md-inline">Status</b-col>
<b-col class="d-none d-md-inline">Eingereicht</b-col> <b-col class="d-none d-md-inline text-center">Eingereicht</b-col>
<b-col>offene Stunden</b-col> <b-col class="text-center">offene Stunden</b-col>
</b-row> </b-row>
<b-row> <b-row class="font-weight-bold pt-3">
<b-col>{{ $d(new Date(minimalDate), 'monthAndYear') }}</b-col> <b-col>{{ $d(new Date(minimalDate), 'monthAndYear') }}</b-col>
<b-col class="d-none d-md-inline"> <b-col class="d-none d-md-inline">
{{ maxGddLastMonth > 0 ? 'Einreichen' : 'Max. erreicht' }} {{ maxGddLastMonth > 0 ? 'Einreichen' : 'Max. erreicht' }}
</b-col> </b-col>
<b-col class="d-none d-md-inline">{{ (1000 - maxGddLastMonth) / 20 }} h</b-col> <b-col class="d-none d-md-inline text-197 text-center">
<b-col>{{ maxGddLastMonth / 20 }} h</b-col> {{ (1000 - maxGddLastMonth) / 20 }} h
</b-col>
<b-col class="text-4 text-center">{{ maxGddLastMonth / 20 }} h</b-col>
</b-row> </b-row>
<b-row> <b-row class="font-weight-bold">
<b-col>{{ $d(new Date(), 'monthAndYear') }}</b-col> <b-col>{{ $d(new Date(), 'monthAndYear') }}</b-col>
<b-col class="d-none d-md-inline"> <b-col class="d-none d-md-inline">
{{ maxGddThisMonth > 0 ? 'Einreichen' : 'Max. erreicht' }} {{ maxGddThisMonth > 0 ? 'Einreichen' : 'Max. erreicht' }}
</b-col> </b-col>
<b-col class="d-none d-md-inline">{{ (1000 - maxGddThisMonth) / 20 }} h</b-col> <b-col class="d-none d-md-inline text-197 text-center">
<b-col>{{ maxGddThisMonth / 20 }} h</b-col> {{ (1000 - maxGddThisMonth) / 20 }} h
</b-col>
<b-col class="text-4 text-center">{{ maxGddThisMonth / 20 }} h</b-col>
</b-row> </b-row>
</div> </div>
</div> </div>