diff options
| author | Özgür Kesim <oec@codeblau.de> | 2024-11-28 22:36:51 +0100 |
|---|---|---|
| committer | Özgür Kesim <oec@codeblau.de> | 2024-11-28 22:36:51 +0100 |
| commit | 22c56dee9b9a1d68c15ba395b223cad2900a8ebf (patch) | |
| tree | 68ed913eff692c53e0f7136dba78ca9ba654027a /templates | |
| parent | 467933483cc53febf2ff57a6eaaae9e9b19095d6 (diff) | |
fix formatting for amounts; better blocked/holiday
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/plan-template.t | 13 | ||||
| -rw-r--r-- | templates/report.t | 14 |
2 files changed, 15 insertions, 12 deletions
diff --git a/templates/plan-template.t b/templates/plan-template.t index d711f01..a5e29e6 100644 --- a/templates/plan-template.t +++ b/templates/plan-template.t @@ -1,6 +1,9 @@ -# Days -{{- $tl := .Timeline }} -{{ range .Days }} -{{ if .IsWeekend }}# {{end}}{{.Date}}{{ if .IsWeekend }} weekend{{ end -}} -{{ with $e := index $tl .Date }} {{ printf "%8s" $e.Total.AsDay }} {{ printf "%8s" $e.WPs }} {{ end }} +# Entry Format: +# 2006-01-02 WP2:wallet 8h Code Audit +{{- $tl := .Timeline -}} +{{ range .Days 2024 }} +{{ if or .IsWeekend .Holiday .Blocked }}# {{end}}{{.Date}} +{{- with .Holiday }} ({{ . }}){{ end -}} +{{- with .Blocked }} ({{ . }}){{ end -}} +{{/* with $e := index $tl .Date }} {{ printf "%8s" $e.WPs }} {{ printf "%8s" $e.Total.AsDay }}{{ end */}} {{- end }} diff --git a/templates/report.t b/templates/report.t index 679c9e6..1f6de14 100644 --- a/templates/report.t +++ b/templates/report.t @@ -8,11 +8,11 @@ Beneficiary: {{.Beneficiary}} # Planning -Budgeted : {{ $totals.Budgeted }} - Planned : {{ $totals.Planned }}{{with $totals.Unaccounted}} - ! Open !: {{ . }}{{end}} - Done : {{ $totals.Done }}{{ with $totals.Open }} - ! Todo !: {{ . }}{{end}} +Budgeted : {{ printf "%8s" $totals.Budgeted }} + Planned : {{ printf "%8s" $totals.Planned }}{{with $totals.Unaccounted}} + ! Open !: {{ printf "%8s" . }}{{end}} + Done : {{ printf "%8s" $totals.Done }}{{ with $totals.Open }} + ! Todo !: {{ printf "%8s" . }}{{end}} {{ range .ParallelWPTotals }}{{.}} {{ end }} @@ -21,12 +21,12 @@ Budgeted : {{ $totals.Budgeted }} 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}} + - 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 }} - Budgeted: {{ printf "%8s" $tt.Budgeted.AsDay }} - Planned: {{ printf "%8s" $tt.Planned.AsDay }}{{with $tt.Unaccounted }} !Unaccounted: {{printf "%8s" .AsDay}}{{end}} - - Actual: {{ printf "%8s" $tt.Done.AsDay }}{{with $tt.Open }} !TODO: {{printf "%8s" .AsDay}}{{end}} + - Actual: {{ printf "%8s" $tt.Done.AsDay }}{{with $tt.Open }} !Todo!: {{printf "%8s" .AsDay}}{{end}} {{ end }} {{ end }} |