From f712837f9197a705daef3fb7a5f88fd306ea4c72 Mon Sep 17 00:00:00 2001
From: Joshua Coles <josh@coles.to>
Date: Sun, 8 Oct 2023 16:38:40 +0100
Subject: [PATCH] Improve icons, add homepage links to courses

---
 app/models/lecture.rb                                |  4 ++++
 app/views/attendance_tracker/index.html.erb          | 12 +++++++++++-
 app/views/lectures/_lecture.html.erb                 |  8 ++++++--
 app/views/work_items/_work_item.html.erb             |  2 +-
 .../20231008152722_add_moodle_link_to_course.rb      |  5 +++++
 db/schema.rb                                         |  3 ++-
 6 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20231008152722_add_moodle_link_to_course.rb

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 82c1a28..07e2e4b 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -19,6 +19,10 @@ class Lecture < ApplicationRecord
     tracked_time_entries.where(kind: [:concurrent, :catchup]).any?
   end
 
+  def entirely_attended_in_person?
+    !(tracked_time_entries.where(kind: [:catchup]).any?)
+  end
+
   def reviewed?
     tracked_time_entries.where(kind: [:review]).any?
   end
diff --git a/app/views/attendance_tracker/index.html.erb b/app/views/attendance_tracker/index.html.erb
index 93125a0..ecc54c7 100644
--- a/app/views/attendance_tracker/index.html.erb
+++ b/app/views/attendance_tracker/index.html.erb
@@ -6,7 +6,17 @@
       <div class="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
         <div class="inline-block py-2 align-middle px-6 lg:px-8">
           <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 rounded-lg">
-            <h2 class="text-2xl p-2 px-4"><%= course.title %></h2>
+            <div class="flex flex-row justify-between items-center px-4 p-2">
+              <h2 class="text-2xl">
+                <%= course.title %>
+              </h2>
+
+              <% if course.homepage.present? %>
+                <a class="align-middle" href="<%= course.homepage %>">
+                  <i class="fa fa-link text-blue-600"></i>
+                </a>
+              <% end %>
+            </div>
 
             <table class="border-t-2 divide-y divide-gray-300 w-full">
               <thead class="bg-gray-50">
diff --git a/app/views/lectures/_lecture.html.erb b/app/views/lectures/_lecture.html.erb
index c24331b..3b00d81 100644
--- a/app/views/lectures/_lecture.html.erb
+++ b/app/views/lectures/_lecture.html.erb
@@ -19,8 +19,12 @@
       <i class="fa fa-hourglass-start <%= prep_icon_class %>"></i>
 
       <% if lecture.attended? %>
-        <i class="fa fa-chalkboard-user text-green-700"></i>
-      <% elsif lecture.live? %>
+        <% if lecture.entirely_attended_in_person? %>
+          <i class="fa fa-chalkboard-user text-green-700"></i>
+        <% else %>
+          <i class="fa fa-video text-green-700"></i>
+        <% end %>
+      <% elsif lecture.is_live? %>
         <i class="fa fa-video text-blue-700"></i>
       <% elsif lecture.start_time.past? %>
         <i class="fa fa-times text-red-700"></i>
diff --git a/app/views/work_items/_work_item.html.erb b/app/views/work_items/_work_item.html.erb
index d65c76b..79897a4 100644
--- a/app/views/work_items/_work_item.html.erb
+++ b/app/views/work_items/_work_item.html.erb
@@ -15,7 +15,7 @@
       <% if work_item.completed? %>
         <i class="fa fa-check text-green-700"></i>
       <% elsif work_item.started? %>
-        <i class="fa fa-play text-blue-700"></i>
+        <i class="fa fa-pen text-blue-700"></i>
       <% else %>
         <%# Symbol to show work has not started yet %>
         <i class="fa fa-clock text-blue-gray-700"></i>
diff --git a/db/migrate/20231008152722_add_moodle_link_to_course.rb b/db/migrate/20231008152722_add_moodle_link_to_course.rb
new file mode 100644
index 0000000..1727ff1
--- /dev/null
+++ b/db/migrate/20231008152722_add_moodle_link_to_course.rb
@@ -0,0 +1,5 @@
+class AddMoodleLinkToCourse < ActiveRecord::Migration[7.1]
+  def change
+    add_column :courses, :homepage, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c21ee59..2463b9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2023_10_08_145328) do
+ActiveRecord::Schema[7.1].define(version: 2023_10_08_152722) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -22,6 +22,7 @@ ActiveRecord::Schema[7.1].define(version: 2023_10_08_145328) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.date "semester_start_date", default: "2023-10-02"
+    t.string "homepage"
   end
 
   create_table "lectures", force: :cascade do |t|