Skip to content

Commit d8b0dbc

Browse files
committed
Adding AutoBreakCalculationActive so tables also have that information.
1 parent d1c70e2 commit d8b0dbc

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

  • eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/Site.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ public class Site
1515
public string DefaultLanguage { get; set; }
1616
public bool HoursStarted { get; set; }
1717
public bool PauseStarted { get; set; }
18+
public bool AutoBreakCalculationActive { get; set; }
1819
}

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,13 @@ public async Task<OperationDataResult<List<Site>>> GetAvailableSites(string? tok
331331
var assignedSites = await _dbContext.AssignedSites
332332
.AsNoTracking()
333333
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
334-
.Select(x => x.SiteId)
335334
.ToListAsync();
336335

337336
var sites = new List<Site>();
338337
foreach (var assignedSite in assignedSites)
339338
{
340339
var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x =>
341-
x.MicrotingUid == assignedSite && x.WorkflowState != Constants.WorkflowStates.Removed);
340+
x.MicrotingUid == assignedSite.SiteId && x.WorkflowState != Constants.WorkflowStates.Removed);
342341
if (site == null) continue;
343342
{
344343
var siteWorker = await sdkDbContext.SiteWorkers
@@ -414,7 +413,8 @@ planRegistrationForToday is
414413
PinCode = worker.PinCode,
415414
DefaultLanguage = language.LanguageCode,
416415
HoursStarted = hoursStarted,
417-
PauseStarted = pauseStarted
416+
PauseStarted = pauseStarted,
417+
AutoBreakCalculationActive = assignedSite.AutoBreakCalculationActive
418418
};
419419
sites.Add(newSite);
420420
}

0 commit comments

Comments
 (0)