moved files fns to html

diff --git a/live/envir.html b/live/envir.html
index 5d186178c50292b9cd9c8a2c5152bd44892d9ad7..d46b9592c9b74f7a5640ffa50ec08e98f5c713cb 100644 (file)
--- a/live/envir.html
+++ b/live/envir.html
@@ -11,7 +11,7 @@
 <script type="text/javascript" src="lib/dygraph-canvas.js"></script>
 <script type="text/javascript" src="lib/dygraph.js"></script>
 <script type="text/javascript" src="lib/debug.js"></script>
-<script type="text/javascript" src="graphs_xml.js"></script>
+<script type="text/javascript" src="graphs.js"></script>
 <script type="text/javascript" src="lib/date-picker/js/datepicker.js"></script>
 <link href="lib/date-picker/css/datepicker.css" rel="stylesheet" type="text/css" />
 </head>
@@ -58,6 +58,33 @@ first_data = date_round(parse_date("2010-10-07"));
 XML_directory = "../XML/";
 setup_datepicker();
 
+/*
+  return the list of XML files for date pvdate
+ */
+function xml_files() {
+  var list = new Array();
+  var oneday = 24*60*60*1000;
+  var start_date = pvdate.getTime() - (period_days-1)*oneday;
+  if (start_date < first_data.getTime()) {
+    start_date = first_data.getTime();
+  }
+  for (var d=0; d<period_days; d++) {
+    var day = new Date(start_date + (d*oneday));
+    if (day.getTime() > pvdate.getTime()) {
+      break;
+    }
+    var f = XML_directory + date_YMD(day) + ".xml";
+    if (d == 0) {
+      list = f;
+    } else {
+      list += ',' + f;
+    }
+  }
+  writeDebug("xml files: " + list);
+
+  return [ list ];
+}
+
 
 /*
   show all the live data graphs

diff --git a/live/index.html b/live/index.html
index f14c4cf01130e4163dd09afd4ffda258c32fad1c..194933fc4858b99f81c5c949d1515d6218c6ff82 100755 (executable)
--- a/live/index.html
+++ b/live/index.html
@@ -78,6 +78,34 @@ serialnums = [ 2001551093, 2001511859, 2001551109, 2001559615, 2001512099, 20015
 CSV_directory = "../CSV/";
 setup_datepicker();
 
+/*
+  return the list of CSV files for the inverters for date pvdate
+ */
+function csv_files() {
+  var list = new Array();
+  var oneday = 24*60*60*1000;
+  var start_date = pvdate.getTime() - (period_days-1)*oneday;
+  if (start_date < first_data.getTime()) {
+    start_date = first_data.getTime();
+  }
+  for (var d=0; d<period_days; d++) {
+    var day = new Date(start_date + (d*oneday));
+    if (day.getTime() > pvdate.getTime()) {
+      break;
+    }
+    for (var i=0; i<serialnums.length; i++) {
+      var f = CSV_directory + date_YMD(day) + "-WR5KA-08:" + 
+       serialnums[i] + ".csv";
+      if (d == 0) {
+       list[i] = f;
+      } else {
+       list[i] += ',' + f;
+      }
+    }
+  }
+  return list;
+}
+
 /*
   show all the live data graphs
  */
@@ -86,6 +114,13 @@ function show_graphs() {
 
   pvdate_base = pvdate.getTime();
 
+  graph_csv_files("Last 15 minute power from each inverter (W)",
+                 csv_files(),
+                 "Pac",
+                 { includeZero: true,
+                   averaging: false,
+                   maxtime: 15 });
+
   graph_sum_csv_files("Total AC Power (W)",
                      csv_files(),
                       "Pac",