From cdb3e1e312144c6d6b4fdc22bae062fb6eaeccee Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Fri, 21 Jul 2023 15:00:32 +0200
Subject: [PATCH] LDEV-2692 show start time on admin scheduled task list

https://luceeserver.atlassian.net/browse/LDEV-2692
---
 .../cfml/context/admin/services.schedule.list.cfm    | 12 ++++++++----
 loader/build.xml                                     |  2 +-
 loader/pom.xml                                       |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/src/main/cfml/context/admin/services.schedule.list.cfm b/core/src/main/cfml/context/admin/services.schedule.list.cfm
index 548222b3dd..0f25f9d89d 100755
--- a/core/src/main/cfml/context/admin/services.schedule.list.cfm
+++ b/core/src/main/cfml/context/admin/services.schedule.list.cfm
@@ -229,7 +229,7 @@ Redirtect to entry --->
 							<cfset _int=toStructInterval(tasks.interval)>
 							<cfset _intervall="#stText.Schedule.Every# (hh:mm:ss) #two(_int.hour)#:#two(_int.minute)#:#two(_int.second)#">
 						<cfelse>
-							<cfset _intervall=tasks.interval>
+							<cfset _intervall="#tasks.interval# " & " (hh:mm:ss tt) " & " #TimeFormat(tasks.StartTime,'hh:mm:ss tt')#">
 						</cfif>
 						<cfif
 							doFilter(session.st.nameFilter,tasks.task,false)
@@ -247,7 +247,11 @@ Redirtect to entry --->
 									<input type="hidden" name="name_#tasks.currentrow#" value="#HTMLEditFormat(tasks.task)#">
 									#tasks.task#
 								</td>
-								<td>#_intervall#</td>
+								<td title=<cfif isNumeric(tasks.interval)>
+									"interval time of #stText.Schedule.Every# task"
+									<cfelse>
+										"Start time of #tasks.interval# task"					
+								</cfif> >#_intervall#</td>
 								<td><cfif len(urlAndPort) gt 50><abbr title="#urlAndPort#">#cut(urlAndPort,50)#</abbr><cfelse>#urlAndPort#</cfif></td>
 								<td>#YesNoFormat(tasks.paused)#</td>
 								<td>
@@ -355,8 +359,8 @@ Redirtect to entry --->
 			<tfoot>
 				<tr>
 					<td colspan="2">
-						<input type="reset" class="bl button reset" name="cancel" value="#stText.Buttons.Cancel#">
-						<input type="submit" class="br button submit" name="run" value="#stText.Buttons.Create#">
+						<input type="submit" class="bl button submit" name="run" value="#stText.Buttons.Create#">
+						<input type="reset" class="br button reset" name="cancel" value="#stText.Buttons.Cancel#">
 					</td>
 				</tr>
 			</tfoot>
diff --git a/loader/build.xml b/loader/build.xml
index b2f2430c0b..67eedff28b 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="5.4.2.15-SNAPSHOT"/>
+  <property name="version" value="5.4.2.16-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>
diff --git a/loader/pom.xml b/loader/pom.xml
index d87550c0f5..b7ab1f8afa 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>5.4.2.15-SNAPSHOT</version>
+  <version>5.4.2.16-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>