participation/management/commands/export_results.py

@@ -17,8 +17,8 @@ class Command(BaseCommand):
             self.w("")
             self.w("")
 
-    def w(self, msg, prefix="", suffix=""):
-        self.stdout.write(f"{prefix}{msg}{suffix}")
+    def w(self, msg):
+        self.stdout.write(msg)
 
     def handle_tournament(self, tournament):
         name = tournament.name
@@ -52,29 +52,28 @@ class Command(BaseCommand):
         self.w("<table>")
         self.w("<thead>")
         self.w("<tr>")
-        self.w("    <th>Équipe</th>")
-        self.w("    <th>Score Tour 1</th>")
-        self.w("    <th>Score Tour 2</th>")
-        self.w("    <th>Total</th>")
-        self.w("    <th class=\"has-text-align-center\">Prix</th>")
+        self.w("\t<th>Équipe</th>")
+        self.w("\t<th>Score Tour 1</th>")
+        self.w("\t<th>Score Tour 2</th>")
+        self.w("\t<th>Total</th>")
+        self.w("\t<th class=\"has-text-align-center\">Prix</th>")
         self.w("</tr>")
         self.w("</thead>")
         self.w("<tbody>")
         for i, (participation, note) in enumerate(notes):
             self.w("<tr>")
-            bold = (not tournament.final and participation.final) or (tournament.final and i < 2)
-            if bold:
-                prefix, suffix = "    <td><strong>", "</strong></td>"
+            if i < (2 if len(notes) >= 7 else 1):
+                self.w(f"\t<th>{participation.team.name} ({participation.team.trigram})</td>")
             else:
-                prefix, suffix = "    <td>", "</td>"
-            self.w(f"{participation.team.name} ({participation.team.trigram})", prefix, suffix)
-            for tournament_round in [1, 2]:
-                pool_note = sum(pool.average(participation)
-                                for pool in tournament.pools.filter(participations=participation,
-                                                                    round=tournament_round).all())
-                self.w(f"{pool_note:.01f}", prefix, suffix)
-            self.w(f"{note:.01f}", prefix, suffix)
-            self.w(participation.mention_final if tournament.final else participation.mention, prefix, suffix)
+                self.w(f"\t<td>{participation.team.name} ({participation.team.trigram})</td>")
+            for pool in tournament.pools.filter(participations=participation).all():
+                pool_note = pool.average(participation)
+                self.w(f"\t<td>{pool_note:.01f}</td>")
+            self.w(f"\t<td>{note:.01f}</td>")
+            if tournament.final:
+                self.w(f"\t<td>{participation.mention_final}</td>")
+            else:
+                self.w(f"\t<td>{participation.mention}</td>")
             self.w("</tr>")
         self.w("</tbody>")
         self.w("</table>")

tfjm.cron

@@ -8,7 +8,7 @@
 */2     *       *       *       *       cd /code && python manage.py update_index &> /dev/null
 
 # Recreate sympa lists
-7       3       *       *      *        cd /code && python manage.py fix_sympa_lists &> /dev/null
+*/2     *       *       *       *       cd /code && python manage.py fix_sympa_lists &> /dev/null
 
 # Check payments from Hello Asso
 */6     *       *       *       *       cd /code && python manage.py check_hello_asso &> /dev/null