Changeset 184

Timestamp:

Jan 30, 2007 11:22:21 PM (6 years ago)

Author:

dkg

Message:

JPDD: properly limit printout listing, change text to be more what phyllis wants, added new "open" function to show details of all open workshops.

Location:

trunk/jpdd

Files:

• class.jpdd.category.php (modified) (1 diff)
• class.jpdd.php (modified) (5 diffs)

trunk/jpdd/class.jpdd.category.php

@@ -17 +17 @@
         }
 
-    function showList($items) {
+    function showList($items, $onlyopen = false) {
       $ret = '';
       reset($items);
       while (list(,$item) = each($items)) {
         $wshops = $item->getM2MPeers('workshop', 'workshop_category', 'Workshops');
+        if ($onlyopen)
+          $wshops = array_filter($wshops, create_function('$x', 'return !$x->isFull();'));
         if (count($wshops)) {
           $ret .= '<div class="array"><div class="array-title">'.$item->getLinkedTitle('title')."</div>\n<ul>\n";

trunk/jpdd/class.jpdd.php

@@ -146 +146 @@
 
     function getAllowedActions() {
-      return array_merge(parent::getAllowedActions(), array('signup', 'printout', 'overview'));
+      return array_merge(parent::getAllowedActions(), array('signup', 'printout', 'overview', 'open'));
     }
 
@@ -196 +196 @@
 
 
+    // fudged from JPDD_Category::getList()
+    function getOpenWorkshops() {
+      $cats = $this->getAll('category');
+      $ret = '';
+      reset($cats);
+      while (list(,$cat) = each($cats)) {
+        $wshops = $cat->getM2MPeers('workshop', 'workshop_category', 'Workshops');
+        $wshops = array_filter($wshops, create_function('$x', 'return !$x->isFull();'));
+        if (count($wshops)) {
+          $ret .= '<div class="array"><div class="array-title">'.$cat->getLinkedTitle('title')."</div>\n";
+          $ret .= join('', array_map(create_function('$w', 'return "<h2>".$w->getLinkedTitle()."</h2>\n".$w->getPresentersWithOrgs()."<div class=\"workshop-blurb\">".$w->getDescription()."</div>\n</li>\n";'), $wshops));
+          $ret .= "</div>\n";
+        }
+      }
+      return $ret;
+    }
+
     function getUnaffiliatedAccounts() {
       $sql = 'SELECT person.* FROM person LEFT JOIN affiliation ON (person.id = affiliation.person_id) WHERE organization_id IS NULL AND person.pass IS NOT NULL ORDER BY last_name, first_name';
@@ -337 +354 @@
       if ($this->_action == 'signup') {
         return $this->handleSignup();
+      } elseif ($this->_action == 'open') {
+        return $this->getOpenWorkshops();
       } elseif ($this->_action == 'printout') {
         $pdf = NULL;
@@ -381 +400 @@
               $this->permissionDenied('This printout is not for you.');
           } elseif ($this->isEmpty($this->_type)) {
-            return $this->getPDFLinkList();
+            if ($this->isAuthenticated() && $this->_authenticated_user->hasAllOfThesePrivileges('Edit People', 'Update Workshops', 'Edit Categories')) 
+              return $this->getPDFLinkList();
+            else
+              $this->permissionDenied('This printout is not for you.');
           }
         }
@@ -404 +426 @@
                    'door.pdf' => array('description' => 'printouts for the doors',
                                        'function' => 'addDoorPDFs'),
-                   'signup.pdf' => array('description' => 'signup sheets for the workshops',
+                   'signup.pdf' => array('description' => 'attendance sheets for the workshops',
                                          'function' => 'addSignupPDFs'),
                    'table.pdf' => array('description' => 'pages for the entrance table',