Skip to content

Commit 97c41d6

Browse files
renemadsenrenemadsen
committed
Adding first steps for new default hours.
1 parent e33bfe0 commit 97c41d6

File tree

5 files changed

+134
-2
lines changed

5 files changed

+134
-2
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/DeviceUserModel.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,49 @@ public class DeviceUserModel
4040
public string Language { get; set; }
4141
public string LanguageCode { get; set; }
4242
public bool? TimeRegistrationEnabled { get; set; }
43+
44+
// minutes from midnight for the start of the shift (0-1440) monday
45+
public int StartMonday { get; set; }
46+
// minutes from midnight for the end of the shift (0-1440) monday
47+
public int EndMonday { get; set; }
48+
// minutes of break for the shift (0-1440) monday
49+
public int BreakMonday { get; set; }
50+
// minutes from midnight for the start of the shift (0-1440) tuesday
51+
public int StartTuesday { get; set; }
52+
// minutes from midnight for the end of the shift (0-1440) tuesday
53+
public int EndTuesday { get; set; }
54+
// minutes of break for the shift (0-1440) tuesday
55+
public int BreakTuesday { get; set; }
56+
// minutes from midnight for the start of the shift (0-1440) wednesday
57+
public int StartWednesday { get; set; }
58+
// minutes from midnight for the end of the shift (0-1440) wednesday
59+
public int EndWednesday { get; set; }
60+
// minutes of break for the shift (0-1440) wednesday
61+
public int BreakWednesday { get; set; }
62+
// minutes from midnight for the start of the shift (0-1440) thursday
63+
public int StartThursday { get; set; }
64+
// minutes from midnight for the end of the shift (0-1440) thursday
65+
public int EndThursday { get; set; }
66+
// minutes of break for the shift (0-1440) thursday
67+
public int BreakThursday { get; set; }
68+
// minutes from midnight for the start of the shift (0-1440) friday
69+
public int StartFriday { get; set; }
70+
// minutes from midnight for the end of the shift (0-1440) friday
71+
public int EndFriday { get; set; }
72+
// minutes of break for the shift (0-1440) friday
73+
public int BreakFriday { get; set; }
74+
// minutes from midnight for the start of the shift (0-1440) saturday
75+
public int StartSaturday { get; set; }
76+
// minutes from midnight for the end of the shift (0-1440) saturday
77+
public int EndSaturday { get; set; }
78+
// minutes of break for the shift (0-1440) saturday
79+
public int BreakSaturday { get; set; }
80+
// minutes from midnight for the start of the shift (0-1440) sunday
81+
public int StartSunday { get; set; }
82+
// minutes from midnight for the end of the shift (0-1440) sunday
83+
public int EndSunday { get; set; }
84+
// minutes of break for the shift (0-1440) sunday
85+
public int BreakSunday { get; set; }
4386
public bool? TaskManagementEnabled { get; set; }
4487
public int? CustomerNo { get; set; }
4588
public int? OtpCode { get; set; }

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationAssignmentWorkerService/BackendConfigurationAssignmentWorkerService.cs‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
379379
.ToListAsync().ConfigureAwait(false);
380380

381381
var timeRegistrationEnabledSites =await
382-
timePlanningDbContext.AssignedSites.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed).Select(x => x.SiteId).ToListAsync().ConfigureAwait(false);
382+
timePlanningDbContext.AssignedSites.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed).ToListAsync().ConfigureAwait(false);
383383

