diff options
| -rw-r--r-- | templates/report.t | 15 | ||||
| -rw-r--r-- | templates/wp-total.t | 20 | ||||
| -rw-r--r-- | zeitgeist.go | 7 |
3 files changed, 25 insertions, 17 deletions
diff --git a/templates/report.t b/templates/report.t index a9b6a59..f2cc359 100644 --- a/templates/report.t +++ b/templates/report.t @@ -8,15 +8,20 @@ Beneficiary: {{.Beneficiary}} # Planing -{{ range $l := .ParallelWPTotals }} -{{. -}} +Budgeted : {{ $totals.Budgeted }} + Planned : {{ $totals.Planned }}{{with $totals.Unaccounted}} + ! Open !: {{ . }}{{end}} + Done : {{ $totals.Done }}{{ with $totals.Open }} + ! TODO !: {{ . }}{{end}} + +{{ range .ParallelWPTotals }}{{.}} {{ end }} {{range $wp, $t := $totals.WP }} Total for {{ $wp }}: - - Budgeted: {{ printf "%8s" $t.Budgeted.AsDay }} - - Planned: {{ printf "%8s" $t.Planned.AsDay }}{{with $t.Unaccounted }} !Unaccounted: {{printf "%8s" .AsDay}}{{end}} - - Actual: {{ printf "%8s" $t.Done.AsDay }}{{with $t.Open }} !TODO: {{printf "%8s" .AsDay }}{{end}} + - Budgeted: {{ printf "%8s" $t.Budgeted.AsDay }} + - Planned: {{ printf "%8s" $t.Planned.AsDay }}{{with $t.Unaccounted }} !Unaccounted: {{printf "%8s" .AsDay}}{{end}} + - Actual: {{ printf "%8s" $t.Done.AsDay }}{{with $t.Open }} !TODO: {{printf "%8s" .AsDay }}{{end}} - Per Task: {{- range $n, $t := $t.Tasks }} - {{ $n }}:{{ $tt := $p.TotalWPTask $wp $n }} diff --git a/templates/wp-total.t b/templates/wp-total.t index 90adf9b..a4cf2f8 100644 --- a/templates/wp-total.t +++ b/templates/wp-total.t @@ -1,17 +1,17 @@ Total for {{ .WP }}: ------------------ -Budgeted: {{ printf "%8s" .Budgeted.AsDay }} - Planned: {{ printf "%8s" .Planned.AsDay }}{{with .Unaccounted }} -! Open !: {{ printf "%8s" .AsDay}}{{end}} - Actual: {{ printf "%8s" .Done.AsDay }}{{with .Open }} -! TODO !: {{ printf "%8s" .AsDay }}{{end}} +Budgeted : {{ printf "%8s" .Budgeted.AsDay }} + Planned : {{ printf "%8s" .Planned.AsDay }}{{with .Unaccounted }} + ! Open !: {{ printf "%8s" .AsDay}}{{end}} + Done : {{ printf "%8s" .Done.AsDay }}{{with .Open }} + ! TODO !: {{ printf "%8s" .AsDay }}{{end}} Per Task: {{ range $n, $t := .Tasks }} »{{ $n }}«: -Budgeted: {{ printf "%8s" $t.Budgeted.AsDay }} - Planned: {{ printf "%8s" $t.Planned.AsDay }}{{with $t.Unaccounted }} -! Open !: {{ printf "%8s" .AsDay}}{{end}} - Actual: {{ printf "%8s" $t.Done.AsDay }}{{with $t.Open }} -! TODO !: {{ printf "%8s" .AsDay}}{{end}} +Budgeted : {{ printf "%8s" $t.Budgeted.AsDay }} + Planned : {{ printf "%8s" $t.Planned.AsDay }}{{with $t.Unaccounted }} + ! Open !: {{ printf "%8s" .AsDay}}{{end}} + Done : {{ printf "%8s" $t.Done.AsDay }}{{with $t.Open }} + ! TODO !: {{ printf "%8s" .AsDay}}{{end}} {{ end }}
\ No newline at end of file diff --git a/zeitgeist.go b/zeitgeist.go index 9dc6e67..a4c05c4 100644 --- a/zeitgeist.go +++ b/zeitgeist.go @@ -888,11 +888,14 @@ type AllTotals struct { func (p *Project) Totals() (at *AllTotals) { at = &AllTotals{ - // TODO: fill in totals here, too WP: make(map[string]*WPTotals), } for n := range p.Workpackages { - at.WP[n], _ = p.TotalWP(n) + t, _ := p.TotalWP(n) + at.WP[n] = t + at.Totals.Budgeted += t.Budgeted + at.Totals.Planned += t.Planned + at.Totals.Done += t.Done } return at } |