X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=templates%2Findex.html.ep;h=cd8155ac915383febf006cc071da7048e00738d5;hb=66549cb3124dc06a95960142da8c364fae031487;hp=ec8487d4dd757560821ed0d5f24494355a5e633d;hpb=ccdf496819d857203d6a8aace11f1ba7daa7e1ef;p=dweather.git

diff --git a/templates/index.html.ep b/templates/index.html.ep
index ec8487d..cd8155a 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -1,4 +1,5 @@
 % my $url = url_for 'weather';
+% my $s;
 <!DOCTYPE html>
 <html>
 	<head>
@@ -20,9 +21,9 @@
 		<script>
 		var ws;
 		var daychart;
-		var daychart_days = 5;
+		var daychart_days = <%= $main::histdays %>;
 		var windrose;
-		var windrose_mins = 10;
+		var windrose_mins = <%= $main::windmins %>;
 		var windspeed;
 		var winddir;
 
@@ -84,7 +85,7 @@
 									js.r.Dir = lastdir;
 								}
 								lastt = js.t;
-								fill_windrose(js, windrose_mins * (60 / 2.5));
+								fill_windrose(js, windrose_mins * 24);
 //							}
 							fill_windspeed(js);
 							fill_winddir(js);
@@ -176,11 +177,26 @@
 					floating: true,
 					backgroundColor: (Highcharts.theme && Highcharts.theme.legendBackgroundColor) || '#FFFFFF'
 				},
+				exporting: {
+					buttons: {
+						contextButton: {
+							enabled: false
+						}
+					}
+				}, 
 				series: [{
 					name: 'Rainfall',
 					type: 'column',
 					yAxis: 1,
-					data: [],
+					data: [ 
+					    <% $s = "";
+						   for (@main::last5daysh) { 
+						      my $r = $main::json->decode($_);
+						      $s .=  "[" . $r->{t}*1000 . "," . $r->{h}->{Rain_1h} . "]," if $r && exists $r->{t} && exists $r->{h}->{Rain_1h};
+						   }
+						   chop $s if length $s; 
+						%><%= $s %>
+					],
 					tooltip: {
 						valueSuffix: ' mm'
 					}
@@ -189,7 +205,15 @@
 					name: 'Sea-Level Pressure',
 					type: 'spline',
 					yAxis: 2,
-					data: [],
+					data: [
+						<% $s = "";
+						   for (@main::last5daysh) { 
+						      my $r = $main::json->decode($_);
+						      $s .=  "[" . $r->{t}*1000 . "," . $r->{h}->{Pressure} . "]," if $r && exists $r->{t} && exists $r->{h}->{Pressure};
+						   }
+						   chop $s if length $s; 
+						%><%= $s %>
+					],
 					marker: {
 						enabled: false
 					},
@@ -201,7 +225,15 @@
 				}, {
 					name: 'Temperature',
 					type: 'spline',
-					data: [],
+					data: [
+						<% $s = "";
+						   for (@main::last5daysh) { 
+						      my $r = $main::json->decode($_);
+						      $s .=  "[" . $r->{t}*1000 . "," . $r->{h}->{Temp_Out} . "]," if $r && exists $r->{t} && exists $r->{h}->{Temp_Out};
+						   }
+						   chop $s if length $s; 
+						%><%= $s %>
+					],
 					tooltip: {
 						valueSuffix: ' Â°C'
 					}
@@ -321,11 +353,34 @@
 						groupPadding: 0
 					}
 				},
+				exporting: {
+					buttons: {
+						contextButton: {
+							enabled: false
+						}
+					}
+				}, 
 
 				series: [ {
-					type: 'scatter',
+					type: 'column',
 					name: 'Wind mph',
-					data: []
+					data: [
+						<% my ($d, $w);
+						   $s = "";
+						   $d = 0; $w = 0;
+					       for (@main::last10minsr) {
+						      my $r = $main::json->decode($_);
+							  if ($r) {
+								  $r->{r}->{Dir} ||= $d;
+								  $r->{r}->{Wind} ||= $w;
+								  $s .=  "[" . $r->{r}->{Dir} . "," . main::nearest(0.1, $r->{r}->{Wind}*2.23694) . "],";
+								  $d = $r->{r}->{Dir};
+								  $w = $r->{r}->{Wind};
+							  }
+						   } 
+						   chop $s if length $s; 
+						%><%= $s %>
+					]
 				}]
 			});
 		}
@@ -415,6 +470,13 @@
 						color: '#DF5353' // red
 					}]
 				},
+				exporting: {
+					buttons: {
+						contextButton: {
+							enabled: false
+						}
+					}
+				}, 
 
 				series: [{
 					name: 'Speed',
@@ -498,6 +560,13 @@
 						text:  'Â° deg'
 					},
 				},
+				exporting: {
+					buttons: {
+						contextButton: {
+							enabled: false
+						}
+					}
+				}, 
 
 				series: [{
 					name: 'Direction',
