Changeset 141

Timestamp:

10/12/08 23:12:46 (7 weeks ago)

Author:

amp4ecs

Message:

Fix wrong width of time slot if one slot in a row is missing.
Fixed wrong sorting of rooms in time slot view.

Files:

• trunk/pi1/class.tx_wseevents_pi1.php (modified) (11 diffs)

trunk/pi1/class.tx_wseevents_pi1.php

@@ -3 +3 @@
 *  Copyright notice
 *
-*  (c) 2007 Michael Oehlhof <typo3@oehlhof.de>
+*  (c) 2007-2008 Michael Oehlhof <typo3@oehlhof.de>
 *  All rights reserved
 *
@@ -703 +703 @@
                 }
 
+                # Check for given width of event titles
+                $teaserwidth = $conf['listTimeslotView.']['teaserWidth'];
+                if (empty($teaserwidth)) {
+                        $teaserwidth = 0;
+                }
+
                 # For debugging output used in development
                 $showdebug = $conf['listTimeslotView.']['debug'];
@@ -730 +736 @@
                 }
                 $template['titlerow']       = $this->cObj->getSubpart($template['total'],     '###TITLEROW###');
+                $template['select']         = $this->cObj->getSubpart($template['titlerow'],  '###SELECT###');
+                $template['titlecol']       = $this->cObj->getSubpart($template['titlerow'],  '###TITLECOLUMN###');
                 $template['evtsection']     = $this->cObj->getSubpart($template['total'],     '###EVENTSELECT###');
                 $template['evtselect']      = $this->cObj->getSubpart($template['evtsection'],'###SELECT###');
                 $template['evtoption']      = $this->cObj->getSubpart($template['evtselect'], '###OPTIONNOTSELECTED###');
                 $template['evtoptionsel']   = $this->cObj->getSubpart($template['evtselect'], '###OPTIONSELECTED###');
-                $template['select']         = $this->cObj->getSubpart($template['titlerow'],  '###SELECT###');
                 $template['option']         = $this->cObj->getSubpart($template['select'],    '###OPTIONNOTSELECTED###');
                 $template['optionsel']      = $this->cObj->getSubpart($template['select'],    '###OPTIONSELECTED###');
-                $template['titlecol']       = $this->cObj->getSubpart($template['titlerow'],  '###TITLECOLUMN###');
                 $template['headerrow']      = $this->cObj->getSubpart($template['total'],     '###HEADERROW###');
                 $template['headercol']      = $this->cObj->getSubpart($template['headerrow'], '###HEADERCOLUMN###');
@@ -951 +957 @@
                                                 if ($showdebugsql==1) { echo '<br>getSlot:'.$showevent.', '.$d.', '.$rooms[$r]['uid'].', '.$s.'<br>'; };
                                                 $slot_id = $this->getSlot($showevent, $d, $rooms[$r]['uid'], $s, $showdebugsql);
