Changeset 2843

Timestamp:

01/08/12 07:58:06 (4 months ago)

Author:

paparazzia

Message:

fix #650

Location:

trunk

Files:

• base/scripts/upgrade-v0.19.sql (modified) (1 diff)
• lib/phpcommon/racesiterators.class.php (modified) (4 diffs)
• site/admin/index.php (modified) (1 diff)
• site/admin/races_instructions.php (modified) (1 diff)
• site/admin/racespreview.php (added)

trunk/base/scripts/upgrade-v0.19.sql

@@ -1 +1 @@
 #Creation de la table racespreview
-DROP TABLE IF EXISTS `racepreview`;
+DROP TABLE IF EXISTS `racespreview`;
 CREATE TABLE `racespreview` (
   `idracespreview` int(11) NOT NULL auto_increment,

trunk/lib/phpcommon/racesiterators.class.php

@@ -26 +26 @@
 
         function __construct() {
-            $this->query = "SELECT * FROM `races` ".
+            $this->query = "(SELECT deptime, closetime, racename, racename as description, boattype, idraces FROM `races` ".
                            "WHERE ( ( started = ". RACE_PENDING ." AND deptime > UNIX_TIMESTAMP() ) OR ( closetime > UNIX_TIMESTAMP() ) ) ".
-                           "AND !(racetype & ".RACE_TYPE_RECORD. ") ORDER BY started ASC, deptime ASC, closetime ASC " ;
+                           "AND !(racetype & ".RACE_TYPE_RECORD. ") ORDER BY started ASC, deptime ASC, closetime ASC ) ".
+                           "UNION ( SELECT deptime, deptime+3600 as closetime, racename, comments as description, NULL as boattype, NULL as idraces ".
+                           "FROM `racespreview` ".
+                           "WHERE deptime > UNIX_TIMESTAMP() )";
             parent::__construct();
         }
@@ -49 +52 @@
             $vevent->setProperty( 'dtend', array('timestamp' => $row['closetime']) );
             $vevent->setProperty( 'summary', html_entity_decode($row['racename'], ENT_COMPAT, "UTF-8") );
-            $vevent->setProperty( 'description', html_entity_decode($row['racename'], ENT_COMPAT, "UTF-8")." ( ".substr($row['boattype'], 5 )." ) " );
+            if (!is_null($row['boattype'])) {
+                $vevent->setProperty( 'description', html_entity_decode($row['racename'], ENT_COMPAT, "UTF-8")." ( ".substr($row['boattype'], 5 )." ) " );
+            } else {
+                $vevent->setProperty( 'description', html_entity_decode($row['description'], ENT_COMPAT, "UTF-8") );
+            }
             //FIXME: construction de l'url ???
-            $vevent->setProperty( 'url', sprintf("http://%s/ics.php?idraces=%d", $_SERVER['SERVER_NAME'],  $row['idraces']));
+            if (!is_null($row['idraces'])) {
+                $vevent->setProperty( 'url', sprintf("http://%s/ics.php?idraces=%d", $_SERVER['SERVER_NAME'],  $row['idraces']));
+            }
             $this->icalobject->setComponent ( $vevent ); // add event to calendar
         }
@@ -65 +74 @@
 
         function __construct() {
-            $this->query = "SELECT * FROM races ".
+            $this->query = "(SELECT deptime, closetime, racename, racename as description, boattype, idraces FROM `races` ".
                            " WHERE ( deptime > (UNIX_TIMESTAMP()-2592000 ) ) AND !(racetype & ".RACE_TYPE_RECORD.") ".
-                           " ORDER BY started ASC, deptime ASC, closetime ASC ";
+                           " ORDER BY started ASC, deptime ASC, closetime ASC ) ".
+                           "UNION ( SELECT deptime, NULL as closetime, racename, comments as description, NULL as boattype, NULL as idraces ".
+                           "FROM `racespreview` ".
+                           "WHERE deptime > UNIX_TIMESTAMP() )";
+
+                           ;
             parent::__construct();
         }
@@ -80 +94 @@
             $jsonarray['end'] = $row['closetime'];
             $jsonarray['title'] = html_entity_decode($row['racename'], ENT_COMPAT, "UTF-8");
-            $jsonarray['allDay'] = False;
-            $jsonarray['url'] = sprintf("http://%s/ics.php?idraces=%d", $_SERVER['SERVER_NAME'],  $row['idraces']);
+            $jsonarray['allDay'] = is_null($row['closetime']);
+            if (!is_null($row['idraces'])) $jsonarray['url'] = sprintf("http://%s/ics.php?idraces=%d", $_SERVER['SERVER_NAME'],  $row['idraces']);
             $this->jsonarray[] = $jsonarray;
         }

trunk/site/admin/index.php

@@ -34 +34 @@
 
     $tablepages = Array(
+        "racespreview.php" => "Incoming Races - Calendar Management",
         "races_instructions.php" => "Races instructions",
         "races.php" => "Races definitions (no uploading, see below)",

trunk/site/admin/races_instructions.php

@@ -20 +20 @@
 
 $opts['fdd']['autoid'] = array(
-  'help'     => 'Unique id of the race',
+  'help'     => 'Unique id of the race instruction',
   'select'   => 'T',
   'input'  => 'R',