martin/mdot_server
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/mdot_server.git synced 2025-03-13 03:50:00 +00:00
Code Issues Projects Releases Wiki Activity

new graph

Browse Source
This commit is contained in:
Martin Donnelly 2016-08-15 12:16:11 +01:00
parent 31b7f6f488
commit e32d4dcd54
66 changed files with 493 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
app/css/style.css Normal file
View File

@ -0,0 +1,66 @@
.amChartsDataSetSelector
{
font-size:12px;
font-family:verdana,helvetica,arial,sans-serif;
}
.amChartsPeriodSelector
{
font-size:12px;
font-family:verdana,helvetica,arial,sans-serif;
}
.amChartsButtonSelected
{
background-color:#CC0000;
border-style:solid;
border-color:#CC0000;
border-width:1px;
color:#FFFFFF;
-moz-border-radius: 5px;
border-radius: 5px;
margin: 1px;
outline: none;
box-sizing: border-box;
}
.amChartsButton
{
color: #000000;
background: transparent;
opacity: 0.7;
border: 1px solid rgba(0, 0, 0, .3);
-moz-border-radius: 5px;
border-radius: 5px;
margin: 1px;
outline: none;
box-sizing: border-box;
}
.amChartsCompareList
{
border-style:solid;
border-color:#CCCCCC;
border-width:1px;
}
.amChartsCompareList div
{
-webkit-box-sizing: initial;
box-sizing: initial;
}
.amChartsInputField
{
}
.amChartsLegend
{
}
.amChartsPanel
{
}

132
app/js/mdot.js
View File

