Merge branch 'develop' into release

nilskuhn · nilskuhn · commit 5d4df5401b7a · 2017-09-29T14:54:14.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,7 @@ scripts/local/
 
 # bower build files
 bower_components/
+.bowerrc
 
 # local docker tests
-docker/local_*
+docker/local_*
diff --git a/grails-app/services/de/iteratec/osm/barchart/BarchartAggregationService.groovy b/grails-app/services/de/iteratec/osm/barchart/BarchartAggregationService.groovy
@@ -53,7 +53,7 @@ class BarchartAggregationService {
         if (!selectedMeasurands) {
             return []
         }
-
+        selectedMeasurands.unique({a, b -> a.name <=> b.name})
         List<EventResultProjection> projections = new EventResultQueryBuilder(osmConfigCacheService.getMinValidLoadtime(), osmConfigCacheService.getMaxValidLoadtime())
                 .withJobResultDateBetween(from, to)
                 .withPageIn(pages, true)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class BarchartAggregationService {`
`53`	`53`	`if (!selectedMeasurands) {`
`54`	`54`	`return []`
`55`	`55`	`}`
`56`		`-`
	`56`	`+ selectedMeasurands.unique({a, b -> a.name <=> b.name})`
`57`	`57`	`List<EventResultProjection> projections = new EventResultQueryBuilder(osmConfigCacheService.getMinValidLoadtime(), osmConfigCacheService.getMaxValidLoadtime())`
`58`	`58`	`.withJobResultDateBetween(from, to)`
`59`	`59`	`.withPageIn(pages, true)`