session timezone

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/session.rs b/src/session.rs
index 4b2e5260c7f6da2a8004ad54a0e4e4a7f60cba1b..915692f1c51ac2fd244c4481c33327faf29cf11c 100644 (file)
--- a/src/session.rs
+++ b/src/session.rs
@@ -14,7 +14,13 @@ struct SessionRenderContext {
   defs : Vec<(VisiblePieceId,Html)>,
   nick : String,
   load : String,
-  log : Vec<Arc<CommittedLogEntry>>,
+  log : Vec<SessionFormattedLogEntry>,
+}
+
+#[derive(Debug,Serialize)]
+struct SessionFormattedLogEntry {
+  when: String,
+  logent: Arc<CommittedLogEntry>,
 }
 
 #[derive(Serialize,Debug)]
@@ -88,6 +94,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
     }
 
     let pl = ig.gs.players.byid_mut(player)?;
+    let tz = &ig.updates.byid(player)?.tz;
     let mut pieces : Vec<_> = ig.gs.pieces.iter().collect();
 
     pieces.sort_by_key(|(_,pr)| &pr.zlevel);
@@ -122,7 +129,10 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
     let src = SessionRenderContext {
       ctoken,
       gen : ig.gs.gen,
-      log : ig.gs.log.iter().map(|(_,logent)| logent.clone()).collect(),
+      log : ig.gs.log.iter().map(|(_, logent)|{
+        let when = logent.when.render(tz);
+        SessionFormattedLogEntry { when, logent: logent.clone() }
+      }).collect(),
       table_size : ig.gs.table_size,
       player,
       defs : alldefs,

diff --git a/templates/session.tera b/templates/session.tera
index e2d1555e6bbdd739787162c997871132429aba24..7711afe2f16da5e1ef1a90bd33ec02cdb45f9497 100644 (file)
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -50,7 +50,7 @@
 <p>
   <div id="log" style="overflow-y: scroll; height: 200px;">
 {% for ent in log %}
-    <div>{{ent.when}}: {{ ent.logent.html | safe }}</div>
+    <div>{{ent.when}}: {{ ent.logent.logent.html | safe }}</div>
 {%- endfor %}
   </div>