@ -1,5 +1,5 @@
'use strict';
/* global Backbone, _, $ */
/* global Backbone, _, $, AmCharts */
/* global mainview */
/* jshint browser: true , devel: true*/
@ -238,7 +238,7 @@
}, this);
this.render();
// This.setupChart();
// This.setupChart();
},
events: {
'change select#displaymode': 'changeMode'
@ -268,17 +268,8 @@
},
updateGraph: function() {
var calcArray;
var startX;
var xstep;
var scale;
let ceiling, ceilingLimit;
let points = [];
let data = [];
let circle, title;
var self = this;
let getMode = this.modes[this.mode];
var occupied;
var chartData = [];
@ -290,48 +281,95 @@
}, this);
console.log(chartData);
this.dataSet.fieldMappings = [{
fromField: 'value',
toField: 'value'
}];
this.dataSet.dataProvider = chartData;
this.chart.dataSets = [this.dataSet];
console.log(chartData);
var stockPanel1 = new AmCharts.StockPanel();
stockPanel1.showCategoryAxis = false;
stockPanel1.title = 'Value';
stockPanel1.percentHeight = 70;
console.log('Doing chart now');
// Graph of first stock panel
var graph1 = new AmCharts.StockGraph();
graph1.valueField = 'value';
graph1.type = 'smoothedLine';
graph1.lineThickness = 2;
graph1.bullet = 'round';
graph1.bulletBorderColor = '#FFFFFF';
graph1.bulletBorderAlpha = 1;
graph1.bulletBorderThickness = 3;
stockPanel1.addStockGraph(graph1);
//debugger;
// SERIAL CHART
self.chart = new AmCharts.AmSerialChart();
// Create stock legend
var stockLegend1 = new AmCharts.StockLegend();
stockLegend1.valueTextRegular = ' ';
stockLegend1.markerType = 'none';
stockPanel1.stockLegend = stockLegend1;
this.chart.panels = [stockPanel1];
//"2016-08-10T23:04:31.000Z"
self.chart.dataProvider = chartData;
self.chart.dataDateFormat = "YYYY-MM-DDTHH:NN:SS.QQQ";
self.chart.categoryField = "date";
var panelsSettings = new AmCharts.PanelsSettings();
panelsSettings.mouseWheelZoomEnabled = true;
panelsSettings.usePrefixes = true;
this.chart.panelsSettings = panelsSettings;
// AXES
// category
var categoryAxis = self.chart.categoryAxis;
categoryAxis.parseDates = true; // as our data is date-based, we set parseDates to true
categoryAxis.minPeriod = "mm"; // our data is daily, so we set minPeriod to DD
categoryAxis.gridAlpha = 0.1;
categoryAxis.minorGridAlpha = 0.1;
categoryAxis.axisAlpha = 0;
categoryAxis.minorGridEnabled = true;
categoryAxis.inside = true;
// value
var valueAxis = new AmCharts.ValueAxis();
valueAxis.tickLength = 0;
valueAxis.axisAlpha = 0;
valueAxis.showFirstLabel = false;
valueAxis.showLastLabel = false;
self.chart.addValueAxis(valueAxis);
// GRAPH
var graph = new AmCharts.AmGraph();
graph.dashLength = 3;
graph.lineColor = "#00CC00";
graph.valueField = "value";
graph.dashLength = 3;
graph.bullet = "round";
graph.balloonText = "[[category]]<br><b><span style='font-size:14px;'>value:[[value]]</span></b>";
self.chart.addGraph(graph);
// CURSOR
var chartCursor = new AmCharts.ChartCursor();
chartCursor.valueLineEnabled = true;
chartCursor.valueLineBalloonEnabled = true;
self.chart.addChartCursor(chartCursor);
// SCROLLBAR
var chartScrollbar = new AmCharts.ChartScrollbar();
self.chart.addChartScrollbar(chartScrollbar);
// HORIZONTAL GREEN RANGE
var guide = new AmCharts.Guide();
guide.value = 10;
guide.toValue = 20;
guide.fillColor = "#00CC00";
guide.inside = true;
guide.fillAlpha = 0.2;
guide.lineAlpha = 0;
valueAxis.addGuide(guide);
/*// TREND LINES
// first trend line
var trendLine = new AmCharts.TrendLine();
// note,when creating date objects 0 month is January, as months are zero based in JavaScript.
trendLine.initialDate = new Date(2016, 7, 8, 12); // 12 is hour - to start trend line in the middle of the day
trendLine.finalDate = new Date(2012, 7, 15, 12);
trendLine.initialValue = 10;
trendLine.finalValue = 19;
trendLine.lineColor = "#CC0000";
self.chart.addTrendLine(trendLine);
// second trend line
trendLine = new AmCharts.TrendLine();
trendLine.initialDate = new Date(2016, 7, 8, 12); // 12 is hour - to start trend line in the middle of the day
trendLine.finalDate = new Date(2012, 7, 15, 12);
trendLine.initialValue = 16;
trendLine.finalValue = 10;
trendLine.lineColor = "#CC0000";
self.chart.addTrendLine(trendLine);*/
// WRITE
$('#chartdiv').empty();
self.chart.write("chartdiv");
this.chart.write('chartdiv');
}

BIN
app/lib/images/dragIcon.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 B

BIN
app/lib/images/dragIconBlack.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 B

BIN
app/lib/images/dragIconH.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 111 B

BIN
app/lib/images/dragIconHBlack.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 111 B

BIN
app/lib/images/dragIconRectBig.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
app/lib/images/dragIconRectBig.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24px" height="32px" viewBox="0 0 24 32">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="2" y="4" fill="#000000" opacity="0.3" width="20" height="26" rx="3" ry="3" filter="url(#f1)"/>
<rect x="2" y="3" fill="#ffffff" width="20" height="26" rx="3" ry="3"/>
<line x1="10.5" y1="11" x2="10.5" y2="21" stroke="#A9A9A9"/>
<line x1="13.5" y1="11" x2="13.5" y2="21" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 700 B

BIN
app/lib/images/dragIconRectBigBlack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

