From b5d1fd46ed61697ad3b18074ef79fa36ab22d8e3 Mon Sep 17 00:00:00 2001
From: Priec <filippriec@gmail.com>
Date: Sat, 16 May 2026 19:17:12 +0200
Subject: [PATCH] better admin calendar

---
 ht_booking/assets/views/calendar/week.html | 37 ++++++++++++++++++----
 ht_booking/src/controllers/calendar.rs     | 11 +++++--
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/ht_booking/assets/views/calendar/week.html b/ht_booking/assets/views/calendar/week.html
index 1e8b45a..9d3b19b 100644
--- a/ht_booking/assets/views/calendar/week.html
+++ b/ht_booking/assets/views/calendar/week.html
@@ -33,11 +33,26 @@
     #cal .cal-day-2 { display: table-cell; }
     #cal.cal-js .cal-day { display: none; }
     #cal.cal-js .cal-day.cal-day-on { display: table-cell; }
+    /* Slim the hour column to its compact label so bookings get the width. */
+    #cal tbody td:first-child {
+      width: 1%;
+      white-space: nowrap;
+      padding: 0.3rem 0.4rem;
+      font-size: 0.7rem;
+      line-height: 1.15;
+    }
   }
 </style>
 {% if is_admin %}
 <style>
-  /* Admin calendar — detailed-view toggle. The public calendar is unaffected. */
+  /* Admin calendar — strict, content-independent column widths. A long
+     booking can never widen its column; it grows taller instead. (The public
+     calendar has merged free rows with a colspan, so it keeps auto layout.) */
+  #cal { table-layout: fixed; }
+  @media (max-width: 767px) {
+    #cal tbody td:first-child { width: 3.25rem; }
+  }
+  /* Detailed-view toggle. */
   .cal-detail { display: none; }
   #cal.cal--detailed .cal-chip {
     position: static;
@@ -48,10 +63,7 @@
     align-items: stretch;
     justify-content: center;
   }
-  #cal.cal--detailed .cal-name {
-    white-space: normal;
-    font-weight: 600;
-  }
+  #cal.cal--detailed .cal-name { font-weight: 600; }
   #cal.cal--detailed .cal-detail {
     display: flex;
     flex-direction: column;
@@ -59,8 +71,21 @@
     margin-top: 2px;
     font-weight: 400;
     line-height: 1.25;
+  }
+  /* Detailed fields wrap to as many lines as needed — the full booking info
+     shows and the cell just grows taller, never wider. */
+  #cal.cal--detailed .cal-name,
+  #cal.cal--detailed .cal-detail > span {
+    white-space: normal;
     overflow-wrap: anywhere;
   }
+  /* A long note is capped with an ellipsis so one booking can't run away. */
+  #cal.cal--detailed .cal-note {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 6;
+    overflow: hidden;
+  }
 </style>
 {% endif %}
 {% endblock head %}
@@ -185,7 +210,7 @@
             <span class="cal-detail">
               {%- if cell.title %}<span class="truncate opacity-95">{{ cell.title }}</span>{% endif -%}
               {%- if cell.contact %}<span class="truncate opacity-80">{{ cell.contact }}</span>{% endif -%}
-              {%- if cell.note %}<span class="opacity-80">{{ cell.note }}</span>{% endif -%}
+              {%- if cell.note %}<span class="cal-note opacity-80">{{ cell.note }}</span>{% endif -%}
             </span>
             {% endif %}
           </a>
diff --git a/ht_booking/src/controllers/calendar.rs b/ht_booking/src/controllers/calendar.rs
index 04b188d..4b4fde1 100644
--- a/ht_booking/src/controllers/calendar.rs
+++ b/ht_booking/src/controllers/calendar.rs
@@ -145,7 +145,7 @@ fn flush_free_run(run: &mut Vec<Row>, out: &mut Vec<Row>) {
     let first = run.first().map_or(FIRST_HOUR, hour_of);
     let last = run.last().map_or(first, hour_of);
     let hour_label = if run.len() > 1 {
-        format!("{first:02}:00 – {:02}:00", last + 1)
+        format!("{first:02}:00–{:02}:00", last + 1)
     } else {
         format!("{first:02}:00")
     };
@@ -196,8 +196,13 @@ pub async fn build_calendar(
     let min_monday = monday_of(Utc::now().date_naive()) - Duration::weeks(2);
     let monday = if is_admin { monday } else { monday.max(min_monday) };
     let can_prev = is_admin || monday > min_monday;
-    // Mobile single-day view opens on today when it falls in the shown week.
-    let day_offset = (Utc::now().date_naive() - monday).num_days();
+    // The mobile day-window opens on the requested day when a week was given
+    // (so returning from the booking editor lands back on it), else on today.
+    let pivot = q_week
+        .as_deref()
+        .and_then(|w| NaiveDate::parse_from_str(w, "%Y-%m-%d").ok())
+        .unwrap_or_else(|| Utc::now().date_naive());
+    let day_offset = (pivot - monday).num_days();
     let mobile_day = if (0..7).contains(&day_offset) { day_offset } else { 0 };
     let sunday = monday + Duration::days(6);