Changeset 121 for roster

Timestamp:

22/11/07 05:59:55 (4 years ago)

Author:

nigel.sim

Message:

• Fixed saving issue where notes would not be editable

File:

• roster/trunk/roster.module (modified) (8 diffs)

roster/trunk/roster.module

@@ -21 +21 @@
         'type' => MENU_LOCAL_TASK
       );
+      $items[] = array(
+        'path' => 'node/'.arg(1).'/csv',
+        'title' => t('csv export'),
+        'callback' => 'roster_csv',
+        'access' => user_access('assign booths'),
+        'type' => MENU_LOCAL_TASK
+      );
     }
   }
@@ -165 +172 @@
   $form['submit'] = array (
      '#type' => 'submit',
-     '#value' => t('Go'),
+     '#value' => t('Save'),
      );
 
@@ -182 +189 @@
   $form['person'] = array(
     '#type' => 'select',
-    '#title' => t(''),
+    '#title' => t('Working'),
     '#options' => $users,
   );
   $form['notes'] = array(
     '#type' => 'textfield',
-    '#title' => t('notes')
+    '#title' => t('Notes')
   );
   $form['bid'] = array(
@@ -199 +206 @@
   $form['save'] = array(
     '#type' => 'submit',
-    '#value' => t('save')
+    '#value' => t('Save')
   );
   $form['aid'] = array(
@@ -207 +214 @@
   if ($selected != NULL){
     $form['aid']['#value'] = $selected->aid;
-    $form['notes']['#value'] = $selected->notes;
+    $form['notes']['#default_value'] = $selected->notes;
     $form['person']['#default_value'] = $selected->person;
   }
@@ -248 +255 @@
 
   // Format roster table for display
-  $table = "<table><tr><th>Booth</th><th>Morning</th><th>Afternoon</th></tr>";
+  $table = "<table border='1px'><tr><th>Booth</th><th>Morning</th><th>Afternoon</th></tr>";
   foreach ($booths as $booth){
-    $table .= "<tr><td>".l($booth->name,'node/'.arg(1).'/booth/'.$booth->bid)."</td>";
-    $people = ($roster[$booth->bid] != NULL)?$roster[$booth->bid][0]:NULL;
+    $table .= "<tr><td>".l($booth->name,'node/'.arg(1).'/booth/'.$booth->bid).
+      "<br/>".$booth->last_votes.'/'.$booth->last_votes_total."</td>";
+    
+    $people = ($roster[$booth->bid] != NULL && $roster[$booth->bid][0] != NULL)?$roster[$booth->bid][0]:array();
     $table .= "<td>";
     foreach ($people as $person)
-      drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, $person, $booth->bid, 0);
+      $table .= drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, $person, $booth->bid, 0);
     // A new one too
-    drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, NULL, $booth->bid, 0);
+    $table .= drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, NULL, $booth->bid, 0);
     $table .= "</td>";
-    $people = ($roster[$booth->bid] != NULL)?$roster[$booth->bid][1]:NULL;
+    
+    $people = ($roster[$booth->bid] != NULL && $roster[$booth->bid][1] != NULL)?$roster[$booth->bid][1]:array();
     $table .= "<td>";
     foreach ($people as $person)
-      drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, $person, $booth->bid, 1)
+      $table .= drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, $person, $booth->bid, 1);
     // A new one too
-    drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, NULL, $booth->bid, 1)
+    $table .= drupal_get_form('roster_assignment_form'.$rosterFormId++, $users, NULL, $booth->bid, 1);
     $table .= "</td>";
     $table .= "</tr>";
@@ -276 +286 @@
   $node->content['body'] = NULL;
   return $node;
+}
+
+function roster_csv($node, $teaser = FALSE, $page = FALSE) {
+  if (!user_access('assign booths'))
+    return FALSE;
+  $node = node_load(arg(1));
+  // Get roster data
+  $booths = roster_get_booths($node->nid);
+  $roster = roster_get_roster($node->nid);
+  $_users = roster_get_group_members($node->group_id);
+  $users = array(''=>'None');
+  foreach ($_users[0] as $contact){
+    $users[$contact['contact_id']] = $contact['sort_name'];
+  }
+  drupal_set_header('Content-Type: text/csv; charset=utf-8');
+  drupal_set_header('Content-Disposition: attachment; filename="roster.csv";');
+
+  print '"Booth","Morning shift","Afternoon shift"'."\n";
+  foreach ($booths as $booth){
+    $morn = $roster[$booth->bid][0];
+    $after = $roster[$booth->bid][1];
+    print '"'.$booth->name.' '.$booth->last_votes.'/'.$booth->last_votes_total.'","';
+    $once = false;
+    foreach ($morn as $p){
+        if ($once)print ' & ';
+        print $users[$p->person].'('.$p->notes.')';
+        $once = true;
+    }
+    print '","';
+    $once = false;
+    foreach ($after as $p){
+        if ($once)print ' & ';
+        print $users[$p->person].'('.$p->notes.')';
+        $once = true;
+    }
+    print "\"\n";
+  }
 }
 
@@ -322 +369 @@
  $sort = array('sort_name' => 'ASC');
 
- $contacts =& crm_contact_search( $params, $return_properties, $sort );
+ $contacts =& crm_contact_search( $params, $return_properties, $sort , 0, 200);
  if (!$contacts) return false;
  return $contacts;