14
app/lib/images/dragIconRectBigBlack.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24px" height="32px" viewBox="0 0 24 32">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="2" y="4" fill="#000000" opacity="0.3" width="20" height="26" rx="3" ry="3" filter="url(#f1)"/>
<rect x="2" y="3" fill="#000000" width="20" height="26" rx="3" ry="3"/>
<line x1="10.5" y1="11" x2="10.5" y2="21" stroke="#A9A9A9"/>
<line x1="13.5" y1="11" x2="13.5" y2="21" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 699 B

BIN
app/lib/images/dragIconRectBigBlackH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 681 B

13
app/lib/images/dragIconRectBigBlackH.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="32px" height="24px" viewBox="0 0 32 24">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="3" y="4" fill="#000000" opacity="0.3" width="26" height="20" rx="3" ry="3" filter="url(#f1)"/>
<rect x="3" y="3" fill="#000000" width="26" height="20" rx="3" ry="3"/>
<line x1="10" y1="11.5" x2="21" y2="11.5" stroke="#A9A9A9"/>
<line x1="10" y1="14.5" x2="21" y2="14.5" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 698 B

BIN
app/lib/images/dragIconRectBigH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

13
app/lib/images/dragIconRectBigH.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="32px" height="24px" viewBox="0 0 32 24">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="3" y="4" fill="#000000" opacity="0.3" width="26" height="20" rx="3" ry="3" filter="url(#f1)"/>
<rect x="3" y="3" fill="#FFFFFF" width="26" height="20" rx="3" ry="3"/>
<line x1="10" y1="11.5" x2="21" y2="11.5" stroke="#A9A9A9"/>
<line x1="10" y1="14.5" x2="21" y2="14.5" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 698 B

BIN
app/lib/images/dragIconRectSmall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRectSmall.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="2" y="2" fill="#000000" opacity="0.3" width="16" height="18" rx="3" ry="3" filter="url(#f1)"/>
<rect x="2" y="1" fill="#ffffff" width="16" height="18" rx="3" ry="3"/>
<line x1="8.5" y1="5" x2="8.5" y2="15" stroke="#A9A9A9"/>
<line x1="11.5" y1="5" x2="11.5" y2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
app/lib/images/dragIconRectSmallBlack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRectSmallBlack.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="2" y="2" fill="#000000" opacity="0.3" width="16" height="18" rx="3" ry="3" filter="url(#f1)"/>
<rect x="2" y="1" fill="#000000" width="16" height="18" rx="3" ry="3"/>
<line x1="8.5" y1="5" x2="8.5" y2="15" stroke="#A9A9A9"/>
<line x1="11.5" y1="5" x2="11.5" y2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
app/lib/images/dragIconRectSmallBlackH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRectSmallBlackH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="1" y="3" fill="#000000" opacity="0.3" width="18" height="16" rx="3" ry="3" filter="url(#f1)"/>
<rect x="1" y="2" fill="#000000" width="18" height="16" rx="3" ry="3"/>
<line x1="5" y1="8.5" x2="15" y2="8.5" stroke="#A9A9A9"/>
<line x1="5" y1="11.5" x2="15" y2="11.5" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
app/lib/images/dragIconRectSmallH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRectSmallH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<rect x="1" y="3" fill="#000000" opacity="0.3" width="18" height="16" rx="3" ry="3" filter="url(#f1)"/>
<rect x="1" y="2" fill="#ffffff" width="18" height="16" rx="3" ry="3"/>
<line x1="5" y1="8.5" x2="15" y2="8.5" stroke="#A9A9A9"/>
<line x1="5" y1="11.5" x2="15" y2="11.5" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
app/lib/images/dragIconRoundBig.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

15
app/lib/images/dragIconRoundBig.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35px" height="35px" viewBox="0 0 35 35">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17.5" cy="18.5" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17.5" cy="17.5" fill="#ffffff" r="15.5"/>
<line x1="16.5" y1="12" x2="16.5" y2="23" stroke="#A9A9A9"/>
<line x1="19.5" y1="12" x2="19.5" y2="23" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 664 B

