make computation of mean value optional

pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java

@@ -1,8 +1,10 @@
 package org.lucares.pdbui;
 
+import org.lucares.pdb.plot.api.AggreateInternal;
 import org.lucares.pdb.plot.api.AxisScale;
 import org.lucares.pdb.plot.api.Limit;
 import org.lucares.pdb.plot.api.PlotSettings;
+import org.lucares.pdbui.domain.Aggregate;
 import org.lucares.pdbui.domain.LimitBy;
 import org.lucares.pdbui.domain.PlotRequest;
 import org.lucares.pdbui.domain.YAxis;
@@ -21,10 +23,19 @@ class PlotSettingsTransformer {
 		result.setDateFrom(request.getDateFrom());
 		result.setDateRange(request.getDateRange());
 		result.setYAxisScale(toAxisScale(request.getAxisScale()));
+		result.setAggregate(toAggregateInternal(request.getAggregate()));
 
 		return result;
 	}
 
+	private static AggreateInternal toAggregateInternal(Aggregate aggregate) {
+		switch (aggregate) {
+		case NONE:return AggreateInternal.NONE;
+		case MEAN:return AggreateInternal.MEAN;
+		}
+		throw new IllegalStateException("unhandled enum: " + aggregate);
+	}
+
 	private static AxisScale toAxisScale(final YAxis yAxis) {
 		switch (yAxis) {
 		case LINEAR:

pdb-ui/src/main/java/org/lucares/pdbui/domain/Aggregate.java

@@ -0,0 +1,5 @@
+package org.lucares.pdbui.domain;
+
+public enum Aggregate {
+	NONE, MEAN
+}

pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java

@@ -20,6 +20,8 @@ public class PlotRequest {
 	private String dateFrom;
 
 	private String dateRange;
+	
+	private Aggregate aggregate = Aggregate.NONE;
 
 	public String getQuery() {
 		return query;
@@ -100,4 +102,12 @@ public class PlotRequest {
 	public void setAxisScale(final YAxis yAxis) {
 		this.yAxis = yAxis;
 	}
+	
+	public void setAggregate(Aggregate aggregate) {
+		this.aggregate = aggregate;
+	}
+	
+	public Aggregate getAggregate() {
+		return aggregate;
+	}
 }

pdb-ui/src/main/resources/resources/js/search.js

@@ -182,6 +182,7 @@ function plot(event){
 	request['dateFrom'] = $('#search-date-from').val();
 	request['dateRange'] = $('#search-date-range').val();
 	request['axisScale'] = $('#search-y-axis-scale').val();
+	request['aggregate'] = $('#show-aggregate').val();
 	
 	
 	var success = function(response){

pdb-ui/src/main/resources/templates/main.html

@@ -47,13 +47,19 @@
 			<option value="1 month">
 		</datalist>
 		
-		<label for="search-y-axis-scale">y-axis:</label>
+		<label for="search-y-axis-scale">Y-Axis:</label>
 		<select id="search-y-axis-scale">
 			<option value="LINEAR" selected="selected">linear</option>
 			<option value="LOG10">log 10</option>
 			<option value="LOG2">log 2</option>
 		</select>
 		
+		<label for="show-aggregate">Aggregate:</label>
+		<select id="show-aggregate">
+			<option value="NONE" selected="selected">-</option>
+			<option value="MEAN">Mean</option>
+		</select>
+		
 		<button id="search-submit"><i class="fa fa-area-chart" aria-hidden="true"></i> Plot</button>
 	</div>