Changeset 68

Timestamp:

17/11/06 04:19:57 (6 years ago)

Author:

nigel

Message:

Implemented meter_extrapolate. It is incorrectly implemented at this
stage, but it shows something.

Next we need to do some graphing. Preferably CSS graphs.

Location:

meter

Files:

• README (modified) (1 diff)
• meter.module (modified) (8 diffs)

meter/README

@@ -2 +2 @@
 The meters can then be graphed for usage over days, months, quarters, etc. 
 The data can also be extracted is csv format.
+
+TODO
+Put in units for meter type
+Graph usage
+Set a maximum value for the meter so wrap arounds can be accounted for.

meter/meter.module

@@ -72 +72 @@
 
 /**
- * Implementation of hook_cron().
- *
- * Closes polls that have exceeded their allowed runtime.
- */
-function meter_cron() {
-  /*$result = db_query('SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid = n.nid WHERE (n.created + p.runtime) < '. time() .' AND p.active = 1 AND p.runtime != 0');
-  while ($poll = db_fetch_object($result)) {
-    db_query("UPDATE {poll} SET active = 0 WHERE nid = %d", $poll->nid);
-  }
-  */
-}
-
-/**
  * Implementation of hook_delete().
  */
@@ -95 +82 @@
  */
 function meter_submit(&$node) {
+  print "<p>meter_submit</p>";
   // Renumber fields
   /*
@@ -106 +94 @@
  */
 function meter_validate($node) {
+  print "<p>meter_validate</p>";
 /*
   if (isset($node->title)) {
@@ -147 +136 @@
 
 function meter_insert($node) {
+  print "<p>meter_insert</p>";
   /*
   if (!user_access('administer nodes')) {
@@ -231 +221 @@
   $output = '<ul>';
   while ($node = db_fetch_object($result)) {
-    $output .= '<li>'. l($node->title, "node/$node->nid") .' - '. format_plural($node->votes, '1 vote', '%count votes') .' - '. ($node->active ? t('open') : t('closed')) .'</li>';
+    $output .= '<li>'. l($node->title, "node/$node->nid") .'</li>';
   }
   $output .= '</ul>';
   $output .= theme("pager", NULL, 15);
   return $output;
-  //$output = '';
-  //return $output;
 }
 
@@ -395 +383 @@
   $form['#action'] = url('node/'. $node->nid.'/add_reading');
 
+  $res = meter_extrapolate(meter_get_values($node), 1,30);
+  foreach ($res as $val){
+    $output .= "<p>$val->to $val->value </p>";
+  }
+
   $output .= drupal_get_form('meter_add_reading', $form);
 
@@ -406 +399 @@
 function meter_csv_readings(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
   $nid = arg(1);
-  $results = db_query("SELECT time, value FROM {meter_readings} WHERE nid = %d", $nid);
+  $results = meter_get_values($node);
   drupal_set_header('Content-Type: text/csv; charset=utf-8');
   drupal_set_header('Content-Disposition: attachment; filename="meter.csv";');
   print "Time, Value\n";
+  foreach($results as $row){
+    print '"'.$row->time.'",'.$row->value."\n";
+  }
+
+}
+
+/**
+  * Query the DB for the reading values
+  */
+function meter_get_values($node){
+  $res = array();
+  $results = db_query("SELECT time, value FROM {meter_readings} WHERE nid = %d ORDER BY time DESC", $node->nid);
+
   while ($row = db_fetch_object($results)){
-    print '"'.$row->time.'",'.$row->value."\n";
-  }
-
+    $res[] = $row;
+  }
+  return $res;
 }
 
@@ -442 +448 @@
   }
 }
+
+/**
+  * Average usage over $days, from midday before the last reading
+  * @param values - object with date and value
+  * @param days - the number of days to average over
+  * @param count - the number of entries to calculate
+  */
+function meter_extrapolate($values, $days, $count){
+  $return = array();
+
+  $last = reset($values);
+  $row = $last;
+  $target = strtotime($row->time); // Set the first target
+
+  for ($i = 0 ; $i < $count ; $i++){
+    // Increment target
+    $oldTarget = $target;
+    $target -= $days*60*60*24;
+
+    while ( !($row === false) && strtotime($row->time) > $target){
+      $last = $row;
+      $row = next($values);
+    }
+    if ($row === false) {
+      break;
+    } else {
+      $timeBetween = (strtotime( $last->time ) - strtotime( $row->time ))/24/3600;
+      $entry = new StdClass();
+      $entry->from = date("d/m/Y H:i", $target);
+      $entry->to = date("d/m/Y H:i", $oldTarget);
+      $entry->value = ($last->value - $row->value) / $timeBetween;
+      $return[$i] = $entry;
+    }
+  }
+  return $return;
+}