Changeset 2914

Timestamp:

02/04/12 09:05:44 (3 months ago)

Author:

paparazzia

Message:

see #244 (quick and dirty display for groups)

Location:

trunk/lib/phpcommon

Files:

• functions.php (modified) (8 diffs)
• racesgroups.class.php (added)
• users.class.php (modified) (2 diffs)

trunk/lib/phpcommon/functions.php

@@ -826 +826 @@
 }
 
+
 function getNumOpponents($idraces, $check = TRUE) {
   //force type int
@@ -857 +858 @@
   //              arrivés     en course       inscrits (arr + out + en course)
   return (array ($num_arrived,$num_racing,$num_arrived + $num_out + $num_racing));
+}
+
+function getRacesGroupsBatch($racelist) {
+  $ret = Array();
+  $in = "races.idraces IN (";
+  $first = TRUE;
+  foreach ($racelist as $idr) {
+    if ($first) {
+      $first = FALSE;
+      $in.=$idr;
+    } else {
+      $in.=",".$idr;
+    }
+  }
+  $in.=")";
+
+  $query = "SELECT races.`idraces`, group_concat(grouptag) AS grouptaglist ".
+           "FROM races LEFT JOIN racestogroups ON (races.idraces = racestogroups.idraces) WHERE ".$in." ".
+           "GROUP BY races.idraces";
+  $result = wrapper_mysql_db_query_reader($query) or die($query);
+  while($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
+    $ret[$row['idraces']] = $row;
+  }
+  return $ret;
 }
 
@@ -981 +1006 @@
       $html .= htmlTinymap($rowdatas['idraces'], $rowdatas['racename']);
       $html .= "</td>\n";
+      $html .= " <td class=\"grouptaglist\">";
+      foreach (split(',', $rowdatas['grouptaglist']) as $g) {
+          $html .= htmlRacesGroupLink($g);
+          $html .= " ";
+      }
+      $html .= "</td>\n";
       $html .= " </tr>\n";
       return $html;
@@ -989 +1020 @@
 }
 