384384
foreach (var deviceUserModel in deviceUsers)
385385
{
@@ -399,7 +399,33 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
399399

400400
deviceUserModel.PinCode = "****";
401401
deviceUserModel.TimeRegistrationEnabled =
402-
timeRegistrationEnabledSites.Any(x => x == deviceUserModel.SiteUid);
402+
timeRegistrationEnabledSites.Any(x => x.SiteId == deviceUserModel.SiteUid);
403+
if (deviceUserModel.TimeRegistrationEnabled != false)
404+
{
405+
var assignedSite = timeRegistrationEnabledSites
406+
.First(x => x.SiteId == deviceUserModel.SiteUid);
407+
deviceUserModel.StartMonday = assignedSite.StartMonday;
408+
deviceUserModel.EndMonday = assignedSite.EndMonday;
409+
deviceUserModel.BreakMonday = assignedSite.BreakMonday;
410+
deviceUserModel.StartTuesday = assignedSite.StartTuesday;
411+
deviceUserModel.EndTuesday = assignedSite.EndTuesday;
412+
deviceUserModel.BreakTuesday = assignedSite.BreakTuesday;
413+
deviceUserModel.StartWednesday = assignedSite.StartWednesday;
414+
deviceUserModel.EndWednesday = assignedSite.EndWednesday;
415+
deviceUserModel.BreakWednesday = assignedSite.BreakWednesday;
416+
deviceUserModel.StartThursday = assignedSite.StartThursday;
417+
deviceUserModel.EndThursday = assignedSite.EndThursday;
418+
deviceUserModel.BreakThursday = assignedSite.BreakThursday;
419+
deviceUserModel.StartFriday = assignedSite.StartFriday;
420+
deviceUserModel.EndFriday = assignedSite.EndFriday;
421+
deviceUserModel.BreakFriday = assignedSite.BreakFriday;
422+
deviceUserModel.StartSaturday = assignedSite.StartSaturday;
423+
deviceUserModel.EndSaturday = assignedSite.EndSaturday;
424+
deviceUserModel.BreakSaturday = assignedSite.BreakSaturday;
425+
deviceUserModel.StartSunday = assignedSite.StartSunday;
426+
deviceUserModel.EndSunday = assignedSite.EndSunday;
427+
deviceUserModel.BreakSunday = assignedSite.BreakSunday;
428+
}
403429

404430
deviceUserModel.TaskManagementEnabled = backendConfigurationPnDbContext.PropertyWorkers.Any(x =>
405431
x.WorkflowState != Constants.WorkflowStates.Removed

‎eform-client/src/app/plugins/modules/backend-configuration-pn/models/device-users/device-user.model.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,25 @@ export class DeviceUserModel {
2626
version: string;
2727
pinCode: string;
2828
employeeNo: string;
29+
startMonday: number;
30+
endMonday: number;
31+
breakMonday: number;
32+
startTuesday: number;
33+
endTuesday: number;
34+
breakTuesday: number;
35+
startWednesday: number;
36+
endWednesday: number;
37+
breakWednesday: number;
38+
startThursday: number;
39+
endThursday: number;
40+
breakThursday: number;
41+
startFriday: number;
42+
endFriday: number;
43+
breakFriday: number;
44+
startSaturday: number;
45+
endSaturday: number;
46+
breakSaturday: number;
47+
startSunday: number;
48+
endSunday: number;
49+
breakSunday: number;
2950
}

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-table/property-worker-table.component.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,27 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
175175
selectedSimpleSite.isBackendUser = simpleSiteDto.isBackendUser;
176176
selectedSimpleSite.pinCode = simpleSiteDto.pinCode;
177177
selectedSimpleSite.employeeNo = simpleSiteDto.employeeNo;
178+
selectedSimpleSite.startMonday = simpleSiteDto.startMonday;
179+
selectedSimpleSite.endMonday = simpleSiteDto.endMonday;
180+
selectedSimpleSite.breakMonday = simpleSiteDto.breakMonday;
181+
selectedSimpleSite.startTuesday = simpleSiteDto.startTuesday;
182+
selectedSimpleSite.endTuesday = simpleSiteDto.endTuesday;
183+
selectedSimpleSite.breakTuesday = simpleSiteDto.breakTuesday;
184+
selectedSimpleSite.startWednesday = simpleSiteDto.startWednesday;
185+
selectedSimpleSite.endWednesday = simpleSiteDto.endWednesday;
186+
selectedSimpleSite.breakWednesday = simpleSiteDto.breakWednesday;
187+
selectedSimpleSite.startThursday = simpleSiteDto.startThursday;
188+
selectedSimpleSite.endThursday = simpleSiteDto.endThursday;
189+
selectedSimpleSite.breakThursday = simpleSiteDto.breakThursday;
190+
selectedSimpleSite.startFriday = simpleSiteDto.startFriday;
191+
selectedSimpleSite.endFriday = simpleSiteDto.endFriday;
192+
selectedSimpleSite.breakFriday = simpleSiteDto.breakFriday;
193+
selectedSimpleSite.startSaturday = simpleSiteDto.startSaturday;
194+
selectedSimpleSite.endSaturday = simpleSiteDto.endSaturday;
195+
selectedSimpleSite.breakSaturday = simpleSiteDto.breakSaturday;
196+
selectedSimpleSite.startSunday = simpleSiteDto.startSunday;
197+
selectedSimpleSite.endSunday = simpleSiteDto.endSunday;
198+
selectedSimpleSite.breakSunday = simpleSiteDto.breakSunday;
178199

179200
const workersAssignments = this.workersAssignments.find(
180201
(x) => x.siteId === simpleSiteDto.siteId

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-workers-page/property-workers-page.component.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,27 @@ export class PropertyWorkersPageComponent implements OnInit, OnDestroy {
9292
selectedSimpleSite.taskManagementEnabled = simpleSiteDto.taskManagementEnabled;
9393
selectedSimpleSite.hasWorkOrdersAssigned = simpleSiteDto.hasWorkOrdersAssigned;
9494
selectedSimpleSite.isBackendUser = simpleSiteDto.isBackendUser;
95+
selectedSimpleSite.startMonday = simpleSiteDto.startMonday;
96+
selectedSimpleSite.endMonday = simpleSiteDto.endMonday;
97+
selectedSimpleSite.breakMonday = simpleSiteDto.breakMonday;
98+
selectedSimpleSite.startTuesday = simpleSiteDto.startTuesday;
99+
selectedSimpleSite.endTuesday = simpleSiteDto.endTuesday;
100+
selectedSimpleSite.breakTuesday = simpleSiteDto.breakTuesday;
101+
selectedSimpleSite.startWednesday = simpleSiteDto.startWednesday;
102+
selectedSimpleSite.endWednesday = simpleSiteDto.endWednesday;
103+
selectedSimpleSite.breakWednesday = simpleSiteDto.breakWednesday;
104+
selectedSimpleSite.startThursday = simpleSiteDto.startThursday;
105+
selectedSimpleSite.endThursday = simpleSiteDto.endThursday;
106+
selectedSimpleSite.breakThursday = simpleSiteDto.breakThursday;
107+
selectedSimpleSite.startFriday = simpleSiteDto.startFriday;
108+
selectedSimpleSite.endFriday = simpleSiteDto.endFriday;
109+
selectedSimpleSite.breakFriday = simpleSiteDto.breakFriday;
110+
selectedSimpleSite.startSaturday = simpleSiteDto.startSaturday;
111+
selectedSimpleSite.endSaturday = simpleSiteDto.endSaturday;
112+
selectedSimpleSite.breakSaturday = simpleSiteDto.breakSaturday;
113+
selectedSimpleSite.startSunday = simpleSiteDto.startSunday;
114+
selectedSimpleSite.endSunday = simpleSiteDto.endSunday;
115+
selectedSimpleSite.breakSunday = simpleSiteDto.breakSunday;
95116

96117
const workersAssignments = this.workersAssignments.find(
97118
(x) => x.siteId === simpleSiteDto.siteId

0 commit comments

Comments
 (0)