From f09367783c4f444a6da8896a4eb220c174d917c5 Mon Sep 17 00:00:00 2001
From: Nicole Rappe <nicole.rappe@bunny-lab.io>
Date: Tue, 23 Sep 2025 13:06:11 -0600
Subject: [PATCH] Added Additional Scheduling Options

---
 .../WebUI/src/Scheduling/Create_Job.jsx       |  5 +++++
 .../src/Scheduling/Scheduled_Jobs_List.jsx    | 22 ++++++++++++++++++-
 Data/Server/job_scheduler.py                  | 14 ++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Data/Server/WebUI/src/Scheduling/Create_Job.jsx b/Data/Server/WebUI/src/Scheduling/Create_Job.jsx
index 40e3665..f1f5b27 100644
--- a/Data/Server/WebUI/src/Scheduling/Create_Job.jsx
+++ b/Data/Server/WebUI/src/Scheduling/Create_Job.jsx
@@ -594,6 +594,11 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) {
                 <Select size="small" fullWidth value={scheduleType} onChange={(e) => setScheduleType(e.target.value)}>
                   <MenuItem value="immediately">Immediately</MenuItem>
                   <MenuItem value="once">At selected date and time</MenuItem>
+                  <MenuItem value="every_5_minutes">Every 5 Minutes</MenuItem>
+                  <MenuItem value="every_10_minutes">Every 10 Minutes</MenuItem>
+                  <MenuItem value="every_15_minutes">Every 15 Minutes</MenuItem>
+                  <MenuItem value="every_30_minutes">Every 30 Minutes</MenuItem>
+                  <MenuItem value="every_hour">Every Hour</MenuItem>
                   <MenuItem value="daily">Daily</MenuItem>
                   <MenuItem value="weekly">Weekly</MenuItem>
                   <MenuItem value="monthly">Monthly</MenuItem>
diff --git a/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx b/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx
index bc2b94e..0439371 100644
--- a/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx
+++ b/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx
@@ -41,10 +41,30 @@ export default function ScheduledJobsList({ onCreateJob, onEditJob, refreshToken
       const resp = await fetch('/api/scheduled_jobs');
       const data = await resp.json();
       if (!resp.ok) throw new Error(data.error || `HTTP ${resp.status}`);
+      const pretty = (st) => {
+        const s = String(st || '').toLowerCase();
+        const map = {
+          'immediately': 'Immediately',
+          'once': 'Once',
+          'every_5_minutes': 'Every 5 Minutes',
+          'every_10_minutes': 'Every 10 Minutes',
+          'every_15_minutes': 'Every 15 Minutes',
+          'every_30_minutes': 'Every 30 Minutes',
+          'every_hour': 'Every Hour',
+          'daily': 'Daily',
+          'weekly': 'Weekly',
+          'monthly': 'Monthly',
+          'yearly': 'Yearly',
+        };
+        if (map[s]) return map[s];
+        try {
+          return s.replace(/_/g, ' ').replace(/^./, c => c.toUpperCase());
+        } catch { return String(st || ''); }
+      };
       const rows = (data.jobs || []).map((j) => {
         const compName = (Array.isArray(j.components) && j.components[0]?.name) || "Demonstration Component";
         const targetText = Array.isArray(j.targets) ? `${j.targets.length} device${j.targets.length!==1?'s':''}` : '';
-        const occurrence = (j.schedule_type || 'immediately').replace(/^./, (c) => c.toUpperCase());
+        const occurrence = pretty(j.schedule_type || 'immediately');
         const fmt = (ts) => {
           if (!ts) return '';
           try {
diff --git a/Data/Server/job_scheduler.py b/Data/Server/job_scheduler.py
index 6fd2a4c..89708a2 100644
--- a/Data/Server/job_scheduler.py
+++ b/Data/Server/job_scheduler.py
@@ -297,6 +297,20 @@ class JobScheduler:
 
         # For recurring types, base off start_ts and last_run_ts
         last = last_run_ts if last_run_ts else None
+        # Minute/Hour intervals
+        if st in ("every_5_minutes", "every_10_minutes", "every_15_minutes", "every_30_minutes", "every_hour"):
+            period_map = {
+                "every_5_minutes": 5 * 60,
+                "every_10_minutes": 10 * 60,
+                "every_15_minutes": 15 * 60,
+                "every_30_minutes": 30 * 60,
+                "every_hour": 60 * 60,
+            }
+            period = period_map.get(st)
+            candidate = (last + period) if last else start_ts
+            while candidate is not None and candidate <= now_ts - 1:
+                candidate += period
+            return candidate
         if st == "daily":
             period = 86400
             candidate = last + period if last else start_ts