mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-14 11:32:48 +00:00
Code Issues Releases Wiki Activity

finished graph information

Browse Source
This commit is contained in:
Mitchell
2016-05-19 23:07:50 -05:00
parent b3da7be0b8
commit 5f988973c4
13 changed files with 319 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/view/sensor_info.html
View File

@@ -5,9 +5,10 @@
<br>
<form class="text-center form-inline">
<div class="form-group">
<select class="form-control" id="option-year">
<option value=">">Years</option>
Year:
<select class="form-control" id="option-year" ng-options="item as item.year for item in list" ng-model="selectedObject" ng-change="selectedMonth = selectedObject.months[0]; onYearChange(selectedObject);">
</select>
<img ng-show="loadingYear" src="/public/images/loading.gif" alt="loading">
</div>
</form>
<br>
@@ -15,20 +16,18 @@
<canvas class="center" id="info-chart-year" width="800" height="400"></canvas>
</div>
<br>
<div id="legend-year" class="chart-legend"></div>
<form class="text-center form-inline">
<div class="form-group">
<select class="form-control" id="option-month">
<option value="">Month + Year</option>
Month:
<select class="form-control" id="option-month" ng-options="month as month for month in selectedObject.months" ng-model="selectedMonth" ng-change="onMonthChange(selectedObject)">
</select>
<img ng-show="loadingMonth" src="/public/images/loading.gif" alt="loading">
</div>
</form>
<br>
<div id="canvas2-id">
<canvas class="center" id="info-chart-month" width="800" height="400"></canvas>
</div>
<br>
<div id="legend-month" class="chart-legend"></div>
</div>
<br>
<br>

9
public/view/template.html
View File

@@ -3,6 +3,7 @@
<head>
<title>mitchel.io</title>
<link rel='shortcut icon' href='/public/favicon.ico' type='image/x-icon' />
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link rel="stylesheet" href="/public/css/style.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.css">
@@ -68,10 +69,6 @@
<footer class="blog-footer">
<p>Site created and managed by Mitchell Gerber</p>
<span>©2015-2016</span>
<br>
<span>Glyphicons provided by</span>
<br>
<a href="http://glyphicons.com/" target="_blank"><span>glyphicons.com</span></a>
</footer>
</body>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
@@ -80,6 +77,10 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-route.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-resource.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.1.3/Chart.bundle.js"></script>
<script src="/public/js/app.js"></script>
<script src="/public/js/IndexController.js"></script>
<script src="/public/js/SensorsController.js"></script>
<script src="/public/js/SensorInfoController.js"></script>
</html>