From e047d4e8a6a702a41a023ad6e15e57b42ab3df06 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:49:47 +0100
Subject: [PATCH] Start end End date Range check

Checks that the Start date starts before the End date.
Message added to Resx
---
 Oqtane.Client/Modules/Admin/Jobs/Edit.razor          | 7 ++++++-
 Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 41926187..848ab8e5 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -31,7 +31,7 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
             <div class="col-sm-9">
-                <input id="runs-every" class="form-control" @bind="@_interval" maxlength="4" required />
+                <input id="runs-every" class="form-control mb-1" @bind="@_interval" maxlength="4" required />
                 <select id="runs-every" class="form-select" @bind="@_frequency" required>
                     <option value="m">@Localizer["Minute(s)"]</option>
                     <option value="H">@Localizer["Hour(s)"]</option>
@@ -154,6 +154,11 @@
 
 	private async Task SaveJob()
 	{
+        if (!Utilities.ValidateEffectiveExpiryDates(_startDate, _endDate))
+        {
+            AddModuleMessage(Localizer["Message.StartEndDateError"], MessageType.Warning);
+            return;
+        }
 		validated = true;
 		var interop = new Interop(JSRuntime);
 		if (await interop.FormValid(form))
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
index facc630b..672f5dc9 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
@@ -192,4 +192,7 @@
   <data name="Once" xml:space="preserve">
     <value>Execute Once</value>
   </data>
+  <data name="Message.StartEndDateError" xml:space="preserve">
+    <value>Start Date cannot be after End Date.</value>
+  </data>
 </root>
\ No newline at end of file