Skip to content

Commit d96aafd

Browse files
committed
Adding more columns for use in debugging as first user.
1 parent 8716772 commit d96aafd

5 files changed

Lines changed: 29 additions & 2 deletions

File tree

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/WorkingHours/Index/TimePlanningWorkingHoursModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ namespace TimePlanning.Pn.Infrastructure.Models.WorkingHours.Index
2727
public class TimePlanningWorkingHoursModel
2828
{
2929
public int? Id { get; set; }
30+
public DateTime CreatedAt { get; set; }
31+
public DateTime? UpdatedAt { get; set; }
3032
public int SdkSiteId { get; set; }
3133
public string WorkerName { get; set; }
3234
public int WeekDay { get; set; }

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ public async Task<OperationDataResult<List<TimePlanningWorkingHoursModel>>> Inde
113113
.Select(x => new TimePlanningWorkingHoursModel
114114
{
115115
Id = x.Id,
116+
CreatedAt = x.CreatedAt,
117+
UpdatedAt = x.UpdatedAt,
116118
WorkerName = site.Name,
117119
WeekDay = (int)x.Date.DayOfWeek,
118120
Date = x.Date,
@@ -147,6 +149,8 @@ public async Task<OperationDataResult<List<TimePlanningWorkingHoursModel>>> Inde
147149
var prePlanning = new TimePlanningWorkingHoursModel
148150
{
149151
Id = 0,
152+
CreatedAt = lastPlanning.CreatedAt,
153+
UpdatedAt = lastPlanning.UpdatedAt,
150154
WorkerName = site.Name,
151155
WeekDay = lastPlanning != null
152156
? (int)lastPlanning.Date.DayOfWeek

eform-client/src/app/plugins/modules/time-planning-pn/models/working-hours/working-hour.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import {TimePlanningMessagesEnum} from '../../enums';
22

33
export class WorkingHourModel {
44
id: number;
5+
createdAt: string;
6+
updatedAt: string;
57
workerName: string;
68
weekDay: number;
79
date: string;

eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-container/working-hours-container.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ export class WorkingHoursContainerComponent implements OnInit, OnDestroy {
7171
...this.workingHoursFormArray.controls,
7272
new FormGroup({
7373
id: new FormControl(x.id),
74+
createdAt: new FormControl(x.createdAt),
75+
updatedAt: new FormControl(x.updatedAt),
7476
isWeekend: new FormControl(x.isWeekend),
7577
isLocked: new FormControl(x.isLocked),
7678
workerName: new FormControl(x.workerName),

eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-table/working-hours-table.component.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ import {Subscription} from 'rxjs';
1212
import {SiteDto} from 'src/app/common/models';
1313
import {MtxGridColumn, MtxGridRowClassFormatter} from '@ng-matero/extensions/grid';
1414
import {TranslateService} from '@ngx-translate/core';
15-
import {DaysOfWeekEnum, HOURS_PICKER_ARRAY, STANDARD_DANISH_DATE_FORMAT} from 'src/app/common/const';
15+
import {
16+
DaysOfWeekEnum, FULL_DATE_FORMAT,
17+
HOURS_PICKER_ARRAY,
18+
PARSING_DATE_FORMAT,
19+
STANDARD_DANISH_DATE_FORMAT
20+
} from 'src/app/common/const';
1621
import {messages} from '../../../../consts/messages';
1722
import {format} from 'date-fns';
1823
import {MatDialog} from '@angular/material/dialog';
@@ -100,7 +105,19 @@ export class WorkingHoursTableComponent implements OnInit, OnChanges, OnDestroy
100105
pinned: 'left',
101106
field: 'id',
102107
formatter: (row: FormGroup) => row.get('id').value,
103-
},
108+
},
109+
{
110+
header: this.translateService.stream('CreatedAt'),
111+
pinned: 'left',
112+
field: 'createdAt',
113+
formatter: (row: FormGroup) => `${format(row.get('createdAt').value, FULL_DATE_FORMAT.replace('YYYY', 'yyyy'))}`,
114+
},
115+
{
116+
header: this.translateService.stream('UpdatedAt'),
117+
pinned: 'left',
118+
field: 'updatedAt',
119+
formatter: (row: FormGroup) => `${format(row.get('updatedAt').value, FULL_DATE_FORMAT.replace('YYYY', 'yyyy'))}`,
120+
},
104121
{
105122
header: this.translateService.stream('DayOfWeek'),
106123
pinned: 'left',

0 commit comments

Comments
 (0)