BIN
app/lib/images/dragIconRoundBigBlack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRoundBigBlack.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35px" height="35px" viewBox="0 0 35 35">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17.5" cy="18.5" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17.5" cy="17.5" fill="#000000" r="15.5"/>
<line x1="16.5" y1="12" x2="16.5" y2="23" stroke="#A9A9A9"/>
<line x1="19.5" y1="12" x2="19.5" y2="23" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 664 B

BIN
app/lib/images/dragIconRoundBigBlackH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
app/lib/images/dragIconRoundBigBlackH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35px" height="35px" viewBox="0 0 35 35">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17.5" cy="18.5" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17.5" cy="17.5" fill="#000000" r="15.5"/>
<line y1="16.5" x1="12" y2="16.5" x2="23" stroke="#A9A9A9"/>
<line y1="19.5" x1="12" y2="19.5" x2="23" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 664 B

BIN
app/lib/images/dragIconRoundBigH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

15
app/lib/images/dragIconRoundBigH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35px" height="35px" viewBox="0 0 35 35">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17.5" cy="18.5" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17.5" cy="17.5" fill="#ffffff" r="15.5"/>
<line y1="16.5" x1="12" y2="16.5" x2="23" stroke="#A9A9A9"/>
<line y1="19.5" x1="12" y2="19.5" x2="23" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 664 B

BIN
app/lib/images/dragIconRoundSmall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
app/lib/images/dragIconRoundSmall.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="10" cy="11" fill="#000000" opacity="0.3" r="9" filter="url(#f1)"/>
<circle cx="10" cy="10" fill="#ffffff" r="9"/>
<line x1="8.5" y1="5" x2="8.5" y2="15" stroke="#A9A9A9"/>
<line x1="11.5" y1="5" x2="11.5" y2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
app/lib/images/dragIconRoundSmallBlack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
app/lib/images/dragIconRoundSmallBlack.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="10" cy="11" fill="#000000" opacity="0.3" r="9" filter="url(#f1)"/>
<circle cx="10" cy="10" fill="#000000" r="9"/>
<line x1="8.5" y1="5" x2="8.5" y2="15" stroke="#A9A9A9"/>
<line x1="11.5" y1="5" x2="11.5" y2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
app/lib/images/dragIconRoundSmallBlackH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
app/lib/images/dragIconRoundSmallBlackH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="10" cy="11" fill="#000000" opacity="0.3" r="9" filter="url(#f1)"/>
<circle cx="10" cy="10" fill="#000000" r="9"/>
<line y1="8.5" x1="5" y2="8.5" x2="15" stroke="#A9A9A9"/>
<line y1="11.5" x1="5" y2="11.5" x2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
app/lib/images/dragIconRoundSmallH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
app/lib/images/dragIconRoundSmallH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px" viewBox="0 0 20 20">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="10" cy="11" fill="#000000" opacity="0.3" r="9" filter="url(#f1)"/>
<circle cx="10" cy="10" fill="#ffffff" r="9"/>
<line y1="8.5" x1="5" y2="8.5" x2="15" stroke="#A9A9A9"/>
<line y1="11.5" x1="5" y2="11.5" x2="15" stroke="#A9A9A9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
app/lib/images/eraserIcon.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 91 B

BIN
app/lib/images/eraserIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

15
app/lib/images/eraserIcon.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="38px" height="38px" viewBox="0 0 38 38">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17" cy="20" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17" cy="19" fill="#FFFFFF" r="15.5"/>
<rect x="12" y="26" fill="#CCCCCC" width="14" height="1"/>
<path transform="translate(-2,0)" d="M21.716,10.329L10.594,21.451l3.957,3.962h4.966l8.64-8.642L21.716,10.329z M19.073,24.347h-4.081l-2.896-2.899l4.768-4.766 l4.936,4.938L19.073,24.347z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 781 B

