X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Fstat-day.php;h=72408e43c32a63a1724e6d4915198a9bfeeb74fc;hb=536da22ebde5fa66e0f7524e9efc0316391f1afd;hp=d21e369b78d5f3ad974d634c9a2610db60d0dc29;hpb=2e2d9c36ba2902a4c2171ba0e0f633ed7da8353c;p=brisk.git

diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index d21e369..72408e4 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -43,7 +43,10 @@ $G_base = "../";
 $mlang_stat_day = array( 'normal match'=> array( 'it' => 'Partite normali',
                                                  'en' => 'Normal matches' ),
                          'special match' => array( 'it' => 'Partite speciali',
-                                                   'en' => 'Special matches')
+                                                   'en' => 'Special matches'),
+
+                         'info_total'=> array( 'it' => 'totali',
+                                               'en' => 'En totali')
                          );
 
 
@@ -261,12 +264,13 @@ function main_pgsql($from, $to)
         }
 
         $trn_n = pg_numrows($trn_pg);
+        printf("Number of tournaments: %d\n", $trn_n);
 
         for ($t = 0 ; $t < $trn_n ; $t++) {
             $trn_obj = pg_fetch_object($trn_pg, $t);
 
-            $tmt_sql = sprintf("SELECT m.code AS code FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_tournaments as t WHERE t.code = m.tcode AND m.code = g.mcode AND g.tstamp >= '%s' AND g.tstamp < '%s' GROUP BY m.code;",
-                               $G_dbpfx, $G_dbpfx, $G_dbpfx, $from, $to);
+            $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 ORDER BY m.code, minus_one_is_old DESC;",
+                               $G_dbpfx, $G_dbpfx, $G_dbpfx, $trn_obj->code, $from, $to);
 
             // if deletable old matches exists then ...
             if (($tmt_pg = pg_query($bdb->dbconn->db(), $tmt_sql)) == FALSE) {
@@ -286,42 +290,39 @@ function main_pgsql($from, $to)
                 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, "<h3>%s</h3>", $mlang_stat_day[$trn_obj->name][$G_lang]);
 
             for ($m = 0 ; $m < $tmt_n ; $m++) {
                 fprintf($fpexp, "<br>");
                 $tmt_obj = pg_fetch_object($tmt_pg, $m);
 
-                $usr_sql = sprintf("
-SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) AS last, m.tidx AS tidx FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_points AS p, %susers AS u, %sbin5_table_orders AS o WHERE m.code = g.mcode AND g.code = p.gcode AND u.code = p.ucode AND m.code = %d AND m.code = o.mcode AND u.code = o.ucode GROUP BY u.code, u.login, m.tidx, o.pos ORDER BY o.pos;", $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx, $tmt_obj->code);
-
-                if (($usr_pg  = pg_query($bdb->dbconn->db(), $usr_sql)) == FALSE ) {
-                    break;
-                }
-                $usr_n = pg_numrows($usr_pg);
-                if ($usr_n != BIN5_PLAYERS_N) {
+                if (($users = $bdb->users_get($tmt_obj->code, TRUE, ($tmt_obj->minus_one_is_old > -1))) == FALSE) {
+                    log_crit("%s: users_get failed", __FUNCTION__);
                     break;
                 }
 
-                $gam_sql = sprintf("SELECT g.* FROM %sbin5_games AS g, %sbin5_matches AS m WHERE g.mcode = m.code AND m.code = %d ORDER BY g.tstamp;",
-                                   $G_dbpfx, $G_dbpfx, $tmt_obj->code);
+                $gam_sql = sprintf("SELECT g.* FROM %sbin5_tournaments as t, %sbin5_matches AS m, %sbin5_games AS g WHERE t.code = m.tcode AND m.code = g.mcode AND m.code = %d ORDER BY g.tstamp;",
+                                   $G_dbpfx, $G_dbpfx, $G_dbpfx, $tmt_obj->code);
                 if (($gam_pg = pg_query($bdb->dbconn->db(), $gam_sql)) == FALSE ) {
+                    log_crit("stat-day: gam_sql failed");
                     break;
                 }
 
-                $usr_obj = array();
-                for ($u = 0 ; $u < $usr_n ; $u++) {
-                    $usr_obj[$u] = pg_fetch_object($usr_pg, $u);
+                for ($u = 0 ; $u < count($users) ; $u++) {
                     if ($u == 0) {
-                        fprintf($fpexp, "<h3>Codice: %d (%s - %s), Tavolo: %s</h3>\n", $tmt_obj->code, $usr_obj[$u]->first, $usr_obj[$u]->last, $usr_obj[$u]->tidx);
+                        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, "<table align='center' class='placing'><tr>\n");
                     }
-                    fprintf($fpexp, "<th>%s</th>", $usr_obj[$u]->login);
-                    $pts_sql = sprintf("SELECT p.pts as pts from %sbin5_matches as m, %sbin5_games as g, %sbin5_points as p, %susers as u WHERE m.code = g.mcode AND g.code = p.gcode AND u.code = p.ucode AND m.code = %d AND u.code = %d ORDER BY g.code", $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx,
-                                       $tmt_obj->code, $usr_obj[$u]->code);
+                    fprintf($fpexp, "<th>%s</th>", $users[$u]['login']);
+                    // note: we are looping on users, order on them not needed
+                    $pts_sql = sprintf("SELECT p.pts as pts from %sbin5_games as g, %sbin5_points as p WHERE g.code = p.gcode AND g.mcode = %d AND p.ucode = %d ORDER BY g.code",
+                                       $G_dbpfx, $G_dbpfx, $G_dbpfx,
+                                       $tmt_obj->code, $users[$u]['code']);
 
                     // points of the match for each user
-                    if (($pts_pg[$u]  = pg_query($bdb->dbconn->db(), $pts_sql)) == FALSE) {
+                    if (($pts_pg[$u] = pg_query($bdb->dbconn->db(), $pts_sql)) == FALSE) {
+                        log_crit("stat-day: pts_sql failed");
                         break;
                     }
                     if ($u == 0) {
@@ -329,29 +330,38 @@ SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) A
                     }
                     else {
                         if ($num_games != pg_numrows($pts_pg[$u])) {
+                            log_crit("stat-day: num_games != pg_numrows");
                             break;
                         }
                     }
                 }
                 if ($u != BIN5_PLAYERS_N) {
+                    log_crit("stat-day: u != BIN5_PLAYERS_N");
                     break;
                 }
-                fprintf($fpexp, "<th>mazzo</th><th>descrizione</th></tr>\n");
 
+                if ($tmt_obj->minus_one_is_old != -1) {
+                    fprintf($fpexp, "<th>mazzo</th><th>descrizione</th></tr>\n");
+                }
                 // LISTA DELLE VARIE PARTITE
                 for ($g = 0 ; $g < $num_games ; $g++) {
                     $gam_obj = pg_fetch_object($gam_pg, $g);
                     fprintf($fpexp, "<tr>");
                     for ($u = 0 ; $u < BIN5_PLAYERS_N ; $u++) {
                         $pts_obj = pg_fetch_object($pts_pg[$u], $g);
-                        fprintf($fpexp, "<th>%d</th>", $pts_obj->pts);
+                        fprintf($fpexp, "<%s>%d</%s>",
+                                ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"),
+                                $pts_obj->pts,
+                                ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"));
+                    }
+                    if ($tmt_obj->minus_one_is_old != -1) {
+                        fprintf($fpexp, "<td>%s</td><td>%s</td>", $users[$gam_obj->mazzo]['login'],
+                                xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult,
+                                                        $gam_obj->asta_win, $users[$gam_obj->asta_win]['login'],
+                                                        $gam_obj->friend, $users[$gam_obj->friend]['login'],
+                                                        $gam_obj->pnt, $gam_obj->asta_pnt) )
+                                );
                     }
-                    fprintf($fpexp, "<td>%s</td><td>%s</td>", $usr_obj[$gam_obj->mazzo]->login,
-                            xcape( game_description($gam_obj->act, 'plain',
-                                                    $gam_obj->asta_win, $usr_obj[$gam_obj->asta_win]->login,
-                                                    $gam_obj->friend, $usr_obj[$gam_obj->friend]->login,
-                                                    $gam_obj->pnt, $gam_obj->asta_pnt) )
-                            );
                     fprintf($fpexp, "</tr>\n");
                 }
 
@@ -360,14 +370,16 @@ SELECT u.code AS code, u.login AS login, min(g.tstamp) AS first, max(g.tstamp) A
                 for ($u = 0 ; $u < BIN5_PLAYERS_N ; $u++) {
                     $tot_sql = sprintf("
 SELECT SUM(p.pts) AS pts FROM %sbin5_matches AS m, %sbin5_games AS g, %sbin5_points AS p, %susers AS u WHERE m.code = g.mcode AND g.code = p.gcode AND u.code = p.ucode AND m.code = %d AND u.code = %d", $G_dbpfx, $G_dbpfx, $G_dbpfx, $G_dbpfx,
-                                       $tmt_obj->code, $usr_obj[$u]->code);
+                                       $tmt_obj->code, $users[$u]['code']);
                     if (($tot_pg  = pg_query($bdb->dbconn->db(), $tot_sql)) == FALSE ) {
                         break;
                     }
                     $tot_obj = pg_fetch_object($tot_pg, 0);
                     fprintf($fpexp, "<th>%d</th>", $tot_obj->pts);
                 }
-                fprintf($fpexp, "</tr>\n");
+                if ($tmt_obj->minus_one_is_old != -1) {
+                    fprintf($fpexp, "<th colspan='2'>%s</th></tr>\n", $mlang_stat_day['info_total'][$G_lang]);
+                }
                 fprintf($fpexp, "</table>\n");
             }
             if ($m < $tmt_n)