Skip to content

Commit be057a8

Browse files
committed
Code cleanup and fixing translations.
1 parent 5d85f2f commit be057a8

File tree

31 files changed

+1087
-16
lines changed

31 files changed

+1087
-16
lines changed

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Planning/PlanRegistrationVersionModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class PlanRegistrationVersionModel
3232
public int Version { get; set; }
3333
public DateTime UpdatedAt { get; set; }
3434
public int? UpdatedByUserId { get; set; }
35+
public string UpdatedByUserName { get; set; }
3536
public List<FieldChange> Changes { get; set; } = [];
3637
}
3738

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ public async Task<OperationResult> Update(int id, TimePlanningPlanningPrDayModel
520520
{
521521
try
522522
{
523+
var currentUserAsync = await userService.GetCurrentUserAsync();
523524
var planning = dbContext.PlanRegistrations
524525
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
525526
.FirstOrDefault(x => x.Id == id);
@@ -965,6 +966,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
965966

966967
// Compute time tracking fields (seconds-based calculation)
967968
PlanRegistrationHelper.ComputeTimeTrackingFields(planning);
969+
planning.UpdatedByUserId = currentUserAsync.Id;
968970

969971
await planning.Update(dbContext).ConfigureAwait(false);
970972
var todayDateMidnight = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
@@ -1483,6 +1485,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
14831485

14841486
// Compute time tracking fields (seconds-based calculation)
14851487
PlanRegistrationHelper.ComputeTimeTrackingFields(planning);
1488+
planning.UpdatedByUserId = currentUser.Id;
14861489

14871490
await planning.Update(dbContext).ConfigureAwait(false);
14881491
var todayDateMidnight = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
@@ -1783,6 +1786,8 @@ public async Task<OperationDataResult<PlanRegistrationVersionHistoryModel>> GetV
17831786
Version = currentVersion.Version,
17841787
UpdatedAt = currentVersion.UpdatedAt ?? DateTime.UtcNow,
17851788
UpdatedByUserId = currentVersion.UpdatedByUserId,
1789+
UpdatedByUserName = currentVersion.UpdatedByUserId == 1 ? "System"
1790+
: await userService.GetFullNameUserByUserIdAsync(currentVersion.UpdatedByUserId).ConfigureAwait(false),
17861791
Changes = changes
17871792
});
17881793
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@
175175
[name]="'isManager'"
176176
formControlName="isManager">
177177
<div>
178-
<div>{{ 'Is Manager' | translate }}</div>
178+
<div>{{ 'Is manager' | translate }}</div>
179179
<small class="checkbox-description">{{ 'Set this user as a manager' | translate }}</small>
180180
</div>
181181
</mat-checkbox>
182182
</div>
183-
183+
184184
<div class="d-flex flex-row" *ngIf="!data.resigned && data.isManager && selectCurrentUserIsAdmin$ | async">
185185
<mat-form-field class="p-1 w-100">
186-
<mat-label>{{ 'Managing Tags' | translate }}</mat-label>
186+
<mat-label>{{ 'Managing tags' | translate }}</mat-label>
187187
<mtx-select
188188
[items]="availableTags"
189189
bindLabel="name"

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/version-history-modal/version-history-modal.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ <h4 class="modal-title">Version History</h4>
1010
<div class="versions-panel" [class.with-side-panel]="selectedGpsCoordinate || selectedSnapshot">
1111
<div *ngFor="let version of versionHistory.versions" class="version-section">
1212
<h5>
13-
{{ formatDateTime(version.updatedAt) }} Values changed
14-
<span *ngIf="version.updatedByUserId">by User ID: {{ version.updatedByUserId }} ({{version.version}})</span>
13+
{{ formatDateTime(version.updatedAt) }} {{ 'Values changed' | translate }}
14+
<span *ngIf="version.updatedByUserId">{{ 'by user' | translate }}: {{ version.updatedByUserName }} ({{version.version}})</span>
1515
</h5>
1616

1717
<mtx-grid
@@ -28,7 +28,7 @@ <h5>
2828
</div>
2929

3030
<div *ngIf="versionHistory.versions.length === 0" class="no-versions">
31-
<p>No version history available.</p>
31+
<p>{{ 'No version history available.' | translate}}</p>
3232
</div>
3333
</div>
3434

@@ -63,12 +63,12 @@ <h5>
6363
<ng-template #toValueTemplate let-row>
6464
<ng-container *ngIf="row.fieldType === 'gps'">
6565
<a href="javascript:void(0)" (click)="onGpsClick(row)">
66-
View on Maps ({{ row.latitude }}, {{ row.longitude }})
66+
{{ 'View on Maps' | translate }} ({{ row.latitude }}, {{ row.longitude }})
6767
</a>
6868
</ng-container>
6969
<ng-container *ngIf="row.fieldType === 'snapshot'">
7070
<a href="javascript:void(0)" (click)="onSnapshotClick(row)">
71-
View Snapshot
71+
{{ 'View Snapshot' | translate }}
7272
</a>
7373
</ng-container>
7474
<ng-container *ngIf="row.fieldType === 'standard'">
@@ -79,7 +79,7 @@ <h5>
7979
<div class="modal-body" *ngIf="loading">
8080
<div class="text-center">
8181
<div class="spinner-border" role="status">
82-
<span class="sr-only">Loading...</span>
82+
<span class="sr-only">{{ 'Loading...' | translate}}</span>
8383
</div>
8484
</div>
8585
</div>

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,47 @@ export const bgBG = {
144144
Maternity: 'Отпуск по майчинство',
145145
VacationDayOff: 'Почивен ден',
146146
Holiday: 'Празник',
147+
'Absence Requests': 'Заявки за отсъствия',
148+
Inbox: 'Входяща поща',
149+
'My Requests': 'Моите заявки',
150+
'Absence Request': 'Заявка за отсъствие',
151+
'Approve Absence Request': 'Одобряване на заявка за отсъствие',
152+
'Reject Absence Request': 'Отхвърляне на заявка за отсъствие',
153+
'Request ID': 'Идентификационен номер на заявката',
154+
'Requested By': 'Заявено от',
155+
'Date From': 'Дата от',
156+
'Date To': 'Дата до',
157+
Status: 'Статус',
158+
'Requested At': 'Заявено в',
159+
'Request Comment': 'Заявка за коментар',
160+
'Decision Comment (Optional)': 'Коментар към решението (по избор)',
161+
'Rejection Comment (Optional)': 'Коментар за отхвърляне (по избор)',
162+
Approve: 'Одобряване',
163+
Reject: 'Отхвърляне',
164+
Pending: 'В очакване',
165+
Approved: 'Одобрено',
166+
Rejected: 'Отхвърлено',
167+
'No absence requests found': 'Няма намерени заявки за отсъствие',
168+
'Error loading absence requests': 'Грешка при зареждане на заявките за отсъствие',
169+
'Absence request approved successfully': 'Заявката за отсъствие е одобрена успешно',
170+
'Error approving absence request': 'Грешка при одобряване на заявката за отсъствие',
171+
'Absence request rejected successfully': 'Заявката за отсъствие е успешно отхвърлена',
172+
'Error rejecting absence request': 'Грешка при отхвърляне на заявката за отсъствие',
173+
'User not authenticated': 'Потребителят не е удостоверен',
174+
'Values changed': 'Променени стойности',
175+
'by user': 'от потребител',
176+
'No version history available.': 'Няма налична история на версиите.',
177+
'View on Maps': 'Преглед в Карти',
178+
'View Snapshot': 'Преглед на моментна снимка',
179+
'Loading...': 'Зареждане...',
180+
Variable: 'Променлива',
181+
'From value': 'От стойност',
182+
'To value': 'Да се оцени',
183+
'Is manager': 'Е мениджър',
184+
'Set this user as a manager': 'Задаване на този потребител като мениджър',
185+
'Managing tags': 'Управление на етикети',
186+
'Select tags that this manager is responsible for': 'Изберете етикети, за които този мениджър е отговорен',
187+
'Select tags': 'Изберете етикети',
188+
'Reconciled in accounting': 'Съгласувано в счетоводството',
189+
'Transferred to payroll': 'Прехвърлено към заплатата',
147190
};

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,47 @@ export const csCZ = {
144144
Maternity: 'Mateřská dovolená',
145145
VacationDayOff: 'Volný den',
146146
Holiday: 'Dovolená',
147+
'Absence Requests': 'Žádosti o nepřítomnost',
148+
Inbox: 'Doručená pošta',
149+
'My Requests': 'Moje požadavky',
150+
'Absence Request': 'Žádost o nepřítomnost',
151+
'Approve Absence Request': 'Schválit žádost o nepřítomnost',
152+
'Reject Absence Request': 'Zamítnout žádost o nepřítomnost',
153+
'Request ID': 'ID požadavku',
154+
'Requested By': 'Požadováno uživatelem',
155+
'Date From': 'Datum od',
156+
'Date To': 'Datum do',
157+
Status: 'Postavení',
158+
'Requested At': 'Požadováno v',
159+
'Request Comment': 'Žádost o komentář',
160+
'Decision Comment (Optional)': 'Komentář k rozhodnutí (volitelné)',
161+
'Rejection Comment (Optional)': 'Komentář k odmítnutí (volitelné)',
162+
Approve: 'Schvalovat',
163+
Reject: 'Odmítnout',
164+
Pending: 'Čeká na vyřízení',
165+
Approved: 'Schválený',
166+
Rejected: 'Odmítnuto',
167+
'No absence requests found': 'Nenalezeny žádné žádosti o absenci',
168+
'Error loading absence requests': 'Chyba při načítání žádostí o absenci',
169+
'Absence request approved successfully': 'Žádost o absenci byla úspěšně schválena',
170+
'Error approving absence request': 'Chyba při schvalování žádosti o absenci',
171+
'Absence request rejected successfully': 'Žádost o absenci byla úspěšně zamítnuta',
172+
'Error rejecting absence request': 'Chyba při zamítnutí žádosti o absenci',
173+
'User not authenticated': 'Uživatel nebyl ověřen',
174+
'Values changed': 'Hodnoty změněny',
175+
'by user': 'uživatelem',
176+
'No version history available.': 'Historie verzí není k dispozici.',
177+
'View on Maps': 'Zobrazit na Mapách',
178+
'View Snapshot': 'Zobrazit snímek',
179+
'Loading...': 'Načítání...',
180+
Variable: 'Proměnná',
181+
'From value': 'Z hodnoty',
182+
'To value': 'Hodnotit',
183+
'Is manager': 'Je manažer',
184+
'Set this user as a manager': 'Nastavit tohoto uživatele jako správce',
185+
'Managing tags': 'Správa štítků',
186+
'Select tags that this manager is responsible for': 'Vyberte štítky, za které je tento správce zodpovědný',
187+
'Select tags': 'Vyberte štítky',
188+
'Reconciled in accounting': 'Odsouhlaseno v účetnictví',
189+
'Transferred to payroll': 'Převedeno na mzdu',
147190
};

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export const da = {
143143
VacationDayOff: 'Afspadsering',
144144
Holiday: 'Helligdag',
145145
'Absence Requests': 'Fraværsanmodninger',
146-
'Inbox': 'Indbakke',
146+
Inbox: 'Indbakke',
147147
'My Requests': 'Mine anmodninger',
148148
'Absence Request': 'Fraværsanmodning',
149149
'Approve Absence Request': 'Godkend fraværsanmodning',
@@ -152,21 +152,37 @@ export const da = {
152152
'Requested By': 'Anmodet af',
153153
'Date From': 'Fra dato',
154154
'Date To': 'Til dato',
155-
'Status': 'Status',
155+
Status: 'Status',
156156
'Requested At': 'Anmodet den',
157157
'Request Comment': 'Anmodningskommentar',
158158
'Decision Comment (Optional)': 'Beslutningskommentar (valgfrit)',
159159
'Rejection Comment (Optional)': 'Afvisningskommentar (valgfrit)',
160-
'Approve': 'Godkend',
161-
'Reject': 'Afvis',
162-
'Pending': 'Afventer',
163-
'Approved': 'Godkendt',
164-
'Rejected': 'Afvist',
160+
Approve: 'Godkend',
161+
Reject: 'Afvis',
162+
Pending: 'Afventer',
163+
Approved: 'Godkendt',
164+
Rejected: 'Afvist',
165165
'No absence requests found': 'Ingen fraværsanmodninger fundet',
166166
'Error loading absence requests': 'Fejl ved indlæsning af fraværsanmodninger',
167167
'Absence request approved successfully': 'Fraværsanmodning godkendt',
168168
'Error approving absence request': 'Fejl ved godkendelse af fraværsanmodning',
169169
'Absence request rejected successfully': 'Fraværsanmodning afvist',
170170
'Error rejecting absence request': 'Fejl ved afvisning af fraværsanmodning',
171171
'User not authenticated': 'Bruger ikke godkendt',
172+
'Values changed': 'Værdier ændret',
173+
'by user': 'af bruger',
174+
'No version history available.': 'Ingen versionshistorik tilgængelig.',
175+
'View on Maps': 'Vis på kort',
176+
'View Snapshot': 'Se øjebliksbillede',
177+
'Loading...': 'Indlæser...',
178+
Variable: 'Variabel',
179+
'From value': 'Fra værdi',
180+
'To value': 'At værdsætte',
181+
'Is manager': 'Er leder',
182+
'Set this user as a manager': 'Angiv denne bruger som administrator',
183+
'Managing tags': 'Administration af tags',
184+
'Select tags that this manager is responsible for': 'Vælg tags, som denne administrator er ansvarlig for',
185+
'Select tags': 'Vælg tags',
186+
'Reconciled in accounting': 'Afstemt i regnskabet',
187+
'Transferred to payroll': 'Overført til lønudbetaling',
172188
};

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,47 @@ export const deDE = {
144144
Maternity: 'Mutterschaftsurlaub',
145145
VacationDayOff: 'Urlaubstag frei',
146146
Holiday: 'Urlaub',
147+
'Absence Requests': 'Abwesenheitsanträge',
148+
Inbox: 'Posteingang',
149+
'My Requests': 'Meine Anfragen',
150+
'Absence Request': 'Abwesenheitsantrag',
151+
'Approve Absence Request': 'Abwesenheitsantrag genehmigen',
152+
'Reject Absence Request': 'Abwesenheitsantrag ablehnen',
153+
'Request ID': 'Anforderungs-ID',
154+
'Requested By': 'Angefordert von',
155+
'Date From': 'Stammen aus',
156+
'Date To': 'Datum bis',
157+
Status: 'Status',
158+
'Requested At': 'Angefordert bei',
159+
'Request Comment': 'Kommentar anfordern',
160+
'Decision Comment (Optional)': 'Kommentar zur Entscheidung (optional)',
161+
'Rejection Comment (Optional)': 'Ablehnungskommentar (optional)',
162+
Approve: 'Genehmigen',
163+
Reject: 'Ablehnen',
164+
Pending: 'Ausstehend',
165+
Approved: 'Genehmigt',
166+
Rejected: 'Abgelehnt',
167+
'No absence requests found': 'Keine Abwesenheitsanträge gefunden',
168+
'Error loading absence requests': 'Fehler beim Laden von Abwesenheitsanfragen',
169+
'Absence request approved successfully': 'Abwesenheitsantrag erfolgreich genehmigt',
170+
'Error approving absence request': 'Fehler bei der Genehmigung des Abwesenheitsantrags',
171+
'Absence request rejected successfully': 'Abwesenheitsantrag erfolgreich abgelehnt',
172+
'Error rejecting absence request': 'Fehler beim Abwesenheitsantrag',
173+
'User not authenticated': 'Benutzer nicht authentifiziert',
174+
'Values changed': 'Werte geändert',
175+
'by user': 'vom Benutzer',
176+
'No version history available.': 'Es ist kein Versionsverlauf verfügbar.',
177+
'View on Maps': 'Auf Karten anzeigen',
178+
'View Snapshot': 'Momentaufnahme anzeigen',
179+
'Loading...': 'Laden...',
180+
Variable: 'Variable',
181+
'From value': 'Aus Wert',
182+
'To value': 'Wert',
183+
'Is manager': 'Ist der Manager',
184+
'Set this user as a manager': 'Diesen Benutzer als Manager festlegen',
185+
'Managing tags': 'Tags verwalten',
186+
'Select tags that this manager is responsible for': 'Wählen Sie die Schlagwörter aus, für die dieser Manager zuständig ist.',
187+
'Select tags': 'Schlagwörter auswählen',
188+
'Reconciled in accounting': 'In der Buchhaltung abgeglichen.',
189+
'Transferred to payroll': 'An die Gehaltsabrechnung übertragen.',
147190
};

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,47 @@ export const elGR = {
144144
Maternity: 'Άδεια μητρότητας',
145145
VacationDayOff: 'Ημέρα διακοπών',
146146
Holiday: 'Αργία',
147+
'Absence Requests': 'Αιτήματα Απουσίας',
148+
Inbox: 'Εισερχόμενα',
149+
'My Requests': 'Τα αιτήματά μου',
150+
'Absence Request': 'Αίτηση Απουσίας',
151+
'Approve Absence Request': 'Έγκριση αιτήματος απουσίας',
152+
'Reject Absence Request': 'Απόρριψη αιτήματος απουσίας',
153+
'Request ID': 'Αίτημα Αναγνωριστικού',
154+
'Requested By': 'Αίτημα από',
155+
'Date From': 'Ημερομηνία από',
156+
'Date To': 'Ημερομηνία έως',
157+
Status: 'Κατάσταση',
158+
'Requested At': 'Ζητήθηκε στις',
159+
'Request Comment': 'Αίτημα σχολίου',
160+
'Decision Comment (Optional)': 'Σχόλιο Απόφασης (Προαιρετικό)',
161+
'Rejection Comment (Optional)': 'Σχόλιο απόρριψης (Προαιρετικό)',
162+
Approve: 'Εγκρίνω',
163+
Reject: 'Απορρίπτω',
164+
Pending: 'Εκκρεμής',
165+
Approved: 'Εγκρίθηκε',
166+
Rejected: 'Απορρίφθηκε',
167+
'No absence requests found': 'Δεν βρέθηκαν αιτήματα απουσίας',
168+
'Error loading absence requests': 'Σφάλμα κατά τη φόρτωση αιτημάτων απουσίας κατά τη φόρτωση',
169+
'Absence request approved successfully': 'Το αίτημα απουσίας εγκρίθηκε με επιτυχία',
170+
'Error approving absence request': 'Σφάλμα κατά την έγκριση αιτήματος απουσίας κατά την έγκριση του αιτήματος απουσίας.',
171+
'Absence request rejected successfully': 'Το αίτημα απουσίας απορρίφθηκε με επιτυχία',
172+
'Error rejecting absence request': 'Σφάλμα απόρριψης αιτήματος απουσίας κατά την απόρριψη αιτήματος απουσίας',
173+
'User not authenticated': 'Ο χρήστης δεν έχει πιστοποιηθεί',
174+
'Values changed': 'Αλλαγή τιμών',
175+
'by user': 'από τον χρήστη',
176+
'No version history available.': 'Δεν υπάρχει διαθέσιμο ιστορικό εκδόσεων.',
177+
'View on Maps': 'Προβολή στους Χάρτες',
178+
'View Snapshot': 'Προβολή στιγμιότυπου',
179+
'Loading...': 'Φόρτωση...',
180+
Variable: 'Μεταβλητός',
181+
'From value': 'Από την τιμή',
182+
'To value': 'Να εκτιμήσω',
183+
'Is manager': 'Είναι διευθυντής',
184+
'Set this user as a manager': 'Ορισμός αυτού του χρήστη ως διαχειριστή',
185+
'Managing tags': 'Διαχείριση ετικετών',
186+
'Select tags that this manager is responsible for': 'Επιλέξτε ετικέτες για τις οποίες είναι υπεύθυνος αυτός ο διαχειριστής',
187+
'Select tags': 'Επιλογή ετικετών',
188+
'Reconciled in accounting': 'Συμφωνημένο στη λογιστική',
189+
'Transferred to payroll': 'Μεταφέρθηκε στη μισθοδοσία',
147190
};

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,20 @@ export const enUS = {
169169
'Absence request rejected successfully': 'Absence request rejected successfully',
170170
'Error rejecting absence request': 'Error rejecting absence request',
171171
'User not authenticated': 'User not authenticated',
172+
'Values changed': 'Values changed',
173+
'by user': 'by user',
174+
'No version history available.': 'No version history available.',
175+
'View on Maps': 'View on Maps',
176+
'View Snapshot': 'View Snapshot',
177+
'Loading...': 'Loading...',
178+
'Variable': 'Variable',
179+
'From value': 'From value',
180+
'To value': 'To value',
181+
'Is manager': 'Is manager',
182+
'Set this user as a manager': 'Set this user as a manager',
183+
'Managing tags': 'Managing tags',
184+
'Select tags that this manager is responsible for': 'Select tags that this manager is responsible for',
185+
'Select tags': 'Select tags',
186+
'Reconciled in accounting': 'Reconciled in accounting',
187+
'Transferred to payroll': 'Transferred to payroll',
172188
};

0 commit comments

Comments
 (0)