Revize d2f2529e
Přidáno uživatelem Václav Jirák před téměř 6 roky(ů)
| webapp/src/app/employees/edit-employee-dialog/edit-employee-dialog.component.html | ||
|---|---|---|
| 29 | 29 |
type="number" |
| 30 | 30 |
placeholder="{{'editEmployee.setSickdays' | translate}}"
|
| 31 | 31 |
min="0" |
| 32 |
step="0.5"
|
|
| 32 |
step="1"
|
|
| 33 | 33 |
[(ngModel)]="_sickDaysCount" |
| 34 | 34 |
> |
| 35 | 35 |
</mat-form-field> |
| ... | ... | |
| 43 | 43 |
type="number" |
| 44 | 44 |
placeholder="{{'editEmployee.addVacation' | translate}}"
|
| 45 | 45 |
min="0" |
| 46 |
step="0.5"
|
|
| 46 |
step="1"
|
|
| 47 | 47 |
[(ngModel)]="_addVacationHoursCount" |
| 48 | 48 |
> |
| 49 | 49 |
</mat-form-field> |
| webapp/src/app/vacation-info/vacation-info.component.html | ||
|---|---|---|
| 1 |
<div class="days-off-info-container">
|
|
| 1 |
<div class="vacation-info-container">
|
|
| 2 | 2 |
|
| 3 |
<div class="component-header" translate>
|
|
| 4 |
<span translate>daysOffInfo.remaining</span>
|
|
| 3 |
<div class="component-header"> |
|
| 4 |
<span translate>{{ 'vacationInfo.header' | translate }}</span>
|
|
| 5 | 5 |
</div> |
| 6 | 6 |
|
| 7 |
<div class="days-off-type-container"> |
|
| 8 |
<span class="days-off-remaining">{{extraVacationRemaining}}</span>
|
|
| 9 |
<span class="days-off-type" translate>vacationType.vacation</span> |
|
| 7 |
<div class="vacation-type-container"> |
|
| 8 |
<span class="vacation-remaining">{{extraVacationRemaining}}</span>
|
|
| 9 |
<span class="units">{{ 'vacationInfo.hours' | translate }}</span>
|
|
| 10 |
<span class="vacation-type" translate>vacationType.vacation</span> |
|
| 10 | 11 |
</div> |
| 11 | 12 |
|
| 12 |
<div class="days-off-type-container"> |
|
| 13 |
<span class="days-off-remaining">{{sickDaysRemaining}}</span>
|
|
| 14 |
<span class="days-off-type" translate>vacationType.sickday</span> |
|
| 13 |
<div class="vacation-type-container"> |
|
| 14 |
<span class="vacation-remaining">{{sickDaysRemaining}}</span>
|
|
| 15 |
<span class="units">{{ 'vacationInfo.days' | translate }}</span>
|
|
| 16 |
<span class="vacation-type" translate>vacationType.sickday</span> |
|
| 15 | 17 |
</div> |
| 16 | 18 |
|
| 17 | 19 |
</div> |
| webapp/src/app/vacation-info/vacation-info.component.sass | ||
|---|---|---|
| 1 | 1 |
@import '../../common-styles/basic-component' |
| 2 | 2 |
|
| 3 |
.days-off-info-container
|
|
| 3 |
.vacation-info-container
|
|
| 4 | 4 |
@extend .basic-component |
| 5 | 5 |
|
| 6 |
.days-off-type-container
|
|
| 6 |
.vacation-type-container
|
|
| 7 | 7 |
border-bottom: 1px solid gainsboro |
| 8 | 8 |
padding-left: 20px |
| 9 | 9 |
|
| 10 |
.days-off-remaining
|
|
| 10 |
.vacation-remaining
|
|
| 11 | 11 |
color: green |
| 12 | 12 |
font-size: 30px |
| 13 | 13 |
font-weight: bold |
| 14 | 14 |
|
| 15 |
.days-off-type
|
|
| 15 |
.vacation-type
|
|
| 16 | 16 |
color: black |
| 17 | 17 |
font-weight: bold |
| 18 | 18 |
display: block |
| 19 |
|
|
| 20 |
.units |
|
| 21 |
color: grey |
|
| 22 |
font-size: 10px |
|
| 23 |
font-style: italic |
|
| webapp/src/assets/i18n/cs.json | ||
|---|---|---|
| 1 | 1 |
{
|
| 2 |
"daysOffInfo": {
|
|
| 3 |
"remaining": "Zbývající dovolená" |
|
| 2 |
"vacationInfo": {
|
|
| 3 |
"header": "Zbývající dovolená", |
|
| 4 |
"days": "dní", |
|
| 5 |
"hours": "hodin" |
|
| 4 | 6 |
}, |
| 5 | 7 |
"userApproval": {
|
| 6 | 8 |
"headline": "Schvalování uživatelů", |
| webapp/src/assets/i18n/en.json | ||
|---|---|---|
| 1 | 1 |
{
|
| 2 |
"daysOffInfo": {
|
|
| 3 |
"remaining": "Vacation remaining" |
|
| 2 |
"vacationInfo": {
|
|
| 3 |
"header": "Vacation remaining", |
|
| 4 |
"days": "days", |
|
| 5 |
"hours": "hours" |
|
| 4 | 6 |
}, |
| 5 | 7 |
"userApproval": {
|
| 6 | 8 |
"headline": "User approval", |
Také k dispozici: Unified diff
Added units to vacation info component