From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Tue, 28 Apr 2020 16:21:58 +0000 (+0200)
Subject: consistency to add minute to apprentices tables
X-Git-Tag: v5.10.0~39
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fminuta-appr;p=brisk.git

consistency to add minute to apprentices tables
---

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 74a5dbd..1c9bea4 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -720,8 +720,11 @@ class BriskDB
 
                 // match not exists, insert it
                 // , BIN5_TOURNAMENT_NO_DRAW
-                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx, mazzo_next, mult_next, tcode) VALUES ('%s', %d, %d, %d, %d) RETURNING *;",
-                                   $G_dbpfx, $sql_ttok, $tidx, $table->mazzo, $table->mult, $table->rules->id_get());
+                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, ttype, tidx, mazzo_next, mult_next, tcode) VALUES ('%s', %d, %d, %d, %d, %d) RETURNING *;",
+                                   $G_dbpfx, $sql_ttok,
+                                   ($tidx < TABLES_CERT_N ? 1 : ($tidx < TABLES_AUTH_N ? 2 : (
+                                       $tidx < TABLES_APPR_N ? 3 : 4))),
+                                   $tidx, $table->mazzo, $table->mult, $table->rules->id_get());
                 if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_affected_rows($mtc_pg) != 1) {
                     log_crit(sprintf("bin5_points_save: failed at insert match [%s]", $mtc_sql));
                     break;
diff --git a/web/briskin5/Obj/rules_old_rules.phh b/web/briskin5/Obj/rules_old_rules.phh
index 3aba2a0..712e650 100644
--- a/web/briskin5/Obj/rules_old_rules.phh
+++ b/web/briskin5/Obj/rules_old_rules.phh
@@ -301,7 +301,7 @@ class Rules_old_rules extends Rules {
                                              $table->old_pnt, $table->old_asta_pnt, $table->old_tourn_pts);
 
 
-        if ($user->table_orig < TABLES_AUTH_N) {
+        if ($user->table_orig < TABLES_APPR_N) {
             require_once("../Obj/dbase_".$G_dbasetype.".phh");
 
             if (($bdb = BriskDB::create()) != FALSE) {
diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index 17c6e8c..7bc80e4 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -116,8 +116,8 @@ 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 
+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 
@@ -167,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']);