Changeset 963


Ignore:
Timestamp:
Jan 28, 2008, 1:55:02 PM (11 years ago)
Author:
Daniel Kahn Gillmor
Message:

jpdd: use short titles in the attendance index; properly filter the signups to courses that are still open.

Location:
trunk/jpdd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/jpdd/class.jpdd.pdf.php

    r630 r963  
    243243          $gutter = $this->_margin;
    244244          $colwid = ($this->_page_width - (($columns - 1)*$gutter + 2*$this->_margin))/$columns;
    245           $peops = $jpdd->getSeriesFromSQL('SELECT last_name, first_name, middle_name, workshop.title AS workshop, room.title AS room FROM '.
     245          $peops = $jpdd->getSeriesFromSQL('SELECT last_name, first_name, middle_name, CASE WHEN workshop.short_title IS NOT NULL THEN workshop.short_title ELSE workshop.title END AS workshop, room.title AS room FROM '.
    246246                                                                           'person JOIN attendance ON (person.id = person_id) JOIN workshop ON (workshop_id = workshop.id) '.
    247247                                                                           'LEFT JOIN room ON (room.id = room_id) '.
  • trunk/jpdd/class.jpdd.person.php

    r948 r963  
    123123        // but we also want to include every role with each affiliation, if possible.
    124124        // you must be able to edit roles to sign people up from this angle also:
    125         $editaudiences = $this->getM2MEditView('workshop', 'audience', 'Attending', 'Sign up for', NULL, create_function('$x', 'global $jpdd; $x->_event_id == $jpdd->getActiveEventID() && !$x->isFull();'));
     125        $editaudiences = $this->getM2MEditView('workshop', 'audience', 'Attending', 'Sign up for', NULL, create_function('$x', 'global $jpdd; return $x->_event_id == $jpdd->getActiveEventID() && !$x->isFull();'));
    126126      }
    127127      return '<div>
Note: See TracChangeset for help on using the changeset viewer.