Skip to content

feat(timeplanning): carry OverMidnight per-site flag (proto + gRPC) #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renemadsen merged 5 commits into from
Jun 19, 2026
Merged

feat(timeplanning): carry OverMidnight per-site flag (proto + gRPC) #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
946c1cb
chore(deps): bump Microting.TimePlanningBase to 10.0.52 (OverMidnight…
renemadsen Jun 19, 2026
039eb77
feat(settings): OverMidnight on AssignedSite + coworker Site models
renemadsen Jun 19, 2026
092a5a2
feat(proto): over_midnight on AssignedSite + Site messages
renemadsen Jun 19, 2026
7f812b9
feat(grpc): carry OverMidnight on assigned-site + coworker responses
renemadsen Jun 19, 2026
447bbba
fix(settings): populate OverMidnight on coworker Site in service layer
renemadsen Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...PI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AssignedSite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public class AssignedSite
public int SaturdayBreakMinutesUpperLimit { get; set; }
public int SundayBreakMinutesUpperLimit { get; set; }
public bool UseOneMinuteIntervals { get; set; }
public bool OverMidnight { get; set; }
public bool AllowAcceptOfPlannedHours { get; set; }
public bool AllowEditOfRegistrations { get; set; }
public bool AllowPersonalTimeRegistration { get; set; }
Expand Down Expand Up @@ -228,6 +229,7 @@ public static implicit operator AssignedSite(
SaturdayBreakMinutesUpperLimit = model.SaturdayBreakMinutesUpperLimit,
SundayBreakMinutesUpperLimit = model.SundayBreakMinutesUpperLimit,
UseOneMinuteIntervals = model.UseOneMinuteIntervals,
OverMidnight = model.OverMidnight,
AllowAcceptOfPlannedHours = model.AllowAcceptOfPlannedHours,
AllowEditOfRegistrations = model.AllowEditOfRegistrations,
AllowPersonalTimeRegistration = model.AllowPersonalTimeRegistration,
Expand Down
1 change: 1 addition & 0 deletions eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/Site.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ public class Site
public DateTime ResignedAtDate { get; set; }
public string? PhoneNumber { get; set; }
public bool UseOneMinuteIntervals { get; set; }
public bool OverMidnight { get; set; }
}
2 changes: 2 additions & 0 deletions eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Protos/settings.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ message AssignedSite {
AutoBreakSettings auto_break_settings = 161;

bool enforce_end_of_shift_before_allow_registration = 162;
bool over_midnight = 163;
}

// Matches C# Site model
Expand Down Expand Up @@ -237,6 +238,7 @@ message Site {
google.protobuf.Timestamp resigned_at_date = 21;
string phone_number = 22;
bool use_one_minute_intervals = 23;
bool over_midnight = 24;
}

// Response wrappers matching C# OperationDataResult<T>
Expand Down
3 changes: 3 additions & 0 deletions .../TimePlanning.Pn/TimePlanning.Pn/Services/GrpcServices/TimePlanningSettingsGrpcService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public override async Task<GetAssignedSiteResponse> GetAssignedSite(
SaturdayBreakMinutesUpperLimit = m.SaturdayBreakMinutesUpperLimit,
SundayBreakMinutesUpperLimit = m.SundayBreakMinutesUpperLimit,
UseOneMinuteIntervals = m.UseOneMinuteIntervals,
OverMidnight = m.OverMidnight,
AllowAcceptOfPlannedHours = m.AllowAcceptOfPlannedHours,
AllowEditOfRegistrations = m.AllowEditOfRegistrations,
AllowPersonalTimeRegistration = m.AllowPersonalTimeRegistration,
Expand Down Expand Up @@ -267,6 +268,7 @@ public override async Task<GetRegistrationSitesResponse> GetRegistrationSites(
DateTime.SpecifyKind(site.ResignedAtDate, DateTimeKind.Utc)),
PhoneNumber = site.PhoneNumber ?? "",
UseOneMinuteIntervals = site.UseOneMinuteIntervals,
OverMidnight = site.OverMidnight,
};
response.Model.Add(grpcSite);
}
Expand Down Expand Up @@ -320,6 +322,7 @@ public override async Task<GetRegistrationSitesResponse> GetRegistrationSitesByC
DateTime.SpecifyKind(site.ResignedAtDate, DateTimeKind.Utc)),
PhoneNumber = site.PhoneNumber ?? "",
UseOneMinuteIntervals = site.UseOneMinuteIntervals,
OverMidnight = site.OverMidnight,
};
response.Model.Add(grpcSite);
}
Expand Down
7 changes: 5 additions & 2 deletions ...TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,8 @@ planRegistrationForToday is
Resigned = assignedSite.Resigned,
ResignedAtDate = assignedSite.ResignedAtDate,
SnapshotEnabled = assignedSite.SnapshotEnabled,
UseOneMinuteIntervals = assignedSite.UseOneMinuteIntervals
UseOneMinuteIntervals = assignedSite.UseOneMinuteIntervals,
OverMidnight = assignedSite.OverMidnight
};
var workerEmail = (worker.Email ?? "").Trim().ToLower();
var user = baseDbContext == null || string.IsNullOrEmpty(workerEmail) ? null : await baseDbContext.Users
Expand Down Expand Up @@ -619,7 +620,8 @@ planRegistrationForToday is
Resigned = assignedSite.Resigned,
ResignedAtDate = assignedSite.ResignedAtDate,
SnapshotEnabled = assignedSite.SnapshotEnabled,
UseOneMinuteIntervals = assignedSite.UseOneMinuteIntervals
UseOneMinuteIntervals = assignedSite.UseOneMinuteIntervals,
OverMidnight = assignedSite.OverMidnight
};
var workerEmail = (worker.Email ?? "").Trim().ToLower();
var user = baseDbContext == null || string.IsNullOrEmpty(workerEmail) ? null : await baseDbContext.Users
Expand Down Expand Up @@ -895,6 +897,7 @@ planRegistrationForToday is
Resigned = assignedSite.Resigned,
ResignedAtDate = assignedSite.ResignedAtDate,
UseOneMinuteIntervals = assignedSite.UseOneMinuteIntervals,
OverMidnight = assignedSite.OverMidnight,
};
var workerEmail = (worker.Email ?? "").Trim().ToLower();
var user = baseDbContext == null || string.IsNullOrEmpty(workerEmail) ? null : await baseDbContext.Users
Expand Down
2 changes: 1 addition & 1 deletion eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/TimePlanning.Pn.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="Microting.EformAngularFrontendBase" Version="10.0.35" />
<PackageReference Include="Microting.eFormApi.BasePn" Version="10.0.29" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
<PackageReference Include="Microting.TimePlanningBase" Version="10.0.51" />
<PackageReference Include="Microting.TimePlanningBase" Version="10.0.52" />
<PackageReference Include="Sentry" Version="6.6.0" />
<PackageReference Include="FirebaseAdmin" Version="3.5.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.80.0" />
Expand Down
Loading