update

models/cloudbrain_static.go

@@ -18,8 +18,8 @@ type TaskDetail struct {
 	Status          string             `json:"Status"`
 	JobType         string             `json:"JobType"`
 	CreatedUnix     timeutil.TimeStamp `json:"CreatedUnix"`
-	WaitTime        timeutil.TimeStamp `json:"WaitTime"`
-	RunTime         int64              `json:"RunTime"`
+	WaitTime        string             `json:"WaitTime"`
+	RunTime         string             `json:"RunTime"`
 	StartTime       timeutil.TimeStamp `json:"StartTime"`
 	EndTime         timeutil.TimeStamp `json:"EndTime"`
 	ComputeResource string             `json:"ComputeResource"`

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -9,7 +9,6 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/timeutil"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 
 	"code.gitea.io/gitea/modules/setting"
@@ -575,7 +574,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		taskDetail.Status = ciTasks[i].Status
 		taskDetail.JobType = ciTasks[i].JobType
 		taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix
-		taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration
+		taskDetail.RunTime = ciTasks[i].Cloudbrain.TrainJobDuration
 		taskDetail.StartTime = ciTasks[i].StartTime
 		taskDetail.EndTime = ciTasks[i].EndTime
 		taskDetail.ComputeResource = ciTasks[i].ComputeResource
@@ -585,9 +584,11 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		if ciTasks[i].Repo != nil {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 		}
-		taskDetail.WaitTime = ciTasks[i].StartTime - ciTasks[i].Cloudbrain.CreatedUnix
-		if taskDetail.WaitTime < 0 {
-			taskDetail.WaitTime = 0
+		WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+		taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+
+		if WaitTimeInt < 0 {
+			taskDetail.WaitTime = "00:00:00"
 		}
 		if ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainTwo || (ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainOne && ciTasks[i].Cloudbrain.JobType == "TRAIN") {
 			taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
@@ -721,25 +722,17 @@ func GetWaittingTop(ctx *context.Context) {
 		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
 
 		var taskDetail models.TaskDetail
-		taskDetail.ID = ciTasks[i].Cloudbrain.ID
-		taskDetail.JobName = ciTasks[i].JobName
 		taskDetail.DisplayJobName = ciTasks[i].DisplayJobName
-		taskDetail.Status = ciTasks[i].Status
-		taskDetail.JobType = ciTasks[i].JobType
-		taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix
-		taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration
-		taskDetail.StartTime = ciTasks[i].StartTime
-		taskDetail.EndTime = ciTasks[i].EndTime
-		taskDetail.ComputeResource = ciTasks[i].ComputeResource
-		taskDetail.Type = ciTasks[i].Cloudbrain.Type
 		taskDetail.UserName = ciTasks[i].User.Name
 		taskDetail.RepoID = ciTasks[i].RepoID
 		if ciTasks[i].Repo != nil {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 		}
-		taskDetail.WaitTime = timeutil.TimeStamp(time.Now().Unix()) - ciTasks[i].Cloudbrain.CreatedUnix
-		if taskDetail.WaitTime < 0 {
-			taskDetail.WaitTime = 0
+		WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+		taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+
+		if WaitTimeInt < 0 {
+			taskDetail.WaitTime = "00:00:00"
 		}
 		tasks = append(tasks, taskDetail)
 	}
@@ -759,26 +752,14 @@ func GetRunningTop(ctx *context.Context) {
 		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
 
 		var taskDetail models.TaskDetail
-		taskDetail.ID = ciTasks[i].Cloudbrain.ID
-		taskDetail.JobName = ciTasks[i].JobName
 		taskDetail.DisplayJobName = ciTasks[i].DisplayJobName
-		taskDetail.Status = ciTasks[i].Status
-		taskDetail.JobType = ciTasks[i].JobType
-		taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix
-		taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration
-		taskDetail.StartTime = ciTasks[i].StartTime
-		taskDetail.EndTime = ciTasks[i].EndTime
-		taskDetail.ComputeResource = ciTasks[i].ComputeResource
-		taskDetail.Type = ciTasks[i].Cloudbrain.Type
+		taskDetail.RunTime = ciTasks[i].Cloudbrain.TrainJobDuration
 		taskDetail.UserName = ciTasks[i].User.Name
 		taskDetail.RepoID = ciTasks[i].RepoID
 		if ciTasks[i].Repo != nil {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 		}
-		taskDetail.WaitTime = timeutil.TimeStamp(time.Now().Unix()) - ciTasks[i].Cloudbrain.CreatedUnix
-		if taskDetail.WaitTime < 0 {
-			taskDetail.WaitTime = 0
-		}
+
 		tasks = append(tasks, taskDetail)
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{