BIN
app/lib/images/eraserIconH.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 B

BIN
app/lib/images/eraserIconH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

15
app/lib/images/eraserIconH.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="38px" height="38px" viewBox="0 0 38 38">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17" cy="20" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17" cy="19" stroke="#000000" stroke-width="1.7" fill="#FFFFFF" r="15.5"/>
<rect x="12" y="26" fill="#CCCCCC" width="14" height="1"/>
<path transform="translate(-2,0)" d="M21.716,10.329L10.594,21.451l3.957,3.962h4.966l8.64-8.642L21.716,10.329z M19.073,24.347h-4.081l-2.896-2.899l4.768-4.766 l4.936,4.938L19.073,24.347z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 817 B

BIN
app/lib/images/export.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

BIN
app/lib/images/exportWhite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 213 B

BIN
app/lib/images/lens.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

7
app/lib/images/lens.svg Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="19px" height="19px" viewBox="0 0 19 19">
<circle cx="8.5" cy="8.5" r="7.5" stroke="#000000" stroke-width="1.5" fill-opacity="0"/>
<line x1="5" y1="9" x2="12" y2="9" stroke="#000000" stroke-width="1.5"/>
<line x1="14" y1="14" x2="19" y2="19" stroke="#000000" stroke-width="1.5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 533 B

BIN
app/lib/images/lensWhite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
app/lib/images/lensWhite.svg Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="19px" height="19px" viewBox="0 0 19 19">
<circle cx="8.5" cy="8.5" r="7.5" stroke="#ffffff" stroke-width="1.5" fill-opacity="0"/>
<line x1="5" y1="9" x2="12" y2="9" stroke="#ffffff" stroke-width="1.5"/>
<line x1="14" y1="14" x2="19" y2="19" stroke="#ffffff" stroke-width="1.5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 533 B

BIN
app/lib/images/lensWhite_old.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
app/lib/images/lens_old.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
app/lib/images/pencilIcon.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 97 B

BIN
app/lib/images/pencilIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

22
app/lib/images/pencilIcon.svg Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="38px" height="38px" viewBox="0 0 38 38">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17" cy="20" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17" cy="19" fill="#FFFFFF" r="15.5"/>
<rect x="11" y="26" fill="#CCCCCC" width="14" height="1"/>
<path transform="translate(-1,0)" d="M17.098,20.305c-0.142,0.146,0.101,0.04,0.137,0.004c0.027-0.028,0.204-0.09,0.484-0.09c0.338,0,0.626,0.092,0.787,0.255
c0.473,0.472,0.424,0.932,0.393,1.078l-2.521,1.055l-1.577-1.577l1.054-2.52c0.039-0.009,0.105-0.018,0.188-0.018
c0.219,0,0.555,0.069,0.893,0.407c0.378,0.378,0.246,1.188,0.166,1.271C17.062,20.207,17.062,20.269,17.098,20.305z
M26.984,14.472c-0.008-0.674-0.61-1.257-1.31-1.933c-0.134-0.129-0.679-0.673-0.809-0.808c-0.679-0.702-1.266-1.31-1.943-1.31
c-0.37,0-0.734,0.207-1.114,0.587l-6.852,6.847c-0.012,0.016-2.877,7.354-2.877,7.354c-0.012,0.032,0,0.063,0.022,0.091
c0.021,0.021,0.044,0.029,0.067,0.029c0.01,0,0.018-0.003,0.028-0.007c0,0,7.357-2.864,7.369-2.877l6.854-6.847
C26.803,15.216,26.988,14.848,26.984,14.472z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/lib/images/pencilIconH.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 113 B

BIN
app/lib/images/pencilIconH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

