Update time since formatting (#1558)

deliahu · web-flow · commit f6720fc0b0ca · 2020-11-13T17:59:20.000-08:00
diff --git a/pkg/lib/time/time.go b/pkg/lib/time/time.go
@@ -73,11 +73,11 @@ func DifferenceStr(t1 *time.Time, t2 *time.Time) string {
 	if durationSecs < 60 {
 		return strconv.Itoa(durationSecs) + "s"
 	} else if durationSecs < 3600 {
-		return strconv.Itoa(durationSecs/60) + "m"
+		return strconv.Itoa(durationSecs/60) + "m" + strconv.Itoa(durationSecs-durationSecs/60*60) + "s"
 	} else if durationSecs < 48*3600 {
-		return strconv.Itoa(durationSecs/3600) + "h"
+		return strconv.Itoa(durationSecs/3600) + "h" + strconv.Itoa((durationSecs-durationSecs/3600*3600)/60) + "m"
 	} else {
-		return strconv.Itoa(durationSecs/(24*3600)) + "d"
+		return strconv.Itoa(durationSecs/(24*3600)) + "d" + strconv.Itoa((durationSecs-durationSecs/(24*3600)*(24*3600))/3600) + "h"
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ func DifferenceStr(t1 time.Time, t2 time.Time) string {`
`73`	`73`	`if durationSecs < 60 {`
`74`	`74`	`return strconv.Itoa(durationSecs) + "s"`
`75`	`75`	`} else if durationSecs < 3600 {`
`76`		`- return strconv.Itoa(durationSecs/60) + "m"`
	`76`	`+ return strconv.Itoa(durationSecs/60) + "m" + strconv.Itoa(durationSecs-durationSecs/60*60) + "s"`
`77`	`77`	`} else if durationSecs < 48*3600 {`
`78`		`- return strconv.Itoa(durationSecs/3600) + "h"`
	`78`	`+ return strconv.Itoa(durationSecs/3600) + "h" + strconv.Itoa((durationSecs-durationSecs/3600*3600)/60) + "m"`
`79`	`79`	`} else {`
`80`		`- return strconv.Itoa(durationSecs/(24*3600)) + "d"`
	`80`	`+ return strconv.Itoa(durationSecs/(243600)) + "d" + strconv.Itoa((durationSecs-durationSecs/(243600)(243600))/3600) + "h"`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`