" +
+ "
| t |
+ + + +
+
+
+
diff --git a/Modules/dashboard/Views/dashboard_config.php b/Modules/dashboard/Views/dashboard_config.php
new file mode 100644
index 000000000..47352edc3
--- /dev/null
+++ b/Modules/dashboard/Views/dashboard_config.php
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Modules/dashboard/Views/dashboard_edit_view.php b/Modules/dashboard/Views/dashboard_edit_view.php
new file mode 100644
index 000000000..ad99cbba1
--- /dev/null
+++ b/Modules/dashboard/Views/dashboard_edit_view.php
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Modules/dashboard/Views/dashboard_list_view.php b/Modules/dashboard/Views/dashboard_list_view.php
new file mode 100644
index 000000000..82a6c3ce0
--- /dev/null
+++ b/Modules/dashboard/Views/dashboard_list_view.php
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " onclick="$.ajax({type : 'POST',url : path + 'dashboard/new.json ',data : '',dataType : 'json',success : location.reload()});">
+ ">
+
+
+
+
+ | + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | +
|---|---|---|---|---|---|---|
| + + | +
+
+
+
+
+ |
+ + + + + + + | ++ + + + + + | ++ + + + + + | ++ + | ++ + + + + + | +
+ +
+ +
| + | + | + | + | + |
|---|---|---|---|---|
| + | + | + | + | + |
+ " onclick="$.ajax({type : 'POST',url : path + 'dashboard/new.json ',data : '',dataType : 'json',success : location.reload()});">
+
+ ">
+
+
+
+ -
+
+
- + + + +
+
+
+
+
diff --git a/Modules/dashboard/Views/js/designer.js b/Modules/dashboard/Views/js/designer.js
new file mode 100644
index 000000000..a8131b442
--- /dev/null
+++ b/Modules/dashboard/Views/js/designer.js
@@ -0,0 +1,298 @@
+function dashboard_designer(_canvas, _grid_size, _widgets)
+{
+ var canvas = _canvas;
+ var widgets = _widgets;
+ var grid_size = _grid_size;
+
+ var canvas = document.getElementById("can");
+ var ctx = canvas.getContext("2d");
+
+ var boxlist = {};
+ var resize = {};
+
+ var selected_box = null;
+ var selected_edge = null;
+ var edit_mode = true;
+ var create = null;
+
+ var boxi = 0;
+
+ var mousedown = false;
+ var mousedown_x = 0;
+ var mousedown_y = 0;
+
+ var page_width = $(canvas).attr("width");
+ var page_height = $(canvas).attr("height");
+ $("#when-selected").hide();
+ draw();
+ scan();
+ widget_buttons();
+
+ function snap(pos) {return Math.round(pos/grid_size)*grid_size;}
+
+ function onbox(x,y)
+ {
+ var box = null;
+ for (z in boxlist) {
+ if (x>boxlist[z]['left'] && x<(boxlist[z]['left']+boxlist[z]['width'])) {
+ if (y>boxlist[z]['top'] && y<(boxlist[z]['top']+boxlist[z]['height'])) {
+ box = z;
+ }
+ }
+ }
+ return box;
+ }
+
+ function scan()
+ {
+ for (z in widgets)
+ {
+ $("."+z).each(function()
+ {
+ var id = 1*($(this).attr("id"));
+ if (id>boxi) boxi = id;
+ boxlist[id] = {
+ 'top':parseInt($(this).css("top")),
+ 'left':parseInt($(this).css("left")),
+ 'width':parseInt($(this).css("width")),
+ 'height':parseInt($(this).css("height"))
+ };
+ });
+ }
+ }
+
+ function draw()
+ {
+ ctx.clearRect(0,0,page_width,page_height);
+
+ //--------------------------------------------------------------------
+ // Draw grid
+ //--------------------------------------------------------------------
+ ctx.fillStyle = "rgba(0, 0, 0, 0.2)";
+ ctx.strokeStyle = "rgba(0, 0, 0, 0.2)";
+ for (var x=1; x<(page_width/grid_size); x++)
+ {
+ for (var y=1; y<(page_height/grid_size); y++)
+ {
+ ctx.fillRect((x*grid_size)-1,(y*grid_size)-1,2,2);
+ }
+ }
+ ctx.strokeRect(0,0,page_width,page_height);
+
+ //--------------------------------------------------------------------
+ // Draw selected box points
+ //--------------------------------------------------------------------
+ if (selected_box)
+ {
+ $("#state").html("Changed");
+ var top = boxlist[selected_box]['top'];
+ var left = boxlist[selected_box]['left'];
+ var width = boxlist[selected_box]['width'];
+ var height = boxlist[selected_box]['height'];
+
+ ctx.fillRect(left-5,top+(height/2)-5,10,10);
+ ctx.fillRect(left+width-5,top+(height/2)-5,10,10);
+
+ ctx.fillRect(left+(width/2)-5,top-5,10,10);
+ ctx.fillRect(left+(width/2)-5,top+height-5,10,10);
+
+ ctx.fillRect(left+(width/2)-5,top+(height/2)-5,10,10);
+ }
+
+ //--------------------------------------------------------------------
+ // Update position and dimentions of elements
+ //--------------------------------------------------------------------
+ for (z in boxlist) {
+ if (z){
+ var element = "#"+z
+ $(element).css("top", boxlist[z]['top']+"px");
+ $(element).css("left", boxlist[z]['left']+"px");
+ $(element).css("width", boxlist[z]['width']+"px");
+ $(element).css("height", boxlist[z]['height']+"px");
+ }
+ }
+ redraw = 1;
+ }
+
+ function draw_options(box_options)
+ {
+ // Build options table html
+ var options_html = "| "+box_options[z]+": | "; + options_html += "
'+html+'
');
+
+ scan();
+ redraw = 1;
+ edit_mode = true;
+ }
+
+ // Click to select
+ $(canvas).click(function(event) {
+ var mx = event.layerX;
+ var my = event.layerY;
+ if (edit_mode) selected_box = onbox(mx,my);
+ if (!selected_box) {$("#testo").hide(); $("#when-selected").hide();}
+
+ draw()
+ });
+
+ $(canvas).mousedown(function(event) {
+ mousedown = true;
+ var mx = event.layerX;
+ var my = event.layerY;
+ if (edit_mode)
+ {
+ // If its not yet selected check if a box is selected now
+ if (!selected_box) selected_box = onbox(mx,my);
+
+ if (selected_box) {
+ $("#when-selected").show();
+ resize = boxlist[selected_box];
+
+ var rightedge = resize['left']+resize['width'];
+ var bottedge = resize['top']+resize['height'];
+ var midx = resize['left']+(resize['width']/2);
+ var midy = resize['top']+(resize['height']/2);
+
+ selected_edge = null;
+ if (Math.abs(mx - rightedge)<20) selected_edge = "right";
+ if (Math.abs(mx - resize['left'])<20) selected_edge = "left";
+ if (Math.abs(my - bottedge)<20) selected_edge = "bottom";
+ if (Math.abs(my - resize['top'])<20) selected_edge = "top";
+ if (Math.abs(my - midy)<20 && Math.abs(mx - midx)<20) selected_edge = "center";
+ }
+ }
+ else
+ {
+ if (create)
+ {
+ add_widget(mx,my,create);
+ create = null;
+ $('option:selected', 'select').removeAttr('selected');
+ $('option[title=1]').attr('selected','selected');
+ $("#when-selected").show();
+ }
+ }
+ });
+
+ $(canvas).mouseup(function(event) {
+ mousedown = false;
+ selected_edge = null;
+ });
+
+ $(canvas).mousemove(function(event) {
+ if (mousedown && selected_box && selected_edge){
+ var mx = event.layerX;
+ var my = event.layerY;
+
+ var rightedge = resize['left']+resize['width'];
+ var bottedge = resize['top']+resize['height'];
+
+ if (selected_edge == "right") boxlist[selected_box]['width'] = (snap(mx)-resize['left']);
+ if (selected_edge == "left")
+ {
+ boxlist[selected_box]['left'] = (snap(mx));
+ boxlist[selected_box]['width'] = rightedge - snap(mx);
+ }
+
+ if (selected_edge == "bottom") boxlist[selected_box]['height'] = (snap(my)-resize['top']);
+ if (selected_edge == "top")
+ {
+ boxlist[selected_box]['top'] = (snap(my));
+ boxlist[selected_box]['height'] = bottedge - snap(my);
+ }
+
+ if (selected_edge == "center")
+ {
+ boxlist[selected_box]['left'] = (snap(mx-boxlist[selected_box]['width']/2));
+ boxlist[selected_box]['top'] = (snap(my-boxlist[selected_box]['height']/2));
+ }
+
+ if (bottedge>parseInt($("#page-container").css("height"))){
+ $("#page-container").css("height",bottedge);
+ $("#can").attr("height",bottedge);
+ page_height = bottedge;
+ }
+
+ draw();
+ }
+ });
+
+ // On save click
+ $("#options-save").click(function()
+ {
+ $(".options").each(function() {
+ if ($(this).attr("id")!="html") $("#"+selected_box).attr($(this).attr("id"), $(this).val());
+ if ($(this).attr("id")=="html") $("#"+selected_box).html($(this).val());
+ });
+ $("#testo").hide();
+ redraw = 1;
+ reloadiframe = selected_box;
+ $("#state").html("Changed");
+ });
+
+ $("#delete-button").click(function(event) {
+ if (selected_box)
+ {
+ delete boxlist[selected_box];
+ $("#"+selected_box).remove();
+ draw();
+ }
+ });
+
+ $("#options-button").click(function(event) {
+ if (selected_box){
+ draw_options(widgets[$("#"+selected_box).attr("class")]["options"]);
+ $("#testo").show();
+ }
+ });
+}
diff --git a/Modules/dashboard/Views/js/render.js b/Modules/dashboard/Views/js/render.js
new file mode 100644
index 000000000..b2e4bf290
--- /dev/null
+++ b/Modules/dashboard/Views/js/render.js
@@ -0,0 +1,234 @@
+/*
+All Emoncms code is released under the GNU Affero General Public License.
+See COPYRIGHT.txt and LICENSE.txt.
+
+---------------------------------------------------------------------
+Emoncms - open source energy visualisation
+Part of the OpenEnergyMonitor project:
+http://openenergymonitor.org
+*/
+
+// Global page vars definition
+var feedids = [];
+// Array that holds ID's of feeds of associative key
+var assoc = [];
+// Array for exact values
+var assoc_curve = [];
+// Array for smooth change values - creation of smooth dial widget
+
+var widgetcanvas = {};
+
+var firstdraw = 1;
+
+var dialrate = 0.02;
+var browserVersion = 999;
+
+var Browser =
+{
+ Version : function()
+ {
+ var version = 999;
+ if (navigator.appVersion.indexOf("MSIE") != -1)
+ version = parseFloat(navigator.appVersion.split("MSIE")[1]);
+ return version;
+ }
+}
+
+function show_dashboard()
+{
+ update(apikey_read);
+ slow_update(apikey_read);
+}
+
+
+function onetime(apikey_read)
+{
+ $('.rawdata,.bargraph,.zoom,.realtime,.simplezoom,.threshold,.orderthreshold,.orderbars,.stacked,.multigraph,.histgraph,.smoothie').each(function(index)
+ {
+
+ var id = $(this).attr("id");
+ var feed = $(this).attr("feed") || 0;
+ var width = $(this).width();
+ var height = $(this).height();
+
+ var attrstring = "";
+ var target = $(this).get(0);
+ var l = target.attributes.length
+ for (var i=0; iHelloWorld
+ //---------------------------------------------------------------------------------------------------------------------- + if ($action == 'set' && $session['write']) // write access required + { + $content = $_POST['content']; + if (!$content) $content = $_GET['content']; + + $id = intval($_POST['id']); + if (!$id) $id = intval($_GET['id']); + + // IMPORTANT: if you get problems with characters being removed check this line: + $content = preg_replace('/[^\w\s-.#<>?",;:=&\/%]/','',$content); // filter out all except characters usually used + + $content = db_real_escape_string($content); + + set_dashboard_content($session['userid'],$content,$id); + + if ($format == 'html') + { + $output['message'] = _("dashboard set"); + } + else + { + $output['message'] = "ok"; + } + } + + //---------------------------------------------------------------------------------------------------------------------- + // SET dashboard configuration + //---------------------------------------------------------------------------------------------------------------------- + elseif ($action == 'setconf' && $session['write']) // write access required + { + $id = intval($_POST['id']); + $name = preg_replace('/[^\w\s-]/','',$_POST['name']); + $alias = preg_replace('/[^a-z]/','',$_POST['alias']); + $description = preg_replace('/[^\w\s-]/','',$_POST['description']); + + // Separated functions to allow set values in independent way + if (isset($_POST['main'])) + set_dashboard_main($session['userid'],$id,intval($_POST['main'])); + + if (isset($_POST['published'])) + set_dashboard_publish($session['userid'],$id,intval($_POST['published'])); + + if (isset($_POST['public'])) + set_dashboard_public($session['userid'],$id,intval($_POST['public'])); + + if (isset($_POST['name'])) + set_dashboard_name($session['userid'],$id,$name); + + if (isset($_POST['alias'])) + set_dashboard_alias($session['userid'],$id,$alias); + + if (isset($_POST['description'])) + set_dashboard_description($session['userid'],$id,$description); + + if (isset($_POST['showdescription'])) + set_dashboard_showdescription($session['userid'],$id,intval($_POST['showdescription'])); + + //set_dashboard_conf($session['userid'],$id,$name,$alias,$description,$main,$public,$published); + + $output['message'] = _("dashboard set configuration"); + } + + return $output; + } + +?> diff --git a/Modules/dashboard/dashboard_model.php b/Modules/dashboard/dashboard_model.php new file mode 100644 index 000000000..351d08048 --- /dev/null +++ b/Modules/dashboard/dashboard_model.php @@ -0,0 +1,244 @@ +'$id'"); + + // set main to the main dashboard + db_query("UPDATE dashboard SET main = TRUE WHERE userid='$userid' AND id='$id'"); + } + else + { + // set main to false all other user dashboards + db_query("UPDATE dashboard SET main = FALSE WHERE userid='$userid' AND id='$id'"); + } + } +} + +// Return the main dashboard from $userid +function get_main_dashboard($userid) +{ + $result = db_query("SELECT * FROM dashboard WHERE userid='$userid' and main=TRUE"); + return db_fetch_array($result); +} + +// Returns the $id dashboard from $userid +function get_dashboard_id($userid, $id, $public, $published) +{ + $qB = ""; if ($public) $qB = " and public=1"; + $qC = ""; if ($published) $qC = " and published=1"; + + $result = db_query("SELECT * FROM dashboard WHERE userid='$userid' and id='$id'".$qB.$qC); + return db_fetch_array($result); +} + +// Returns the $id dashboard from $userid +function get_dashboard_alias($userid, $alias, $public, $published) +{ + $qB = ""; if ($public) $qB = " and public=1"; + $qC = ""; if ($published) $qC = " and published=1"; + + $result = db_query("SELECT * FROM dashboard WHERE userid='$userid' and alias='$alias'".$qB.$qC); + return db_fetch_array($result); +} + +/* + * Set a $id dashboard from $userid as main dashboard + * Only one dashboard can be main so first set all dashboards main property to false if new main dashboard is set + * Main dashboard is set published too + */ +function set_dashboard_main($userid, $id, $main) +{ + // set user main dashboard + if ($main == '1') + { + // set main to false all other user dashboards + db_query("UPDATE dashboard SET main = FALSE WHERE userid='$userid' AND id<>'$id'"); + + // set main to the main dashboard + db_query("UPDATE dashboard SET main = TRUE WHERE userid='$userid' AND id='$id'"); + + // main dashboard must be published + set_dashboard_publish($userid,$id,'1'); + } + else + { + db_query("UPDATE dashboard SET main = FALSE WHERE userid='$userid' AND id='$id'"); + } +} + +/* + * Set a $id dashboard from $userid as published/unpublished dashboard + * + */ +function set_dashboard_publish($userid, $id, $published) +{ + if ($published == '1') + db_query("UPDATE dashboard SET published = TRUE WHERE userid='$userid' AND id='$id'"); + else + db_query("UPDATE dashboard SET published = FALSE WHERE userid='$userid' AND id='$id'"); +} + +/* + * Set a $id dashboard from $userid as public/private dashboard + * + */ +function set_dashboard_public($userid, $id, $public) +{ + if ($public == '1') + db_query("UPDATE dashboard SET public = TRUE WHERE userid='$userid' AND id='$id'"); + else + db_query("UPDATE dashboard SET public = FALSE WHERE userid='$userid' AND id='$id'"); +} + +/* + * Set showdescription property + */ +function set_dashboard_showdescription($userid, $id, $showdescription) +{ + if ($showdescription == '1') + db_query("UPDATE dashboard SET showdescription = TRUE WHERE userid='$userid' AND id='$id'"); + else + db_query("UPDATE dashboard SET showdescription = FALSE WHERE userid='$userid' AND id='$id'"); +} + +function build_dashboard_menu($userid,$location) +{ + global $path, $session; + $public = 0; $published = 0; + if ($location!="run") { $dashpath = 'dashboard/'.$location; } else { $dashpath = $session['username']; $public = !$session['write']; $published = 1;} + + $dashboards = get_dashboard_list($userid, $public, $published); + $topmenu=""; + foreach ($dashboards as $dashboard) + { + // Check show description + if ($dashboard['showdescription']) + { + $desc = ' title="'.$dashboard['description'].'"'; + } + else + { + $desc = ''; + } + + // Set URL using alias or id + if ($dashboard['alias']) + { + $aliasurl = "/".$dashboard['alias']; + } + else + { + $aliasurl = '&id='.$dashboard['id']; + } + + // Build the menu item + $topmenu.='Feed API
+ +General
+ + + + +Feed properties
+ + + +feed/set?id=1&field=name&value=newname
+ +Feed data
+ +feed/update?id=1&time=UNIXTIME&value=100
+feed/data?id=1?start=0&end=0&dp=100
+ +Delete feeds
+ + + diff --git a/Modules/feed/Views/feedlist_view.php b/Modules/feed/Views/feedlist_view.php new file mode 100644 index 000000000..962e2487c --- /dev/null +++ b/Modules/feed/Views/feedlist_view.php @@ -0,0 +1,180 @@ + + + + + + + + ++
(no confirmation) + + diff --git a/Modules/feed/feed_controller.php b/Modules/feed/feed_controller.php new file mode 100644 index 000000000..d665dafa2 --- /dev/null +++ b/Modules/feed/feed_controller.php @@ -0,0 +1,231 @@ + $feeds,'del'=>$del)); + } + + + /* + + Feed property actions + + */ + + //--------------------------------------------------------------------------------------------------------- + // current feed value + // http://yoursite/emoncms/feed/value?id=1 + //--------------------------------------------------------------------------------------------------------- + elseif ($action == 'value' && $session['read']) + { + $feedid = intval($_GET["id"]); + if (feed_belongs_user($feedid,$session['userid'])) + { + $output['content'] = get_feed_field($feedid,'value'); + } + } + + elseif ($action == 'get' && $session['write']) + { + $feedid = intval($_GET['id']); + if (feed_belongs_user($feedid,$session['userid'])) + { + $field = $_GET['field']; + if ($field) $output['content'] = get_feed_field($feedid,$field); + if (!$field) $output['content'] = json_encode(get_feed($feedid)); + } + } + + elseif ($action == 'set' && $session['write']) + { + $feedid = intval($_GET['id']); + if (feed_belongs_user($feedid,$session['userid'])) + { + $field = $_GET['field']; + $value = $_GET['value']; + set_feed_field($feedid,$field,$value); + } + } + + /* + + Feed data actions + + */ + + elseif ($action == "insert" && $session['write']) + { + $feedid = intval($_GET["id"]); + $feedtime = intval($_GET["time"]); + $value = floatval($_GET["value"]); + + if (!$feedtime) $feedtime = time(); + insert_feed_data($feedid,time(),$feedtime,$value); + } + + elseif ($action == "update" && $session['write']) + { + $feedid = intval($_GET["id"]); + if (feed_belongs_user($feedid, $session['userid'])) { + $feedtime = intval($_GET["time"]); + $value = floatval($_GET["value"]); + + if (!$feedtime) $feedtime = time(); + update_feed_data($feedid,time(),$feedtime,$value); + } + } + + //--------------------------------------------------------------------------------------------------------- + // get feed data + // start: start time, end: end time, dp: number of datapoints in time range to fetch + // http://yoursite/emoncms/feed/data?id=1&start=000&end=000&dp=1 + //--------------------------------------------------------------------------------------------------------- + elseif ($action == 'data' && $session['read']) + { + $feedid = intval($_GET['id']); + + // Check if feed belongs to user + if (feed_belongs_user($feedid,$session['userid'])) + { + $start = floatval($_GET['start']); + $end = floatval($_GET['end']); + $dp = intval($_GET['dp']); + $data = get_feed_data($feedid,$start,$end,$dp); + $output['content'] = json_encode($data); + } else { $output['message'] = "Permission denied"; } + } + + elseif ($action == 'histogram' && $session['read']) + { + $feedid = intval($_GET['id']); + + // Check if feed belongs to user + if (feed_belongs_user($feedid,$session['userid'])) + { + $start = floatval($_GET['start']); + $end = floatval($_GET['end']); + $data = get_histogram_data($feedid,$start,$end); + $output['content'] = json_encode($data); + } else { $output['message'] = "Permission denied"; } + } + + elseif ($action == 'kwhatpower' && $session['read']) + { + $feedid = intval($_GET['id']); + // Check if feed belongs to user + if (feed_belongs_user($feedid,$session['userid'])) + { + $min = floatval($_GET['min']); + $max = floatval($_GET['max']); + + $data = get_kwhd_atpower($feedid,$min,$max); + $output['content'] = json_encode($data); + + } else { $output['message'] = "This is not your feed..."; } + } + + /* + + Delete + + */ + + //--------------------------------------------------------------------------------------------------------- + // Delete a feed ( move to recycle bin, so not permanent ) + // http://yoursite/emoncms/feed/delete?id=1 + //--------------------------------------------------------------------------------------------------------- + elseif ($action == "delete" && $session['write']) + { + $feedid = intval($_GET["id"]); + if (feed_belongs_user($feedid, $session['userid'])) + { + delete_feed($userid,$feedid); + $output['message'] = _("Feed ").get_feed_field($feedid,'name')._(" deleted"); + } else $output['message'] = _("Feed does not exist"); + } + + //--------------------------------------------------------------------------------------------------------- + // Restore feed ( if in recycle bin ) + // http://yoursite/emoncms/feed/restore?id=1 + //--------------------------------------------------------------------------------------------------------- + if ($action == "restore" && $session['write']) + { + $feedid = intval($_GET["id"]); + if (feed_belongs_user($feedid, $session['userid'])) { + restore_feed($userid,$feedid); + } + $output['message'] = "feed restored"; + if ($format == 'html') header("Location: list"); // Return to feed list page + } + + //--------------------------------------------------------------------------------------------------------- + // Permanent delete equivalent to empty recycle bin + // http://yoursite/emoncms/feed/permanentlydelete + //--------------------------------------------------------------------------------------------------------- + if ($action == "emptybin" && $session['write']) + { + permanently_delete_feeds($session['userid']); + $output['message'] = "Deleted feeds are now permanently deleted"; + } + + return $output; + } + +?> diff --git a/Modules/feed/feed_model.php b/Modules/feed/feed_model.php new file mode 100644 index 000000000..cff405ab0 --- /dev/null +++ b/Modules/feed/feed_model.php @@ -0,0 +1,326 @@ +0) + { + $feedname = "feed_".$feedid; + + if ($datatype!=3) { + $result = db_query( + "CREATE TABLE $feedname ( + time INT UNSIGNED, data float, + INDEX ( `time` ))"); + } + + if ($datatype==3) { + $result = db_query( + "CREATE TABLE $feedname ( + time INT UNSIGNED, data float, data2 float, + INDEX ( `time` ))"); + } + + return $feedid; + } else return 0; + } + + function get_feed_id($userid,$name) + { + $result = db_query("SELECT id FROM feeds WHERE userid = '$userid' AND name = '$name'"); + $row = db_fetch_array($result); + return $row['id']; + } + + function feed_belongs_user($feedid,$userid) + { + $result = db_query("SELECT id FROM feeds WHERE `userid` = '$userid' AND `id` = '$feedid'"); + $row = db_fetch_array($result); + if ($row) return 1; + return 0; + } + + /* + + User Feed lists + + Returns a specified user's feedlist in different forms: + get_user_feeds: all the feeds table data + get_user_feed_ids: only the id's + get_user_feed_names: id's and names + + */ + + function get_user_feeds($userid,$status) + { + $result = db_query("SELECT * FROM feeds WHERE userid = $userid AND status = '$status'"); + if (!$result) return 0; + $feeds = array(); + while ($row = db_fetch_object($result)) { $row->size = get_feedtable_size($row->id); $feeds[] = $row; } + return $feeds; + } + + function get_user_feed_ids($userid) + { + $result = db_query("SELECT id FROM feeds WHERE userid = $userid"); + if (!$result) return 0; + $feeds = array(); + while ($row = db_fetch_object($result)) { $feeds[] = $row->id; } + return $feeds; + } + + function get_user_feed_names($userid) + { + $result = db_query("SELECT id,name FROM feeds WHERE userid = $userid"); + if (!$result) return 0; + $feeds = array(); + while ($row = db_fetch_array($result)) { $feeds[] = array($row['id'],$row['name']); } + return $feeds; + } + + /* + + Feeds table GET functions + + */ + + function get_feed($id) + { + $result = db_query("SELECT * FROM feeds WHERE id = $id"); + return db_fetch_object($result); + } + + function get_feed_field($id,$field) + { + $result = db_query("SELECT `$field` FROM feeds WHERE `id` = '$id'"); + $row = db_fetch_array($result); + return $row[0]; + } + + function get_feed_timevalue($id) + { + $result = db_query("SELECT time,value FROM feeds WHERE id = '$id'"); + return db_fetch_array($result); + } + + /* + + Feeds table SET functions + + */ + + function set_feed_field($id,$field,$value) + { + if ($field!='id') $result = db_query("UPDATE feeds SET `$field` = '$value' WHERE id = $id"); + return $result; + } + + /* + + Feed data functions + + insert, update, get and specialist histogram functions + + */ + + function insert_feed_data($feedid,$updatetime,$feedtime,$value) + { + if (get_feed_field($feedid,'status')==1) return $value; // Dont insert if deleted + + $feedname = "feed_".trim($feedid).""; + + // a. Insert data value in feed table + db_query("INSERT INTO $feedname (`time`,`data`) VALUES ('$feedtime','$value')"); + + // b. Update feeds table + $updatetime = date("Y-n-j H:i:s", $updatetime); + db_query("UPDATE feeds SET value = '$value', time = '$updatetime' WHERE id='$feedid'"); + + return $value; + } + + function update_feed_data($feedid,$updatetime,$feedtime,$value) + { + if (get_feed_field($feedid,'status')==1) return $value; // Dont update if deleted + + $feedname = "feed_".trim($feedid).""; + + // a. update or insert data value in feed table + $result = db_query("SELECT * FROM $feedname WHERE time = '$feedtime'"); + $row = db_fetch_array($result); + + if ($row) db_query("UPDATE $feedname SET data = '$value', time = '$feedtime' WHERE time = '$feedtime'"); + if (!$row) {$value = 0; db_query("INSERT INTO $feedname (`time`,`data`) VALUES ('$feedtime','$value')"); } + + // b. Update feeds table + $updatetime = date("Y-n-j H:i:s", $updatetime); + db_query("UPDATE feeds SET value = '$value', time = '$updatetime' WHERE id='$feedid'"); + return $value; + } + + function get_feed_data($feedid,$start,$end,$dp) + { + if ($end == 0) $end = time()*1000; + + $feedname = "feed_".trim($feedid).""; + $start = $start/1000; $end = $end/1000; + + $data = array(); + if (($end - $start) > (5000) && $dp>0) //why 5000? + { + $range = $end - $start; + $td = $range / $dp; + + for ($i=0; $i<$dp; $i++) + { + $t = $start + $i*$td; + $tb = $start + ($i+1)*$td; + $result = db_query("SELECT * FROM $feedname WHERE `time` >$t AND `time` <$tb LIMIT 1"); + + if($result){ + $row = db_fetch_array($result); + $dataValue = $row['data']; + if ($dataValue!=NULL) { // Remove this to show white space gaps in graph + $time = $row['time'] * 1000; + $data[] = array($time , $dataValue); + } + } + } + } else { + $result = db_query("select * from $feedname WHERE time>$start AND time<$end order by time Desc"); + while($row = db_fetch_array($result)) { + $dataValue = $row['data']; + $time = $row['time'] * 1000; + $data[] = array($time , $dataValue); + } + } + + return $data; + } + + function get_histogram_data($feedid,$start,$end) + { + if ($end == 0) $end = time()*1000; + $feedname = "feed_".trim($feedid).""; + $start = $start/1000; $end = $end/1000; + $data = array(); + + // Histogram has an extra dimension so a sum and group by needs to be used. + $result = db_query("select data2, sum(data) as kWh from $feedname WHERE time>='$start' AND time<'$end' group by data2 order by data2 Asc"); + + $data = array(); // create an array for them + while($row = db_fetch_array($result)) // for all the new lines + { + $dataValue = $row['kWh']; // get the datavalue + $data2 = $row['data2']; // and the instant watts + $data[] = array($data2 , $dataValue); // add time and data to the array + } + return $data; + } + + function get_kwhd_atpower($feedid, $min, $max) + { + $feedname = "feed_".trim($feedid).""; + $result = db_query("SELECT time, sum(data) as kWh FROM `$feedname` WHERE `data2`>='$min' AND `data2`<='$max' group by time"); + + $data = array(); + while($row = db_fetch_array($result)) $data[] = array($row['time']* 1000 , $row['kWh']); + + return $data; + } + + /* + + Feed table size + + */ + + function get_feedtable_size($feedid) + { + $feedname = "feed_".$feedid; + $result = db_query("SHOW TABLE STATUS LIKE '$feedname'"); + $row = db_fetch_array($result); + $tablesize = $row['Data_length']+$row['Index_length']; + return $tablesize; + } + + function get_user_feeds_size($userid) + { + $result = db_query("SELECT id FROM feeds WHERE userid = '$userid'"); + $total = 0; + if ($result) { + while ($row = db_fetch_array($result)) { + $total += get_feedtable_size($row['id']); + } + } + + return $total; + } + + /* + + Feed wastebin, restore and permanent deletion + + */ + + function delete_feed($userid,$feedid) + { + // feed status of 1 = deleted, this provides a way to soft delete so that if the delete was a mistake + // it can be taken out of the recycle bin. + db_query("UPDATE feeds SET status = 1 WHERE id='$feedid'"); + } + + function restore_feed($userid,$feedid) + { + // feed status of 1 = deleted, this provides a way to soft delete so that if the delete was a mistake + // it can be taken out of the recycle bin. + db_query("UPDATE feeds SET status = 0 WHERE id='$feedid'"); + } + + function permanently_delete_feeds($userid) + { + $result = db_query("SELECT * FROM feeds WHERE userid = '$userid'"); + $feeds = array(); + if ($result) { + while ($row = db_fetch_object($result)) { + $feed = get_feed($row->id); + $feedid = $feed->id; + if ($feed && $feed->status==1){ + db_query("DELETE FROM feeds WHERE id = '$feedid'"); + db_query("DROP TABLE feed_".$feedid); + } + } + } + } + +?> diff --git a/Modules/feed/feed_schema.php b/Modules/feed/feed_schema.php new file mode 100644 index 000000000..70ccc8843 --- /dev/null +++ b/Modules/feed/feed_schema.php @@ -0,0 +1,14 @@ + array('type' => 'int(11)', 'Null'=>'NO', 'Key'=>'PRI', 'Extra'=>'auto_increment'), + 'name' => array('type' => 'text'), + 'userid' => array('type' => 'int(11)'), + 'tag' => array('type' => 'text'), + 'time' => array('type' => 'datetime'), + 'value' => array('type' => 'float'), + 'status' => array('type' => 'int(11)'), + 'datatype' => array('type' => 'int(11)', 'Null'=>'NO') +); + +?> diff --git a/Modules/input/Views/input_api.php b/Modules/input/Views/input_api.php new file mode 100644 index 000000000..b39f26087 --- /dev/null +++ b/Modules/input/Views/input_api.php @@ -0,0 +1,39 @@ + + +
Input API
+ +Post data
+JSON:
input/post?json={power:200}
CSV:
input/post?csv=100,200,300
Assign inputs to a node group:
input/post?node=1&csv=100,200,300
Set the input entry time manually:
+input/post?time=&node=1&csv=100,200,300
List
+ + + + +Delete
+ + + + +Process
+ +Query input process:
input/process/query?type=1
List input process list:
input/process/list?inputid=1
Add an input process:
input/process/add?inputid=1&type=1&arg=-1&arg2=power
Delete input process:
input/process/delete?inputid=1&processid=1
Move input process:
input/process/move?inputid=1&processid=1&moveby=1
Reset input process list:
input/process/reset?inputid=1
Autoconfigure inputs (works with inputs called power, temp & temperature):
input/autoconfigure
+ ">
+
+
+
+
+
+
+
diff --git a/Modules/input/Views/input_node.php b/Modules/input/Views/input_node.php
new file mode 100644
index 000000000..1b3928fcf
--- /dev/null
+++ b/Modules/input/Views/input_node.php
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ">
+
+
+
+
+
+
+
+
diff --git a/Modules/input/Views/process_list.php b/Modules/input/Views/process_list.php
new file mode 100644
index 000000000..397c99465
--- /dev/null
+++ b/Modules/input/Views/process_list.php
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + " . _("Are you sure you want to delete input: ") . $name . "?"; ?> + + + + diff --git a/Modules/input/input_controller.php b/Modules/input/input_controller.php new file mode 100644 index 000000000..500dd4feb --- /dev/null +++ b/Modules/input/input_controller.php @@ -0,0 +1,329 @@ + $inputs)); + } + + //--------------------------------------------------------------------------------------------------------- + // List inputs by node + // http://yoursite/emoncms/input/list.html + // http://yoursite/emoncms/input/list.json + //--------------------------------------------------------------------------------------------------------- + if ($action == 'node' && $session['read']) + { + $inputs = get_user_inputsbynode($session['userid']); + + if ($format == 'json') $output['content'] = json_encode($inputs); + if ($format == 'html') $output['content'] = view("input/Views/input_node.php", array('inputs' => $inputs)); + } + + //--------------------------------------------------------------------------------------------------------- + // Delete an input + // http://yoursite/emoncms/input/delete?id=1 + //--------------------------------------------------------------------------------------------------------- + if ($action == "delete" && $session['write']) + { + $inputid = intval(get("id")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + delete_input($session['userid'],$inputid); + $output['message'] = _("Input deleted").' '.$inputid; + } else $output['message'] = "Input ".$inputid." does not exist"; + } + + if ($action == "autoconfigure" && $session['write']) + { + $inputs = get_user_inputs($session['userid']); + foreach ($inputs as $input) + { + auto_configure_inputs($session['userid'],$input[0],$input[1]); + } + $output['message'] = "Autoconfigured"; + } + + /* + + Input Process actions + + */ + + if ($action == "process" && $session['read']) + { + //-------------------------------------------------------------------------- + // Query process + // http://yoursite/emoncms/process/query?type=1 + // Returns ProcessArg type as int; String description; Array of feedids and names + // eg. [2,"Feed",[["1","power"],["3","power-histogram"],["2","power-kwhd"]]] + //-------------------------------------------------------------------------- + if ($subaction == 'query' && $session['read']) // read access required + { + $type = intval(get("type")); // get process type + + $arg = preg_replace('/[^\w\s-.]/','',get('arg')); // filter out all except for alphanumeric white space and dash + $arg = db_real_escape_string($arg); + + $process = get_process($type); + + $newprocess[0] = $process[1]; // Process arg type + switch($process[1]) { + case ProcessArg::VALUE: + $newprocess[1] = "Value"; + break; + case ProcessArg::INPUTID: + $newprocess[1] = "Input"; + $newprocess[2] = get_user_input_names($session['userid']); + break; + case ProcessArg::FEEDID: + $newprocess[1] = "Feed"; + $newprocess[2] = get_user_feed_names($session['userid']); + break; + default: + $newprocess[1] = "ERROR"; + } + $output['message'] = json_encode($newprocess); + } + + //--------------------------------------------------------------------------------------------------------- + // Get process list of input + // http://yoursite/emoncms/input/process/list.json?inputid=1 + //--------------------------------------------------------------------------------------------------------- + if ($subaction == "list" && $session['read']) + { + $inputid = intval(get("inputid")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + $input_processlist = get_input_processlist_desc($session['userid'],$inputid); + + if ($format == 'json') $output['content'] = json_encode($input_processlist); + if ($format == 'html') $output['content'] = view("input/Views/process_list.php", array('inputid'=>$inputid, 'input_processlist' => $input_processlist, 'process_list'=>get_process_list())); + } + else $output['message'] = "Input ".$inputid." does not exist"; + } + + //--------------------------------------------------------------------------------------------------------- + // Add process + // http://yoursite/emoncms/input/process/add?inputid=1&type=1&arg=power + //--------------------------------------------------------------------------------------------------------- + if ($subaction == "add" && $session['write']) // write access required + { + $inputid = intval(get("inputid")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + $processid = intval(get('type')); // get process type (ProcessArg::) + $arg = floatval(get('arg')); // This is: actual value (i.e x0.01), inputid or feedid + + //arg2 is feed name if arg=-1 (create new feed) + $arg2 = preg_replace('/[^\w\s-.]/','',get('arg2')); // filter out all except for alphanumeric white space and dash + $arg2 = db_real_escape_string($arg2); + + $process = get_process($processid); + + $valid = false; // Flag to determine if argument is valid + + switch ($process[1]) { + case ProcessArg::VALUE: // If arg type value + $arg = floatval($arg); + $id = $arg; + if ($arg != '') { + $valid = true; + } + else { + $output['message'] = 'ERROR: Argument must be a valid number greater or less than 0.'; + } + break; + case ProcessArg::INPUTID: // If arg type input + // Check if input exists (returns 0 if invalid) + $name = get_input_name($arg); + $id = get_input_id($session['userid'],$name); + if (($name == '') || ($id == '')) { + $output['message'] = 'ERROR: Input does not exist!'; + } + else { + $valid = true; + } + break; + case ProcessArg::FEEDID: // If arg type feed + // First check if feed exists of given feed id and user. + $name = get_feed_field($arg,'name'); + $id = get_feed_id($session['userid'],$name); + if (($name == '') || ($id == '')) { + // If it doesnt then create a feed, $process[3] is the number of datafields in the feed table + $id = create_feed($session['userid'],$arg2, $process[4]); + // Check feed was created successfully + $name = get_feed_field($id,'name'); + if ($name == '') { + $output['message'] = 'ERROR: Could not create new feed!'; + } + else { + $valid = true; + } + } + else { + $valid = true; + } + break; + } + + if ($valid) { + add_input_process($session['userid'],$inputid,$processid,$id); + } + + if ($format == 'json') { + $output['message'] = json_encode($output['message']); + } + elseif ($format == 'html') $output['message'] = "Input process added"; + + } else $output['message'] = "Input ".$inputid." does not exist"; + } + + //-------------------------------------------------------------------------- + // Delete process + // http://yoursite/emoncms/process/delete?inputid=1&processid=1 + //-------------------------------------------------------------------------- + if ($subaction == 'delete' && $session['write']) // write access required + { + $inputid = intval(get("inputid")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + $processid = intval($_GET['processid']); + if (delete_input_process($session['userid'],$inputid,$processid)) + $output['message'] = "Input process deleted"; + else + $output['message'] = "Input process does not exist"; + } else $output['message'] = "Input ".$inputid." does not exist"; + } + + //-------------------------------------------------------------------------- + // Move process + // http://yoursite/emoncms/process/move?inputid=1&processid=1&moveby=1/-1 + //-------------------------------------------------------------------------- + if ($subaction == 'move' && $session['write']) // write access required + { + $inputid = intval(get("inputid")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + $processid = intval($_GET['processid']); + $moveby = intval($_GET['moveby']); + move_input_process($session['userid'],$inputid,$processid,$moveby); + $output['message'] = "Input process moved"; + } else $output['message'] = "Input ".$inputid." does not exist"; + } + + if ($subaction == "reset") + { + $inputid = intval(get("inputid")); + if (input_belongs_to_user($session['userid'], $inputid)) + { + reset_input_process($session['userid'], $inputid ); + $output['message'] = _("Process list has been reset"); + } else $output['message'] = "Input ".$inputid." does not exist"; + } + } + + return $output; +} + +?> diff --git a/Modules/input/input_model.php b/Modules/input/input_model.php new file mode 100644 index 000000000..eab7ea67e --- /dev/null +++ b/Modules/input/input_model.php @@ -0,0 +1,271 @@ +$index && $array[$index]) {unset($array[$index]); $success = true;} + + // Save new process list + set_input_processlist($inputid, implode(",", $array)); + + return $success; +} + +/****** +* move_input_process - move process up/down list of processes by $moveby (eg. -1, +1) +******/ +function move_input_process($userid, $id, $index, $moveby) +{ + if (($moveby > 1) || ($moveby < -1)) return false; // Only support +/-1 (logic is easier) + + $process_list = get_input_processlist($userid, $id); + $array = explode(",", $process_list); + $index = $index - 1; // Array is 0-based. Index from process page is 1-based. + + $newindex = $index + $moveby; // Calc new index in array + // Check if $newindex is greater than size of list + if ($newindex > (count($array)-1)) $newindex = (count($array)-1); + // Check if $newindex is less than 0 + if ($newindex < 0) $newindex = 0; + + $replace = $array[$newindex]; // Save entry that will be replaced + $array[$newindex] = $array[$index]; + $array[$index] = $replace; + + // Save new process list + set_input_processlist($id, implode(",", $array)); + return true; +} + +function reset_input_process($userid, $id) +{ + set_input_processlist($id, ""); +} + + //----------------------------------------------------------------------------------------------- + // This function gets a users input list, its used to create the input/list page + //----------------------------------------------------------------------------------------------- +function get_user_inputs($userid) +{ + $result = db_query("SELECT * FROM input WHERE userid = '$userid'"); + $inputs = array(); + if ($result) + { + while ($row = db_fetch_array($result)) + { + $inputs[] = array( + $row['id'], + $row['name'], + strtotime($row['time']) * 1000, + $row['value'], 'nodeid'=>$row['nodeid'] + ); + } + } + return $inputs; +} + +function get_user_inputsbynode($userid) +{ + $result = db_query("SELECT * FROM input WHERE userid = '$userid' ORDER BY nodeid"); + $inputs = array(); + if ($result) + { + while ($row = db_fetch_array($result)) + { + $inputs[] = array( + $row['id'], + $row['name'], + strtotime($row['time']) * 1000, + $row['value'], 'nodeid'=>$row['nodeid'] + ); + } + } + return $inputs; +} + +//----------------------------------------------------------------------------------------------- +// Return a list of users input ids and names +//----------------------------------------------------------------------------------------------- +function get_user_input_names($userid) +{ + $result = db_query("SELECT id,name FROM input WHERE userid = $userid ORDER BY name ASC"); + $inputs = array(); + if ($result) { + while ($row = db_fetch_array($result)) { + $inputs[] = array($row['id'],$row['name']); + } + } + return $inputs; +} + +function get_input_id($user, $name) +{ + $result = db_query("SELECT id FROM input WHERE name='$name' AND userid='$user'"); + if ($result) + { + $array = db_fetch_array($result); + return $array['id']; + } + else + return 0; +} + +function get_input_name($id) +{ + $result = db_query("SELECT name FROM input WHERE id='$id'"); + if ($result) + { + $array = db_fetch_array($result); + return $array['name']; + } + else + return 0; +} + +function get_input_processlist($userid, $id) +{ + $result = db_query("SELECT processList FROM input WHERE userid='$userid' AND id='$id'"); + $array = db_fetch_array($result); + return $array['processList']; +} + +//----------------------------------------------------------------------------------------------- +// Gets the inputs process list and converts id's into descriptive text +//----------------------------------------------------------------------------------------------- +function get_input_processlist_desc($userid, $id) +{ + $process_list = get_input_processlist($userid, $id); + // Get the input's process list + + $list = array(); + if ($process_list) + { + $array = explode(",", $process_list); + // input process list is comma seperated + foreach ($array as $row)// For all input processes + { + $row = explode(":", $row); + // Divide into process id and arg + $processid = $row[0]; + $arg = $row[1]; + // Named variables + $process = get_process($processid); + // gets process details of id given + + $processDescription = $process[0]; + // gets process description + if ($process[1] == ProcessArg::INPUTID) + $arg = get_input_name($arg); + // if input: get input name + elseif ($process[1] == ProcessArg::FEEDID) + $arg = get_feed_field($arg,'name'); + // if feed: get feed name + + $list[] = array( + $processDescription, + $arg + ); + // Populate list array + } + } + return $list; +} + +function delete_input($userid, $inputid) +{ + // Inputs are deleted permanentely straight away rather than a soft delete + // as in feeds - as no actual feed data will be lost + db_query("DELETE FROM input WHERE userid = '$userid' AND id = '$inputid'"); +} +?> diff --git a/Modules/input/input_schema.php b/Modules/input/input_schema.php new file mode 100644 index 000000000..fab210ea4 --- /dev/null +++ b/Modules/input/input_schema.php @@ -0,0 +1,13 @@ + array('type' => 'int(11)', 'Null'=>'NO', 'Key'=>'PRI', 'Extra'=>'auto_increment'), + 'userid' => array('type' => 'text'), + 'name' => array('type' => 'text'), + 'nodeid' => array('type' => 'int(11)'), + 'processList' => array('type' => 'text'), + 'time' => array('type' => 'datetime'), + 'value' => array('type' => 'float') +); + +?> diff --git a/Modules/input/process_model.php b/Modules/input/process_model.php new file mode 100644 index 000000000..c71b322e3 --- /dev/null +++ b/Modules/input/process_model.php @@ -0,0 +1,734 @@ +0 && $id
" . $mail -> getMessage() . "
"); + } + else + { + $output = "" . _("Message successfully sent!") . "
"; + } + + return $output; +} +?> diff --git a/Modules/notify/notify_controller.php b/Modules/notify/notify_controller.php new file mode 100644 index 000000000..2a0cfa619 --- /dev/null +++ b/Modules/notify/notify_controller.php @@ -0,0 +1,70 @@ +$feedid,'notify'=>$notify)); + } + + elseif ($action == 'setrecipients' && $session['write']) + { + $recipients = preg_replace('/[^\w\s-.,@]/','',$_GET["recipients"]); + set_notify_recipients($userid,$recipients); + + $recipients = get_notify_recipients($userid); + + if ($format == 'html') $output['content'] = view("notify/notify_settings_view.php", array('recipients'=>$recipients)); + } + + elseif ($action == 'settings' && $session['write']) + { + $recipients = get_notify_recipients($userid); + + if ($format == 'html') $output['content'] = view("notify/notify_settings_view.php", array('recipients'=>$recipients)); + } + + return $output; + } + +?> diff --git a/Modules/notify/notify_model.php b/Modules/notify/notify_model.php new file mode 100644 index 000000000..7e0fb6b13 --- /dev/null +++ b/Modules/notify/notify_model.php @@ -0,0 +1,120 @@ +" . _("Feed ") . $feed[1] . _(" is") . " == " . $row['onvalue'] . ""; + $notification_number++; + db_query("UPDATE notify SET onvalue_sent = 1 WHERE feedid='$feedid'"); + } + + if (!$row['oninactive_sent'] && $row['oninactive'] && !$active)// NOTIFY On inactive + { + $notification_message .= "" . _("Feed ") . $feed[1] . _(" is inactive") . "
"; + $notification_number++; + db_query("UPDATE notify SET oninactive_sent = 1 WHERE feedid='$feedid'"); + } + } + + $to = get_notify_recipients($userid); + $subject = $notification_number . "x emoncms events"; + $body = $notification_message; + + if ($notification_number > 0) + send_mail($to, $subject, $body); + return $notification_message; +} + +function set_notify($userid, $feedid, $onvalue, $oninactive, $periodic) +{ + $result = db_query("SELECT * FROM notify WHERE `userid` = '$userid' AND `feedid` = '$feedid' "); + if ($row = db_fetch_array($result)) + { + db_query("UPDATE notify SET onvalue = '$onvalue', oninactive = '$oninactive', periodic = '$periodic' WHERE `feedid` = '$feedid'"); + } + else + { + db_query("INSERT INTO notify (`userid`,`feedid`,`onvalue`,`onvalue_sent`,`oninactive`,`oninactive_sent`,`periodic`) VALUES ('$userid','$feedid','$onvalue','0','$oninactive','0','$periodic')"); + } +} + +function get_notify($userid, $feedid) +{ + $result = db_query("SELECT * FROM notify WHERE `userid` = '$userid' AND `feedid` = '$feedid' "); + return db_fetch_array($result); +} + +function set_notify_recipients($userid, $recipients) +{ + $result = db_query("SELECT * FROM notify_mail WHERE `userid` = '$userid'"); + if ($row = db_fetch_array($result)) + { + db_query("UPDATE notify_mail SET recipients = '$recipients' WHERE `userid` = '$userid'"); + } + else + { + db_query("INSERT INTO notify_mail (`userid`,`recipients`) VALUES ('$userid','$recipients')"); + } +} + +function get_notify_recipients($userid) +{ + $result = db_query("SELECT * FROM notify_mail WHERE `userid` = '$userid'"); + $row = db_fetch_array($result); + return $row['recipients']; +} + +function get_notify_users() +{ + $result = db_query("SELECT * FROM notify_mail"); + + $users = array(); + while ($row = db_fetch_array($result)) + { + $users[] = array( + 'userid' => $row['userid'], + 'recipients' => $row['recipients'] + ); + } + return $users; +} diff --git a/Modules/notify/notify_schema.php b/Modules/notify/notify_schema.php new file mode 100644 index 000000000..5b82eda06 --- /dev/null +++ b/Modules/notify/notify_schema.php @@ -0,0 +1,18 @@ + array('type' => 'int(11)'), + 'feedid' => array('type' => 'int(11)'), + 'onvalue' => array('type' => 'float'), + 'onvalue_sent' => array('type' => 'tinyint(1)'), + 'oninactive' => array('type' => 'tinyint(1)'), + 'oninactive_sent' => array('type' => 'tinyint(1)'), + 'periodic' => array('type' => 'tinyint(1)') +); + +$schema['notify_mail'] = array( + 'userid' => array('type' => 'int(11)'), + 'recipients' => array('type' => 'text') +); + +?> diff --git a/Modules/notify/notify_settings_view.php b/Modules/notify/notify_settings_view.php new file mode 100644 index 000000000..b386d015e --- /dev/null +++ b/Modules/notify/notify_settings_view.php @@ -0,0 +1,21 @@ + + + diff --git a/Modules/notify/notify_view.php b/Modules/notify/notify_view.php new file mode 100644 index 000000000..894581ddc --- /dev/null +++ b/Modules/notify/notify_view.php @@ -0,0 +1,32 @@ + + + ++ +
+ + + diff --git a/Modules/sync/sync_controller.php b/Modules/sync/sync_controller.php new file mode 100644 index 000000000..20779e24f --- /dev/null +++ b/Modules/sync/sync_controller.php @@ -0,0 +1,135 @@ +remoteurl; + $remotekey = $settingsarray->remotekey; + } + + if ($url && $remotekey){ + + $settingsarray->remoteurl = $url; + $settingsarray->remotekey = $remotekey; + set_user_settingsarray($session['userid'], $settingsarray); + + // Request feed list + $fh = @fopen($url."/feed/list.json?apikey=".$remotekey, 'r' ); + // Read reply + $data = ""; while (($buffer = fgets($fh)) !== false) {$data .= $buffer;} + // Convert into feedlist array + $remote_feeds = json_decode($data); + fclose($fh); + + /* + + This section gets import queue location of the feeds + + */ + + // Get id position of first feed in line + $result = db_query("SELECT * FROM importqueue ORDER BY `queid` Asc LIMIT 1"); + $row = db_fetch_array($result); + $first_in_line = $row['queid']; + + // For each feed check that the feed exists in the import que and calculate its position + for ($i=0; $iAccount Sync
+Sync multiple instances of emoncms together. Keep a local copy of data stored on a remote server.
+ + + + +| Feed name | Remote ahead by: | Queue Position | Sync |
|---|---|---|---|
| + | + | + | > | +
+
+
diff --git a/Modules/user/user_controller.php b/Modules/user/user_controller.php
new file mode 100644
index 000000000..c53e43a58
--- /dev/null
+++ b/Modules/user/user_controller.php
@@ -0,0 +1,278 @@
+ 30)
+ {
+ $output['message'] = _("Please enter a username that is 4 to 30 characters long")."
+ 
+
+
+
+
+
+
+
+
+ "; + $failed = TRUE; + } + elseif (strlen($password) < 4 || strlen($password) > 30) + { + $output['message'] = _("Please enter a password that is 4 to 30 characters long")."
"; + $failed = TRUE; + } + else + { + create_user($username,$password); + $result = user_logon($username,$password); + $output['message'] = _("Your new account has been created"); + if ($format == 'html') + { + header("Location: ../user/view"); + } + } + + if ($failed && $format=='html') $output['content'] = view('user/login_block.php', array()); + } + + // http://yoursite/emoncms/user/changepass?old=sdgs43&new=sdsg345 + if ($action == 'changepass' && $_SESSION['write']) + { + $failed = FALSE; + $oldpass = db_real_escape_string($_POST['oldpass']); + $newpass = db_real_escape_string($_POST['newpass']); + if (strlen($newpass) < 4 || strlen($newpass) > 30) + { + $failed = TRUE; + $output['message'] = _("Please enter a password that is 4 to 30 characters long")."
"; + } + elseif (change_password($_SESSION['userid'],$oldpass,$newpass)) + { + $output['message'] = _("Your password has been changed"); + } + else + { + $failed = TRUE; + $output['message'] = _("Invalid password"); + } + + if ($format=='html') $action = 'view'; + } + + // http://yoursite/emoncms/user/changepass?old=sdgs43&new=sdsg345 + if ($action == 'changedetails' && $_SESSION['write']) + { + $username = preg_replace('/[^\w\s-.]/','',$_POST["username"]); + $username = db_real_escape_string($username); + + $email = preg_replace('/[^\w\s-.@]/','',$_POST["email"]); + $email = db_real_escape_string($email); + + $id = get_user_id($username); + if ($id && $id!=$_SESSION['userid']) + { + $output['message'] = _("Sorry username already exists"); + } + elseif (strlen($username) < 4 || strlen($username) > 30) + { + $output['message'] = _("Please enter a username that is 4 to 30 characters long")."
"; + } + elseif (!$email) + { + $output['message'] = _("No email address present")."
"; + } + else + { + $output['message'] = _("Username and password updated"); + set_user_username($_SESSION['userid'], $username); + set_user_email($_SESSION['userid'], $email); + } + + if ($format=='html') $action = 'view'; + } + + //-------------------------------------------------------------------------- + // NEW API READ + // http://yoursite/emoncms/user/newapiread + //-------------------------------------------------------------------------- + if ($action == 'newapiread' && $session['write']) + { + $apikey_read = md5(uniqid(mt_rand(), true)); + set_apikey_read($session['userid'],$apikey_read); + $output['message'] = _("New read apikey: ").$apikey_read; + + if ($format == 'html') + { + header("Location: view"); + } + } + + //-------------------------------------------------------------------------- + // NEW API WRITE + // http://yoursite/emoncms/user/newapiwrite + //-------------------------------------------------------------------------- + if ($action == 'newapiwrite' && $session['write']) + { + $apikey_write = md5(uniqid(mt_rand(), true)); + set_apikey_write($session['userid'],$apikey_write); + $output['message'] = _("New write apikey: ").$apikey_write; + + if ($format == 'html') + { + header("Location: view"); + } + } + + //-------------------------------------------------------------------------- + // Logout + // http://yoursite/emoncms/user/logout + //-------------------------------------------------------------------------- + if ($action == 'logout' && $session['read']) + { + if ($_POST['CSRF_token'] == $_SESSION['CSRF_token']) + { + user_logout(); + $output['message'] = _("You are logged out"); + } + else + { + reset_CSRF_token(); + $output['message'] = _("Invalid token"); + } + + if ($format == 'html'){ + header("Location: ../"); + } + } + + //-------------------------------------------------------------------------- + // GET API READ + // http://yoursite/emoncms/user/getapiread + //-------------------------------------------------------------------------- + if ($action == 'getapiread' && $session['read']) + { + $apikey_read = get_apikey_read($session['userid']); + $output = $apikey_read; + } + + //-------------------------------------------------------------------------- + // GET API WRITE + // http://yoursite/emoncms/user/getapiwrite + //-------------------------------------------------------------------------- + if ($action == 'getapiwrite' && $session['write']) + { + $apikey_write = get_apikey_write($session['userid']); + $output = $apikey_write; + } + + //-------------------------------------------------------------------------- + // GET USER + // http://yoursite/emoncms/user/view + //-------------------------------------------------------------------------- + if ($action == 'view' && $session['write']) + { + $user = get_user($session['userid']); + + if ($format == 'json') $output['content'] = json_encode($user); + if ($format == 'html') $output['content'] = view("user/user_view.php", array('user' => $user)); + } + + //-------------------------------------------------------------------------- + // SET USERS DEFAULT LANGUAGE + // http://yoursite/emoncms/user/setlang + //-------------------------------------------------------------------------- + if ($action == 'setlang' && $session['write']) + { + // Store userlang in database + set_user_lang($session['userid'],$_GET['lang']); + + // Reload the page + if ($format == 'html') + { + header("Location: view"); + } + } + + return $output; + } + +?> diff --git a/Modules/user/user_model.php b/Modules/user/user_model.php new file mode 100644 index 000000000..22a8d8ed6 --- /dev/null +++ b/Modules/user/user_model.php @@ -0,0 +1,288 @@ + $row['username'], + 'email' => $row['email'], + 'apikey_read' => $row['apikey_read'], + 'apikey_write' => $row['apikey_write'], + 'lang' => $row['lang'], + 'timeoffset' => $row['timeoffset'] + ); + } + return $user; +} + +function get_apikey_read($userid) +{ + $result = db_query("SELECT apikey_read FROM users WHERE id=$userid"); + if ($result) + { + $row = db_fetch_array($result); + $apikey = $row['apikey_read']; + } + return $apikey; +} + +function get_apikey_write($userid) +{ + $result = db_query("SELECT apikey_write FROM users WHERE id=$userid"); + if ($result) + { + $row = db_fetch_array($result); + $apikey = $row['apikey_write']; + } + return $apikey; +} + +function set_user_username($userid, $username) +{ + db_query("UPDATE users SET username = '$username' WHERE id='$userid'"); +} + +function set_user_email($userid, $email) +{ + db_query("UPDATE users SET email = '$email' WHERE id='$userid'"); +} + +function set_apikey_read($userid, $apikey) +{ + db_query("UPDATE users SET apikey_read = '$apikey' WHERE id='$userid'"); +} + +function set_apikey_write($userid, $apikey) +{ + db_query("UPDATE users SET apikey_write = '$apikey' WHERE id='$userid'"); +} + +function get_apikey_read_user($apikey) +{ + $result = db_query("SELECT id FROM users WHERE apikey_read='$apikey'"); + $row = db_fetch_array($result); + return $row['id']; +} + +function get_apikey_write_user($apikey) +{ + $result = db_query("SELECT id FROM users WHERE apikey_write='$apikey'"); + $row = db_fetch_array($result); + return $row['id']; +} + +function create_user($username, $password) +{ + $hash = hash('sha256', $password); + $string = md5(uniqid(mt_rand(), true)); + $salt = substr($string, 0, 3); + $hash = hash('sha256', $salt . $hash); + + $apikey_write = md5(uniqid(mt_rand(), true)); + $apikey_read = md5(uniqid(mt_rand(), true)); + + db_query("INSERT INTO users ( username, password, salt ,apikey_read, apikey_write ) VALUES ( '$username' , '$hash' , '$salt', '$apikey_read', '$apikey_write' );"); + + // Make the first user an admin + $userid = db_insert_id(); + if ($userid == 1) + { + db_query("UPDATE users SET admin = 1 WHERE id = '$userid'"); + } +} + +function ckeck_for_user_directory($username) +{ + // Get the user id + $id = get_user_id($username); + + // Check if the user directory exists and create it + if (!is_dir("./users/$id")) + mkdir("./users/$id", 0700); +} + +function user_logon($username, $password) +{ + $result = db_query("SELECT id,password,admin,salt,lang FROM users WHERE username = '$username'"); + $userData = db_fetch_array($result); + $hash = hash('sha256', $userData['salt'] . hash('sha256', $password)); + + if ((db_num_rows($result) < 1) || ($hash != $userData['password'])) + { + $_SESSION['read'] = 0; + $_SESSION['write'] = 0; + $_SESSION['admin'] = 0; + $success = 0; + } + else + { + //this is a security measure + session_regenerate_id(); + $_SESSION['userid'] = $userData['id']; + $_SESSION['username'] = $username; + $_SESSION['read'] = 1; + $_SESSION['write'] = 1; + $_SESSION['admin'] = $userData['admin']; + $_SESSION['lang'] = $userData['lang']; + $_SESSION['editmode'] = TRUE; + + // If user is created or login we check here if the user directory was created on server + ckeck_for_user_directory($username); + + $success = 1; + } + return $success; +} + +function user_logout() +{ + $_SESSION['read'] = 0; + $_SESSION['write'] = 0; + $_SESSION['admin'] = 0; + session_destroy(); +} + +function get_user_id($username) +{ + $result = db_query("SELECT id FROM users WHERE username = '$username';"); + $row = db_fetch_array($result); + return $row['id']; +} + +function get_user_name($id) +{ + $result = db_query("SELECT username FROM users WHERE id = '$id';"); + $row = db_fetch_array($result); + return $row['username']; +} + +function change_password($userid, $oldpass, $newpass) +{ + $result = db_query("SELECT password, salt FROM users WHERE id = '$userid'"); + $userData = db_fetch_array($result); + $hash = hash('sha256', $userData['salt'] . hash('sha256', $oldpass)); + // hash of oldpass + + if ($hash == $userData['password']) + { + $hash = hash('sha256', $newpass); + $string = md5(uniqid(rand(), true)); + $salt = substr($string, 0, 3); + $hash = hash('sha256', $salt . $hash); + db_query("UPDATE users SET password = '$hash', salt = '$salt' WHERE id = '$userid'"); + return 1; + // success + } + else + { + return 0; + // failed + } +} + +function get_user_list() +{ + $result = db_query("SELECT id, username, admin FROM users"); + $userlist = array(); + while ($row = db_fetch_array($result)) + { + $userlist[] = array( + 'userid' => $row['id'], + 'name' => $row['username'], + 'admin' => $row['admin'] + ); + } + + return $userlist; +} + +function set_user_lang($userid, $lang) +{ + db_query("UPDATE users SET lang = '$lang' WHERE id='$userid'"); +} + +function get_user_lang($userid) +{ + $result = db_query("SELECT lang FROM users WHERE id = '$userid';"); + $row = db_fetch_array($result); + return $row['lang']; +} + +function set_user_timeoffset($userid,$timeoffset) +{ + db_query("UPDATE users SET timeoffset = '$timeoffset' WHERE id='$userid'"); +} + +function get_user_timeoffset($userid) +{ + $result = db_query("SELECT timeoffset FROM users WHERE id = '$userid';"); + $row = db_fetch_array($result); + return $row['timeoffset']; +} + +function get_user_settingsarray($userid) +{ + $result = db_query("SELECT settingsarray FROM users WHERE id = '$userid';"); + $row = db_fetch_array($result); + return json_decode($row['settingsarray']); +} + +function set_user_settingsarray($userid, $settingsarray) +{ + $settingsarray = json_encode($settingsarray); + db_query("UPDATE users SET settingsarray = '$settingsarray' WHERE id='$userid'"); +} + +?> diff --git a/Modules/user/user_schema.php b/Modules/user/user_schema.php new file mode 100644 index 000000000..bf83d7a80 --- /dev/null +++ b/Modules/user/user_schema.php @@ -0,0 +1,18 @@ + array('type' => 'int(11)', 'Null'=>'NO', 'Key'=>'PRI', 'Extra'=>'auto_increment'), + 'username' => array('type' => 'varchar(30)'), + 'email' => array('type' => 'varchar(30)'), + 'password' => array('type' => 'varchar(64)'), + 'salt' => array('type' => 'varchar(3)'), + 'apikey_write' => array('type' => 'varchar(64)'), + 'apikey_read' => array('type' => 'varchar(64)'), + 'lastlogin' => array('type' => 'datetime'), + 'admin' => array('type' => 'int(11)', 'Null'=>'NO'), + 'lang' => array('type' => 'varchar(5)'), + 'timeoffset' => array('type' => 'int(11)'), + 'settingsarray' => array('type' => 'text') +); + +?> diff --git a/Modules/user/user_view.php b/Modules/user/user_view.php new file mode 100644 index 000000000..e2bf324e5 --- /dev/null +++ b/Modules/user/user_view.php @@ -0,0 +1,96 @@ + + + + '; + echo ''._("Select preferred language").''; + echo ''; + } + + echo ''; + echo ''; + + ?> + + + + + + + + + diff --git a/Modules/vis/api_view.php b/Modules/vis/api_view.php new file mode 100644 index 000000000..14cd6539d --- /dev/null +++ b/Modules/vis/api_view.php @@ -0,0 +1,392 @@ + + + + + + + +
|
+
+ + + |
+ + + | +
|
+
+ + + |
+ + + | +
+
|
+ + API url: api/post + |
+ + |
|
+ |
+ + + | +
|
+ + |
+ + + | +
+
button.'); ?>
+ +| + + | ++ + | ++ + | +
|---|---|---|
|
+
+ + + |
+
|
+
+ + &apikey= + |
+
|
+
+ + '); ?> + |
+
|
+
+ + + |
+
Bar graph:
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/common/api.js b/Modules/vis/visualisations/common/api.js
new file mode 100644
index 000000000..4c9d990e3
--- /dev/null
+++ b/Modules/vis/visualisations/common/api.js
@@ -0,0 +1,96 @@
+
+ //-------------------------------------------------------------------------------
+ // Get feed list
+ //-------------------------------------------------------------------------------
+ function get_feed_list(apikey)
+ {
+ var list = [];
+ $.ajax({
+ type: "GET",
+ url: path+"feed/list.json?apikey="+apikey,
+ dataType: 'json',
+ async: false,
+ success: function(data) { list = data; }
+ });
+ return list;
+ }
+
+ //-------------------------------------------------------------------------------
+ // Get feed data
+ //-------------------------------------------------------------------------------
+ function get_feed_data(feedID,start,end,dp)
+ {
+ var feedIn = [];
+ $.ajax({
+ url: path+'feed/data.json',
+ data: "&apikey="+apikey+"&id="+feedID+"&start="+start+"&end="+end+"&dp="+dp,
+ dataType: 'json',
+ async: false,
+ success: function(datain) { feedIn = datain; }
+ });
+ return feedIn;
+ }
+
+ //-------------------------------------------------------------------------------
+ // Get histogram data
+ //-------------------------------------------------------------------------------
+ function get_histogram_data(feedID,start,end)
+ {
+ var feedIn = [];
+ $.ajax({
+ url: path+'feed/histogram.json',
+ data: "&apikey="+apikey+"&id="+feedID+"&start="+start+"&end="+end,
+ dataType: 'json',
+ async: false,
+ success: function(datain) { feedIn = datain; }
+ });
+ return feedIn;
+ }
+
+ //-------------------------------------------------------------------------------
+ // Get kwh per day at power range
+ //-------------------------------------------------------------------------------
+ function get_kwhatpower(feedid,rmin,rmax)
+ {
+ var feedIn = [];
+ $.ajax({
+ url: path+'feed/kwhatpower.json',
+ data: "&apikey="+apikey+"&id="+feedid+"&min="+rmin+"&max="+rmax,
+ dataType: 'json',
+ async: false,
+ success: function(data_in) { feedIn = data_in; }
+ });
+ return feedIn;
+ }
+
+ //-------------------------------------------------------------------------------
+ // Get feed data
+ //-------------------------------------------------------------------------------
+ function get_multigraph(apikey)
+ {
+ var feedlist = [];
+ $.ajax({
+ type: "GET",
+ url: path+"vis/multigraphget.json?apikey="+apikey, //+apikey_write,
+ async: false,
+ dataType: 'json',
+ success: function(data){feedlist = data;}
+ });
+ return feedlist;
+ }
+
+ //-------------------------------------------------------------------------------
+ // Get feed data
+ //-------------------------------------------------------------------------------
+ function save_multigraph(write_apikey,feedlist)
+ {
+ var feedlist_save = eval(JSON.stringify(feedlist));
+ for(var i in feedlist_save) { feedlist_save[i].plot.data = null; }
+
+ $.ajax({
+ type: "POST",
+ url: path+"vis/multigraphsave.json?apikey="+write_apikey,
+ data: "&data="+JSON.stringify(feedlist_save),
+ success: function(msg) {console.log(msg);}
+ });
+ }
diff --git a/Modules/vis/visualisations/common/daysmonthsyears.js b/Modules/vis/visualisations/common/daysmonthsyears.js
new file mode 100644
index 000000000..fafaebf1b
--- /dev/null
+++ b/Modules/vis/visualisations/common/daysmonthsyears.js
@@ -0,0 +1,137 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+ function get_range(data,start,end)
+ {
+ var gdata = [];
+ for (var z in data) //for all variables
+ {
+ if (data[z][0] >= start && data[z][0] < end) gdata[z] = data[z];
+ }
+ return gdata;
+ }
+
+ function get_days_month(data,month,year)
+ {
+ return get_range(data,Date.UTC(year,month,0),Date.UTC(year,month+1,0));
+ }
+
+ function get_last_30days(data)
+ {
+ var d = new Date();
+ var s = d - (3600000*24*30);
+ return get_range(data,s,d);
+ }
+
+
+ function get_months(data)
+ {
+ var gdata = [];
+ gdata.data = [];
+ gdata.days =[];
+
+ var sum=0, s=0, i=0;
+ var lmonth=0,month=0,year;
+ var tmp = []
+ var d = new Date();
+
+ for (var z in data)
+ {
+ lmonth = month;
+
+ d.setTime(data[z][0]);
+ month = d.getMonth();
+ year = d.getFullYear();
+
+ if (month!=lmonth && z!=0)
+ {
+ var tmp = [];
+ tmp[0] = Date.UTC(year,month+1,1);
+ tmp[1] = sum; ///daysInMonth(month-1, year);
+
+ gdata.data[i] = tmp;
+ gdata.days[i] = s;
+ i++;
+ sum = 0; s = 0;
+ }
+
+ sum += parseFloat(data[z][1]);
+ s++;
+
+ }
+
+ var tmp = [];
+ tmp[0] = Date.UTC(year,month,1);
+ tmp[1] = sum; ///daysInMonth(month, year);
+
+ gdata.data[i] = tmp;
+ gdata.days[i] = s;
+
+ return gdata;
+ }
+
+ function get_months_year(data,year)
+ {
+ data = get_range(data,Date.UTC(year,0,1),Date.UTC(year+1,0,1));
+ return get_months(data);
+ }
+
+ function get_years(data)
+ {
+ var gdata = [];
+ gdata.data = [];
+ gdata.days =[];
+
+
+ var sum=0, s=0, i=0;
+ var lyear=0,year=0;
+ var tmp = []
+ var d = new Date();
+
+ for (var z in data)
+ {
+ if (data[z][0]>1000000){
+ lyear = year;
+
+ d.setTime(data[z][0]); // Get the date of the day
+ year = d.getFullYear(); // Get the year of the day
+ console.log(data[z][0]);
+ if (year!=lyear && z!=0) // We sum all days until we find a new year
+ {
+ var tmp = [];
+ tmp[0] = Date.UTC(year+1,6,1);
+ tmp[1] = sum;
+
+ gdata.data[i] = tmp;
+ gdata.days[i] = s;
+ i++;
+ sum = 0; s = 0;
+ }
+
+ sum += parseFloat(data[z][1]); // Add the day kwh/d value to the sum
+ s++; // Sum count
+ }
+
+ }
+
+ var tmp = [];
+ tmp[0] = Date.UTC(year,6,1);
+ tmp[1] = sum;
+
+ gdata.data[i] = tmp;
+ gdata.days[i] = s;
+
+ return gdata;
+ }
+
+
+ function daysInMonth(iMonth, iYear)
+ {
+ return 32 - new Date(iYear, iMonth, 32).getDate();
+ }
diff --git a/Modules/vis/visualisations/common/inst.js b/Modules/vis/visualisations/common/inst.js
new file mode 100644
index 000000000..7e71ffebc
--- /dev/null
+++ b/Modules/vis/visualisations/common/inst.js
@@ -0,0 +1,59 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+
+
+ function inst_zoomout()
+ {
+ var time_window = end - start;
+ var middle = start + time_window / 2;
+ time_window = time_window * 2; // SCALE
+ start = middle - (time_window/2);
+ end = middle + (time_window/2);
+ timeWindowChanged = 1;
+ }
+
+
+ function inst_zoomin()
+ {
+ var time_window = end - start;
+ var middle = start + time_window / 2;
+ time_window = time_window * 0.5; // SCALE
+ start = middle - (time_window/2);
+ end = middle + (time_window/2);
+ timeWindowChanged = 1;
+ }
+
+ function inst_panright()
+ {
+ var laststart = start; var lastend = end;
+ var timeWindow = (end-start);
+ var shiftsize = timeWindow * 0.2;
+ start += shiftsize;
+ end += shiftsize;
+ timeWindowChanged = 1;
+ }
+
+ function inst_panleft()
+ {
+ var laststart = start; var lastend = end;
+ var timeWindow = (end-start);
+ var shiftsize = timeWindow * 0.2;
+ start -= shiftsize;
+ end -= shiftsize;
+ timeWindowChanged = 1;
+ }
+
+ function inst_timewindow(time)
+ {
+ start = ((new Date()).getTime())-(3600000*24*time); //Get start time
+ end = (new Date()).getTime(); //Get end time
+ timeWindowChanged = 1;
+ movingtime = 1;
+ }
diff --git a/Modules/vis/visualisations/common/proc.js b/Modules/vis/visualisations/common/proc.js
new file mode 100644
index 000000000..c1a9fcc43
--- /dev/null
+++ b/Modules/vis/visualisations/common/proc.js
@@ -0,0 +1,22 @@
+
+function power_stats(data)
+{
+ var npoints = 0;
+
+ var stats = [];
+ stats['average'] = 0;
+ stats['kwh'] = 0;
+
+ for (var i=1; i
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ +
| Date : | ' + d.toDateString() + ' |
|---|---|
| Energy : | ' + parseFloat(kwhd).toFixed(2) + ' kWh/d |
| Cost : | '+ parseFloat(kwhd * price).toFixed(2) + currency + '/d, ' + parseFloat(kwhd * price * 365).toFixed(0) + currency + '/y |
Comparison
'; + out += '' + result + 'kWh
'; + out += '' + result2 + currency + '/d ('; + out += parseFloat(result2 * 365).toFixed(0) + currency + '/y)
kWh/d Comparison
+ + + + + + diff --git a/Modules/vis/visualisations/dailyhistogram/dailyhistogram.php b/Modules/vis/visualisations/dailyhistogram/dailyhistogram.php new file mode 100644 index 000000000..8bb8ad888 --- /dev/null +++ b/Modules/vis/visualisations/dailyhistogram/dailyhistogram.php @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + +Daily Histogram
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/dailyhistogram/graphs.js b/Modules/vis/visualisations/dailyhistogram/graphs.js
new file mode 100644
index 000000000..94ec69b60
--- /dev/null
+++ b/Modules/vis/visualisations/dailyhistogram/graphs.js
@@ -0,0 +1,56 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+
+ //--------------------------------------------------------------
+ // Bar graph
+ //--------------------------------------------------------------
+ function bargraph(data,barwidth,mode)
+ {
+ $.plot($("#placeholder"), [{color: "#0096ff", data: data}],
+ {
+ bars: { show: true,align: "center",barWidth: (barwidth*1000),fill: true },
+ grid: { show: true, hoverable: true, clickable: true },
+ xaxis: { mode: "time", localTimezone: true, minTickSize: [1, mode], tickLength: 1}
+ });
+ }
+
+ function instgraph(data)
+ {
+ $.plot($("#placeholder"), [{color: "#0096ff", data: data}],
+ {
+ lines: { show: true, fill: true },
+ grid: { show: true, hoverable: true },
+ xaxis: { mode: "time" , localTimezone: true, min: start, max: end },
+ selection: { mode: "x"}
+ });
+ }
+
+ function plotHistogram(data, start, end)
+ {
+ barwidth = 50;
+ $.plot(placeholder,[
+ {
+ color: "#0096ff",
+ data: data , //data
+ //lines: { show: true, fill: true } //style
+ bars: { show: true,align: "center",barWidth: barwidth,fill: true }
+ }], {
+ xaxis: { mode: null },
+ grid: { show: true, hoverable: true, clickable: true },
+ selection: { mode: "xy" }
+ } );
+ }
+
+
+
+
+
+
+
diff --git a/Modules/vis/visualisations/dailyhistogram/view.js b/Modules/vis/visualisations/dailyhistogram/view.js
new file mode 100644
index 000000000..473ea96d2
--- /dev/null
+++ b/Modules/vis/visualisations/dailyhistogram/view.js
@@ -0,0 +1,99 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+
+ function set_daily_view()
+ {
+ $('#inst-buttons').hide();
+ bargraph(days,3600*22,"day");
+ $("#out").html(""); view = 2;
+ $("#return").val("View: monthly view");
+ $("#out2").html("Daily view");
+ $('#axislabely').html("Energy (Hover for info, press to zoom in. Histogram:
+ )
+
+ + + +
+
Date / Time
+ +
+
+
+
+
+
+ (kWh)"); + $("#bot_out").html(bot_kwhd_text); + $("#enableHistogram").show(); + } + + function set_monthly_view() + { + bargraph(months.data,3600*24*20, "month"); + $("#out").html(""); view = 1; + $("#return").val("View: annual view"); + $("#out2").html("Monthly view"); + $('#axislabely').html("Energy
(kWh)"); + $("#return_ctr").show(); + $("#enableHistogram").show(); + } + + function set_annual_view() + { + bargraph(years.data,3600*24*330, "year"); + $("#out").html(""); view = 0; + $("#out2").html("Annual view"); + $('#axislabely').html("Energy
(kWh)"); + $("#return_ctr").hide(); + $("#enableHistogram").show(); + } + + function set_last30days_view() + { + bargraph(days,3600*22, "day"); + $("#out").html(""); view = 2; + $("#return").val("View: monthly view"); + $("#out2").html("Last 30 days"); + $('#axislabely').html("Energy
(kWh)"); + $("#bot_out").html(bot_kwhd_text); + $("#enableHistogram").show(); + } + + //-------------------------------------------------------------------------- + // Inst graphing + //-------------------------------------------------------------------------- + function set_inst_view(day) + { + start = day; end = day + 3600000 * 24; + + vis_feed_data(); + view = 3; + $("#out2").html("Power view"); + $("#return").val("View: daily view"); + $('#axislabely').html("Power
(Watts)"); + $('#inst-buttons').show(); + $("#enableHistogram").show(); + } + + //-------------------------------------------------------------------------- + // Histogram graphing + //-------------------------------------------------------------------------- + function set_histogram_view(start, end) + { + $('#loading').show(); + //$("#out").html("Loading..."); + + //start = day; + //end = day + 3600000 * 24; + // vis_feed_data(apikey,whw,start,end,1); + + last_view = view; + view = 5; + var ret; + if (last_view==0) ret = "annual"; + if (last_view==1) ret = "monthly"; + if (last_view==2) ret = "daily"; + if (last_view==3) ret = "daily"; + $("#out2").html("Histogram "+ret); + //$("#return").val("View: back"); + $("#return").val("View: "+ret); + $('#axislabely').html("Energy
(kWh)"); + $('#axislabelx').html("Watts"); + $('#inst-buttons').hide(); + $("#return_ctr").show(); + $("#enableHistogram").hide(); + //$('#enableHistogram').removeAttr('checked'); + } diff --git a/Modules/vis/visualisations/edit.php b/Modules/vis/visualisations/edit.php new file mode 100644 index 000000000..3c955c906 --- /dev/null +++ b/Modules/vis/visualisations/edit.php @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + +
Datapoint editor:
+Click on a datapoint to select, then in the edit box below the graph enter in the new value. You can also add another datapoint by changing the time to a point in time that does not yet have a datapoint.
+ + +
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ +
+ Edit feed_ @ time: new value:
+
+
+
+
+
+
diff --git a/Modules/vis/visualisations/histgraph.php b/Modules/vis/visualisations/histgraph.php
new file mode 100644
index 000000000..db96c5b8d
--- /dev/null
+++ b/Modules/vis/visualisations/histgraph.php
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+Histogram:
+ + +
+
+
+
+
diff --git a/Modules/vis/visualisations/multigraph.php b/Modules/vis/visualisations/multigraph.php
new file mode 100644
index 000000000..6fff05680
--- /dev/null
+++ b/Modules/vis/visualisations/multigraph.php
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
++
Multigraph
+ + +
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ + + + + + + diff --git a/Modules/vis/visualisations/multigraph_manual.php b/Modules/vis/visualisations/multigraph_manual.php new file mode 100644 index 000000000..f957ee1a7 --- /dev/null +++ b/Modules/vis/visualisations/multigraph_manual.php @@ -0,0 +1,153 @@ + + + + + + + + + + + + + +
Multigraph
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/orderbars.php b/Modules/vis/visualisations/orderbars.php
new file mode 100644
index 000000000..3826cd8d5
--- /dev/null
+++ b/Modules/vis/visualisations/orderbars.php
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ Bar graph (ordered by height):
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/orderthreshold.php b/Modules/vis/visualisations/orderthreshold.php
new file mode 100644
index 000000000..acec1ceca
--- /dev/null
+++ b/Modules/vis/visualisations/orderthreshold.php
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++
Threshold Order
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/rawdata.php b/Modules/vis/visualisations/rawdata.php
new file mode 100644
index 000000000..414e5fdce
--- /dev/null
+++ b/Modules/vis/visualisations/rawdata.php
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++
Raw data:
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/realtime.php b/Modules/vis/visualisations/realtime.php
new file mode 100644
index 000000000..469e49a94
--- /dev/null
+++ b/Modules/vis/visualisations/realtime.php
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ +
Realtime data:
+ + +
+
+
+
+
+
+
+
diff --git a/Modules/vis/visualisations/simplezoom.php b/Modules/vis/visualisations/simplezoom.php
new file mode 100644
index 000000000..734433f63
--- /dev/null
+++ b/Modules/vis/visualisations/simplezoom.php
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Simpler kWh/d zoomer
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/smoothie/smoothie.js b/Modules/vis/visualisations/smoothie/smoothie.js
new file mode 100644
index 000000000..250e4e455
--- /dev/null
+++ b/Modules/vis/visualisations/smoothie/smoothie.js
@@ -0,0 +1,301 @@
+// MIT License:
+//
+// Copyright (c) 2010-2011, Joe Walnes
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+/**
+ * Smoothie Charts - http://smoothiecharts.org/
+ * (c) 2010-2012, Joe Walnes
+ *
+ * v1.0: Main charting library, by Joe Walnes
+ * v1.1: Auto scaling of axis, by Neil Dunn
+ * v1.2: fps (frames per second) option, by Mathias Petterson
+ * v1.3: Fix for divide by zero, by Paul Nikitochkin
+ * v1.4: Set minimum, top-scale padding, remove timeseries, add optional timer to reset bounds, by Kelley Reynolds
+ * v1.5: Set default frames per second to 50... smoother.
+ * .start(), .stop() methods for conserving CPU, by Dmitry Vyal
+ * options.iterpolation = 'bezier' or 'line', by Dmitry Vyal
+ * options.maxValue to fix scale, by Dmitry Vyal
+ * v1.6: minValue/maxValue will always get converted to floats, by Przemek Matylla
+ * v1.7: options.grid.fillStyle may be a transparent color, by Dmitry A. Shashkin
+ * Smooth rescaling, by Kostas Michalopoulos
+ */
+
+function TimeSeries(options) {
+ options = options || {};
+ options.resetBoundsInterval = options.resetBoundsInterval || 3000; // Reset the max/min bounds after this many milliseconds
+ options.resetBounds = options.resetBounds || false; // Enable or disable the resetBounds timer
+ this.options = options;
+ this.data = [];
+
+ this.maxValue = Number.NaN; // The maximum value ever seen in this time series.
+ this.minValue = Number.NaN; // The minimum value ever seen in this time series.
+
+ // Start a resetBounds Interval timer desired
+ if (options.resetBounds) {
+ this.boundsTimer = setInterval(function(thisObj) { thisObj.resetBounds(); }, options.resetBoundsInterval, this);
+ }
+}
+
+// Reset the min and max for this timeseries so the graph rescales itself
+TimeSeries.prototype.resetBounds = function() {
+ this.maxValue = Number.NaN;
+ this.minValue = Number.NaN;
+ for (var i = 0; i < this.data.length; i++) {
+ this.maxValue = !isNaN(this.maxValue) ? Math.max(this.maxValue, this.data[i][1]) : this.data[i][1];
+ this.minValue = !isNaN(this.minValue) ? Math.min(this.minValue, this.data[i][1]) : this.data[i][1];
+ }
+};
+
+TimeSeries.prototype.append = function(timestamp, value) {
+ this.data.push([timestamp, value]);
+ this.maxValue = !isNaN(this.maxValue) ? Math.max(this.maxValue, value) : value;
+ this.minValue = !isNaN(this.minValue) ? Math.min(this.minValue, value) : value;
+};
+
+function SmoothieChart(options) {
+ // Defaults
+ options = options || {};
+ options.grid = options.grid || { fillStyle:'#000000', strokeStyle: '#777777', lineWidth: 1, millisPerLine: 1000, verticalSections: 2 };
+ options.millisPerPixel = options.millisPerPixel || 20;
+ options.fps = options.fps || 50;
+ options.maxValueScale = options.maxValueScale || 1;
+ options.minValue = options.minValue;
+ options.maxValue = options.maxValue;
+ options.labels = options.labels || { fillStyle:'#ffffff' };
+ options.interpolation = options.interpolation || "bezier";
+ options.scaleSmoothing = options.scaleSmoothing || 0.125;
+ this.options = options;
+ this.seriesSet = [];
+ this.currentValueRange = 1;
+ this.currentVisMinValue = 0;
+}
+
+SmoothieChart.prototype.addTimeSeries = function(timeSeries, options) {
+ this.seriesSet.push({timeSeries: timeSeries, options: options || {}});
+};
+
+SmoothieChart.prototype.removeTimeSeries = function(timeSeries) {
+ this.seriesSet.splice(this.seriesSet.indexOf(timeSeries), 1);
+};
+
+SmoothieChart.prototype.streamTo = function(canvas, delay) {
+ var self = this;
+ this.render_on_tick = function() {
+ self.render(canvas, new Date().getTime() - (delay || 0));
+ };
+
+ this.start();
+};
+
+SmoothieChart.prototype.start = function() {
+ if (!this.timer)
+ this.timer = setInterval(this.render_on_tick, 1000/this.options.fps);
+};
+
+SmoothieChart.prototype.stop = function() {
+ if (this.timer) {
+ clearInterval(this.timer);
+ this.timer = undefined;
+ }
+};
+
+SmoothieChart.prototype.render = function(canvas, time) {
+ var canvasContext = canvas.getContext("2d");
+ var options = this.options;
+ var dimensions = {top: 0, left: 0, width: canvas.clientWidth, height: canvas.clientHeight};
+
+ // Save the state of the canvas context, any transformations applied in this method
+ // will get removed from the stack at the end of this method when .restore() is called.
+ canvasContext.save();
+
+ // Round time down to pixel granularity, so motion appears smoother.
+ time = time - time % options.millisPerPixel;
+
+ // Move the origin.
+ canvasContext.translate(dimensions.left, dimensions.top);
+
+ // Create a clipped rectangle - anything we draw will be constrained to this rectangle.
+ // This prevents the occasional pixels from curves near the edges overrunning and creating
+ // screen cheese (that phrase should neeed no explanation).
+ canvasContext.beginPath();
+ canvasContext.rect(0, 0, dimensions.width, dimensions.height);
+ canvasContext.clip();
+
+ // Clear the working area.
+ canvasContext.save();
+ canvasContext.fillStyle = options.grid.fillStyle;
+ canvasContext.clearRect(0, 0, dimensions.width, dimensions.height);
+ canvasContext.fillRect(0, 0, dimensions.width, dimensions.height);
+ canvasContext.restore();
+
+ // Grid lines....
+ canvasContext.save();
+ canvasContext.lineWidth = options.grid.lineWidth || 1;
+ canvasContext.strokeStyle = options.grid.strokeStyle || '#ffffff';
+ // Vertical (time) dividers.
+ if (options.grid.millisPerLine > 0) {
+ for (var t = time - (time % options.grid.millisPerLine); t >= time - (dimensions.width * options.millisPerPixel); t -= options.grid.millisPerLine) {
+ canvasContext.beginPath();
+ var gx = Math.round(dimensions.width - ((time - t) / options.millisPerPixel));
+ canvasContext.moveTo(gx, 0);
+ canvasContext.lineTo(gx, dimensions.height);
+ canvasContext.stroke();
+ canvasContext.closePath();
+ }
+ }
+
+ // Horizontal (value) dividers.
+ for (var v = 1; v < options.grid.verticalSections; v++) {
+ var gy = Math.round(v * dimensions.height / options.grid.verticalSections);
+ canvasContext.beginPath();
+ canvasContext.moveTo(0, gy);
+ canvasContext.lineTo(dimensions.width, gy);
+ canvasContext.stroke();
+ canvasContext.closePath();
+ }
+ // Bounding rectangle.
+ canvasContext.beginPath();
+ canvasContext.strokeRect(0, 0, dimensions.width, dimensions.height);
+ canvasContext.closePath();
+ canvasContext.restore();
+
+ // Calculate the current scale of the chart, from all time series.
+ var maxValue = Number.NaN;
+ var minValue = Number.NaN;
+
+ for (var d = 0; d < this.seriesSet.length; d++) {
+ // TODO(ndunn): We could calculate / track these values as they stream in.
+ var timeSeries = this.seriesSet[d].timeSeries;
+ if (!isNaN(timeSeries.maxValue)) {
+ maxValue = !isNaN(maxValue) ? Math.max(maxValue, timeSeries.maxValue) : timeSeries.maxValue;
+ }
+
+ if (!isNaN(timeSeries.minValue)) {
+ minValue = !isNaN(minValue) ? Math.min(minValue, timeSeries.minValue) : timeSeries.minValue;
+ }
+ }
+
+ if (isNaN(maxValue) && isNaN(minValue)) {
+ return;
+ }
+
+ // Scale the maxValue to add padding at the top if required
+ if (options.maxValue != null)
+ maxValue = options.maxValue;
+ else
+ maxValue = maxValue * options.maxValueScale;
+ // Set the minimum if we've specified one
+ if (options.minValue != null)
+ minValue = options.minValue;
+ var targetValueRange = maxValue - minValue;
+ this.currentValueRange += options.scaleSmoothing*(targetValueRange - this.currentValueRange);
+ this.currentVisMinValue += options.scaleSmoothing*(minValue - this.currentVisMinValue);
+ var valueRange = this.currentValueRange;
+ var visMinValue = this.currentVisMinValue;
+
+ // For each data set...
+ for (var d = 0; d < this.seriesSet.length; d++) {
+ canvasContext.save();
+ var timeSeries = this.seriesSet[d].timeSeries;
+ var dataSet = timeSeries.data;
+ var seriesOptions = this.seriesSet[d].options;
+
+ // Delete old data that's moved off the left of the chart.
+ // We must always keep the last expired data point as we need this to draw the
+ // line that comes into the chart, but any points prior to that can be removed.
+ while (dataSet.length >= 2 && dataSet[1][0] < time - (dimensions.width * options.millisPerPixel)) {
+ dataSet.splice(0, 1);
+ }
+
+ // Set style for this dataSet.
+ canvasContext.lineWidth = seriesOptions.lineWidth || 1;
+ canvasContext.fillStyle = seriesOptions.fillStyle;
+ canvasContext.strokeStyle = seriesOptions.strokeStyle || '#ffffff';
+ // Draw the line...
+ canvasContext.beginPath();
+ // Retain lastX, lastY for calculating the control points of bezier curves.
+ var firstX = 0, lastX = 0, lastY = 0;
+ for (var i = 0; i < dataSet.length; i++) {
+ // TODO: Deal with dataSet.length < 2.
+ var x = Math.round(dimensions.width - ((time - dataSet[i][0]) / options.millisPerPixel));
+ var value = dataSet[i][1];
+ var offset = value - visMinValue;
+ var scaledValue = dimensions.height - (valueRange ? Math.round((offset / valueRange) * dimensions.height) : 0);
+ var y = Math.max(Math.min(scaledValue, dimensions.height - 1), 1); // Ensure line is always on chart.
+
+ if (i == 0) {
+ firstX = x;
+ canvasContext.moveTo(x, y);
+ }
+ // Great explanation of Bezier curves: http://en.wikipedia.org/wiki/B�zier_curve#Quadratic_curves
+ //
+ // Assuming A was the last point in the line plotted and B is the new point,
+ // we draw a curve with control points P and Q as below.
+ //
+ // A---P
+ // |
+ // |
+ // |
+ // Q---B
+ //
+ // Importantly, A and P are at the same y coordinate, as are B and Q. This is
+ // so adjacent curves appear to flow as one.
+ //
+ else {
+ switch (options.interpolation) {
+ case "line":
+ canvasContext.lineTo(x,y);
+ break;
+ case "bezier":
+ default:
+ canvasContext.bezierCurveTo( // startPoint (A) is implicit from last iteration of loop
+ Math.round((lastX + x) / 2), lastY, // controlPoint1 (P)
+ Math.round((lastX + x)) / 2, y, // controlPoint2 (Q)
+ x, y); // endPoint (B)
+ break;
+ }
+ }
+
+ lastX = x, lastY = y;
+ }
+ if (dataSet.length > 0 && seriesOptions.fillStyle) {
+ // Close up the fill region.
+ canvasContext.lineTo(dimensions.width + seriesOptions.lineWidth + 1, lastY);
+ canvasContext.lineTo(dimensions.width + seriesOptions.lineWidth + 1, dimensions.height + seriesOptions.lineWidth + 1);
+ canvasContext.lineTo(firstX, dimensions.height + seriesOptions.lineWidth);
+ canvasContext.fill();
+ }
+ canvasContext.stroke();
+ canvasContext.closePath();
+ canvasContext.restore();
+ }
+
+ // Draw the axis values on the chart.
+ if (!options.labels.disabled) {
+ canvasContext.fillStyle = options.labels.fillStyle;
+ var maxValueString = parseFloat(maxValue).toFixed(2);
+ var minValueString = parseFloat(minValue).toFixed(2);
+ canvasContext.fillText(maxValueString, dimensions.width - canvasContext.measureText(maxValueString).width - 2, 10);
+ canvasContext.fillText(minValueString, dimensions.width - canvasContext.measureText(minValueString).width - 2, dimensions.height - 2);
+ }
+
+ canvasContext.restore(); // See .save() above.
+}
diff --git a/Modules/vis/visualisations/smoothie/smoothie.php b/Modules/vis/visualisations/smoothie/smoothie.php
new file mode 100644
index 000000000..2757f0b16
--- /dev/null
+++ b/Modules/vis/visualisations/smoothie/smoothie.php
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+ +
Smoothie
+
+
+
+
+
+
+
diff --git a/Modules/vis/visualisations/stacked.php b/Modules/vis/visualisations/stacked.php
new file mode 100644
index 000000000..e1563c06a
--- /dev/null
+++ b/Modules/vis/visualisations/stacked.php
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Stacked
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/threshold.php b/Modules/vis/visualisations/threshold.php
new file mode 100644
index 000000000..ffc1a65d8
--- /dev/null
+++ b/Modules/vis/visualisations/threshold.php
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++
Threshold
+ + +
+
+
+
+
+
diff --git a/Modules/vis/visualisations/zoom/graphs.js b/Modules/vis/visualisations/zoom/graphs.js
new file mode 100644
index 000000000..cfa144422
--- /dev/null
+++ b/Modules/vis/visualisations/zoom/graphs.js
@@ -0,0 +1,40 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+
+ //--------------------------------------------------------------
+ // Bar graph
+ //--------------------------------------------------------------
+ function bargraph(data,barwidth,mode)
+ {
+ $.plot($("#placeholder"), [{color: "#0096ff", data: data}],
+ {
+ bars: { show: true,align: "center",barWidth: (barwidth*1000),fill: true },
+ grid: { show: true, hoverable: true, clickable: true },
+ xaxis: { mode: "time", localTimezone: true, minTickSize: [1, mode], tickLength: 1}
+ });
+ }
+
+ function instgraph(data)
+ {
+ $.plot($("#placeholder"), [{color: "#0096ff", data: data}],
+ {
+ lines: { show: true, fill: true },
+ grid: { show: true, hoverable: true },
+ xaxis: { mode: "time" , localTimezone: true, min: start, max: end },
+ selection: { mode: "x"}
+ });
+ }
+
+
+
+
+
+
+
diff --git a/Modules/vis/visualisations/zoom/view.js b/Modules/vis/visualisations/zoom/view.js
new file mode 100644
index 000000000..99f96066d
--- /dev/null
+++ b/Modules/vis/visualisations/zoom/view.js
@@ -0,0 +1,65 @@
+ /*
+ All Emoncms code is released under the GNU Affero General Public License.
+ See COPYRIGHT.txt and LICENSE.txt.
+
+ ---------------------------------------------------------------------
+ Emoncms - open source energy visualisation
+ Part of the OpenEnergyMonitor project:
+ http://openenergymonitor.org
+ */
+
+ function set_daily_view()
+ {
+ $('#inst-buttons').hide();
+ bargraph(days,3600*22,"day");
+ $("#out").html(""); view = 2;
+ $("#return").val("View: monthly view");
+ $("#out2").html("Daily view");
+ $('#axislabely').html("Energy
+
+
+
+
+ |
+
+
+
+
+
+
+
+ (kWh)"); + $("#bot_out").html(bot_kwhd_text); + } + + function set_monthly_view() + { + bargraph(months.data,3600*24*20, "month"); + $("#out").html(""); view = 1; + $("#return").val("View: annual view"); + $("#out2").html("Monthly view"); + $('#axislabely').html("Energy
(kWh)"); + $("#return_ctr").show(); + } + + function set_annual_view() + { + bargraph(years.data,3600*24*330, "year"); + $("#out").html(""); view = 0; + $("#out2").html("Annual view"); + $('#axislabely').html("Energy
(kWh)"); + $("#return_ctr").hide(); + + } + + function set_last30days_view() + { + bargraph(days,3600*22, "day"); + $("#out").html(""); view = 2; + $("#return").val("View: monthly view"); + $("#out2").html("Last 30 days"); + $('#axislabely').html("Energy
(kWh)"); + $("#bot_out").html(bot_kwhd_text); + } + + //-------------------------------------------------------------------------- + // Inst graphing + //-------------------------------------------------------------------------- + function set_inst_view(day) + { + start = day; end = day + 3600000 * 24; + + vis_feed_data(); + view = 3; + $("#out2").html("Power view"); + $("#return").val("View: daily view"); + $('#axislabely').html("Power
(Watts)"); + $('#inst-buttons').show(); + } diff --git a/Modules/vis/visualisations/zoom/zoom.php b/Modules/vis/visualisations/zoom/zoom.php new file mode 100644 index 000000000..e596fedde --- /dev/null +++ b/Modules/vis/visualisations/zoom/zoom.php @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + +
kWh/d Zoomer
+ + +
+
+
+
+
+
diff --git a/Theme/basic/embed.php b/Theme/basic/embed.php
new file mode 100644
index 000000000..cbb836185
--- /dev/null
+++ b/Theme/basic/embed.php
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ : Hover on bar for info, press to zoom in
+ + + +
+
Date / Time
+ +
+
+
+
+
+
+
+
+
+
+
diff --git a/Theme/basic/emoncms logo off.png b/Theme/basic/emoncms logo off.png
new file mode 100644
index 000000000..ce6354fcc
Binary files /dev/null and b/Theme/basic/emoncms logo off.png differ
diff --git a/Theme/basic/emoncms logo.png b/Theme/basic/emoncms logo.png
new file mode 100644
index 000000000..8cde78715
Binary files /dev/null and b/Theme/basic/emoncms logo.png differ
diff --git a/Theme/basic/emoncms_logo.png b/Theme/basic/emoncms_logo.png
new file mode 100644
index 000000000..9e9ec132a
Binary files /dev/null and b/Theme/basic/emoncms_logo.png differ
diff --git a/Theme/basic/favicon.png b/Theme/basic/favicon.png
new file mode 100644
index 000000000..9fd33e9d8
Binary files /dev/null and b/Theme/basic/favicon.png differ
diff --git a/Theme/basic/ios_load.png b/Theme/basic/ios_load.png
new file mode 100644
index 000000000..997356e76
Binary files /dev/null and b/Theme/basic/ios_load.png differ
diff --git a/Theme/basic/logo_normal.png b/Theme/basic/logo_normal.png
new file mode 100644
index 000000000..839830d64
Binary files /dev/null and b/Theme/basic/logo_normal.png differ
diff --git a/Theme/basic/menu_view.php b/Theme/basic/menu_view.php
new file mode 100644
index 000000000..fb1ae894f
--- /dev/null
+++ b/Theme/basic/menu_view.php
@@ -0,0 +1,34 @@
+
+
+
+
+
diff --git a/Theme/basic/style.css b/Theme/basic/style.css
new file mode 100644
index 000000000..2db7af57f
--- /dev/null
+++ b/Theme/basic/style.css
@@ -0,0 +1,760 @@
+/*
+ * Style Sheet
+ *
+ * e3top-menu top dashboards menu
+ * e3header top header dashboards menu
+ */
+
+html, body {
+ margin: 0;
+ padding: 0;
+ font-family: Helvetica, Arial, sans-serif;
+ height: 100%;
+ font-weight: normal;
+ font-size: 14px;
+ line-height: 1.6;
+ color: #333;
+ background: none repeat scroll 0 0 #FBFBFB;
+}
+
+.wrapper {
+ min-height: 100%;
+ height: auto !important;
+ height: 100%;
+ margin: 0 auto -37px;
+}
+
+.widget-container {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ margin: 0px;
+ padding: 20px;
+}
+
+.widget-container-nc {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ float: left;
+ margin: 0px;
+ padding: 20px;
+}
+
+.widget-container-v {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ width: 200px;
+ float: left;
+ margin-left: 20px;
+ padding: 5px;
+}
+
+.widget-container-h {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ height: 200px;
+ margin: 0px;
+ padding: 10px;
+}
+
+.widget {
+ width: 200px;
+ height: 200px;
+ float: left;
+ text-align: center;
+ position: relative;
+}
+
+.title {
+ width: 100%;
+ padding: 0px;
+ margin-top: 15px;
+ margin-bottom: 15px;
+ text-align: center;
+ font-size: 22px;
+ font-weight: bold;
+}
+
+.title-left {
+
+ padding: 12px;
+ text-align: left;
+ font-size: 22px;
+ font-weight: bold;
+}
+
+.dial {
+ padding: 0px;
+}
+
+.led {
+ padding: 0px;
+}
+
+.stats {
+ width: 100%;
+ height: 200px;
+ padding: 0px;
+ margin-top: 15px;
+ text-align: center;
+}
+
+.value {
+ color: #33a4d9;
+ font-size: 22px;
+ font-weight: bold;
+ margin-top: 2px;
+ margin-bottom: 5px;
+}
+
+.widget_H {
+ border: 1px solid #CCC;
+ height: 200px;
+ float: left;
+ background-color: #eee;
+ margin: 5px;
+ padding: 5px;
+}
+
+.header {
+ border: 1px solid #2A2A2A;
+ background-color: #464646;
+ background-image: -ms-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -moz-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -o-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));
+ background-image: -webkit-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: linear-gradient(bottom,#373737,#464646 5px);
+ color: #CCCCCC;
+ direction: ltr;
+ font: 13px/28px sans-serif;
+ height: 28px;
+ left: 0;
+ min-width: 600px;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ z-index: 100;
+}
+
+.header h1 {
+ text-align: center;
+ font-size: 16px;
+}
+
+.e3header {
+ border: 1px solid #2A2A2A;
+ background-color: #464646;
+ background-image: -ms-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -moz-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -o-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: -webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));
+ background-image: -webkit-linear-gradient(bottom,#373737,#464646 5px);
+ background-image: linear-gradient(bottom,#373737,#464646 5px);
+ color: #CCCCCC;
+ direction: ltr;
+ font: 13px/28px sans-serif;
+ height: 28px;
+ left: 0;
+ min-width: 600px;
+ position: top; /*fixed;*/
+ top: 100;
+ width: 100%;
+ z-index: 100;
+}
+
+.footer {
+ text-align: center;
+ padding-top: 4px;
+ font-size: 13px;
+ font-weight: bold;
+}
+
+.footer a {
+ color: #77b4d9;
+ text-decoration: none;
+}
+
+.button {
+ text-align: center;
+ cursor: pointer;
+ margin: .5em 5px;
+ padding: .6em 25px;
+ -webkit-border-radius: 1em;
+ border-radius: 1em;
+ -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.3);
+ box-shadow: 0 1px 4px rgba(0,0,0,.3);
+ text-decoration: none;
+ border: 1px solid #CCC;
+ background: #EEE;
+ font-weight: bold;
+ color: #444;
+ text-shadow: 0 1px 1px #F6F6F6;
+ background-image: -webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+ background-image: -webkit-linear-gradient(#fdfdfd,#eee);
+ background-image: -moz-linear-gradient(#fdfdfd,#eee);
+ background-image: -ms-linear-gradient(#fdfdfd,#eee);
+ background-image: -o-linear-gradient(#fdfdfd,#eee);
+ background-image: linear-gradient(#fdfdfd,#eee);
+}
+
+.button:hover {
+ background-image: -webkit-linear-gradient(#eee,#ddd);
+}
+
+input.nobox {
+ width: 100px;
+ text-align: right;
+ color: #F78623;
+ font-weight: bold;
+ border: none;
+ border-bottom: 1px solid #AAA;
+ font-size: 16px;
+ background: none;
+}
+
+.inp01 {
+ text-align: left;
+ color: #F78623;
+ border: 1px solid #DDD;
+ font-size: 16px;
+ padding: 5px;
+ background-color: rgb(250,250,250);
+ margin-top: 2px
+}
+
+.button04 {
+ border: 1px solid #c86106;
+ color: white;
+ text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+ background-color: #F78623;
+ font-weight: bold;
+ border-radius: 2px;
+ line-height: 18px;
+ padding: 0 8px;
+ cursor: pointer
+}
+
+.button05 {
+ border: 1px solid #22a4d9;
+ color: white;
+ text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+ background-color: #33a4d9;
+ font-weight: bold;
+ border-radius: 2px;
+ line-height: 22px;
+ padding: 0 8px;
+ cursor: pointer
+}
+
+.button05:active {
+ background-color: #45abdb;
+}
+
+.button06 {
+ border: 1px solid #22a4d9;
+ color: white;
+ text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+ background-color: #33a4d9;
+ font-weight: bold;
+ border-radius: 2px;
+ line-height: 45px;
+ padding: 0 16px;
+ width: 130px;
+ cursor: pointer
+}
+
+.buttonlistctrl {
+ width : 20px;
+ height : 20px;
+ border: none;
+ color: transparent;
+ font-size: 0;
+ float: left;
+ padding: 0px;
+ margin: 3px;
+ display: inline;
+}
+
+table.catlist {
+ width: 100%;
+ border: 1px solid #DFDFDF;
+ border-radius: 3px 3px 0px 0px;
+ margin: 0px;
+ border-spacing: 0;
+ border-bottom: 0px;
+}
+
+table.catlist th {
+ border: 0px;
+ padding: 5px;
+ margin: 0px;
+ background-color: #F1F1F1;
+ background-image: -ms-linear-gradient(top,#F9F9F9,#ECECEC);
+ background-image: -moz-linear-gradient(top,#F9F9F9,#ECECEC);
+ background-image: -o-linear-gradient(top,#F9F9F9,#ECECEC);
+ background-image: -webkit-gradient(linear,left top,left bottom,from(#F9F9F9),to(#ECECEC));
+ background-image: -webkit-linear-gradient(top,#F9F9F9,#ECECEC);
+ background-image: linear-gradient(top,#F9F9F9,#ECECEC);
+ border-bottom: 1px solid #DFDFDF;
+ border-top: 1px solid #DFDFDF;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
+}
+
+table.catlist td {
+ border: 0px;
+ padding: 5px;
+ margin: 0px;
+ line-height: 35px;
+ text-align: center;
+}
+
+table.catlist tr.d0 td {
+ background-color: #f9f9f9;
+ border-bottom: 1px solid #DFDFDF;
+ border-top: 1px solid #FFFFFF;
+}
+
+table.catlist tr.d1 td {
+ background-color: #fcfcfc;
+ border-bottom: 1px solid #DFDFDF;
+ border-top: 1px solid #FFFFFF;
+}
+
+table.catlist th:first-of-type {
+ border-top-left-radius: 3px;
+}
+
+table.catlist th:last-of-type {
+ border-top-right-radius: 3px;
+}
+
+#message {
+ border: 1px solid #22a4d9b;
+ color: white;
+ text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+ background-color: #33a4d9;
+ font-weight: bold;
+ line-height: 24px;
+ padding: 0 8px;
+ cursor: pointer
+}
+
+.login-container {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ font-weight: normal;
+ margin-left: 8px;
+ padding: 26px 24px 46px;
+ max-width: 350px;
+ margin-right: 20px;
+ font-family: sans-serif;
+ font-size: 14px;
+ color: #777777;
+}
+
+#top-menu {
+ display: block;
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+}
+
+#top-menu li {
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+ border-right: 1px solid #555555;
+ float: left;
+}
+
+#top-menu li:hover {
+ background-color: #3A3A3A;
+ background-image: -moz-linear-gradient(center bottom , #3A3A3A, #222222);
+ color: #FAFAFA;
+}
+
+#top-menu li a {
+ display: block;
+ height: 28px;
+ margin: 0;
+ padding: 0 12px;
+ border-right: 1px solid #333333;
+ text-decoration: none;
+ color: #CCCCCC;
+ font: 13px/28px sans-serif;
+ text-shadow: 0 -1px 0 #444444;
+ text-transform: none;
+}
+
+#top-menu li:hover > a {
+ color: #FAFAFA;
+}
+
+#top-menu li:hover > a {
+ color: #FAFAFA;
+}
+
+#e3top-menu {
+ display: block;
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+}
+
+#e3top-menu li {
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+ border-right: 1px solid #555555;
+ float: left;
+}
+
+#e3top-menu li:hover {
+ background-color: #3A3A3A;
+ background-image: -moz-linear-gradient(center bottom , #3A3A3A, #222222);
+ color: #FAFAFA;
+}
+
+#e3top-menu li a {
+ display: block;
+ height: 28px;
+ margin: 0;
+ padding: 0 12px;
+ border-right: 1px solid #333333;
+ text-decoration: none;
+ color: #CCCCCC;
+ font: 13px/28px sans-serif;
+ text-shadow: 0 -1px 0 #444444;
+ text-transform: none;
+}
+
+#e3top-menu li:hover > a {
+ color: #FAFAFA;
+}
+
+#e3top-menu li:hover > a {
+ color: #FAFAFA;
+}
+
+#emoncms-logo {
+ float: left;
+ padding: 2px;
+}
+.Container-White {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #E5E5E5;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ margin: 0px;
+ padding: 0px;
+}
+
+.Container-Grey {
+ background: none repeat scroll 0 0 #ddd;
+ border: 1px solid #ccc;
+ box-shadow: 0 4px 10px -1px rgba(200, 200, 200, 0.7);
+ margin: 0px;
+ padding: 0px;
+}
+
+.heading-center {
+ font-weight:bold;
+ font-size:24px;
+ padding-top:20px;
+ text-align:center;
+}
+
+.feedvalue {
+ font-weight:bold;
+ font-size:24px;
+ padding-top:20px;
+ text-align:center;
+ color:#4444CC;
+}
+
+.heading {
+ font-weight:bold;
+ font-size:24px;
+ padding-top:20px;
+}
+
+
+.greydashmenu {
+ display: block;
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+}
+
+.greydashmenu li {
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+ border-right: 1px solid #eee;
+ float: left;
+}
+
+.greydashmenu li a {
+ display: block;
+ margin: 0;
+ padding: 0 12px;
+ border-right: 1px solid #ccc;
+ text-decoration: none;
+ font: 13px/27px sans-serif;
+ text-transform: none;
+}
+
+#markdown a {
+ color: #4183C4; }
+#markdown a.absent {
+ color: #cc0000; }
+#markdown a.anchor {
+ display: block;
+ padding-left: 30px;
+ margin-left: -30px;
+ cursor: pointer;
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+ margin: 20px 0 10px;
+ padding: 0;
+ font-weight: bold;
+ -webkit-font-smoothing: antialiased;
+ cursor: text;
+ position: relative; }
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor {
+ /*background: url("../../images/modules/styleguide/para.png") no-repeat 10px center;*/
+ text-decoration: none; }
+
+h1 tt, h1 code {
+ font-size: inherit; }
+
+h2 tt, h2 code {
+ font-size: inherit; }
+
+h3 tt, h3 code {
+ font-size: inherit; }
+
+h4 tt, h4 code {
+ font-size: inherit; }
+
+h5 tt, h5 code {
+ font-size: inherit; }
+
+h6 tt, h6 code {
+ font-size: inherit; }
+
+h1 {
+ font-size: 28px;
+ color: black; }
+
+h2 {
+ font-size: 24px;
+ color: black; }
+
+#markdown h2 {
+ font-size: 24px;
+ border-bottom: 1px solid #cccccc;
+ color: black; }
+
+h3 {
+ font-size: 18px; }
+
+h4 {
+ font-size: 16px; }
+
+h5 {
+ font-size: 14px; }
+
+h6 {
+ color: #777777;
+ font-size: 14px; }
+
+#markdown p, #markdown blockquote, #markdown ul, #markdown ol, #markdown dl, #markdown li, #markdown table, #markdown pre {
+ margin: 15px 0; }
+
+#markdown hr {
+ /*background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;*/
+ border: 0 none;
+ color: #cccccc;
+ height: 4px;
+ padding: 0; }
+
+h1 p, h2 p, h3 p, h4 p, h5 p, h6 p {
+ margin-top: 0; }
+
+li p.first {
+ display: inline-block; }
+
+ul, ol {
+ padding-left: 30px; }
+
+ul :first-child, ol :first-child {
+ margin-top: 0; }
+
+ul :last-child, ol :last-child {
+ margin-bottom: 0; }
+
+dl {
+ padding: 0; }
+ dl dt {
+ font-size: 14px;
+ font-weight: bold;
+ font-style: italic;
+ padding: 0;
+ margin: 15px 0 5px; }
+ dl dt:first-child {
+ padding: 0; }
+ dl dt > :first-child {
+ margin-top: 0; }
+ dl dt > :last-child {
+ margin-bottom: 0; }
+ dl dd {
+ margin: 0 0 15px;
+ padding: 0 15px; }
+ dl dd > :first-child {
+ margin-top: 0; }
+ dl dd > :last-child {
+ margin-bottom: 0; }
+
+blockquote {
+ border-left: 4px solid #dddddd;
+ padding: 0 15px;
+ color: #777777; }
+ blockquote > :first-child {
+ margin-top: 0; }
+ blockquote > :last-child {
+ margin-bottom: 0; }
+
+#markdown table {
+ padding: 0; }
+#markdown table tr {
+ border-top: 1px solid #cccccc;
+ background-color: white;
+ margin: 0;
+ padding: 0; }
+#markdown table tr:nth-child(2n) {
+ background-color: #f8f8f8; }
+#markdown table tr th {
+ font-weight: bold;
+ border: 1px solid #cccccc;
+ text-align: left;
+ margin: 0;
+ padding: 6px 13px; }
+#markdown table tr td {
+ border: 1px solid #cccccc;
+ text-align: left;
+ margin: 0;
+ padding: 6px 13px; }
+#markdown table tr th :first-child, table tr td :first-child {
+ margin-top: 0; }
+#markdown table tr th :last-child, table tr td :last-child {
+ margin-bottom: 0; }
+
+img {
+ max-width: 100%; }
+
+span.frame {
+ display: block;
+ overflow: hidden; }
+ span.frame > span {
+ border: 1px solid #dddddd;
+ display: block;
+ float: left;
+ overflow: hidden;
+ margin: 13px 0 0;
+ padding: 7px;
+ width: auto; }
+ span.frame span img {
+ display: block;
+ float: left; }
+ span.frame span span {
+ clear: both;
+ color: #333333;
+ display: block;
+ padding: 5px 0 0; }
+span.align-center {
+ display: block;
+ overflow: hidden;
+ clear: both; }
+ span.align-center > span {
+ display: block;
+ overflow: hidden;
+ margin: 13px auto 0;
+ text-align: center; }
+ span.align-center span img {
+ margin: 0 auto;
+ text-align: center; }
+span.align-right {
+ display: block;
+ overflow: hidden;
+ clear: both; }
+ span.align-right > span {
+ display: block;
+ overflow: hidden;
+ margin: 13px 0 0;
+ text-align: right; }
+ span.align-right span img {
+ margin: 0;
+ text-align: right; }
+span.float-left {
+ display: block;
+ margin-right: 13px;
+ overflow: hidden;
+ float: left; }
+ span.float-left span {
+ margin: 13px 0 0; }
+span.float-right {
+ display: block;
+ margin-left: 13px;
+ overflow: hidden;
+ float: right; }
+ span.float-right > span {
+ display: block;
+ overflow: hidden;
+ margin: 13px auto 0;
+ text-align: right; }
+
+code, tt {
+ margin: 0 2px;
+ padding: 0 5px;
+ white-space: nowrap;
+ border: 1px solid #eaeaea;
+ background-color: #f8f8f8;
+ border-radius: 3px; }
+
+pre code {
+ margin: 0;
+ padding: 0;
+ white-space: pre;
+ border: none;
+ background: transparent; }
+
+.highlight pre {
+ background-color: #f8f8f8;
+ border: 1px solid #cccccc;
+ font-size: 13px;
+ line-height: 19px;
+ overflow: auto;
+ padding: 6px 10px;
+ border-radius: 3px; }
+
+pre {
+ background-color: #f8f8f8;
+ border: 1px solid #cccccc;
+ font-size: 13px;
+ line-height: 19px;
+ overflow: auto;
+ padding: 6px 10px;
+ border-radius: 3px; }
+ pre code, pre tt {
+ background-color: transparent;
+ border: none; }
diff --git a/Theme/basic/theme.php b/Theme/basic/theme.php
new file mode 100644
index 000000000..c65595bea
--- /dev/null
+++ b/Theme/basic/theme.php
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Message:
+
+
+
+
+
+
+
+
+
+
+ ';
+ print $content;
+ echo '
';
+ }
+ else {
+ print $content;
+ }
+
+ ?>
+
+
+
+
+
+
+
+
+
+
diff --git a/core.php b/core.php
new file mode 100644
index 000000000..210154791
--- /dev/null
+++ b/core.php
@@ -0,0 +1,143 @@
+ 1) { $route['format'] = $lastarg_split[1]; }
+ $args[$lastarg] = $lastarg_split[0];
+
+ if (count($args) > 0) { $route['controller'] = $args[0]; }
+ if (count($args) > 1) { $route['action'] = $args[1]; }
+ if (count($args) > 2) { $route['subaction'] = $args[2]; }
+
+ return $route;
+ }
+
+ function controller($controller_name)
+ {
+ $output = array('content'=>'');
+
+ if ($controller_name)
+ {
+ $controller = $controller_name."_controller";
+ $controllerScript = "Modules/".$controller_name."/".$controller.".php";
+ if (is_file($controllerScript))
+ {
+ require $controllerScript;
+ $output = $controller();
+ }
+ }
+
+ //if (!$output['content']) $output['content'] = "404 Page does not exist";
+ return $output;
+ }
+
+ function view($filepath, array $args)
+ {
+ extract($args);
+ ob_start();
+ include "Modules/$filepath";
+ $content = ob_get_clean();
+ return $content;
+ }
+
+ function theme($filepath, array $args)
+ {
+ global $theme;
+ extract($args);
+ ob_start();
+ include "Theme/$theme/$filepath";
+ $content = ob_get_clean();
+ return $content;
+ }
+
+ function load_db_schema()
+ {
+ $schema = array();
+ $dir = scandir("Modules");
+ for ($i=2; $i