Changeset 561

Timestamp:

Sep 17, 2007 1:19:31 AM (6 years ago)

Author:

dkg

Message:

JPDD: cleaning up rules for self-edit of accounts.

Location:

trunk/jpdd

Files:

• class.dkg.row.php (modified) (2 diffs)
• class.dkg.site.php (modified) (1 diff)
• class.jpdd.person.php (modified) (4 diffs)

trunk/jpdd/class.dkg.row.php

@@ -97 +97 @@
         $nonpeers = array_filter($nonpeers, $nonpeerlimitfunc);
       }
+      if (count($peers) == 0 &&
+          count($nonpeers) == 0)
+        return '';
+
       $ret = '<fieldset class="m2medit"><legend>';
       if (count($peers))
@@ -112 +116 @@
 <option value="">None</option>
 '.join("\n", array_map(create_function('$h', "return '<option value=\"'.\$h->getID().'\">'.\$h->getTitle().'</option>';"), $nonpeers)).'
-</select></label>
-</fieldset>
-';
+</select></label>';
+
+      $ret .= '</fieldset>';
       
       return $ret;

trunk/jpdd/class.dkg.site.php

@@ -393 +393 @@
     function getLogoutForm($followupURI = NULL) {
       return '<form id="logout_form" class="logout" action="'.$this->Path("logout").'" method="post">
-'.($this->isAuthenticated() ? '<div class="salutation">Welcome,<br/>'.$this->_authenticated_user->getTitle().$this->getAdditionalSalutation().'</div>':'').'
+'.($this->isAuthenticated() ? '<div class="salutation">Welcome,<br/>'.$this->_authenticated_user->getLinkedTitle().$this->getAdditionalSalutation().'</div>':'').'
 <input class="submit" type="submit" value="Logout"/>
 '.$this->getFormTokenHiddenInput().'

trunk/jpdd/class.jpdd.person.php

@@ -28 +28 @@
     function getSalutation() {
       global $jpdd;
-      $wt = $this->getWorkshopText();
-      if ('' == $wt) {
-        return 'You are not signed up for any workshop.  Please <a href="'.$jpdd->Path('category').'">choose one</a>.';
+
+      // if no workshops are set up at all, people should be able to
+      // apply to the workshop by indicating a preferred category:
+      $wc = $jpdd->getValueFromSQL('SELECT COUNT(*) AS foo FROM workshop WHERE event_id = '.$jpdd->getActiveEventID(), 'foo');
+      if ($wc == 0) {
+        // FIXME: is this person already applied?  if not, should they
+        // be able to make an application on their own?  should we
+        // report the category their application is under?
+
+        // this person a liaison for this event?  if so, direct them to their 
+        $lc = $jpdd->getValueFromSQL('SELECT COUNT(*) AS foo FROM person_role JOIN role ON (role.id = role_id) WHERE person_id = '.
+                                     $this->getID().' AND event_id = '.$jpdd->getActiveEventID().' AND role.title = '.$jpdd->escStr('liaison'),
+                                     'foo');
+        if ($lc > 0) {
+          // FIXME: present some sort of simplified reporting here?
+          // (like "all done")?  provide direct links to liaison
+          // pages?
+          return 'Please check in on your organization'.($lc > 1 ? 's':'').' through the links below';
+        } else {
+          return 'No workshops have been created yet.  You will be notified when workshops have been created.';
+        }
       } else {
-        return 'You will be '.$wt;
+        $wt = $this->getWorkshopText();
+        if ('' == $wt) {
+          return 'You are not signed up for any workshop.  Please <a href="'.$jpdd->Path('category').'">choose one</a>.';
+        } else {
+          return 'You will be '.$wt;
+        }
       }
     }
@@ -84 +107 @@
     }
 
+    function canEditAffiliationsAndRoles() {
+      
+    }
+
     function getFormInnards() {
       global $jpdd;
       $emailerr = is_null($this->_email) ? NULL : $jpdd->isValid('e-mail',$this->_email);
       $editroles = '';
+      $editaffiliations = '';
+
+      // we'll use editing roles as a decent proxy for being able to massage affiliations directly.
       if ($jpdd->_authenticated_user->HasAnyOfThesePrivileges('Edit Roles')) {
 
@@ -104 +134 @@
           }
         }
+        
+        $editaffiliations = $this->getM2MEditView('organization', 'affiliation', 'Affiliated With', 'Add Affiliation');
       }
       return '<div>
@@ -111 +143 @@
 <label>Last name:<br/><input type="text" name="last_name" value="'.htmlentities($this->_last_name).'"/></label><br/>
 <label>E-mail Address:<br/>'.(is_null($emailerr)?'':'<span class="error">'.$emailerr.'</span><br/>').'<input type="text" name="email" '.(is_null($emailerr)?'':'class="error" ').'value="'.htmlentities($this->_email).'"/></label><br/>
-'.$this->getM2MEditView('organization', 'affiliation', 'Affiliated With', 'Add Affiliation').'
-'.$this->getM2MEditView('workshop', 'audience', 'Attending', 'Sign up for', NULL, create_function('$x', 'return !$x->isFull();')).'
+'.$editaffiliations.'
+'.$this->getM2MEditView('workshop', 'audience', 'Attending', 'Sign up for', NULL, create_function('$x', 'global $jpdd; $x->_event_id == $jpdd->getActiveEventID() && !$x->isFull();')).'
 '.$editroles.'
 </div>';