22
app/lib/images/pencilIconH.svg Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="38px" height="38px" viewBox="0 0 38 38">
<defs>
<filter id="f1" >
<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
</filter>
</defs>
<circle cx="17" cy="20" fill="#000000" opacity="0.3" r="15.5" filter="url(#f1)"/>
<circle cx="17" cy="19" stroke="#000000" stroke-width="1.7" fill="#FFFFFF" r="15.5"/>
<rect x="11" y="26" fill="#CCCCCC" width="14" height="1"/>
<path transform="translate(-1,0)" d="M17.098,20.305c-0.142,0.146,0.101,0.04,0.137,0.004c0.027-0.028,0.204-0.09,0.484-0.09c0.338,0,0.626,0.092,0.787,0.255
c0.473,0.472,0.424,0.932,0.393,1.078l-2.521,1.055l-1.577-1.577l1.054-2.52c0.039-0.009,0.105-0.018,0.188-0.018
c0.219,0,0.555,0.069,0.893,0.407c0.378,0.378,0.246,1.188,0.166,1.271C17.062,20.207,17.062,20.269,17.098,20.305z
M26.984,14.472c-0.008-0.674-0.61-1.257-1.31-1.933c-0.134-0.129-0.679-0.673-0.809-0.808c-0.679-0.702-1.266-1.31-1.943-1.31
c-0.37,0-0.734,0.207-1.114,0.587l-6.852,6.847c-0.012,0.016-2.877,7.354-2.877,7.354c-0.012,0.032,0,0.063,0.022,0.091
c0.021,0.021,0.044,0.029,0.067,0.029c0.01,0,0.018-0.003,0.028-0.007c0,0,7.357-2.864,7.369-2.877l6.854-6.847
C26.803,15.216,26.988,14.848,26.984,14.472z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/lib/images/xIcon.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 B

BIN
app/lib/images/xIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

7
app/lib/images/xIcon.svg Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24px" height="24px" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="11" fill="#FFFFFF" stroke="rgba(0,0,0,0.15)"/>
<line x1="7" y1="7" x2="17" y2="17" stroke="#000000"/>
<line x1="17" y1="7" x2="7" y2="17" stroke="#000000"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 479 B

BIN
app/lib/images/xIconH.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 B

BIN
app/lib/images/xIconH.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

7
app/lib/images/xIconH.svg Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24px" height="24px" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="11" fill="#DADADA" stroke="rgba(0,0,0,0.15)"/>
<line x1="7" y1="7" x2="17" y2="17" stroke="#000000"/>
<line x1="17" y1="7" x2="7" y2="17" stroke="#000000"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 479 B

3
app/test.html
View File

@ -5,6 +5,9 @@
<title>Title</title>
<link href="css/mui.css" rel="stylesheet"
type="text/css"/>
<link href="css/style.css" rel="stylesheet"
type="text/css"/>
<script src="lib/notification.js"></script>
<link rel="stylesheet" href="css/notification.css">
</head>

4
lib/server/db-mdot.js
View File

@ -13,7 +13,7 @@ module.exports = function(db) {
module.sqlAllGetDecoded = function(deviceId) {
logger.debug('mdot:sqlAllGetDecoded');
return new Promise(function(resolve, reject) {
db.any('select * from decoded where deviceid=$1;', [deviceId])
db.any('select * from decoded where deviceid=$1 order by timestamp asc;', [deviceId])
.then(function(d) {
return resolve(d);
})
@ -27,7 +27,7 @@ module.exports = function(db) {
module.sqlRangedGetDecoded = function(params) {
logger.debug('mdot:sqlRangedGetDecoded');
return new Promise(function(resolve, reject) {
db.any('select * from decoded where deviceid=$1 and timestamp between $2 and $3;', [params.deviceID, params.startTS, params.endTS])
db.any('select * from decoded where deviceid=$1 and timestamp between $2 and $3 order by timestamp asc;', [params.deviceID, params.startTS, params.endTS])
.then(function(d) {
return resolve(d);
})