CSC/ECE 517 Fall 2017/E1781 Topic Management - Revision history

Rbalakr2: /* Issue #718: */

2017-11-27T01:51:15Z

Issue #718:

← Older revision		Revision as of 01:51, 27 November 2017
Line 253:		Line 253:
	In ''''' app/controllers/suggestion_controller.rb'''''		In ''''' app/controllers/suggestion_controller.rb'''''

	Including the text provided in the comment field, while approving the topic.		Including the text provided in the comment field, while approving the topic. This ensures that comments are saved when an instructor accepts a topic suggestion in the backend.

	def approve		def approve
			# 1781 - 718 issue
	if(params[:suggestion_comment][:comments] && params[:suggestion_comment][:comments] != "" )		# The Instructor should be able to give feed backs during the times of approval as well.
	@suggestioncomment = SuggestionComment.new(vote: 'A', comments: params[:suggestion_comment][:comments])		# Thus we are getting the comments through the request when approval is made and saving those in
	@suggestioncomment.suggestion_id = params[:id]		# Database with Vote type as A - meaning approval
	@suggestioncomment.commenter = session[:user].name		if params[:suggestion_comment][:comments] && params[:suggestion_comment][:comments] != ""
	@suggestioncomment.save		@suggestioncomment = SuggestionComment.new(vote: 'A', comments: params[:suggestion_comment][:comments])
	~~end~~		@suggestioncomment.suggestion_id = params[:id]
			@suggestioncomment.commenter = session[:user].name
			@suggestioncomment.save

	Including the text provided in the comment field, while rejecting the topic.		Including the text provided in the comment field, while rejecting the topic.This ensures that comments are saved when an instructor rejects a topic suggestion in the backend.

	def reject_suggestion		def reject_suggestion
			# 1781 - 718 issue
	if(params[:suggestion_comment][:comments] && params[:suggestion_comment][:comments] != "" )		# The Instructor should be able to give feed backs during the times of rejection as well.
	@suggestioncomment = SuggestionComment.new(vote: 'D', comments: params[:suggestion_comment][:comments])		# Thus we are getting the comments through the request when denial is made and saving those in
	@suggestioncomment.suggestion_id = params[:id]		# Database with Vote type as D - meaning reject
	@suggestioncomment.commenter = session[:user].name		if params[:suggestion_comment][:comments] && params[:suggestion_comment][:comments] != ""
	@suggestioncomment.save		@suggestioncomment = SuggestionComment.new(vote: 'D', comments: params[:suggestion_comment][:comments])
	end		@suggestioncomment.suggestion_id = params[:id]
			@suggestioncomment.commenter = session[:user].name
			@suggestioncomment.save
			end

	In ''''' app/views/suggestion/show.html.erb'''''		In ''''' app/views/suggestion/show.html.erb'''''

			The following piece of code is to handle scenarios in frontend to list the comments even for approval and deniel of suggestions.

	<pre>		<pre>

	<% for suggestion_comment in @suggestion.suggestion_comments %>		<% for suggestion_comment in @suggestion.suggestion_comments %>
	<tr class="listingRow">		<tr class="listingRow">
	<td align="center"><%=suggestion_comment.commenter %></td>		<td align="center"><%=suggestion_comment.commenter %></td>
	<td align="center">		<td align="center">
	<%if suggestion_comment.vote == 'Y' %>		<%if suggestion_comment.vote == 'Y' %>
	Yes		Yes
	<%elsif suggestion_comment.vote == 'N'%>		<%elsif suggestion_comment.vote == 'N'%>
	No		No
	<%elsif suggestion_comment.vote == 'R'%>		<%elsif suggestion_comment.vote == 'R'%>
	Revise		Revise
	<%elsif suggestion_comment.vote == 'A'%>		<!-- Two more crieteria for displaying comments. During Approval and Denial. Issue #1781 -->
	Approved		<%elsif suggestion_comment.vote == 'A'%>
	<%elsif suggestion_comment.vote == 'D'%>		Approved
	Denied		<%elsif suggestion_comment.vote == 'D'%>
	<%else%>		Denied
	--		<%else%>
	<%end%>		--
			<%end%>

	</pre>		</pre>

Rbalakr2: /* Issue #971: Change create topic UI into AJAX */

2017-11-27T01:47:12Z

Issue #971: Change create topic UI into AJAX

Show changes

Rbalakr2: /* Issue #971: Change create topic UI into AJAX */

2017-11-27T01:45:09Z

Issue #971: Change create topic UI into AJAX

← Older revision		Revision as of 01:45, 27 November 2017
Line 46:		Line 46:
	On the controller '''''app/controllers/sign_up_sheet_controller.rb''''' we edited the Load_add_signup_topics, which was converted from a function into a Rest endpoint(Json).		On the controller '''''app/controllers/sign_up_sheet_controller.rb''''' we edited the Load_add_signup_topics, which was converted from a function into a Rest endpoint(Json).

	def load_add_signup_topics		# retrieves all the data associated with the given assignment. Includes all topics,
			# this should retrieve results in Json so that it can be ajaxed
			# 1781
			# the following method is an action which renders all the topics of an assignment in the JSON format.
			def load_add_signup_topics
	@id = params[:id]		@id = params[:id]
	assignment_id = params[:id]		assignment_id = params[:id]
