Changeset 84 for openweather

Timestamp:

05/01/07 00:33:34 (5 years ago)

Author:

nigel

Message:

Stubs for PHP graphing

Location:

openweather

Files:

• fonts (added)
• fonts/ARIAL.TTF (added)
• fonts/ARIALBD.TTF (added)
• graph.php (added)
• openweather.module (modified) (9 diffs)

openweather/openweather.module

@@ -106 +106 @@
           'title' => t('readings'),
           'callback' => 'openweather_csv_readings',
+          'access' => user_access('access content'),
+          'weight' => 3,
+          'type' => MENU_LOCAL_TASK);
+
+      $items[] = array('path' => 'node/'. arg(1) .'/graph',
+          'title' => t('graph'),
+          'callback' => 'openweather_graph',
           'access' => user_access('access content'),
           'weight' => 3,
@@ -153 +160 @@
 
 /**
- * Callback for processing a vote
- */
-function openweather_add_reading() {
-  global $user;
-  $nid = arg(1);
-
-  $node = node_load($nid);
-
-  $edit = $_POST['edit'];
-  $date = $edit['date'];
-  $value = $edit['value'];
-  $comment = $edit['comment'];
-
-
-  if ($node->uid == $user->uid) {
-    db_query('INSERT INTO {openweather_readings} (nid, time, value, comment) VALUES (%d, "%s", %d, "%s")', $node->nid, $date, $value, $comment);
-    drupal_set_message(t('Your reading was recorded.'));
-  }
-  else {
-    drupal_set_message(t("You're not allowed to add reading for this openweather."), 'error');
-  }
-
-  drupal_goto('node/'. $nid);
-}
-
-/**
  * Implementation of hook_view().
  *
@@ -195 +176 @@
   $res = openweather_extrapolate(openweather_get_values($node), 1,30);
 
-  $output .= openweather_graph($res);
+  //$output .= openweather_graph($res);
 
   $node->links = $links;
@@ -202 +183 @@
   $node->body = $output; //$output.drupal_get_form('openweather_add_reading', $form);
 }
-
-/**
-  *
-  */
-function openweather_edit_readings() {
-  $nid = arg(1);
-  $node = node_load($nid);
-
-  if ($_GET['action'] == 'delete'){
-    db_query("DELETE FROM {openweather_readings} WHERE nid=%d AND time='%s';", $nid, $_GET['time']);
-    drupal_set_message(t('Reading removed.'));
-  }
-
-  $headers = array(
-    array('data'=>t('Date')),
-    array('data'=>t('Reading')),
-    array('data'=>t('Comment')),
-    array('data'=>t('Edit')),
-    array('data'=>t('Delete')),
-    );
-
-  $rows = array();
-  $rows_ = openweather_get_values($node);
-  foreach ($rows_ as $r){
-    $rows[] = array(
-        $r->time,
-        $r->value,
-        $r->comment,
-        l(t('edit'), "node/$nid/edit_reading", array(), 'time='.urlencode($r->time)),
-        l(t('delete'), "node/$nid/edit_readings", array(), 'action=delete&time='.urlencode($r->time)),
-        );
-  }
-
-  $output .= theme("table", $headers, $rows);
-  return $output;
-}
-
-/**
-  * Edit the reading
-  */
-function openweather_edit_reading() {
-  $nid = arg(1);
-  $node = node_load($nid);
-  $edit = $_REQUEST['edit'];
-
-  if ($_REQUEST['op'] == t('Save')){
-    db_query("UPDATE {openweather_readings} SET time='%s', value=%d, comment='%s' WHERE nid=%d AND time='%s';", $edit['time'], $edit['value'], $edit['comment'], $edit['nid'], $edit['orig_time']);
-    drupal_set_message("Saved reading.");
-    drupal_goto("node/$nid/edit_readings");
-  } else if ($_REQUEST['op'] == t('Cancel')){
-    drupal_set_message("Cancelled editing.");
-    drupal_goto("node/$nid/edit_readings");
-  }
-
-  $r = db_query("SELECT * FROM {openweather_readings} WHERE nid=%d AND time='%s';", $nid, $_GET['time']);
-  $r = db_fetch_object($r);
-
-  $form['nid'] = array('#type' => 'hidden', '#value' => $node->nid);
-  $form['orig_time'] = array('#type' => 'hidden', '#value' => $r->time);
-  $form['time'] = array(
-            '#title' => t('Date'),
-            '#type' => 'textfield',
-            '#default_value' => $r->time,
-            '#attributes' => array('class' => 'jscalendar'),
-            '#jscalendar_ifFormat' => '%Y-%m-%d %H:%M',
-            '#jscalendar_showsTime' => 'true',
-            '#jscalendar_timeFormat' => variable_get('event_ampm', '0') == 0 ? '24' : '12',
-            '#size' => 19,
-            '#maxlength' => 19,
-            '#weight' => -14,
-            '#description' => t('YYYY-MM-DD HH:MM'),
-            );
-
-  $form['value'] = array(
-        '#title' => t('Value'),
-        '#type' => 'textfield',
-        '#default_value' => $r->value);
-
-  $form['comment'] = array(
-        '#title' => t('Comment'),
-        '#type' => 'textfield',
-        '#default_value' => $r->comment);
-
-  $form['action_save'] = array('#type' => 'submit', '#value' => t('Save'));
-  $form['action_cancel'] = array('#type' => 'submit', '#value' => t('Cancel'));
-  $form['#action'] = url('node/'. $node->nid.'/edit_reading');
-
-  return drupal_get_form('openweather_edit_reading', $form);
-}
-
 
 /**
@@ -313 +204 @@
 function openweather_get_values($node){
   $res = array();
-  $results = db_query("SELECT time, value, comment FROM {openweather_readings} WHERE nid = %d ORDER BY time DESC", $node->nid);
+  $results = db_query("SELECT * FROM {openweather_readings} WHERE nid = %d ORDER BY time DESC", $node->nid);
 
   while ($row = db_fetch_object($results)){
@@ -375 +266 @@
   * Draw a CSS/HTML graph
   */
+/*
 function openweather_graph($entries){
   if (count($entries) == 0)
@@ -399 +291 @@
   return $output;
 }
-
+*/
 function openweather_xmlrpc(){
   return array(
@@ -428 +320 @@
   if ($user->uid) { 
     $node = node_load($nid);
+    watchdog('INFO', $node->type, WATCHDOG_WARNING);
+    if ($node->type != 'openweather')
+        return false;
     // Check person owns or can write to entry
-    return true;
+
+    return db_query("INSERT INTO {openweather_readings} (nid, `time`, temp_in, temp_out, rel_hum_in, rel_hum_out, windspeed, wind_angle, wind_chill, rain_1h, rel_pressure, dewpoint) VALUES (%d, '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", $nid, $data['timestamp'], $data['temp_in'], $data['temp_out'], $data['rel_hum_in'], $data['rel_hum_out'], $data['windspeed'], $data['wind_angle'], $data['wind_chill'], $data['rain_1h'], $data['rel_pressure'], $data['dewpoint']);
   } else {
     return false;
@@ -435 +331 @@
 }
 
+
+/**
+  * Produce a PNG graph of the $type data for the last 24 hours
+  */
+function openweather_graph() {
+  $nid = arg(1);
+  $type = arg(3);
+  $node = node_load($nid);
+
+  if ($type == null) $type = 'temp';
+
+  $results = openweather_get_values($node);
+  drupal_set_header('Content-Type: image/png');
+  include 'graph.php';
+  $g = new graph(400, 240);
+  $g->parameter['path_to_fonts'] = 'modules/openweather/fonts/';
+  $g->parameter['title'] = $type;
+  $g->parameter['x_label'] = 'Date';
+  $g->parameter['y_label'] = '';
+
+  $g->draw();
+}