summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Gotsche <n@softwarefools.com>2019-05-08 12:05:56 +0200
committerNikolaus Gotsche <n@softwarefools.com>2019-05-08 12:05:56 +0200
commiteeca61f9137ef70f53e03cf0df8e0c2cda4bb9ce (patch)
treea784ed09b858fa38f6bbee213d7e9e5b47b1f14a
parent1308154bfde61973308df8e908a45cd95781939c (diff)
Minor beautifications0.4.2
-rw-r--r--analyze.go8
-rw-r--r--main.go4
2 files changed, 8 insertions, 4 deletions
diff --git a/analyze.go b/analyze.go
index 86a18c8..b90b568 100644
--- a/analyze.go
+++ b/analyze.go
@@ -93,12 +93,14 @@ func ShowFullAnalysis() {
fmt.Println(frame("Full Analysis",true))
for _,mo := range analysis {
fmt.Println(sli,mo.Year,mo.MonthName)
- fmt.Printf("%s Workhours: %.2f\n",nli,mo.Workhours)
- fmt.Println(nli," Days:",mo.Days)
+ fmt.Printf("%s Workhours: %.2f[h]\n",nli,mo.Workhours)
+ fmt.Printf("%s Earnings: %.2f[€]\n",nli,mo.Earnings)
+ fmt.Println(nli," Days:",len(mo.Days))
cnt, hr, dur := AnalyzeTasks(GetSelectedTasks(mo.Tasks))
fmt.Println(nli," Tasks:",cnt,"Hours:", hr)
- fmt.Println(nli,dur)
+ fmt.Println(nli," ",dur)
fmt.Println(nli,"Projects:",len(mo.Projects))
+ fmt.Println(nli)
}
fmt.Println(frame("",false))
}
diff --git a/main.go b/main.go
index 7996c51..d211245 100644
--- a/main.go
+++ b/main.go
@@ -20,6 +20,7 @@ import (
var (
version string
compdate string
+ compyear string
)
//var svar string
@@ -81,6 +82,7 @@ func title(frame bool) {
bHiM := color.New(color.FgHiMagenta, color.Bold).SprintFunc()
bM := color.New(color.FgMagenta, color.Bold).SprintFunc()
line := "___"
+ compyear = compdate[len(compdate)-4:]
if frame {
fmt.Printf("%s%s%s%s%s%s%s%s\n\n", bR(line), bHiR(line), bHiY(line), bHiG(line), bHiC(line), bHiB(line), bHiM(line), bM(line))
@@ -89,7 +91,7 @@ func title(frame bool) {
if frame {
fmt.Printf("%s%s%s%s%s%s%s%s\n", bR(line), bHiR(line), bHiY(line), bHiG(line), bHiC(line), bHiB(line), bHiM(line), bM(line))
fmt.Printf("Version %s (%s)\n", version, compdate)
- fmt.Println("(c) 2018 - n@gotsche.at\n")
+ fmt.Printf("(c) 2018-%v - n@softwarefools.com\n\n",compyear)
}
}