From 83ef49d7834db88fdf9a33369e2b70f00a5e8090 Mon Sep 17 00:00:00 2001
From: Zac Wood <zwood2@gmu.edu>
Date: Wed, 24 Oct 2018 16:58:14 -0400
Subject: [PATCH] instructor page updates

---
 schedules/app/models/semester.rb              |  4 +++
 schedules/app/views/instructors/show.html.erb | 29 +++++++++++++++----
 schedules/app/views/shared/_course.html.erb   |  6 ----
 schedules/config/routes.rb                    |  3 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/schedules/app/models/semester.rb b/schedules/app/models/semester.rb
index 419e047..cea92f3 100644
--- a/schedules/app/models/semester.rb
+++ b/schedules/app/models/semester.rb
@@ -8,4 +8,8 @@ class Semester < ApplicationRecord
   # Ensure necessary fields are present.
   validates :year, presence: true
   validates :season, presence: true
+
+  def to_s
+    return "#{season} #{year}"
+  end
 end
diff --git a/schedules/app/views/instructors/show.html.erb b/schedules/app/views/instructors/show.html.erb
index 678e28f..2606a80 100644
--- a/schedules/app/views/instructors/show.html.erb
+++ b/schedules/app/views/instructors/show.html.erb
@@ -1,7 +1,24 @@
-<h1><%= @instructor.name %></h1>
+<div class="row">
+    <div class="col-4">
+	<h1><%= @instructor.name %></h1>
+	<% prev = @instructor.course_sections.reject { |s| s.course.semester == @semester }.map { |s| s.name.split[0..1].join(' ') }.uniq %>
 
-<% if @courses.any? %>
-    <%= render partial: 'shared/course', collection: @courses, locals: { expanded: true } %>
-<% else %>
-    <p><%= @instructor.name %> has not taught any courses...</p>
-<% end %>
+	<% if prev.count.positive? %>
+	    <strong>Previously taught: </strong>
+	    <ul>
+		<% prev.each do |s| %>
+		    <li><%= s %></li>
+		<% end %>
+	    </ul>
+	<% end %>
+    </div>
+
+    <div class ="col-8">
+	<h3><%= @semester.to_s %></h3>
+	<% if @courses.any? %>
+	    <%= render partial: 'shared/course', collection: @courses, locals: { expanded: true } %>
+	<% else %>
+	    <p><%= @instructor.name %> is not teaching any courses this semester...</p>
+	<% end %>
+    </div>
+</div>
diff --git a/schedules/app/views/shared/_course.html.erb b/schedules/app/views/shared/_course.html.erb
index 3b678cc..02122a6 100644
--- a/schedules/app/views/shared/_course.html.erb
+++ b/schedules/app/views/shared/_course.html.erb
@@ -8,12 +8,6 @@
 		    <h4 class="title"><%= "#{course.subject} #{course.course_number}" %></h4>
 		<% end %>
 	    </div>
-	    
-	    <!-- <div class="col">
-		 <h4 id="add-course-btn" class="text-right" onclick="addCourse(event, '<%= course.id %>');">
-		 <i class="fas fa-plus" style="color: green"></i>
-		 </h4>
-		 </div>     -->
 	</div>
 	<h5><em><%= course.title %></em></h5>
     </div>
diff --git a/schedules/config/routes.rb b/schedules/config/routes.rb
index 136f057..0e8765f 100644
--- a/schedules/config/routes.rb
+++ b/schedules/config/routes.rb
@@ -4,9 +4,10 @@ Rails.application.routes.draw do
   get 'sessions/update', as: 'update_session'
   get 'sessions/cart'
 
+  resources :courses, only: [:show]
   resources :instructors, only: [:index, :show]
   get 'schedule', to: 'schedules#show', as: 'schedule'
-
+  
   scope :api do # Register /api routes
     resources :courses, only: [:index, :show]
     resources :course_sections, only: [:index]
-- 
GitLab