Skip to content
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

Jump to bottom

print more info when created record collides with others #174

Merged
merged 11 commits into from
Sep 12, 2021
Merged

print more info when created record collides with others #174

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
63168dd
feat: print more info when created record collides with others
RedemptionC Aug 28, 2021
1e15c20
fix: check if project and end is nil before we print
RedemptionC Aug 28, 2021
c3b4a35
fix: change timetrace_test.go because we have added one more return v…
RedemptionC Aug 28, 2021
501941f
fix: remove unnecessary code
RedemptionC Aug 28, 2021
dbcdf1a
feat: print colliding records in table format
RedemptionC Aug 28, 2021
3fd9651
feat: print colliding records in table format
RedemptionC Aug 28, 2021
a5147bf
feat: remove unnecessary comment
RedemptionC Aug 28, 2021
6e7391b
Merge branch 'issue-173' of github.com:RedemptionC/timetrace into iss…
RedemptionC Aug 28, 2021
65590a3
refactor: change function name:
RedemptionC Sep 4, 2021
d599180
fix:change test file as well
RedemptionC Sep 4, 2021
0c08e97
fix:use simple loop instead of reflect.DeepEqual
RedemptionC Sep 5, 2021
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
2 changes: 1 addition & 1 deletion cli/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func createRecordCommand(t *core.Timetrace) *cobra.Command {
return
}
if collides {
out.Err("Record collides with other record!")
out.Warn(" start and end of the record should not overlap with others")
return
}

Expand Down
22 changes: 19 additions & 3 deletions core/timetrace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"github.com/dominikbraun/timetrace/config"
"github.com/dominikbraun/timetrace/out"
)

const (
Expand Down Expand Up @@ -295,17 +296,32 @@ func (t *Timetrace) RecordCollides(toCheck Record) (bool, error) {
}

func collides(toCheck Record, allRecords []*Record) bool {
collide := false
for _, rec := range allRecords {
var project, end string
if rec.Project != nil {
project = rec.Project.Key
}
if rec.End != nil {
end = rec.End.String()
}

if rec.End != nil && rec.Start.Before(*toCheck.End) && rec.End.After(toCheck.Start) {
return true
defer out.Info("%v %v-%v", project, rec.Start.String(), end)
collide = true
}

if rec.End == nil && toCheck.End.After(rec.Start) {
return true
defer out.Info("%v %v-%v", project, rec.Start.String(), end)
collide = true
}
}

return false
if collide {
out.Err("collides with these records :")
}

return collide
}

// isBackFile checks if a given filename is a backup-file
Expand Down