Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial zoom level option in Visualizations #596

Merged
merged 4 commits into from
Nov 10, 2016
Merged

Initial zoom level option in Visualizations #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec0adfa
Default zoom level in Rawdata Visualization
RDCH106 Nov 4, 2016
afcb4c9
Default zoom level in BarGraph Visualization
RDCH106 Nov 7, 2016
f4615c2
Default zoom level in TimeStoreDaily Visualization
RDCH106 Nov 7, 2016
ce40cdc
Default zoom level in Threshold Visualization
RDCH106 Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Modules/vis/visualisations/bargraph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
var mode = urlParams.mode;
if (mode==undefined || mode=='') mode = false;

var initzoom = urlParams.initzoom;
if (initzoom==undefined || initzoom=='' || "DWMY".indexOf(initzoom)===-1) initzoom = 'W';

document.getElementById("textunitD").innerHTML=units;
document.getElementById("textunitM").innerHTML=units;
document.getElementById("textunitY").innerHTML=units;
Expand Down Expand Up @@ -112,16 +115,14 @@

var intervalms = interval * 1000;

var timeWindow;

if (intervalcode=='y')
timeWindow = 3600000*24*365*5;
else if (intervalcode=='m')
timeWindow = 3600000*24*365;
else if (intervalcode=='d')
timeWindow = 3600000*24*10;
else
timeWindow = 3600000*24*31;
if (initzoom==='D')
var timeWindow = (3600000*24.0);
if (initzoom==='W')
var timeWindow = (3600000*24.0*7);
if (initzoom==='M')
var timeWindow = (3600000*24.0*30);
if (initzoom==='Y')
var timeWindow = (3600000*24.0*365);

