Issue #206 Modified Courses Tab, edited controllers accordingly

alaashafaee · Apr 22, 2014 · 455ddaf · 455ddaf
1 parent 6e71e35
commit 455ddaf
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 3 deletions.
diff --git a/tutor/app/controllers/lecturers_controller.rb b/tutor/app/controllers/lecturers_controller.rb
@@ -7,6 +7,7 @@ class LecturersController < ApplicationController
 	# Author: Serag
 	def show
 		@lecturer = Lecturer.find(params[:id])
+		@courses = @lecturer.courses.order("created_at desc")
 	end
 	def index
 	end

diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb
@@ -7,6 +7,7 @@ class StudentsController < ApplicationController
 	# Author: Serag
 	def show
 		@student = Student.find(params[:id])
+		@courses = @student.courses.order("created_at desc")
 	end
 	def index
 	end

diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb
@@ -7,6 +7,7 @@ class TeachingAssistantsController < ApplicationController
 	# Author: Serag
 	def show
 		@teaching_assistant = TeachingAssistant.find(params[:id])
+		@courses = @teaching_assistant.courses.order("created_at desc")
 	end
 	def index
 	end

diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb
@@ -84,7 +84,29 @@
 					<p> @lecturer.getStat() "to be reviewed" </p>
 		        </div>
 				<div id="tab3" class="tab">
-					<p> "courses here" </p>
+					<table class = "table table-striped", style = "width:80%">
+						<tr>
+							<th>Name</th>
+							<th>Code</th>
+							<th>Options</th>
+							<th></th>
+						</tr>
+						<% @courses.each do |c| %>
+							<tr>
+								<td><%= link_to c.name, :controller => 'courses', :action => 'show', :id => c.id, 
+											:method => :get, class: "btn btn-success" %></td>
+								<td><%= c.code %></td>
+								<% if current_lecturer %>
+									<td>
+									<%= link_to "Manage Course", {:controller => 'courses', :action => 'edit', :method => :get, :id => c.id}, class: "btn btn-success", style: "text-decoration:none" %>
+									</td>
+								<% end %>
+								<td>
+									<%= link_to "Discussion Board", {:controller => 'discussion_boards', :action => 'show', :id => c.id	}, class: "btn btn-success", method: :get, style: "text-decoration:none" %>
+								</td>
+							</tr>
+						<% end %>
+					</table>
 				</div>
 			</div>
 		</div>

diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb
@@ -84,7 +84,29 @@
 					<p> @student.getStat() "to be reviewed" </p>
 		        </div>
 				<div id="tab3" class="tab">
-					<p> "courses here" </p>
+					<table class = "table table-striped", style = "width:80%">
+						<tr>
+							<th>Name</th>
+							<th>Code</th>
+							<th>Options</th>
+							<th></th>
+						</tr>
+						<% @courses.each do |c| %>
+							<tr>
+								<td><%= link_to c.name, :controller => 'courses', :action => 'show', :id => c.id, 
+											:method => :get, class: "btn btn-success" %></td>
+								<td><%= c.code %></td>
+								<% if current_lecturer %>
+									<td>
+									<%= link_to "Manage Course", {:controller => 'courses', :action => 'edit', :method => :get, :id => c.id}, class: "btn btn-success", style: "text-decoration:none" %>
+									</td>
+								<% end %>
+								<td>
+									<%= link_to "Discussion Board", {:controller => 'discussion_boards', :action => 'show', :id => c.id	}, class: "btn btn-success", method: :get, style: "text-decoration:none" %>
+								</td>
+							</tr>
+						<% end %>
+					</table>
 				</div>
 			</div>
 		</div>

diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb
@@ -84,7 +84,29 @@
 					<p> @teaching_assistant.getStat() "to be reviewed" </p>
 		        </div>
 				<div id="tab3" class="tab">
-					<p> "courses here" </p>
+					<table class = "table table-striped", style = "width:80%">
+						<tr>
+							<th>Name</th>
+							<th>Code</th>
+							<th>Options</th>
+							<th></th>
+						</tr>
+						<% @courses.each do |c| %>
+							<tr>
+								<td><%= link_to c.name, :controller => 'courses', :action => 'show', :id => c.id, 
+											:method => :get, class: "btn btn-success" %></td>
+								<td><%= c.code %></td>
+								<% if current_lecturer %>
+									<td>
+									<%= link_to "Manage Course", {:controller => 'courses', :action => 'edit', :method => :get, :id => c.id}, class: "btn btn-success", style: "text-decoration:none" %>
+									</td>
+								<% end %>
+								<td>
+									<%= link_to "Discussion Board", {:controller => 'discussion_boards', :action => 'show', :id => c.id	}, class: "btn btn-success", method: :get, style: "text-decoration:none" %>
+								</td>
+							</tr>
+						<% end %>
+					</table>
 				</div>
 			</div>
 		</div>