Changeset 69

Timestamp:

17/11/06 14:51:41 (6 years ago)

Author:

nigel

Message:

Cleaned up unused code.
Added CSS grapher

File:

• meter/meter.module (modified) (6 diffs)

meter/meter.module

@@ -12 +12 @@
 `nid` INT( 10 ) NOT NULL ,
 `time` DATETIME NOT NULL ,
-`value` DECIMAL NOT NULL
+`value` DECIMAL NOT NULL,
+`comment` VARCHAR( 255 )
 ) ENGINE = MYISAM 
 */
@@ -249 +250 @@
 
 /**
- * Themes the voting form for a poll.
- */
-function theme_meter_view_voting($form) {
-  $output .= '<div class="poll">';
-  $output .= '  <div class="vote-form">';
-  $output .= '    <div class="choices">';
-  $output .= form_render($form['choice']);
-  $output .= '    </div>';
-  $output .= form_render($form['nid']);
-  $output .= form_render($form['vote']);
-  $output .= '  </div>';
-  $output .= form_render($form);
-  $output .= '</div>';
-  return $output;
-}
-
-/**
- * Generates a graphical representation of the results of a poll.
- */
-function meter_view_results(&$node, $teaser, $page, $block) {
-  // Count the votes and find the maximum
-  foreach ($node->choice as $choice) {
-    $total_votes += $choice['chvotes'];
-    $max_votes = max($max_votes, $choice['chvotes']);
-  }
-
-  foreach ($node->choice as $i => $choice) {
-    if ($choice['chtext'] != '') {
-      $meter_results .= theme('meter_bar', check_plain($choice['chtext']), round($choice['chvotes'] * 100 / max($total_votes, 1)), format_plural($choice['chvotes'], '1 vote', '%count votes'), $block);
-    }
-  }
-
-  $output .= theme('meter_results', check_plain($node->title), $meter_results, $total_votes, $node->links, $block);
-
-  return $output;
-}
-
-function theme_meter_results($title, $results, $votes, $links, $block) {
-  if ($block) {
-    $output .= '<div class="poll">';
-    $output .= '<div class="title">'. $title .'</div>';
-    $output .= $results;
-    $output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>';
-    $output .= '</div>';
-    $output .= '<div class="links">'. theme('links', $links) .'</div>';
-  }
-  else {
-    $output .= '<div class="poll">';
-    $output .= $results;
-    $output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>';
-    $output .= '</div>';
-  }
-
-  return $output;
-}
-
-function theme_meter_bar($title, $percentage, $votes, $block) {
-  if ($block) {
-    $output  = '<div class="text">'. $title .'</div>';
-    $output .= '<div class="bar"><div style="width: '. $percentage .'%;" class="foreground"></div></div>';
-    $output .= '<div class="percent">'. $percentage .'%</div>';
-  }
-  else {
-    $output  = '<div class="text">'. $title .'</div>';
-    $output .= '<div class="bar"><div style="width: '. $percentage .'%;" class="foreground"></div></div>';
-    $output .= '<div class="percent">'. $percentage .'% ('. $votes .')</div>';
-  }
-
-  return $output;
-}
-
-/**
  * Callback for processing a vote
  */
@@ -332 +261 @@
   $date = $edit['date'];
   $value = $edit['value'];
+  $comment = $edit['comment'];
 
 
   if ($node->uid == $user->uid) {
-    db_query('INSERT INTO {meter_readings} (nid, time, value) VALUES (%d, "%s", %d)', $node->nid, $date, $value);
+    db_query('INSERT INTO {meter_readings} (nid, time, value, comment) VALUES (%d, "%s", %d, "%s")', $node->nid, $date, $value, $comment);
     drupal_set_message(t('Your reading was recorded.'));
   }
@@ -380 +310 @@
         '#type' => 'textfield');
 
+  $form['comment'] = array(
+        '#title' => t('Comment'),
+        '#type' => 'textfield');
+
   $form['add_reading'] = array('#type' => 'submit', '#value' => t('Add reading'));
   $form['#action'] = url('node/'. $node->nid.'/add_reading');
 
   $res = meter_extrapolate(meter_get_values($node), 1,30);
-  foreach ($res as $val){
+  /*foreach ($res as $val){
     $output .= "<p>$val->to $val->value </p>";
-  }
-
+  }*/
+
+  $output .= meter_graph($res);
   $output .= drupal_get_form('meter_add_reading', $form);
 
@@ -414 +349 @@
 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);
+  $results = db_query("SELECT time, value, comment FROM {meter_readings} WHERE nid = %d ORDER BY time DESC", $node->nid);
 
   while ($row = db_fetch_object($results)){
@@ -482 +417 @@
     }
   }
+
   return $return;
 }
+
+function meter_graph($entries){
+  if (count($entries) == 0)
+    return "No entries";
+  $height = 200;
+  $width = 500;
+  $output = '<div style="background: white; border: 1px solid; position: relative; width: '.$width.'px; height:'.$height.'px">';
+
+  $w = floor($width/count($entries));
+  $offset = ($width-($w*count($entries)))/2;
+  $i = 0;
+  $max = 20;
+  foreach ($entries as $e){
+    $output .= "<div title='".$e->from." to ".$e->to." value: ".sprintf("%1.2f",$e->value)."' style='width:${w}px; height:".floor($e->value/20*$height)."px; bottom: 0px; position: absolute; right:".($i*$w+$offset)."px; background: grey; border: solid 1px;'>".round($e->value)."</div>\n";
+    $i++;
+  }
+  $output .= '</div>';
+  return $output;
+}