consistency to add minute to apprentices tables

[brisk.git] / web / briskin5 / stat-day.php

diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index 8afb371..7bc80e4 100644 (file)
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -38,19 +38,28 @@ curl -d "pazz=$BRISK_PASS" "http://$BRISK_SITE/briskin5/stat-day.php?from=$(date
 
 */
 
-$G_base = "../";
+foreach (array("HTTP_HOST", "DOCUMENT_ROOT") as $i) {
+    if (isset($_SERVER[$i])) {
+        $$i = $_SERVER[$i];
+        }
+    }
 
-// SYNC WITH bin5_tournaments table
-$mlang_stat_day = array(
-                         'old rules: with draw'=> array( 'it' => 'Partite vecchie (con il pareggio)',
-                                                         'en' => 'Old matches (with draw)' ),
+foreach (array("pazz") as $i) {
+    if (isset($_POST[$i])) {
+        $$i = $_POST[$i];
+        }
+    }
 
-                         'new rules: without draw' => array( 'it' => 'Partite nuove (senza pareggio)',
-                                                             'en' => 'New matches (without draw)'),
+foreach (array("from", "to") as $i) {
+    if (isset($_GET[$i])) {
+        $$i = $_GET[$i];
+        }
+    }
 
-                         'special match' => array( 'it' => 'Partite speciali',
-                                                   'en' => 'Special matches'),
+$G_base = "../";
 
+// SYNC WITH bin5_tournaments table
+$mlang_stat_day = array(
                          'info_total'=> array( 'it' => 'totali',
                                                'en' => 'En totali')
                          );
@@ -107,11 +116,11 @@ function main_pgsql($from, $to)
             $trn_obj = pg_fetch_object($trn_pg, $t);
 
             $tmt_sql = sprintf("
-SELECT m.code AS code, m.mazzo_next as minus_one_is_old
-    FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_tournaments as t
-    WHERE t.code = m.tcode AND m.code = g.mcode
-        AND t.code = %d AND g.tstamp >= '%s' AND g.tstamp < '%s'
-    GROUP BY m.code, minus_one_is_old
+SELECT m.code AS code, m.ttype AS ttype, m.mazzo_next AS minus_one_is_old 
+    FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_tournaments AS t 
+    WHERE t.code = m.tcode AND m.code = g.mcode 
+        AND t.code = %d AND g.tstamp >= '%s' AND g.tstamp < '%s' 
+    GROUP BY m.code, minus_one_is_old 
     ORDER BY m.code, minus_one_is_old DESC;",
                                $G_dbpfx, $G_dbpfx, $G_dbpfx, $trn_obj->code, $from, $to);
 
@@ -129,12 +138,8 @@ SELECT m.code AS code, m.mazzo_next as minus_one_is_old
             if ($tmt_n == 0)
                 continue;
 
-            if (!isset($mlang_stat_day[$trn_obj->name][$G_lang])) {
-                log_crit("stat-day: tournament name not found in array");
-                break;
-            }
-            printf("[Tournament [%s]], number of matches: %d\n", $mlang_stat_day[$trn_obj->name][$G_lang], $tmt_n);
-            fprintf($fpexp, "<h2 style=\"padding: 8px; background-color: pink;\">%s</h2>", $mlang_stat_day[$trn_obj->name][$G_lang]);
+            printf("[Tournament [%s]], number of matches: %d\n", rules_id2descr($trn_obj->code, $G_lang), $tmt_n);
+            fprintf($fpexp, "<h2 style=\"padding: 8px; background-color: pink;\">%s</h2>", xcape(ucfirst(rules_id2descr($trn_obj->code, $G_lang))));
 
             // loop on matches
             for ($m = 0 ; $m < $tmt_n ; $m++) {
@@ -162,7 +167,9 @@ SELECT g.* FROM %sbin5_tournaments AS t, %sbin5_matches AS m, %sbin5_games AS g
                 for ($u = 0 ; $u < count($users) ; $u++) {
                     // log_crit("stat-day: LOOP u");
                     if ($u == 0) {
-                        fprintf($fpexp, "<h3>Codice: %d (%s - %s), Tavolo: %s</h3>\n", $tmt_obj->code, $users[$u]['first'], $users[$u]['last'], $users[$u]['tidx']);
+                        fprintf($fpexp, "<h3>Codice: %d (%s - %s), Tavolo: %s%s</h3>\n",
+                        $tmt_obj->code, $users[$u]['first'], $users[$u]['last'], $users[$u]['tidx'],
+                        ($tmt_obj->ttype > 2 ? " (tavolo per apprendisti)" : ""));
                         fprintf($fpexp, "<table align='center' class='placing'><tr>\n");
                     }
                     fprintf($fpexp, "<th>%s</th>", $users[$u]['login']);
@@ -261,10 +268,9 @@ SELECT p.pts AS pts
                                 ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"));
                     }
                     if ($tmt_obj->minus_one_is_old != -1) {
-                        // FIXME
-                        $rules_name = "Rules_old_rules";
+                        $rules_name = rules_id2name($trn_obj->code);
                         fprintf($fpexp, "<td>%s</td><td>%s</td>", $users[$gam_obj->mazzo]['login'],
-                                xcape( ${rules_name}::game_description($gam_obj->act, 'plain', $gam_obj->mult,
+                                xcape( $rules_name::game_description($gam_obj->act, 'plain', $gam_obj->mult,
                                                         $gam_obj->asta_win,
                                                         ($gam_obj->asta_win != -1 ?
                                                          $users[$gam_obj->asta_win]['login'] : ""),