Changeset 90

Timestamp:

06/01/07 18:31:43 (5 years ago)

Author:

nigel

Message:

Added settings screen and improved _page hook

File:

• openweather/openweather.module (modified) (5 diffs)

openweather/openweather.module

@@ -121 +121 @@
 }
 
+/**
+ * _page hook
+ * Display official stats, and a list of weather stations w/ stats
+ */
 function openweather_page() {
   global $user;
@@ -127 +131 @@
 
   // If there is official weather get it
-  $radarURL = get_variable('openweather_radar', null);
+  $radarURL = variable_get('openweather_radar', null);
   if ($radarURL != null) $output .= "<img src='$radarURL'/>";
 
@@ -136 +140 @@
   $output .= '<ul>';
   while ($node = db_fetch_object($result)) {
-    $output .= '<li>'. l($node->title, "node/$node->nid") .'</li>';
+    $output .= '<li>'. l($node->title, "node/$node->nid").openweather_summary($node->nid) .'</li>';
   }
   $output .= '</ul>';
   $output .= theme("pager", NULL, 15);
   return $output;
+}
+
+function openweather_settings() {
+  $form['openweather_radar'] = array(
+    '#type'=>'textfield',
+    '#title'=>t('URL for weather radar'),
+    '#default_value'=>variable_get('openweather_radar', ''));
+
+  return $form;
 }
 
@@ -195 +208 @@
 
 /**
+  * Summary table of weather station feed
+  */
+function openweather_summary($nid){
+  $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $nid ORDER BY `time` DESC LIMIT 1");
+  $data = db_fetch_object($data);
+
+  $output .= "<table>";
+  $output .= "<tr><th>Temperature</th><td>$data->temp_out dec C</td><th>Humidity</th><td>$data->rel_hum_out %</td></tr>";
+  $output .= "<tr><th>Wind speed</th><td>$data->windspeed kMh</td><th>Wind direction</th><td>".openweather_to_direction($data->wind_angle)."($data->wind_angle)</td></tr>";
+  $output .= "<tr><th>Relative pressure</th><td>$data->rel_pressure</td><th>Timestamp</th><td>$data->time</td></tr>";
+  $output .= "</table>";
+  return $output;
+}
+
+/**
  * Implementation of hook_view().
  *
@@ -209 +237 @@
   $links[] = l(t('export readings'), 'node/'.$node->nid.'/csv_readings',array('title'=>'Export the openweather readings as CSV'));
 
-  $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $node->nid ORDER BY `time` DESC LIMIT 1");
-  $data = db_fetch_object($data);
-
-  $output .= "<table>";
-  $output .= "<tr><th>Temperature</th><td>$data->temp_out dec C</td><th>Humidity</th><td>$data->rel_hum_out %</td></tr>";
-  $output .= "<tr><th>Wind speed</th><td>$data->windspeed kMh</td><th>Wind direction</th><td>".openweather_to_direction($data->wind_angle)."($data->wind_angle)</td></tr>";
-  $output .= "<tr><th>Relative pressure</th><td>$data->rel_pressure</td><th></th><td></td></tr>";
-  $output .= "</table>";
+  $output .= openweather_summary($node->nid);
 
   $output .= "<img src='?q=node/".$node->nid."/graph/temp_out' />";