Changeset 72

Timestamp:

19/11/06 05:50:04 (6 years ago)

Author:

nigel

Message:

Editing of entries

File:

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

meter/meter.module

@@ -135 +135 @@
 
 function meter_insert($node) {
-  print "<p>meter_insert</p>";
   /*
   if (!user_access('administer nodes')) {
@@ -186 +185 @@
           'weight' => 3,
           'type' => MENU_LOCAL_TASK);
-
-
+      $items[] = array('path' => 'node/'. arg(1) .'/edit_readings',
+          'title' => t('edit readings'),
+          'callback' => 'meter_edit_readings',
+          'access' => user_access('access content'),
+          'weight' => 3,
+          'type' => MENU_LOCAL_TASK);
+      $items[] = array('path' => 'node/'. arg(1) .'/edit_reading',
+          'title' => t('edit reading'),
+          'callback' => 'meter_edit_reading',
+          'access' => user_access('access content'),
+          'weight' => 3,
+          'type' => MENU_CALLBACK);
     }
   }
@@ -286 +295 @@
 
   $links = array();
-  //$links[] = l(t('add reading'), 'node/'.$node->nid.'/add_reading',array('title'=>'Add a meter reading'));
+  $links[] = l(t('edit readings'), 'node/'.$node->nid.'/edit_readings',array('title'=>'Edit meter readings'));
   $links[] = l(t('export readings'), 'node/'.$node->nid.'/csv_readings',array('title'=>'Export the meter readings as CSV'));
 
@@ -316 +325 @@
 
   $res = meter_extrapolate(meter_get_values($node), 1,30);
-  /*foreach ($res as $val){
-    $output .= "<p>$val->to $val->value </p>";
-  }*/
 
   $output .= meter_graph($res);
-  $output .= drupal_get_form('meter_add_reading', $form);
 
   $node->links = $links;
-  $node->body = $node->teaser = $output;
-}
+  // Only show the add readings form when in full view
+  $node->teaser = $output;
+  $node->body = $output.drupal_get_form('meter_add_reading', $form);
+}
+
+/**
+  *
+  */
+function meter_edit_readings() {
+  $nid = arg(1);
+  $node = node_load($nid);
+
+  if ($_GET['action'] == 'delete'){
+    db_query("DELETE FROM {meter_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_ = meter_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 meter_edit_reading() {
+  $nid = arg(1);
+  $node = node_load($nid);
+  $edit = $_REQUEST['edit'];
+
+  if ($_REQUEST['op'] == t('Save')){
+    db_query("UPDATE {meter_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 {meter_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('meter_edit_reading', $form);
+}
+
 
 /**
   * Export the meter readings as a CSV file
   */
-function meter_csv_readings(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
+function meter_csv_readings() {
   $nid = arg(1);
+  $node = node_load($nid);
   $results = meter_get_values($node);
   drupal_set_header('Content-Type: text/csv; charset=utf-8');
@@ -339 +437 @@
     print '"'.$row->time.'",'.$row->value."\n";
   }
-
 }
 
@@ -412 +509 @@
 }
 
+
+/**
+  * Draw a CSS/HTML graph
+  */
 function meter_graph($entries){
   if (count($entries) == 0)