Merge pull request #137 from vshn/tz-in-all-report

Display timezone in all-employee-report
vshn · Nov 18, 2022 · d75c3a5 · d75c3a5
2 parents 9866d56 + fdacdff
commit d75c3a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/web/employeereport/employeereport_view.go b/pkg/web/employeereport/employeereport_view.go
@@ -54,6 +54,7 @@ func (v *reportView) getValuesForReport(report timesheet.Report, previousPayslip
 		"ReportDirectLink":                fmt.Sprintf("/report/%d/%d/%02d", report.Employee.ID, v.year, v.month),
 		"ButtonText":                      v.getButtonText(nextPayslip),
 		"Workload":                        v.FormatFloat(report.Summary.AverageWorkload*100, 0),
+		"Timezone":                        report.From.Location(),
 		"Leaves":                          report.Summary.TotalLeave,
 		"ExcusedHours":                    v.FormatDurationInHours(report.Summary.TotalExcusedTime),
 		"WorkedHours":                     v.FormatDurationInHours(report.Summary.TotalWorkedTime),

diff --git a/templates/employeereport.html b/templates/employeereport.html
@@ -86,7 +86,7 @@ <h1>Attendances for {{ .Month }} {{ .Year }}</h1>
     <tbody>
     {{ range .Reports }}
     <tr>
-        <td><a href="{{ .ReportDirectLink }}">{{ .Name }}</a> ({{ .Workload }}%)</td>
+        <td><a href="{{ .ReportDirectLink }}">{{ .Name }}</a><br>Workload: {{ .Workload }}%<br>Location: {{ .Timezone }}</td>
         <td>{{ .Leaves }}d</td>
         <td>{{ .ExcusedHours }}</td>
         <td>{{ .WorkedHours }}</td>