Skip to content

get more details for export #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
individual-it merged 4 commits into from
Feb 9, 2026
Merged

get more details for export #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07cd65e
get more details per report item
individual-it Feb 5, 2026
4ba81b6
limit getting projects to client
individual-it Feb 6, 2026
2430345
give template access to all projects of a client
individual-it Feb 6, 2026
518b4fc
return empty ArbitraryString if the given item does not exist
individual-it Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion cmd/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ var exportCmd = &cobra.Command{

funcMap := template.FuncMap{
"ArbitraryString": func(i int) string {
return arbitraryString[i]
if len(arbitraryString) >= i+1 {
return arbitraryString[i]
}

return ""
},
"ExportDate": func() string {
return exportDate
Expand All @@ -72,6 +76,26 @@ var exportCmd = &cobra.Command{
}
return report
},
"AllSelectedProjects": func() []string {
return projects
},
"AllProjectsOfClient": func(clientName string) []string {
client, err := tmetric.GetClientByName(config, tmetricUser, clientName)
if err != nil {
_, _ = fmt.Fprint(os.Stderr, err)
os.Exit(1)
}
projects, err := tmetric.GetAllProjects(config, tmetricUser, client)
if err != nil {
_, _ = fmt.Fprint(os.Stderr, err)
os.Exit(1)
}
var projectNames []string
for _, project := range projects {
projectNames = append(projectNames, project.Name)
}
return projectNames
},
"AllWorkTypes": func() []tmetric.Tag {
workTypes, _ := tmetric.GetAllWorkTypes(config, tmetricUser)
return workTypes
Expand Down
22 changes: 13 additions & 9 deletions tmetric/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ import (
)

type ReportItem struct {
StartTime string `json:"startTime"`
EndTime string `json:"endTime"`
User string `json:"user"`
IssueId string `json:"issueId"`
WorkpackageId string
StartTime string `json:"startTime"`
EndTime string `json:"endTime"`
User string `json:"user"`
IssueId string `json:"issueId"`
Project string `json:"project"`
Client string `json:"client"`
Description string `json:"description"`
WorkpackageId string
CalculatedDuration time.Duration
}

type Report struct {
Expand Down Expand Up @@ -61,7 +65,7 @@ func (reportItem *ReportItem) getDuration() (time.Duration, error) {
func GetDetailedReport(
config *config.Config, tmetricUser User, clientName string, tagName string, groupName string, startDate string, endDate string, projects []string,
) (Report, error) {
client, err := getClientByName(config, tmetricUser, clientName)
client, err := GetClientByName(config, tmetricUser, clientName)
if err != nil {
return Report{}, err
}
Expand All @@ -73,7 +77,7 @@ func GetDetailedReport(

var projectsIds []string // we need a slice of strings for the URL parameters, so let's declare it a string slice
for _, projectName := range projects {
project, err := getProjectByName(config, tmetricUser, projectName)
project, err := getProjectByName(config, tmetricUser, projectName, client)
if err != nil {
return Report{}, err
}
Expand Down Expand Up @@ -122,9 +126,9 @@ func GetDetailedReport(
var report Report
for _, item := range reportItems {
item.WorkpackageId = strings.Trim(item.IssueId, "#") // remove leading '#' from issue id
item.CalculatedDuration, _ = item.getDuration()
report.ReportItems = append(report.ReportItems, item)
itemDuration, _ := item.getDuration()
report.Duration += itemDuration
report.Duration += item.CalculatedDuration
}
return report, nil
}
9 changes: 5 additions & 4 deletions tmetric/tmetric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ func getTeamByName(config *config.Config, tmetricUser User, name string) (Team,
return Team{}, fmt.Errorf("could not find any team with name '%v'", name)
}

func getAllProjects(config *config.Config, tmetricUser User) ([]ProjectV2, error) {
func GetAllProjects(config *config.Config, tmetricUser User, client Client) ([]ProjectV2, error) {
httpClient := resty.New()
tmetricUrl, _ := url.JoinPath(
config.TmetricAPIBaseUrl, "accounts/", strconv.Itoa(tmetricUser.ActiveAccountId), "/projects",
)
resp, err := httpClient.R().
SetQueryParam("ClientList", strconv.Itoa(client.Id)).
SetAuthToken(config.TmetricToken).
Get(tmetricUrl)
if err != nil || resp.StatusCode() != 200 {
Expand All @@ -94,8 +95,8 @@ func getAllProjects(config *config.Config, tmetricUser User) ([]ProjectV2, error
return projects, nil
}

func getProjectByName(config *config.Config, tmetricUser User, name string) (ProjectV2, error) {
projects, err := getAllProjects(config, tmetricUser)
func getProjectByName(config *config.Config, tmetricUser User, name string, client Client) (ProjectV2, error) {
projects, err := GetAllProjects(config, tmetricUser, client)
if err != nil {
return ProjectV2{}, err
}
Expand Down Expand Up @@ -151,7 +152,7 @@ func getWorkTypeByName(config *config.Config, tmetricUser User, name string) (Ta
return Tag{}, fmt.Errorf("could not find any work type with name '%v'", name)
}

func getClientByName(config *config.Config, tmetricUser User, name string) (Client, error) {
func GetClientByName(config *config.Config, tmetricUser User, name string) (Client, error) {
httpClient := resty.New()
tmetricUrl, _ := url.JoinPath(
config.TmetricAPIBaseUrl, "accounts/", strconv.Itoa(tmetricUser.ActiveAccountId), "/clients",
Expand Down