From dac580fb2625280c77968a7d531aa7a7eb5a2491 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 10 Nov 2024 13:52:26 +0100
Subject: [PATCH] =?UTF-8?q?=C5=A0koly:=20Lep=C5=A1=C3=AD=20form=C3=A1tov?=
 =?UTF-8?q?=C3=A1n=C3=AD=20log=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/init-schools | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/init-schools b/bin/init-schools
index 80d7d734..a8f3f325 100755
--- a/bin/init-schools
+++ b/bin/init-schools
@@ -21,6 +21,7 @@ import mo.config as config
 import mo.db as db
 import mo.util
 from mo.util import die
+from mo.util_format import timeformat
 
 mo.util.init_standalone()
 session = db.get_session()
@@ -308,14 +309,14 @@ def create_action(ps: ProtoSchool, type: ActionType, msg: str) -> Action:
     print(f'>> {type.name} (#{school_id}, RED_IZO {ps.red_izo}): {msg}')
     if school_id > 0:
         print(f'\t# URL: {school_url(school_id)}')
-        logs = session.query(db.Log).filter_by(type=db.LogType.place, id=school_id).all()
+        logs = session.query(db.Log).filter_by(type=db.LogType.place, id=school_id).options(joinedload(db.LogType.user)).order_by(db.Log.changed_at).all()
         for log in logs:
             action = log.details.get('action', '?')
             reason = log.details.get('reason', '?')
             if action == 'new' or reason == 'init-schools':
                 pass
             else:
-                print(f'\t# Log: {log.details}')
+                print(f'\t# Log ({timeformat(log.changed_at)} {log.user.full_name() if log.user else "system"}): {log.details}')
     if ps.unsure_region:
         print('\t# WARNING: Obec s nejistým regionem')
     return Action(type=type, school_id=school_id, values={})
-- 
GitLab