From f3eb9a99fb0cec49546f1153b95324a6c2630c45 Mon Sep 17 00:00:00 2001
From: Teal <git@teal.is>
Date: Mon, 27 May 2024 17:07:45 +0200
Subject: [PATCH] grey out
---
app/views/assignments/by_user.html.erb | 6 +++---
app/views/assignments/index.html.erb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/assignments/by_user.html.erb b/app/views/assignments/by_user.html.erb
index 5557083..18e263e 100644
--- a/app/views/assignments/by_user.html.erb
+++ b/app/views/assignments/by_user.html.erb
@@ -12,14 +12,14 @@
</tr>
</thead>
<tbody>
- <% @user.assignments.future.includes(:session, session: :conference).order('sessions.starts_at').each do |assignment| %>
- <tr class="*:border *:p-1">
+ <% @user.assignments.includes(:session, session: :conference).order('sessions.starts_at').each do |assignment| %>
+ <tr class="*:border *:p-1 <%= assignment.session.starts_at < Time.now ? "past" : "future" %>">
<td><%= assignment.session.conference.name %></td>
<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><%= 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>
+ <td><% assignment.session.assignments.map(&:user).each do |other_user| %><%= render partial: 'application/user_avatar', locals: { user: other_user } %><% end %></td>
</tr>
<% end %>
</table>
diff --git a/app/views/assignments/index.html.erb b/app/views/assignments/index.html.erb
index 456a7b3..763d001 100644
--- a/app/views/assignments/index.html.erb
+++ b/app/views/assignments/index.html.erb
@@ -10,7 +10,7 @@
<li class="<%= assignment.session.starts_at < now ? "past" : "future" %>">
<%= assignment.session.starts_at.strftime('%H:%M') %> @ <%= assignment.session.stage.name %>:
<%= link_to assignment.session.title, assignment.session %>
- <small><% assignment.session.assignments.map(&:user).reject{ |u| u == user }.each do |other_user| %>
+ <small><% assignment.session.assignments.map(&:user).each do |other_user| %>
<%= render partial: 'application/user_avatar', locals: { user: other_user } %>
<% end %></small>
</li>
--
GitLab