From d47661b1bc3db37b9ae5eab1326b38eaa91236be Mon Sep 17 00:00:00 2001
From: Teal <git@teal.is>
Date: Mon, 27 May 2024 12:28:08 +0200
Subject: [PATCH] fix tz bullshit?
---
app/controllers/assignments_controller.rb | 4 ++--
app/views/assignments/by_user.html.erb | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index f9bcb29..fe2197f 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -70,8 +70,8 @@ class AssignmentsController < ApplicationController
other_users = other_users - [ @user.name ]
event = Icalendar::Event.new
- event.dtstart = Icalendar::Values::DateTime.new(session.starts_at)
- event.dtend = Icalendar::Values::DateTime.new(session.ends_at)
+ event.dtstart = Icalendar::Values::DateTime.new(session.starts_at, tzid: session.starts_at.zone)
+ event.dtend = Icalendar::Values::DateTime.new(session.ends_at, tzid: session.ends_at.zone)
event.summary = [session.title, session.stage.name].join(' @ ')
event.description = other_users.join(', ') + "\n\n" + helpers.strip_tags(session.description)
event.location = [session.stage.name, session.conference.name].join(' @ ')
diff --git a/app/views/assignments/by_user.html.erb b/app/views/assignments/by_user.html.erb
index 1786c8e..9274e3a 100644
--- a/app/views/assignments/by_user.html.erb
+++ b/app/views/assignments/by_user.html.erb
@@ -1,4 +1,5 @@
<div>
+ <h4 class="text-xl my-2"><%= link_to @user.name, user_assignments_path(@user) %> <span class="font-normal"><%= link_to user_assignments_path(@user, format: 'ics') do %><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="ml-2 mb-1 size-4 inline-block stroke-slate-400 fill-slate-400"><path fill-rule="evenodd" d="M5.75 2a.75.75 0 01.75.75V4h7V2.75a.75.75 0 011.5 0V4h.25A2.75 2.75 0 0118 6.75v8.5A2.75 2.75 0 0115.25 18H4.75A2.75 2.75 0 012 15.25v-8.5A2.75 2.75 0 014.75 4H5V2.75A.75.75 0 015.75 2zm-1 5.5c-.69 0-1.25.56-1.25 1.25v6.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-6.5c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"></path></svg><% end %></span></h4>
<table class="border *:border">
<thead>
<tr class="*:font-bold *:border">
@@ -17,7 +18,7 @@
<td><%= assignment.session.starts_at.strftime('%Y-%m-%d') %></td>
<td><%= assignment.session.starts_at.strftime('%H:%M') %></td>
<td><%= assignment.session.stage.name %></td>
- <td><%= assignment.session.title %></td>
+ <td><%= link_to assignment.session.title, assignment.session.url, target: "_top" %></td>
<td><% assignment.session.assignments.map(&:user).reject{ |u| u == @user }.each do |other_user| %><%= render partial: 'application/user_avatar', locals: { user: other_user } %><% end %></td>
</tr>
<% end %>
--
GitLab