diff --git a/app/controllers/attendance_tracker_controller.rb b/app/controllers/attendance_tracker_controller.rb index 6dce48b..0a2c075 100644 --- a/app/controllers/attendance_tracker_controller.rb +++ b/app/controllers/attendance_tracker_controller.rb @@ -1,11 +1,6 @@ class AttendanceTrackerController < ApplicationController before_action :refresh_toggl - def index - @courses = Course.active.sort_by(&:title) - @current_lecture = get_current_lecture - end - def overview @courses = Course.active.sort_by(&:title) @current_lecture = get_current_lecture @@ -13,9 +8,9 @@ class AttendanceTrackerController < ApplicationController def today @courses = Course.active.sort_by(&:title) - @date = Date.today + @date = Date.tomorrow @current_lecture = get_current_lecture - @lectures = @courses.flat_map { |course| course.lectures.filter { |a| a.start_time.today? } }.sort_by { |l| l.start_time } + @lectures = @courses.flat_map { |course| course.lectures.filter { |a| a.start_time.to_date == @date } }.sort_by { |l| l.start_time } end def course_focus diff --git a/app/views/attendance_tracker/_course_table.erb b/app/views/attendance_tracker/_course_table.erb index a144479..732e508 100644 --- a/app/views/attendance_tracker/_course_table.erb +++ b/app/views/attendance_tracker/_course_table.erb @@ -8,7 +8,7 @@ <% course.lectures.sort_by(&:start_time).group_by(&:week_number).each do |(week_number, lectures)| %> -
+
Week <%= week_number %>
diff --git a/app/views/attendance_tracker/index.html.erb b/app/views/attendance_tracker/index.html.erb deleted file mode 100644 index 0ece73c..0000000 --- a/app/views/attendance_tracker/index.html.erb +++ /dev/null @@ -1,63 +0,0 @@ -

Attendance Tracker

- -
- <% @courses.each do |course| %> -
-
-
-
-
-

- <%= course.title %> -

- - <% if course.homepage.present? %> - - - - <% end %> -
- - - - - - - - - - - - - - <% course.lectures.group_by { |lecture| lecture.week_number }.each do |(week_number, lectures)| %> - - - - - <%= render lectures %> - <% end %> - -
LectureDateStatusAction
-
-
- Week <%= week_number %> -
- -
- <% total_for_week = lectures.sum { |lecture| lecture.total_overall_time }.seconds %> - <%# TODO: Improve this figure, atm it is for lectures in week, not time spent in week (ie - prepping for lecture next week will count in next week not current week) %> - <% if total_for_week > 0 %> - (Total <%= humanise_duration(lectures.sum { |lecture| lecture.total_overall_time }.seconds) %> - ) - <% end %> -
-
-
-
-
-
-
- <% end %> -
diff --git a/app/views/attendance_tracker/overview.erb b/app/views/attendance_tracker/overview.erb index 5464086..9052d67 100644 --- a/app/views/attendance_tracker/overview.erb +++ b/app/views/attendance_tracker/overview.erb @@ -2,10 +2,10 @@

Overview

-
+
<% @courses.each do |course| %> -
-
+
+

<%= course.title %>

<% if course.homepage.present? %> @@ -15,7 +15,7 @@ <% end %>
-
+
<%= render partial: 'course_table', locals: { course: course, current_lecture: @current_lecture } %>
diff --git a/app/views/attendance_tracker/today.html.erb b/app/views/attendance_tracker/today.html.erb index 1fa3a0f..7c94a15 100644 --- a/app/views/attendance_tracker/today.html.erb +++ b/app/views/attendance_tracker/today.html.erb @@ -10,31 +10,7 @@
Action
- <% @lectures.each do |lecture| %> - <% status_classes = class_names({ - 'lecture-future': lecture.start_time.future?, - 'bg-purple-100': lecture == @current_lecture, - 'bg-green-100': lecture.attended?, - }) %> - -
-
- <%= lecture.course.title %> -
- -
- <%= lecture.title %> -
- -
- <%= render partial: 'lectures/lecture_status_icons', locals: { lecture: } %> -
- -
- <%= render partial: 'lectures/lecture_action', locals: { lecture: } %> -
-
- <% end %> + <%= render @lectures, { div: true, today_view: true } %>
diff --git a/app/views/lectures/_lecture.html.erb b/app/views/lectures/_lecture.html.erb index 295fbbb..e34406c 100644 --- a/app/views/lectures/_lecture.html.erb +++ b/app/views/lectures/_lecture.html.erb @@ -19,13 +19,17 @@ data-controller="popover" data-action="mouseenter->popover#show mouseleave->popover#hide" > - <%= lecture.start_time.to_fs(:dmy) %> + <% if local_assigns[:today_view] %> + <%= lecture.start_time.to_fs(:time) %> ‐ <%= lecture.end_time.to_fs(:time) %> + <% else %> + <%= lecture.start_time.to_fs(:dmy) %> - + + <% end %>
diff --git a/config/routes.rb b/config/routes.rb index 6fad381..bbce2ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ Rails.application.routes.draw do get '/courses/:id/fill_in_default_live_video_url', to: 'courses#fill_in_default_live_video_url', as: :course_fill_in_default_live_video_url end - root controller: :attendance_tracker, action: :index + root controller: :attendance_tracker, action: :overview get '/today', controller: :attendance_tracker, action: :today get '/overview', controller: :attendance_tracker, action: :overview get '/courses/:id', controller: :attendance_tracker, action: :course_focus