Skip to content

Commit 752a93c

Browse files
renemadsenrenemadsen
committed
Adding translations and descriptions for the checkboxes.
1 parent a0c333e commit 752a93c

29 files changed

Lines changed: 243 additions & 10 deletions

File tree

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.html‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
[id]="'useGoogleSheetAsDefault'"
1111
[name]="'useGoogleSheetAsDefault'"
1212
[(ngModel)]="data.useGoogleSheetAsDefault">
13-
{{ 'Use Google Sheet as default' | translate }}
13+
<div>
14+
<div>{{ 'Use Google Sheet as default' | translate }}</div>
15+
<small class="checkbox-description"></small>
16+
</div>
1417
</mat-checkbox>
1518
</div>
1619
<div class="d-flex flex-row" *ngIf="!data.useGoogleSheetAsDefault && selectCurrentUserIsFirstUser$ | async" >
@@ -19,7 +22,10 @@
1922
[id]="'useOnlyPlanHours'"
2023
[name]="'useOnlyPlanHours'"
2124
[(ngModel)]="data.useOnlyPlanHours">
22-
{{ 'Use only plan hours' | translate }}
25+
<div>
26+
<div>{{ 'Use only plan hours' | translate }}</div>
27+
<small class="checkbox-description"></small>
28+
</div>
2329
</mat-checkbox>
2430
</div>
2531
<!-- <div class="d-flex flex-row">-->
@@ -46,7 +52,10 @@
4652
[id]="'autoBreakCalculationActive'"
4753
[name]="'autoBreakCalculationActive'"
4854
[(ngModel)]="data.autoBreakCalculationActive">
49-
{{ 'Auto break calculation' | translate }}
55+
<div>
56+
<div>{{ 'Auto break calculation' | translate }}</div>
57+
<small class="checkbox-description"></small>
58+
</div>
5059
</mat-checkbox>
5160
</div>
5261
<div class="d-flex flex-row">
@@ -55,7 +64,10 @@
5564
[id]="'allowPersonalTimeRegistration'"
5665
[name]="'allowPersonalTimeRegistration'"
5766
[(ngModel)]="data.allowPersonalTimeRegistration">
58-
{{ 'Allow personal time registration' | translate }}
67+
<div>
68+
<div>{{ 'Allow time registration on mobile' | translate }}</div>
69+
<small class="checkbox-description">{{'Enter start time, stop time, and total break. Select Allow editing of work hours on mobile to edit times.' | translate}}</small>
70+
</div>
5971
</mat-checkbox>
6072
</div>
6173
<div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration">
@@ -64,7 +76,10 @@
6476
[id]="'allowEditOfRegistrations'"
6577
[name]="'allowEditOfRegistrations'"
6678
[(ngModel)]="data.allowEditOfRegistrations">
67-
{{ 'Allow edit of registrations' | translate }}
79+
<div>
80+
<div>{{ 'Allow editing of working hours on mobile' | translate }}</div>
81+
<small class="checkbox-description">{{'Start time, stop time and breaks can be edited.' | translate}}</small>
82+
</div>
6883
</mat-checkbox>
6984
</div>
7085
<div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration && !data.allowAcceptOfPlannedHours">
@@ -73,7 +88,10 @@
7388
[id]="'usePunchClock'"
7489
[name]="'usePunchClock'"
7590
[(ngModel)]="data.usePunchClock">
76-
{{ 'Use punch clock' | translate }}
91+
<div>
92+
<div>{{ 'Use time clock on mobile' | translate }}</div>
93+
<small class="checkbox-description">{{'Working hours are recorded by pressing Start/Stop working hours. Breaks are recorded by pressing Start/Stop break time. Select Allow editing of working hours on mobile to edit times.' | translate}}</small>
94+
</div>
7795
</mat-checkbox>
7896
</div>
7997
<div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration && !data.allowAcceptOfPlannedHours && data.usePunchClock">
@@ -82,7 +100,10 @@
82100
[id]="'usePunchClockWithAllowRegisteringInHistory'"
83101
[name]="'usePunchClockWithAllowRegisteringInHistory'"
84102
[(ngModel)]="data.usePunchClockWithAllowRegisteringInHistory">
85-
{{ 'Allow registering time in history for punch clock' | translate }}
103+
<div>
104+
<div>{{ 'Allow entry of unregistered working hours on mobile' | translate }}</div>
105+
<small class="checkbox-description">{{ 'Indtast starttidspunkt, stoptidspunkt og samlet pause bag ud i tiden. Vælg Tillad redigering af arbejdstid på mobil for at redigere tidspunkter.' | translate }}</small>
106+
</div>
86107
</mat-checkbox>
87108
</div>
88109
<div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration && !data.usePunchClock && selectCurrentUserIsAdmin$ | async">
@@ -91,7 +112,10 @@
91112
[id]="'allowAcceptOfPlannedHours'"
92113
[name]="'allowAcceptOfPlannedHours'"
93114
[(ngModel)]="data.allowAcceptOfPlannedHours">
94-
{{ 'Allow accept of planned hours' | translate }}
115+
<div>
116+
<div>{{ 'Allow receipt for standard time on mobile' | translate }}</div>
117+
<small class="checkbox-description">{{'Scheduled working hours can be approved with a single click. Scheduled working hours cannot be edited.' | translate}}</small>
118+
</div>
95119
</mat-checkbox>
96120
</div>
97121
</mat-tab>

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import {AssignedSiteModel, GlobalAutoBreakSettingsModel} from '../../../../models';
1010
import {MatButton, MatIconButton} from '@angular/material/button';
1111
import {FormsModule} from '@angular/forms';
12-
import {MatFormField, MatLabel} from '@angular/material/form-field';
12+
import {MatFormField, MatHint, MatLabel} from '@angular/material/form-field';
1313
import {MatInput} from '@angular/material/input';
1414
import {TranslatePipe} from '@ngx-translate/core';
1515
import {selectAuthIsAdmin, selectCurrentUserIsAdmin, selectCurrentUserIsFirstUser} from 'src/app/state';
@@ -46,6 +46,7 @@ import {MatIcon} from '@angular/material/icon';
4646
NgxMaterialTimepickerModule,
4747
MatIcon,
4848
MatIconButton,
49+
MatHint,
4950
],
5051
styleUrls: ['./assigned-site-dialog.component.scss']
5152
})

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</div>
119119
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
120120
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
121-
<div class="{{ getCellTextColorForDay(row, col.field) }}">
121+
<div class="{{ getCellTextColor(row, col.field) }}">
122122
<strong id="flexBalanceToDate{{index}}_{{col.field}}">{{ 'Flex balance to date' | translate}}: {{ convertHoursToTime(row.planningPrDayModels[col.field]?.sumFlexEnd)}}</strong>
123123
</div>
124124
</div>

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/bgBG.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ export const bgBG = {
9696
Shift: 'Shift',
9797
Registered: 'Регистриран',
9898
PlannedHours: 'Планирани часове',
99+
'Use Google Sheet as default': 'Използване на Google Таблици по подразбиране',
100+
'Use only plan hours': 'Използвайте само часове по план',
101+
'Auto break calculation': 'Автоматично изчисляване на прекъсване',
102+
'Allow time registration on mobile': 'Разрешаване на регистрация на време на мобилно устройство',
103+
'Allow editing of working hours on mobile': 'Разрешаване на редактиране на работно време на мобилно устройство',
104+
'Use time clock on mobile': 'Използвайте часовник на мобилно устройство',
105+
'Allow entry of unregistered working hours on mobile': 'Разрешаване на въвеждането на нерегистрирани работни часове на мобилно устройство',
106+
'Allow receipt for standard time on mobile': 'Разрешаване на разписка за стандартно време на мобилно устройство',
99107
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/csCZ.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ export const csCZ = {
9696
Shift: 'Posun',
9797
Registered: 'Registrovaný',
9898
PlannedHours: 'Plánované hodiny',
99+
'Use Google Sheet as default': 'Použít jako výchozí nastavení Google Tabulky',
100+
'Use only plan hours': 'Používejte pouze plánované hodiny',
101+
'Auto break calculation': 'Automatický výpočet přerušení',
102+
'Allow time registration on mobile': 'Povolit registraci času na mobilu',
103+
'Allow editing of working hours on mobile': 'Povolit úpravu pracovní doby na mobilu',
104+
'Use time clock on mobile': 'Používejte časovač na mobilu',
105+
'Allow entry of unregistered working hours on mobile': 'Povolit zadávání neregistrované pracovní doby na mobilu',
106+
'Allow receipt for standard time on mobile': 'Povolit účtenku pro standardní čas na mobilu',
99107
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/da.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,12 @@ export const da = {
9494
Shift: 'Skift',
9595
Registered: 'Registreret',
9696
PlannedHours: 'Planlagte timer',
97+
'Use Google Sheet as default': 'Brug Google Sheet som standard',
98+
'Use only plan hours': 'Brug kun plantimer',
99+
'Auto break calculation': 'Automatisk pauseberegning',
100+
'Allow time registration on mobile': 'Tillad tidsregistrering på mobil',
101+
'Allow editing of working hours on mobile': 'Tillad redigering af arbejdstider på mobilen',
102+
'Use time clock on mobile': 'Brug stempelur på mobilen',
103+
'Allow entry of unregistered working hours on mobile': 'Tillad indtastning af uregistrerede arbejdstimer på mobilen',
104+
'Allow receipt for standard time on mobile': 'Tillad kvittering for standardtid på mobil',
97105
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/deDE.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ export const deDE = {
9696
Shift: 'Schicht',
9797
Registered: 'Eingetragen',
9898
PlannedHours: 'Geplante Stunden',
99+
'Use Google Sheet as default': 'Google Sheet als Standard verwenden',
100+
'Use only plan hours': 'Nur Planstunden verwenden',
101+
'Auto break calculation': 'Automatische Bruchberechnung',
102+
'Allow time registration on mobile': 'Zeiterfassung auf Mobilgeräten zulassen',
103+
'Allow editing of working hours on mobile': 'Bearbeiten der Arbeitszeiten auf dem Handy ermöglichen',
104+
'Use time clock on mobile': 'Verwenden Sie die Stechuhr auf dem Handy',
105+
'Allow entry of unregistered working hours on mobile': 'Erfassung nicht erfasster Arbeitszeiten mobil ermöglichen',
106+
'Allow receipt for standard time on mobile': 'Empfang für Standardzeit auf Mobilgeräten zulassen',
99107
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/elGR.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ export const elGR = {
9696
Shift: 'Αλλαγή',
9797
Registered: 'Εγγεγραμμένος',
9898
PlannedHours: 'Προγραμματισμένες ώρες',
99+
'Use Google Sheet as default': 'Χρήση του Υπολογιστικού Φύλλου Google ως προεπιλογή',
100+
'Use only plan hours': 'Χρησιμοποιήστε μόνο τις ώρες του προγράμματος.',
101+
'Auto break calculation': 'Αυτόματος υπολογισμός διαλείμματος',
102+
'Allow time registration on mobile': 'Να επιτρέπεται η εγγραφή χρόνου σε κινητό',
103+
'Allow editing of working hours on mobile': 'Να επιτρέπεται η επεξεργασία των ωρών εργασίας σε κινητά',
104+
'Use time clock on mobile': 'Χρήση χρονομέτρου σε κινητό',
105+
'Allow entry of unregistered working hours on mobile': 'Επιτρέψτε την εισαγωγή μη καταχωρημένων ωρών εργασίας στο κινητό',
106+
'Allow receipt for standard time on mobile': 'Να επιτρέπεται η λήψη για την τυπική ώρα σε κινητό',
99107
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/enUS.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,12 @@ export const enUS = {
9494
'Shift': 'Shift',
9595
'Registered': 'Registered',
9696
'PlannedHours': 'Planned hours',
97+
'Use Google Sheet as default': 'Use Google Sheet as default',
98+
'Use only plan hours': 'Use only plan hours',
99+
'Auto break calculation': 'Auto break calculation',
100+
'Allow time registration on mobile': 'Allow time registration on mobile',
101+
'Allow editing of working hours on mobile': 'Allow editing of working hours on mobile',
102+
'Use time clock on mobile': 'Use time clock on mobile',
103+
'Allow entry of unregistered working hours on mobile': 'Allow entry of unregistered working hours on mobile',
104+
'Allow receipt for standard time on mobile': 'Allow receipt for standard time on mobile',
97105
};

‎eform-client/src/app/plugins/modules/time-planning-pn/i18n/esES.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ export const esES = {
9696
Shift: 'Cambio',
9797
Registered: 'Registrado',
9898
PlannedHours: 'Horas planificadas',
99+
'Use Google Sheet as default': 'Utilice Google Sheet como predeterminado',
100+
'Use only plan hours': 'Utilice únicamente horas del plan',
101+
'Auto break calculation': 'Cálculo de pausa automática',
102+
'Allow time registration on mobile': 'Permitir el registro de tiempo en el móvil',
103+
'Allow editing of working hours on mobile': 'Permitir la edición del horario laboral en el móvil',
104+
'Use time clock on mobile': 'Usar el reloj de control de tiempo en el móvil',
105+
'Allow entry of unregistered working hours on mobile': 'Permitir la entrada de horas de trabajo no registradas en el móvil',
106+
'Allow receipt for standard time on mobile': 'Permitir recibo de hora estándar en móvil',
99107
};

0 commit comments

Comments
 (0)