From c952ded006c7eaba9c65cde1e35c0e796a4ad953 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Mon, 28 Mar 2022 19:55:43 +0500
Subject: [PATCH] Add next launch time field

---
 httpserver.go |  6 ++++--
 index.htm     |  2 ++
 job.go        | 35 ++++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/httpserver.go b/httpserver.go
index 04d3f9b..abd1ec7 100644
--- a/httpserver.go
+++ b/httpserver.go
@@ -33,8 +33,10 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	buf := new(bytes.Buffer)
 	jobEntries := c.Entries()
 	var jobs []*Job
-	for _, v := range jobEntries {
-		jobs = append(jobs, v.Job.(*Job))
+	for _, jobEntry := range jobEntries {
+		job := jobEntry.Job.(*Job)
+		job.NextLaunch = jobEntry.Next.Format(config.TimeFormat)
+		jobs = append(jobs, job)
 	}
 	indexTemplate.ExecuteTemplate(buf, "index", jobs)
 	globalMutex.RUnlock()
diff --git a/index.htm b/index.htm
index 83cc2e7..2ccfbad 100644
--- a/index.htm
+++ b/index.htm
@@ -193,6 +193,7 @@
 				<th>Start time</th>
 				<th>Finish time</th>
 				<th>Duration</th>
+				<th>Next launch</th>
 				<th>Last error</th>
 			</tr>
 			{{range .}}<tr>
@@ -208,6 +209,7 @@
 				<td>{{.LastStartTime}}</td>
 				<td>{{.LastEndTime}}</td>
 				<td align="right">{{.LastExecutionDuration}}</td>
+				<td>{{.NextLaunch}}</td>
 				<td class="smaller red">{{.LastError}}</td>
 			</tr>{{end}}
 		</table>
diff --git a/job.go b/job.go
index c8de416..0abcf48 100644
--- a/job.go
+++ b/job.go
@@ -20,6 +20,24 @@ type JobConfig struct {
 	Description string
 }
 
+type Job struct {
+	Name string // from filename
+
+	Cron        string   // cron decription
+	Command     string   // command for execution
+	Params      []string // command params
+	FileName    string   // short job name
+	Description string   // job description
+
+	// Fields for stats
+	CurrentRunningCount   int
+	LastStartTime         string
+	LastEndTime           string
+	LastExecutionDuration string
+	LastError             string
+	NextLaunch            string
+}
+
 var globalMutex sync.RWMutex
 
 func readJob(filePath string) (*Job, error) {
@@ -49,23 +67,6 @@ func (js *JobConfig) Write() {
 	ioutil.WriteFile("job.conf", buf.Bytes(), 0644)
 }
 
-type Job struct {
-	Name string // from filename
-
-	Cron        string   // cron decription
-	Command     string   // command for execution
-	Params      []string // command params
-	FileName    string   // short job name
-	Description string   // job description
-
-	// Fields for stats
-	CurrentRunningCount   int
-	LastStartTime         string
-	LastEndTime           string
-	LastExecutionDuration string
-	LastError             string
-}
-
 func (j *Job) Run() {
 	startTime := time.Now()