Line 56:		Line 60:
	# colloborating for JSON		# colloborating for JSON
	@sign_up_topics.each {\|topic\|		@sign_up_topics.each {\|topic\|
	topic_id = topic.id		topic_id = topic.id
	slots_fill_temp = 0		slots_fill_temp = 0
	slots_waitlisted = 0		slots_waitlisted = 0
	participants = []		participants = []
	~~'''~~ if @slots_filled		if @slots_filled
	~~'''~~@slots_filled.each {\|slot\|		@slots_filled.each {\|slot\|
	~~'''~~if slot.topic_id == topic_id		if slot.topic_id == topic_id
	~~'''~~slots_fill_temp = slot.count		slots_fill_temp = slot.count
	~~'''~~end		end
	~~'''~~}		}
	~~'''~~end		end
	~~'''~~if @slots_waitlisted		if @slots_waitlisted
	~~'''~~@slots_waitlisted.each {\|slot\|		@slots_waitlisted.each {\|slot\|
	~~'''~~if slot.topic_id == topic_id		if slot.topic_id == topic_id
	~~'''~~slots_waitlisted = slot.count		slots_waitlisted = slot.count
	~~'''~~end		end
	~~'''~~}		}
	~~'''~~end		end
	~~'''~~if @participants		if @participants
	~~'''~~@participants.each {\|participant\|		@participants.each {\|participant\|
	~~'''~~if participant.topic_id == topic_id		if participant.topic_id == topic_id
	~~'''~~participants << participant
	~~'''~~end		participants << participant
	~~'''~~}		end
	~~'''~~end		}
	topic.slots_filled_value = slots_fill_temp		end
	topic.slots_waitlisted = slots_waitlisted		topic.slots_filled_value = slots_fill_temp
	topic.slots_available = topic.max_choosers - topic.slots_filled_value		topic.slots_waitlisted = slots_waitlisted
	topic.partipants = participants		topic.slots_available = topic.max_choosers - topic.slots_filled_value
	}		topic.partipants = participants
	~~'''~~render :json => {		}
	~~'''~~:id => @id.as_json,		# ACS Removed the if condition (and corresponding else) which differentiate assignments as team and individual assignments
	~~'''~~:sign_up_topics => @sign_up_topics.as_json( :methods => [:slots_filled_value,:slots_waitlisted,:slots_available,:partipants]),		# to treat all assignments as team assignments
	~~'''~~:slots_waitlisted => @slots_waitlisted.as_json,		# Though called participants, @participants are actually records in signed_up_teams table, which
	~~'''~~:assignment => @assignment.as_json		# is a mapping table between teams and topics (waitlisted recored are also counted)
	~~'''~~}		render :json => {
			:id => @id.as_json,
			:sign_up_topics => @sign_up_topics.as_json( :methods => [:slots_filled_value,:slots_waitlisted,:slots_available,:partipants]),
			:slots_waitlisted => @slots_waitlisted.as_json,
			:assignment => @assignment.as_json
			}
	end		end

Vannama: /* Issue #971: Change create topic UI into AJAX */

2017-11-25T04:25:46Z

Issue #971: Change create topic UI into AJAX

← Older revision		Revision as of 04:25, 25 November 2017
Line 395:		Line 395:
	var left = $('.jsgrid-grid-body').scrollLeft() < $('.jsgrid-grid-body .jsgrid-table').width() - $('.jsgrid-grid-body').width() + 16 ?		var left = $('.jsgrid-grid-body').scrollLeft() < $('.jsgrid-grid-body .jsgrid-table').width() - $('.jsgrid-grid-body').width() + 16 ?
	$('.jsgrid-grid-body').scrollLeft() : $('.jsgrid-grid-body .jsgrid-table').width() - $('.jsgrid-grid-body').width() + 16;		$('.jsgrid-grid-body').scrollLeft() : $('.jsgrid-grid-body .jsgrid-table').width() - $('.jsgrid-grid-body').width() + 16;
	$('.jsgrid-header-row th:nth-child(-n+' + cols + '), .jsgrid-filter-row td:nth-child(-n+' + cols + '), .jsgrid-insert-row td:nth-child(-n+' + cols + '), .jsgrid-grid-body tr td:nth-child(-n+' + cols + ')')		$('.jsgrid-header-row th:nth-child(-n+' + cols + '), .jsgrid-filter-row td:nth-child(-n+' + cols + '), .jsgrid-insert-row td:nth-child(-n+' + cols + '), .jsgrid-grid-body tr td:nth-child(-n+' + cols + ')')
	.css({		.css({
	"position": "relative",		"position": "relative",

Vannama: /* Issue #971: Change create topic UI into AJAX */

2017-11-25T04:24:47Z

Issue #971: Change create topic UI into AJAX

Show changes

Vannama: /* Testing Plan */

2017-11-25T04:15:44Z

Testing Plan

← Older revision		Revision as of 04:15, 25 November 2017
Line 373:		Line 373:
	Screencast of the demo: https://youtu.be/fCxhD-qFUro		Screencast of the demo: https://youtu.be/fCxhD-qFUro
	The majority of the changes can be tested via the UI. Follow the instructions below to check the tasks.		The majority of the changes can be tested via the UI. Follow the instructions below to check the tasks.


	* '''Issue #971:''' Change create topic UI into AJAX		* '''Issue #971:''' Change create topic UI into AJAX

Vannama: /* Introduction */

2017-11-25T04:14:30Z

Introduction

← Older revision		Revision as of 04:14, 25 November 2017
Line 12:		Line 12:

	=== Problem Statement ===		=== Problem Statement ===
	~~The following were~~ the ~~tasks identified~~ to be ~~accomplished through this project~~.		Expertiza allows the instructor to define different topics that students or teams could choose from as their assignment. Each topic can have 0 or more slots that indicate the number of students or teams that can be signed up for that topic.
			To improve the user experience when managing topics, the following tasks were identified:
	* '''Issue #971:''' Change create topic UI into AJAX		* '''Issue #971:''' Change create topic UI into AJAX
	* '''Issue #926:''' We need a way to sort topics by topic number in assignment#edit page		* '''Issue #926:''' We need a way to sort topics by topic number in assignment#edit page

Vannama: /* Issue #718: */

2017-11-25T04:09:13Z

Issue #718:

← Older revision		Revision as of 04:09, 25 November 2017
Line 353:		Line 353:
	<% if @suggestion.status != 'Approved' && @suggestion.status != 'Rejected' && session[:user] != nil && (session[:user].role_id == 2 \|\| session[:user].role_id == 3 \|\| session[:user].role_id == 4) %>		<% if @suggestion.status != 'Approved' && @suggestion.status != 'Rejected' && session[:user] != nil && (session[:user].role_id == 2 \|\| session[:user].role_id == 3 \|\| session[:user].role_id == 4) %>
	<%= submit_tag "Approve suggestion", :name => 'approve_suggestion' %>		<%= submit_tag "Approve suggestion", :name => 'approve_suggestion' %>
	~~   ~~
	<%= submit_tag "Reject suggestion", :name => 'reject_suggestion' %>		<%= submit_tag "Reject suggestion", :name => 'reject_suggestion' %>
	~~   ~~
	<% end %>		<% end %>
	</pre>		</pre>
Line 364:		Line 362:


	Comments during approval or rejection ~~gets~~ reflected in the feedback list.		Comments during approval or rejection get reflected in the feedback list.

	[[File:After_approval_suggestion.png]]		[[File:After_approval_suggestion.png]]

Vannama: /* Solutions implemented and Delivered */

2017-11-25T04:07:44Z

Solutions implemented and Delivered

← Older revision		Revision as of 04:07, 25 November 2017
Line 121:		Line 121:
	"category": "",		"category": "",
	... (And so on.)		... (And so on.)


	Similarly, all the actions/methods (destroy\|setup_new_topic\|update_existing_topic\|update\|set_values_for_new_topic ) were changed to render Json rather than rendering a view, in order to satisty the Ajax requirements in the front end.		Similarly, all the actions/methods (destroy\|setup_new_topic\|update_existing_topic\|update\|set_values_for_new_topic ) were changed to render Json rather than rendering a view, in order to satisty the Ajax requirements in the front end.

Vannama: /* Solutions implemented and Delivered */

2017-11-25T04:07:02Z

Solutions implemented and Delivered

← Older revision		Revision as of 04:07, 25 November 2017
Line 42:		Line 42:

	In addition, when adding a topic, the default slot is set as 1 instead of 0. The current warning message that shows up when the slot is 0, has been fixed to close properly.		In addition, when adding a topic, the default slot is set as 1 instead of 0. The current warning message that shows up when the slot is 0, has been fixed to close properly.


	On the controller '''''app/controllers/sign_up_sheet_controller.rb''''' we edited the Load_add_signup_topics, which was converted from a function into a Rest endpoint(Json).		On the controller '''''app/controllers/sign_up_sheet_controller.rb''''' we edited the Load_add_signup_topics, which was converted from a function into a Rest endpoint(Json).
Line 122:		Line 121:
	"category": "",		"category": "",
	... (And so on.)		... (And so on.)



	Similarly, all the actions/methods (destroy\|setup_new_topic\|update_existing_topic\|update\|set_values_for_new_topic ) were changed to render Json rather than rendering a view, in order to satisty the Ajax requirements in the front end.		Similarly, all the actions/methods (destroy\|setup_new_topic\|update_existing_topic\|update\|set_values_for_new_topic ) were changed to render Json rather than rendering a view, in order to satisty the Ajax requirements in the front end.


	On the model '''''app/models/sign_up_topic.rb''''' an attribute accessor was created for variables to set properties that are required for the JSON.		On the model '''''app/models/sign_up_topic.rb''''' an attribute accessor was created for variables to set properties that are required for the JSON.