view.start = +new Date - timeWindow;
view.end = +new Date;
Expand Down
13 changes: 11 additions & 2 deletions Modules/vis/visualisations/rawdata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@
if (scale==undefined || scale=='') scale = 1;
var fill = +urlParams.fill;
if (fill==undefined || fill=='') fill = 0;
if (fill>0) fill = true;
if (fill>0) fill = true;
var initzoom = urlParams.initzoom;
if (initzoom==undefined || initzoom=='' || "DWMY".indexOf(initzoom)===-1) initzoom = 'W';
// Some browsers want the colour codes to be prepended with a "#". Therefore, we
// add one if it's not already there
if (plotColour.indexOf("#") == -1) {
Expand All @@ -104,7 +106,14 @@

if (embed) placeholder.height($(window).height()-top_offset);

var timeWindow = (3600000*24.0*7);
if (initzoom==='D')
var timeWindow = (3600000*24.0);
if (initzoom==='W')
var timeWindow = (3600000*24.0*7);
if (initzoom==='M')
var timeWindow = (3600000*24.0*30);
if (initzoom==='Y')
var timeWindow = (3600000*24.0*365);
view.start = +new Date - timeWindow;
view.end = +new Date;

Expand Down
15 changes: 13 additions & 2 deletions Modules/vis/visualisations/threshold.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

<script language="javascript" type="text/javascript" src="<?php echo $path;?>Modules/vis/visualisations/common/api.js"></script>
<script language="javascript" type="text/javascript" src="<?php echo $path;?>Modules/vis/visualisations/common/inst.js"></script>
<script language="javascript" type="text/javascript" src="<?php echo $path;?>Modules/vis/visualisations/common/vis.helper.js"></script>

<?php if (!$embed) { ?>
<h2><?php echo _("Threshold"); ?></h2>
Expand Down Expand Up @@ -62,8 +63,18 @@

var path = "<?php echo $path; ?>";
var apikey = "<?php echo $apikey; ?>";

var timeWindow = (3600000*24.0*7); //Initial time window

var initzoom = urlParams.initzoom;
if (initzoom==undefined || initzoom=='' || "DWMY".indexOf(initzoom)===-1) initzoom = 'W'; //Initial time window

if (initzoom==='D')
var timeWindow = (3600000*24.0);
if (initzoom==='W')
var timeWindow = (3600000*24.0*7);
if (initzoom==='M')
var timeWindow = (3600000*24.0*30);
if (initzoom==='Y')
var timeWindow = (3600000*24.0*365);
var start = ((new Date()).getTime())-timeWindow; //Get start time
var end = (new Date()).getTime(); //Get end time

Expand Down
12 changes: 11 additions & 1 deletion Modules/vis/visualisations/timestoredaily.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,23 @@
// var feedid = urlParams['feedid'];
// var embed = urlParams['embed'] || false;

var initzoom = urlParams.initzoom;
if (initzoom==undefined || initzoom=='' || "DWMY".indexOf(initzoom)===-1) initzoom = 'W';

var placeholder_bound = $('#placeholder_bound');
var placeholder = $('#placeholder').width(placeholder_bound.width()).height($('#placeholder_bound').height()-top_offset);
if (embed) placeholder.height($(window).height()-top_offset);



var timeWindow = (3600000*24.0*7);
if (initzoom==='D')
var timeWindow = (3600000*24.0);
if (initzoom==='W')
var timeWindow = (3600000*24.0*7);
if (initzoom==='M')
var timeWindow = (3600000*24.0*30);
if (initzoom==='Y')
var timeWindow = (3600000*24.0*365);
view.start = +new Date - timeWindow;
view.end = +new Date;

Expand Down
32 changes: 16 additions & 16 deletions Modules/vis/widget/vis_render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ function vis_widgetlist(){
{
"offsetx":0,"offsety":0,"width":400,"height":300,
"menu":"Visualisations",
"options":["feedid","colour","units","dp","scale","fill"],
"optionstype":["feedid","colour_picker","value","value","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Colour"),_Tr("units"),_Tr("dp"),_Tr("scale"),_Tr("Fill")],
"optionshint":[_Tr("Feed source"),_Tr("Line colour in hex. Blank is use default."),_Tr("units"),_Tr("Decimal points"),_Tr("Scale by"),_Tr("Fill value")],
"options":["feedid","colour","units","dp","scale","fill","initzoom"],
"optionstype":["feedid","colour_picker","value","value","value","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Colour"),_Tr("units"),_Tr("dp"),_Tr("scale"),_Tr("Fill"),_Tr("Initial Zoom")],
"optionshint":[_Tr("Feed source"),_Tr("Line colour in hex. Blank is use default."),_Tr("units"),_Tr("Decimal points"),_Tr("Scale by"),_Tr("Fill value"),_Tr("D=Day, W=Week, M=Month, Y=Year")],

"html":""
},
Expand All @@ -39,21 +39,21 @@ function vis_widgetlist(){
{
"offsetx":0,"offsety":0,"width":400,"height":300,
"menu":"Visualisations",
"options":["feedid","colour","interval","units","dp","scale","delta","mode"],
"optionstype":["feedid","colour_picker","value","value","value","value","boolean","value"],
"optionsname":[_Tr("Feed"),_Tr("Colour"),_Tr("interval"),_Tr("units"),_Tr("dp"),_Tr("scale"),_Tr("delta"),_Tr("mode")],
"optionshint":[_Tr("Feed source"),_Tr("Line colour in hex. Blank is use default."),_Tr("Interval (seconds)-you can set \"d\" for day, \"m\" for month, or \"y\" for year"),_Tr("Units"),_Tr("Decimal points"),_Tr("Scale by"),_Tr("Show difference between each bar"),_Tr("Mode set to 'daily' can be used instead of interval for timezone based daily data")],
"options":["feedid","colour","interval","units","dp","scale","delta","mode","initzoom"],
"optionstype":["feedid","colour_picker","value","value","value","value","boolean","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Colour"),_Tr("interval"),_Tr("units"),_Tr("dp"),_Tr("scale"),_Tr("delta"),_Tr("mode"),_Tr("Initial Zoom")],
"optionshint":[_Tr("Feed source"),_Tr("Line colour in hex. Blank is use default."),_Tr("Interval (seconds)-you can set \"d\" for day, \"m\" for month, or \"y\" for year"),_Tr("Units"),_Tr("Decimal points"),_Tr("Scale by"),_Tr("Show difference between each bar"),_Tr("Mode set to 'daily' can be used instead of interval for timezone based daily data"),_Tr("D=Day, W=Week, M=Month, Y=Year")],
"html":""
},

"timestoredaily":
{
"offsetx":0,"offsety":0,"width":400,"height":300,
"menu":"Visualisations",
"options":["feedid","units"],
"optionstype":["feedid","value"],
"optionsname":[_Tr("Feed"),_Tr("Units")],
"optionshint":[_Tr("Feed source"),_Tr("Units to show")],
"options":["feedid","units","initzoom"],
"optionstype":["feedid","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Units"),_Tr("Initial Zoom")],
"optionshint":[_Tr("Feed source"),_Tr("Units to show"),_Tr("D=Day, W=Week, M=Month, Y=Year")],
"html":""
},

Expand Down Expand Up @@ -94,10 +94,10 @@ function vis_widgetlist(){
{
"offsetx":0,"offsety":0,"width":400,"height":300,
"menu":"Visualisations",
"options":["feedid","thresholdA","thresholdB"],
"optionstype":["feedid","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Threshold A"),_Tr("Threshold B")],
"optionshint":[_Tr("Feed source"),_Tr("Threshold A used"),_Tr("Threshold B used")],
"options":["feedid","thresholdA","thresholdB","initzoom"],
"optionstype":["feedid","value","value","value"],
"optionsname":[_Tr("Feed"),_Tr("Threshold A"),_Tr("Threshold B"),_Tr("Initial Zoom")],
"optionshint":[_Tr("Feed source"),_Tr("Threshold A used"),_Tr("Threshold B used"),_Tr("D=Day, W=Week, M=Month, Y=Year")],
"html":""
},

Expand Down