wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

server: fix date parsing w/ TZ and cal widget highlight

Browse Source
This commit is contained in:
Bill Thiede 2025-09-14 11:00:21 -07:00
parent 030d1c2ebe
commit 33c0a106b7
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server/src/email_extract.rs
View File

@ -2157,28 +2157,28 @@ mod tests {
let meta = extract_calendar_metadata_from_mail(&parsed, &body); let meta = extract_calendar_metadata_from_mail(&parsed, &body);
// Assert detection as Google Calendar // Assert detection as Google Calendar
assert!(meta.is_google_calendar_event); assert!(meta.is_google_calendar_event);
// Debug: print the rendered HTML for inspection
let html = meta.body_html.expect("body_html"); let html = meta.body_html.expect("body_html");
// Print event date info for debugging
for part in parsed.subparts.iter() {
if part.ctype.mimetype == TEXT_CALENDAR {
if let Ok(ical) = part.get_body() {
println!("ICAL data: {}", ical);
if let Some(start) = ical.lines().find(|l| l.starts_with("DTSTART:")) {
println!("Start date: {}", start);
}
}
}
}
println!("Rendered HTML: {}", html); println!("Rendered HTML: {}", html);
// Check that the calendar table highlights Thursday, not Friday
// Look for a table header row with days of week (allow whitespace) // Look for September 11 (Thursday) being highlighted
let thursday_idx = html // The calendar should show Sept 11 highlighted with background:#ffd700 and the correct data-event-day
.find(">\n Thu<") assert!(html.contains(r#"data-event-day="2025-09-11""#));
.or_else(|| html.find(">Thu<")) assert!(html.contains(r#"background:#ffd700"#));
.expect("Should have a Thursday column");
let friday_idx = html // Since 1:00 AM UTC on Friday 9/12 is 6:00 PM PDT on Thursday 9/11, verify times are correct
.find(">\n Fri<") assert!(html.contains("6:00 PM Thu Sep 11, 2025"));
.or_else(|| html.find(">Fri<"))
.expect("Should have a Friday column");
// Find the first highlighted cell (background:#ffd700)
let highlight_idx = html
.find("background:#ffd700")
.expect("Should highlight a day");
// The highlight should be closer to Thursday than Friday
assert!(
highlight_idx > thursday_idx && highlight_idx < friday_idx,
"Thursday should be highlighted, not Friday"
);
} }
use super::*; use super::*;
#[test] #[test]

8
server/templates/ical_summary.html
View File

@ -74,13 +74,7 @@
{% for week in all_days|batch(7) %} {% for week in all_days|batch(7) %}
<tr> <tr>
{% for day in week %} {% for day in week %}
{% if event_days.contains(day) && today.is_some() && today.unwrap() == day %} {% if event_days.contains(day) %}
<td
data-event-day="{{ day.format("%Y-%m-%d") }}"
style="background:#ffd700; color:#222; font-weight:bold; border:2px solid #2196f3; border-radius:4px; text-align:center; box-shadow:0 0 0 2px #2196f3;">
{{ day.day() }}
</td>
{% elif event_days.contains(day) %}
<td <td
data-event-day="{{ day.format("%Y-%m-%d") }}" data-event-day="{{ day.format("%Y-%m-%d") }}"
style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;"> style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;">