Monthly Analysis shows Daydata0.4.9

1 files changed, 14 insertions, 8 deletions

diff --git a/analyze.go b/analyze.go
index aa18053..7294985 100644
--- a/analyze.go
+++ b/analyze.go
@@ -9,8 +9,8 @@ import (
 type Daydata struct {
 	Day int
 
-	Taskcount int
-	Projectcount int
+	Tasks []int
+	Projects []int
 
 	Workhours float64
 	Workvalue float64
@@ -49,7 +49,9 @@ type Year struct {
 }
 
 func (d Daydata)Show()(out string){
-	out = fmt.Sprintf("%v. : %v Tasks in %v Projects: %.2f [h] for %.2f[€]",d.Day,d.Taskcount,d.Projectcount,d.Workhours,d.Workvalue)
+	//cnt, hr, dur := AnalyzeTasks(GetSelectedTasks(d.Tasks))
+	out = fmt.Sprintf("%v. : %v Tasks in %v Projects: %.2f [h] for %.2f[€]",d.Day,len(d.Tasks),len(d.Projects),d.Workhours,d.Workvalue)
+	//out = fmt.Sprintf("%v. : %v Tasks in %v Projects: %.2f [h] for %.2f[€]  | TEST: cnt:%v, %.2f[h], %s",d.Day,len(d.Tasks),len(d.Projects),d.Workhours,d.Workvalue,cnt,hr,dur)
 	return
 }
 
@@ -74,14 +76,19 @@ func MakeAnalysis() {
 		val := ta.Money()
 
 		if exist {
+			daydat := Daydata{day,[]int{ta.Id},[]int{ta.Projectid}, dur,val}
 			dex,dexid := DaydataExists(day,analysis[exid].Daydatas)
 			if !isElement(day,analysis[exid].Days){
 				analysis[exid].Days = append(analysis[exid].Days,day)
+				analysis[exid].Daydatas = append(analysis[exid].Daydatas,daydat)
 			}else{
 				if dex {
 					analysis[exid].Daydatas[dexid].Workvalue += val
 					analysis[exid].Daydatas[dexid].Workhours += dur
-					analysis[exid].Daydatas[dexid].Taskcount += 1
+					analysis[exid].Daydatas[dexid].Tasks = append(analysis[exid].Daydatas[dexid].Tasks,ta.Id)
+					if !isElement(ta.Projectid,analysis[exid].Daydatas[dexid].Projects){
+						analysis[exid].Daydatas[dexid].Projects = append(analysis[exid].Daydatas[dexid].Projects,ta.Projectid)
+					}
 				}
 			}
 			analysis[exid].Workvalue += val
@@ -89,13 +96,12 @@ func MakeAnalysis() {
 			analysis[exid].Tasks = append(analysis[exid].Tasks,ta.Id)
 			if !isElement(ta.Projectid,analysis[exid].Projects){
 				analysis[exid].Projects = append(analysis[exid].Projects,ta.Projectid)
-			}else{
-				if dex {
+			/*	if dex {
 					analysis[exid].Daydatas[dexid].Projectcount += 1
-				}
+				} */
 			}
 		}else{
-			daydat := Daydata{day,1,1, dur,val}
+			daydat := Daydata{day,[]int{ta.Id},[]int{ta.Projectid}, dur,val}
 			analysis = append(analysis,Month{
 				month,
 				monthstr,