Skip to content

Commit 6b95c22

Browse files
committed
Fixing dayOfPayment int issue.
1 parent 20b9a74 commit 6b95c22

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public class AssignedSite
155155

156156
public bool UseDetailedPauseEditing { get; set; }
157157
public bool UsePunchClockWithAllowRegisteringInHistory { get; set; }
158+
public int DayOfPayment { get; set; } = 20;
158159

159160
// implicit conversion from Microting.TimePlanningBase.Infrastructure.Data.Entities.AssignedSite to AssignedSite
160161
public static implicit operator AssignedSite(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public class TimePlanningBaseSettings
6262
public string FridayBreakMinutesUpperLimit { get; set; }
6363
public string SaturdayBreakMinutesUpperLimit { get; set; }
6464
public string SundayBreakMinutesUpperLimit { get; set; }
65-
public string DayOfPayment { get; set; }
65+
public int DayOfPayment { get; set; }
6666
public string ShowCalculationsAsNumber { get; set; }
6767
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
105105
SaturdayBreakMinutesUpperLimit = int.Parse(_options.Value.SaturdayBreakMinutesUpperLimit),
106106
SundayBreakMinutesUpperLimit = int.Parse(_options.Value.SundayBreakMinutesUpperLimit),
107107
ShowCalculationsAsNumber = _options.Value.ShowCalculationsAsNumber == "1",
108-
DayOfPayment = int.Parse(_options.Value.DayOfPayment)
108+
DayOfPayment = _options.Value.DayOfPayment,
109109
};
110110

111111
//timePlanningSettingsModel.AssignedSites = assignedSites;
@@ -173,7 +173,7 @@ await _options.UpdateDb(settings =>
173173
timePlanningSettingsModel.SundayBreakMinutesUpperLimit.ToString();
174174
settings.ShowCalculationsAsNumber = timePlanningSettingsModel.ShowCalculationsAsNumber ? "1" : "0";
175175
settings.DayOfPayment =
176-
timePlanningSettingsModel.DayOfPayment.ToString();
176+
timePlanningSettingsModel.DayOfPayment;
177177
}, _dbContext, _userService.UserId);
178178
await GoogleSheetHelper.PushToGoogleSheet(await _core.GetCore(), _dbContext, _logger);
179179

@@ -450,10 +450,11 @@ planRegistrationForToday is
450450
return new OperationDataResult<Infrastructure.Models.Settings.AssignedSite>(false, "Site not found");
451451
}
452452

453-
var dbAssignedSite = await _dbContext.AssignedSites
453+
Infrastructure.Models.Settings.AssignedSite dbAssignedSite = await _dbContext.AssignedSites
454454
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
455455
.AsNoTracking()
456456
.FirstOrDefaultAsync(x => x.SiteId == sdkSite.MicrotingUid);
457+
dbAssignedSite.DayOfPayment = _options.Value.DayOfPayment;
457458

458459
return new OperationDataResult<Infrastructure.Models.Settings.AssignedSite>(true, dbAssignedSite);
459460
}

0 commit comments

Comments
 (0)