1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
package reports
import (
"database/sql"
"fmt"
"time"
"git.tjp.lol/punchcard/internal/queries"
)
type TimesheetData struct {
ClientID int64
ClientName string
ProjectName string
ContractorName string
ContractorLabel string
ContractorEmail string
DateRange DateRange
Entries []TimesheetEntry
TotalHours float64
GeneratedDate time.Time
Timezone string
}
type TimesheetEntry struct {
Date string `json:"date"`
StartTime string `json:"start_time"`
EndTime string `json:"end_time"`
Duration string `json:"duration"`
Hours float64 `json:"hours"`
ProjectName string `json:"project_name"`
Description string `json:"description"`
}
type timesheetEntryData struct {
TimeEntryID int64
StartTime time.Time
EndTime sql.NullTime
Description sql.NullString
ClientID int64
ClientName string
ProjectID sql.NullInt64
ProjectName sql.NullString
DurationSeconds int64
}
func GenerateTimesheetData(
entries interface{},
clientID int64,
clientName,
projectName string,
contractor queries.Contractor,
dateRange DateRange,
loc *time.Location,
) (*TimesheetData, error) {
var timeEntries []timesheetEntryData
switch e := entries.(type) {
case []queries.GetTimesheetDataByClientRow:
for _, entry := range e {
timeEntries = append(timeEntries, timesheetEntryData{
TimeEntryID: entry.TimeEntryID,
StartTime: entry.StartTime,
EndTime: entry.EndTime,
Description: entry.Description,
ClientID: entry.ClientID,
ClientName: entry.ClientName,
ProjectID: entry.ProjectID,
ProjectName: entry.ProjectName,
DurationSeconds: entry.DurationSeconds,
})
}
case []queries.GetTimesheetDataByProjectRow:
for _, entry := range e {
timeEntries = append(timeEntries, timesheetEntryData{
TimeEntryID: entry.TimeEntryID,
StartTime: entry.StartTime,
EndTime: entry.EndTime,
Description: entry.Description,
ClientID: entry.ClientID,
ClientName: entry.ClientName,
ProjectID: sql.NullInt64{Int64: entry.ProjectID, Valid: true},
ProjectName: sql.NullString{String: entry.ProjectName, Valid: true},
DurationSeconds: entry.DurationSeconds,
})
}
default:
return nil, fmt.Errorf("unsupported entry type")
}
timesheetEntries := convertToTimesheetEntries(timeEntries, loc)
// Calculate total hours from raw seconds (same method as invoices)
totalSeconds := int64(0)
for _, entry := range timeEntries {
totalSeconds += entry.DurationSeconds
}
totalHours := float64(totalSeconds) / 3600.0
// Get the actual timezone name (not "Local" but the real zone name)
timezoneName := loc.String()
if timezoneName == "Local" {
// Get the actual local timezone name by checking current time
now := time.Now()
zone, _ := now.Zone()
timezoneName = zone
}
timesheet := &TimesheetData{
ClientID: clientID,
ClientName: clientName,
ProjectName: projectName,
ContractorName: contractor.Name,
ContractorLabel: contractor.Label,
ContractorEmail: contractor.Email,
DateRange: dateRange,
Entries: timesheetEntries,
TotalHours: totalHours,
GeneratedDate: time.Now().UTC(),
Timezone: timezoneName,
}
return timesheet, nil
}
func convertToTimesheetEntries(entries []timesheetEntryData, loc *time.Location) []TimesheetEntry {
var timesheetEntries []TimesheetEntry
for _, entry := range entries {
if !entry.EndTime.Valid {
continue // Skip entries without end time
}
// Convert UTC times to specified timezone
localStartTime := entry.StartTime.In(loc)
localEndTime := entry.EndTime.Time.In(loc)
// Format date as YYYY-MM-DD
date := localStartTime.Format("2006-01-02")
// Format times as HH:MM
startTime := localStartTime.Format("15:04")
endTime := localEndTime.Format("15:04")
// Format duration as HH:MM
duration := formatDuration(entry.DurationSeconds)
// Calculate hours as decimal, rounded to nearest minute
totalMinutes := (entry.DurationSeconds + 30) / 60 // Round to nearest minute
hours := float64(totalMinutes) / 60.0
// Get project name
projectName := ""
if entry.ProjectName.Valid {
projectName = entry.ProjectName.String
}
// Get description
description := ""
if entry.Description.Valid {
description = entry.Description.String
}
timesheetEntries = append(timesheetEntries, TimesheetEntry{
Date: date,
StartTime: startTime,
EndTime: endTime,
Duration: duration,
Hours: hours,
ProjectName: projectName,
Description: description,
})
}
return timesheetEntries
}
func formatDuration(seconds int64) string {
// Round to nearest minute
totalMinutes := (seconds + 30) / 60 // Add 30 seconds for rounding
hours := totalMinutes / 60
minutes := totalMinutes % 60
return fmt.Sprintf("%d:%02d", hours, minutes)
}
|
