Changeset 153

Timestamp:

Jan 27, 2007 11:43:46 PM (6 years ago)

Author:

dkg

Message:

JPDD: Created new overview which shows accounts who have not signed up for anything yet.

Location:

trunk/jpdd

Files:

• class.dkg.person.php (modified) (2 diffs)
• class.jpdd.php (modified) (3 diffs)

trunk/jpdd/class.dkg.person.php

@@ -10 +10 @@
 
         function getTitle() {
-          global $jpdd;
-          $x = '_'.$jpdd->users['username'];
+          global $dkg_site;
+          $x = '_'.$dkg_site->users['username'];
           return $this->$x;
         }
@@ -20 +20 @@
 
         function getPrivileges() {
-          global $jpdd;
-          return $jpdd->getSeriesFromSQL('SELECT title, description FROM person_privilege JOIN privilege ON (privilege.id = person_privilege.privilege_id) WHERE person_id = '.$this->getID(), 'DKG_Row');
+          global $dkg_site;
+          return $dkg_site->getSeriesFromSQL('SELECT title, description FROM person_privilege JOIN privilege ON (privilege.id = person_privilege.privilege_id) WHERE person_id = '.$this->getID(), 'DKG_Row');
         }
+    
+    function getLinkedEmail() {
+      global $dkg_site;
+      if (is_null($this->_email))
+        return '';
+      $errs = $dkg_site->isValid('email', $this->_email);
+      return (is_null($errs) ? "<a class=\"email\" href=\"mailto:".$this->_email."\">&lt;".$this->_email."&gt;</a>" : '<span class="error">'.$errs.': '.htmlentities($this->_email).'</span>');
+    }
 
         function hasAnyOfThesePrivileges() {

trunk/jpdd/class.jpdd.php

@@ -120 +120 @@
         '<li>Workshop attendees: '.(int)$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM audience', 'foo')."\n".
         '<li>Complete on-line accounts: '.$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM person WHERE pass IS NOT NULL', 'foo')."\n".
-        '<ul><li>who aren\'t presenters or attendees yet: '.(int)$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM (SELECT id FROM person WHERE pass IS NOT NULL) AS p LEFT JOIN attendance ON (p.id = attendance.person_id) WHERE workshop_id IS NULL', 'foo')."\n".
+        '<ul><li>who <a href="'.$this->Path('overview', 'noworkshop').'">aren\'t presenters or attendees</a> yet: '.(int)$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM (SELECT id FROM person WHERE pass IS NOT NULL) AS p LEFT JOIN attendance ON (p.id = attendance.person_id) WHERE workshop_id IS NULL', 'foo')."\n".
         '<li>who are <a href="'.$this->Path('overview', 'unaffiliated').'">unaffiliated with any school</a>: '.(int)$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM (SELECT id FROM person WHERE pass IS NOT NULL) AS p LEFT JOIN affiliation ON (p.id = affiliation.person_id) WHERE organization_id IS NULL', 'foo')."</ul>\n".
         '<li>People without e-mail addresses: '.(int)$this->getValueFromSQL('SELECT COUNT(*) AS foo FROM person WHERE email IS NULL', 'foo')."\n".
@@ -127 +127 @@
 
     function getUnaffiliatedAccounts() {
-      $sql = 'SELECT person.* FROM person LEFT JOIN affiliation ON (person.id = affiliation.person_id) WHERE affiliation.id IS NULL AND person.pass IS NOT NULL ORDER BY last_name, first_name';
+      $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';
       $us = $this->getSeriesFromSQL($sql, 'JPDD_Person');
-      return "<h3>Unaffiliated accounts<ul>\n".join('', array_map(create_function('$x', 'return "<li>".$x->getLinkedTitle().(is_null($x->_email) ? "" : " - <a class=\"email\" href=\"mailto:".$x->_email."\">&lt;".$x->_email."&gt;</a>")."\n";'), $us))."</ul>";
+      return "<h3>Unaffiliated accounts<ul>\n".join('', array_map(create_function('$x', 'return "<li>".$x->getLinkedTitle()." ".$x->getLinkedEmail()."\n";'), $us))."</ul>";
+    }
+    function getAccountsWithNoWorkshop() {
+      $sql = 'SELECT person.* FROM person LEFT JOIN attendance ON (person.id = attendance.person_id) WHERE workshop_id IS NULL AND person.pass IS NOT NULL ORDER BY last_name, first_name';
+      $us = $this->getSeriesFromSQL($sql, 'JPDD_Person');
+      return "<h3>Accounts who are not presenters or attendees<ul>\n".join('', array_map(create_function('$x', 'return "<li>".$x->getNameWithOrgs()." ".$x->getLinkedEmail()."\n";'), $us))."</ul>";
     }
 
@@ -252 +257 @@
       } elseif ($which == 'unaffiliated') {
         $ret .= $this->getUnaffiliatedAccounts();
+      } elseif ($which == 'noworkshop') {
+        $ret .= $this->getAccountsWithNoWorkshop();
       } else {
         $ret .= $this->getGenericOverview();