-                                                if (empty($slot_id) && !$allrooms) {
+                                                if ($r==1 && empty($slot_id) && !$allrooms) {
                                                         // Check if a slot is assigned for all rooms
                                                         if ($showdebugsql==1) { echo 'getSlot:'.$showevent.', '.$d.', 0, '.$s.'<br>'; };
@@ -984 +990 @@
                                                                 $markerArray['###SLOTLINKNAME###'] = $sessionlinkname;
                                                                 $markerArray['###SLOTSESSION###'] = $sessiondata['catnum'];
-                                                                $markerArray['###SLOTTEASER###'] = $sessiondata['teaser'];
+                                                                # Cut teaser if longer than max teaser width
+                                                                if ($teaserwidth > 0) {
+                                                                        $markerArray['###SLOTTEASER###'] = substr($sessiondata['teaser'], 0, $teaserwidth).'...';
+                                                                } else {
+                                                                        $markerArray['###SLOTTEASER###'] = $sessiondata['teaser'];
+                                                                }
+                                                                # Get speaker list of session
+                                                                $markerArray['###SLOTSPEAKER###'] = $this->getSpeakerNames($sessiondata['speaker']);
                                                         } else {
                                                                 $markerArray = array();
@@ -991 +1004 @@
                                                                         $markerArray['###SLOTSESSION###'] = $this->pi_getLL('tx_wseevents_sessions.slot_notassigned');
                                                                         $markerArray['###SLOTTEASER###'] = $this->pi_getLL('tx_wseevents_sessions.slot_notassigned');
+                                                                        $markerArray['###SLOTSPEAKER###'] = '';
                                                                 } else {
                                                                         $markerArray['###SLOTNAME###'] = '';
                                                                         $markerArray['###SLOTSESSION###'] = '';
                                                                         $markerArray['###SLOTTEASER###'] = '';
+                                                                        $markerArray['###SLOTSPEAKER###'] = '';
                                                                 }
                                                                 $markerArray['###SLOTCATEGORY###'] = 0;
@@ -1575 +1590 @@
                                 $data = $this->pi_getRecord('static_countries',$this->internal['currentRow'][$fN]);
                                 $iso = $data['cn_iso_3'];
-                                return $this->staticInfo->getStaticInfoName('COUNTRIES', $iso);
+                                return $this->staticInfo->getStaticInfoName('COUNTRIES', $iso);//.':'.$iso.':'.$this->staticInfo->getCurrentLanguage();
                         break;
 
@@ -1773 +1788 @@
                 $where = 'sys_language_uid=0 AND location='.$loc_id.$this->cObj->enableFields('tx_wseevents_rooms');
                 $this->conf['pidList'] = $eventPid;
-                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,name,comment,seats', 'tx_wseevents_rooms', $where);
+                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,name,comment,seats,number', 'tx_wseevents_rooms', $where, 'number');
                 $id = 1;
                 while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
@@ -1794 +1809 @@
         function getSlot($event, $day, $room, $slot, $showdbgsql) {
                 $where = 'event='.$event.' AND eventday='.$day.' AND room='.$room.' AND begin='.$slot.$this->cObj->enableFields('tx_wseevents_timeslots');
-                $this->conf['pidList'] = $eventPid;
+//              $this->conf['pidList'] = $eventPid;
                 if ($showdbgsql==1) { echo 'getSlot where:'.$where.'<br>'; };
                 $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid', 'tx_wseevents_timeslots', $where);
@@ -1833 +1848 @@
                 $where = 'sys_language_uid=0'.$this->cObj->enableFields('tx_wseevents_sessions');
                 $this->conf['pidList'] = $eventPid;
-                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,name,category,number,teaser,timeslots', 'tx_wseevents_sessions', $where);
+                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,name,category,number,teaser,timeslots,speaker', 'tx_wseevents_sessions', $where);
                 while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
 //                      foreach(explode(',',$row['timeslots']) as $k){
@@ -1851 +1866 @@
         }
 
+
+
+
+        /**
+         * Get speaker names for a list of speaker id's
+         *
+         * @param       integer         $speakerlist: list of speaker id's
+         * @return      string          string with list of speakers
+         */
+        function getSpeakerNames($speakerlist) {
+                foreach(explode(',',$speakerlist) as $k){
+                        $data = $this->pi_getRecord('tx_wseevents_speakers',$k);
+                        // Get the name and firstname
+                        if (!empty($data['firstname'])) {
+                                if (((isset($this->conf['lastnameFirst']))) && ($this->conf['lastnameFirst']==1)) {
+                                        $speakername =  $data['name'].', '.$data['firstname'];
+                                } else {
+                                        $speakername =  $data['firstname'].' '.$data['name'];
+                                }
+                        } else {
+                                $speakername =  $data['name'];
+                        }
+                        if (isset($content)) {
+                                $content .= $this->internal['speakerdelimiter'].$speakername;
+                        } else {
+                                $content = $speakername;
+                        }
+                }
+                if (empty($content)) {
+                        $content = $this->pi_getLL('tx_wseevents_sessions.nospeakers','[no speaker assigned]');
+                }
+                return $content;
+        }
+
 }