RE1-T117 PR#409 fixes

Author: ucswift

Core/Resgrid.Services/CheckInTimerService.cs

@@ -554,6 +554,9 @@ private static void ValidateTimerValues(int timerTargetType, int durationMinutes
 
 			if (warningThresholdMinutes < 1)
 				throw new InvalidOperationException("Check-in timer warning threshold must be at least 1 minute.");
+
+			if (warningThresholdMinutes >= durationMinutes)
+				throw new InvalidOperationException("Check-in timer warning threshold must be less than the duration.");
 		}
 
 		private static HashSet<int> ParseActiveForStates(string activeForStates)

Tests/Resgrid.Tests/Services/CheckInTimerServiceTests.cs

@@ -342,6 +342,26 @@ public async Task SaveTimerConfigAsync_Throws_WhenDurationInvalid()
 			await act.Should().ThrowAsync<InvalidOperationException>();
 		}
 
+		[Test]
+		public async Task SaveTimerConfigAsync_Throws_WhenWarningThresholdEqualsDuration()
+		{
+			var config = new CheckInTimerConfig { DepartmentId = 10, TimerTargetType = 0, DurationMinutes = 30, WarningThresholdMinutes = 30 };
+
+			Func<Task> act = async () => await _service.SaveTimerConfigAsync(config);
+
+			await act.Should().ThrowAsync<InvalidOperationException>();
+		}
+
+		[Test]
+		public async Task SaveTimerConfigAsync_Throws_WhenWarningThresholdExceedsDuration()
+		{
+			var config = new CheckInTimerConfig { DepartmentId = 10, TimerTargetType = 0, DurationMinutes = 15, WarningThresholdMinutes = 30 };
+
+			Func<Task> act = async () => await _service.SaveTimerConfigAsync(config);
+
+			await act.Should().ThrowAsync<InvalidOperationException>();
+		}
+
 		[Test]
 		public async Task SaveTimerConfigAsync_ClearsUnitTypeId_ForNonUnitTypeTargets()
 		{

Web/Resgrid.Web.Services/Controllers/v4/WeatherAlertsController.cs

@@ -378,10 +378,11 @@ public async Task<ActionResult<GetWeatherAlertSettingsResult>> SaveSettings([Fro
 					if (entry.StartHour < 0 || entry.StartHour > 23 || entry.EndHour < 0 || entry.EndHour > 24)
 						return BadRequest("Auto-message schedule hours are invalid: start hour must be 0-23 and end hour must be 0-24.");
 
-					// Hours only apply to enabled rows; the window must be non-empty and forward
-					// (use 0 and 24 for 24-hour delivery)
-					if (entry.Enabled && entry.EndHour <= entry.StartHour)
-						return BadRequest("Auto-message schedule end hour must be greater than the start hour. Use start 0 and end 24 for 24-hour delivery.");
+					// Hours only apply to enabled rows; the window must be non-empty. An end hour
+					// less than the start hour is a valid overnight window (e.g. 22 to 6); only an
+					// equal start and end is empty (use 0 and 24 for 24-hour delivery)
+					if (entry.Enabled && entry.EndHour == entry.StartHour)
+						return BadRequest("Auto-message schedule window cannot be empty: start hour and end hour must differ. Use start 0 and end 24 for 24-hour delivery.");
 				}
 			}
 

Web/Resgrid.Web/Areas/User/Controllers/DepartmentController.cs

@@ -2021,6 +2021,10 @@ public async Task<IActionResult> SaveCheckInTimerConfig(string configId, int tim
 			{
 				return BadRequest(ex.Message);
 			}
+			catch (UnauthorizedAccessException)
+			{
+				return NotFound();
+			}
 
 			return RedirectToAction("DispatchSettings");
 		}

Web/Resgrid.Web/Areas/User/Views/WeatherAlerts/Settings.cshtml

@@ -66,7 +66,7 @@
 						<div class="form-group">
 							<label class="col-sm-4 control-label">@localizer["AutoMessageSeverity"]</label>
 							<div class="col-sm-8">
-								<p class="text-muted" style="margin-bottom:10px;">Configure which severity levels generate auto-messages and optionally restrict them to specific hours (department local time). Delivery runs from the start hour up to (but not including) the end hour, so the end hour must be greater than the start hour. Use start 0 and end 24 for 24-hour delivery.</p>
+								<p class="text-muted" style="margin-bottom:10px;">Configure which severity levels generate auto-messages and optionally restrict them to specific hours (department local time). Delivery runs from the start hour up to (but not including) the end hour. If the start hour is later than the end hour the window wraps overnight &mdash; for example, 18 and 6 delivers from 6pm to 6am. Use start 0 and end 24 for 24-hour delivery.</p>
 								<table class="table table-bordered" style="max-width:550px;">
 									<thead>
 										<tr>