-function dispHtmlRacesList($where = "") {
-
-  echo "<table>\n";
-  echo "<thead>\n";
-  echo "    <tr>\n";
-  echo "    <th>".getLocalizedString("raceid")."</th>\n";
-  echo "    <th>".getLocalizedString("racename")."</th>\n";
-  echo "    <th>".getLocalizedString("departuredate")." (GMT)</th>\n";
-  echo "    <th>". join('<br />', explode("/", getLocalizedString("racenumboats")))."</th>\n";
-  echo "    <th>".getLocalizedString("map")."</th>\n";
-  echo "    </tr>\n";
-  echo "   </thead>\n";
-  echo "  <tbody>\n";
-//  echo "<tr><td></td><td></td><td></td><td></td></tr>";
-
-
-  // La requete qui donne la liste des courses en cours
-  $query= "SELECT idraces, racename, started, deptime, startlong, startlat, ".
-    "boattype, closetime, racetype, if(started=".RACE_ENDED.", 0, deptime) ".
-    "AS deptimesort FROM races $where ORDER by started DESC, deptimesort ASC, ".
-    "closetime DESC, idraces DESC";
-
-  $result = wrapper_mysql_db_query_reader($query) or die($query);
-
-  if (mysql_num_rows($result)) {
-      $allRacesRows = array();
-      $allRacesIds  = array();
-      while($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
-        array_push($allRacesRows, $row);
-        array_push($allRacesIds, $row['idraces']);      
-      }
-      $allNumOpponents = getNumOpponentBatch($allRacesIds);
-
-      foreach($allRacesRows as $row) {
-        $row['num_opps'] = $allNumOpponents[$row['idraces']];
-        echo htmlRacesListRow($row);
-      }
+function dispHtmlRacesList($where = "", $limit = 100) {
+
+    // La requete qui donne la liste des courses en cours
+    $query= "SELECT races.idraces, racename, started, deptime, startlong, startlat, ".
+      "boattype, closetime, racetype, if(started=".RACE_ENDED.", 0, deptime) ".
+      "AS deptimesort, group_concat(grouptag) AS grouptaglist ".
+      "FROM races LEFT JOIN racestogroups ON (races.idraces = racestogroups.idraces) $where ".
+      "GROUP BY races.idraces ORDER by started DESC, deptimesort ASC, closetime DESC, idraces DESC ".
+      "LIMIT $limit";
+
+    $result = wrapper_mysql_db_query_reader($query) or die($query);
+
+    if (mysql_num_rows($result)) {
+        $allRacesRows = array();
+        while($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
+            $allRacesRows[$row['idraces']] = $row;
+        }
+        echo htmlRacesList($allRacesRows);
+    }
+}
+
+function htmlRacesList($raceslist) {
+  $html = "";
+      $html .= "<table>\n";
+  $html .= "<thead>\n";
+  $html .= "    <tr>\n";
+  $html .= "    <th>".getLocalizedString("raceid")."</th>\n";
+  $html .= "    <th>".getLocalizedString("racename")."</th>\n";
+  $html .= "    <th>".getLocalizedString("departuredate")." (GMT)</th>\n";
+  $html .= "    <th>". join('<br />', explode("/", getLocalizedString("racenumboats")))."</th>\n";
+  $html .= "    <th>".getLocalizedString("map")."</th>\n";
+  $html .= "    <th>".getLocalizedString("Group(s)")."</th>\n";
+  $html .= "    </tr>\n";
+  $html .= "   </thead>\n";
+  $html .= "  <tbody>\n";
+
+  $allNumOpponents = getNumOpponentBatch(array_keys($raceslist));
+  $allRacesGroups = getRacesGroupsBatch(array_keys($raceslist));
+ 
+  foreach ($raceslist as $idraces => $row) {
+      $row['num_opps'] = $allNumOpponents[$row['idraces']];
+      $row['grouptaglist'] = $allRacesGroups[$row['idraces']]['grouptaglist'];
+      $html .= htmlRacesListRow($row);
   }  
 
-  echo "</tbody>\n";
-  echo "</table>\n  ";
+  $html .= "</tbody>\n";
+  $html .= "</table>\n  ";
+
+  return $html;
+}
+
+function htmlRacesGroupLink($grouptag) {
+    if (is_null($grouptag) || $grouptag == "") return "";
+    return "<a href=\"/racesgroups.php?grouptag=$grouptag\">!$grouptag</a>";
 }
 
@@ -1465 +1509 @@
 }
 
+function getFullUserObject($id, $initrow = NULL) {
+    if (!is_null($uo = getUserObject($id, $initrow))) {
+        return new fullUsers($id, $uo);
+    } else {
+        return null;
+    }
+}
+
 function getUserObject($id, $initrow = NULL) {
   static $uobjects = Array();
@@ -1569 +1621 @@
 }
 
-function setUserPref($idusers,$pref_name,$pref_value, $save=true) {
+function setUserPref($idusers, $pref_name, $pref_value, $save=true) {
     //FIXME : this is duplicated in users.class
     if ($idusers != "" and $save) {
@@ -1583 +1635 @@
 
 function getUserPref($idusers,$pref_name) {
-
     if ($idusers != "") {
         $query_pref = "SELECT `pref_value` FROM `user_prefs` WHERE `idusers` = $idusers AND `pref_name` = '$pref_name'";
@@ -1594 +1645 @@
 
         return ($pref_value);
-    }
-}
-
-function listUserPref($idusers, $prefix = null) {
-    if ($idusers != "") {
-        $prefs=array();
-        $query_pref = "SELECT `pref_name`, `pref_value` FROM `user_prefs` WHERE `idusers` = $idusers";
-        if (!is_null($prefix)) $query_pref .= " AND `pref_name` LIKE '".$prefix."%'";
-        $query_pref .= " ORDER BY `pref_name`";
-        $result_pref = wrapper_mysql_db_query_reader($query_pref) or die($query_pref);
-        while ( $row = mysql_fetch_array($result_pref, MYSQL_ASSOC) ) {
-            $prefs[$row["pref_name"]]=$row["pref_value"];
-        }
-        return($prefs);
     }
 }

trunk/lib/phpcommon/users.class.php

@@ -652 +652 @@
     }
   }
-  
-  function getMyPref($pref_name) {
+
+  function feedPrefs() {
       if (!isset($this->preferences)) {
           $query_pref = "SELECT pref_name, pref_value FROM user_prefs".
@@ -669 +669 @@
           $this->preferences['boatname'] = $this->users->boatname;
       }
+  }
+  
+  function getMyPref($pref_name) {
+      $this->feedPrefs();
       if (array_key_exists($pref_name, $this->preferences)) {
         return $this->preferences[$pref_name];