Filtering on tags, Rounding on 'time'

util/helpers.go

@@ -102,9 +102,11 @@ func DurationToDecimal(dur time.Duration) float64 {
 	mins := dur.Minutes() - (dur.Hours() * 60)
 	return dur.Hours() + (mins / 60)
 }
+
 func AddDurations(dur1, dur2 time.Duration) time.Duration {
 	return time.Duration(int64(dur1) + int64(dur2))
 }
+
 func SubDurations(dur1, dur2 time.Duration) time.Duration {
 	return time.Duration(int64(dur1) - int64(dur2))
 }
@@ -359,10 +361,12 @@ func BuildFilterFromArgs(args []string) func(*timertxt.Timer) bool {
 	end := time.Now()
 	var contextFilters []string
 	var projectFilters []string
+	var tagFilters []string
 	var allFilters []func(timertxt.Timer) bool
 	if len(args) > 0 {
 		contextFilters, args = GetContextsFromSlice(args)
 		projectFilters, args = GetProjectsFromSlice(args)
+		tagFilters, args = GetAdditionalTagsFromSlice(args)
 	}
 	if len(args) > 0 {
 		var err error
@@ -394,22 +398,33 @@ func BuildFilterFromArgs(args []string) func(*timertxt.Timer) bool {
 		allFilters = append(allFilters, func(t timertxt.Timer) bool {
 			for _, v := range contextFilters {
 				v = strings.TrimPrefix(v, "@")
-				if !t.HasContext(v) {
-					return false
+				if t.HasContext(v) {
+					return true
 				}
 			}
-			return true
+			return false
 		})
 	}
 	if len(projectFilters) > 0 {
 		allFilters = append(allFilters, func(t timertxt.Timer) bool {
 			for _, v := range projectFilters {
 				v = strings.TrimPrefix(v, "+")
-				if !t.HasProject(v) {
-					return false
+				if t.HasProject(v) {
+					return true
 				}
 			}
-			return true
+			return false
+		})
+	}
+	if len(tagFilters) > 0 {
+		allFilters = append(allFilters, func(t timertxt.Timer) bool {
+			for _, v := range tagFilters {
+				pts := strings.Split(v, ":")
+				if len(pts) == 2 && t.HasTag(pts[0]) && t.GetTag(pts[0]) == pts[1] {
+					return true
+				}
+			}
+			return false
 		})
 	}
 	doFilters := func(t *timertxt.Timer) bool {
@@ -441,6 +456,7 @@ func StringSliceContains(sl []string, val string) bool {
 	}
 	return false
 }
+
 func AppendStringIfDistinct(sl []string, val string) []string {
 	if !StringSliceContains(sl, val) {
 		return append(sl, val)