CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-04-01T02:17:35Z

Dnhancoc: /* Code Modifications */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

[[File:CheckFieldsTitle.png]][[File:CheckFieldsUrl.png]][[File:CheckFieldsDescription.png]]

Changed files:
:app/views/bookmarks/new.html.erb
<pre style="color: black; border:1px;">
<nowiki></nowiki>

<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

</pre>

:app/views/bookmarks/edit.html.erb

<pre style="color: black; border:1px;">


<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

</pre>
Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire. The integer '5' used in calculating both types of average scores was used because of the fact that there are a total of five stars for each questionnaire question.

[[File:BookmarkAvgRatings.png]]

Qustionnaire for fourth bookmark listed above (do your own calculation to find the mean for 'Your rating'):

[[File:QuestionnaireForLastBookmark.png]]

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

# calculate average questionnaire score for 'Your rating' for specific bookmark
def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

# calculate average questionnaire score for 'Avg. rating' for specific bookmark
def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb
<pre style="color: black; border:1px;">
<nowiki></nowiki>
<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>
</pre>

<pre style="color: black; border:1px;">

<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>
</pre>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

[[File:Bookmark list.png]]

Changed files:
:app/views/bookmarks/list.html.erb
<pre style="color: black; border:1px;">

<th class="head">Badge</th>

<td>



<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>
</pre>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki></nowiki>
<% if session[:user].id != bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki></nowiki>
<% if session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

[[File:Sign up sheet bookmarks.png]]

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
def view
...
@use_bookmark = @assignment.use_bookmark
...
end

:app/views/student_task/view.html.erb
<<nowiki />!--Show bookmarks if they are allowed for this assignment-->
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/controllers/assignments_controller.rb
def edit
...
@use_bookmark = @assignment.use_bookmark
end

:app/views/sign_up_sheet/_actions.html.erb
<<nowiki />!--Shows bookmarks if they are allowed for this assignment.-->
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />!--Bookmarks may be disabled for this assignment-->
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commits can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here] and [https://github.com/hosungh/expertiza/commit/d71642353f9c2db20778c2665fb5efcd96ea31db here]

[[File:Disable-bookmark-links.png]]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki>
<% is_teammate = false %></nowiki>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<nowiki></nowiki>
<% if bookmark.user_id != session[:user].id %>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
<% else %>
<%= '-' %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Bookmark response list.png]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>
<nowiki></nowiki>
<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>
<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>
<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>

<nowiki></nowiki>
<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>

<nowiki></nowiki>
<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>

<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''DB Diagram'''==
[[File:Model.png]]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

A demo that shows that these features are implemented can be found [https://youtu.be/_DwqJ95FbMM here].

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [http://152.46.16.56:8080 http://152.46.16.56:8080]

Note: To aid in testing, we have created an assignment called "Bookmark Demo" as instructor6. The students assigned to this assignment include student6340, student6341, and student5648.

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [http://152.46.16.56:8080 Deployed Application]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

5. [https://youtu.be/_DwqJ95FbMM Demo]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-04-01T02:15:52Z

Dnhancoc: /* Code Modifications */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

[[File:CheckFieldsTitle.png]][[File:CheckFieldsUrl.png]][[File:CheckFieldsDescription.png]]

Changed files:
:app/views/bookmarks/new.html.erb
<pre style="color: black; border:1px;">
<nowiki></nowiki>

<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

</pre>

:app/views/bookmarks/edit.html.erb

<pre style="color: black; border:1px;">


<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

</pre>
Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire. The integer '5' used in calculating both types of average scores was used because of the fact that there are a total of five stars for each questionnaire question.

[[File:BookmarkAvgRatings.png]]

Qustionnaire for fourth bookmark listed above (do your own calculation to find the mean for 'Your rating'):

[[File:QuestionnaireForLastBookmark.png]]

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

# calculate average questionnaire score for 'Your rating' for specific bookmark
def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

# calculate average questionnaire score for 'Avg. rating' for specific bookmark
def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb
<pre style="color: black; border:1px;">
<nowiki></nowiki>
<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>
</pre>

<pre style="color: black; border:1px;">

<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>
</pre>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

[[File:Bookmark list.png]]

Changed files:
:app/views/bookmarks/list.html.erb
<pre style="color: black; border:1px;">

<th class="head">Badge</th>

<td>



<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>
</pre>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki></nowiki>
<% if session[:user].id != bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki></nowiki>
<% if session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

[[File:Sign up sheet bookmarks.png]]

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<<nowiki />!--Show bookmarks if they are allowed for this assignment-->
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/controllers/assignments_controller.rb
def edit
...
@use_bookmark = @assignment.use_bookmark
end

:app/views/sign_up_sheet/_actions.html.erb
<<nowiki />!--Shows bookmarks if they are allowed for this assignment.-->
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />!--Bookmarks may be disabled for this assignment-->
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commits can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here] and [https://github.com/hosungh/expertiza/commit/d71642353f9c2db20778c2665fb5efcd96ea31db here]

[[File:Disable-bookmark-links.png]]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb
<nowiki>
<% is_teammate = false %></nowiki>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<nowiki></nowiki>
<% if bookmark.user_id != session[:user].id %>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
<% else %>
<%= '-' %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Bookmark response list.png]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>
<nowiki></nowiki>
<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>
<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>
<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>

<nowiki></nowiki>
<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>

<nowiki></nowiki>
<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>

<nowiki></nowiki>
<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''DB Diagram'''==
[[File:Model.png]]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

A demo that shows that these features are implemented can be found [https://youtu.be/_DwqJ95FbMM here].

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [http://152.46.16.56:8080 http://152.46.16.56:8080]

Note: To aid in testing, we have created an assignment called "Bookmark Demo" as instructor6. The students assigned to this assignment include student6340, student6341, and student5648.

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [http://152.46.16.56:8080 Deployed Application]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

5. [https://youtu.be/_DwqJ95FbMM Demo]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-24T01:46:15Z

Dnhancoc: /* Application Deployment */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

[[File:CheckFieldsTitle.png]][[File:CheckFieldsUrl.png]][[File:CheckFieldsDescription.png]]

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

[[File:BookmarkAvgRatings.png]]

Qustionnaire for fourth bookmark listed above (do your own calculation to find the mean for 'Your rating'):

[[File:QuestionnaireForLastBookmark.png]]

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

[[File:Bookmark list.png]]

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

[[File:Sign up sheet bookmarks.png]]

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

[[File:Disable-bookmark-links.png]]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Bookmark response list.png]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [http://152.46.17.220:8080 http://152.46.17.220:8080]

Note: To aid in testing, we have created an assignment called "Bookmarks Test Assignment" as instructor6. The students assigned to this assignment include student7339, student7340, and student7341.

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [http://152.46.17.220:8080 Deployed Application]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

File:Disable-bookmark-links.png

2020-03-23T23:38:50Z

Dnhancoc: Dnhancoc uploaded a new version of File:Disable-bookmark-links.png

File:Screenshot (49).png

2020-03-23T23:32:06Z

Dnhancoc:

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T23:24:37Z

Dnhancoc: /* Code Modifications */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

[[File:CheckFieldsTitle.png]][[File:CheckFieldsUrl.png]][[File:CheckFieldsDescription.png]]

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

[[File:Avg_Ratings_and_Badges.png]]

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

[[File:Bookmark list.png]]

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

[[File:Sign up sheet bookmarks.png]]

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

[[File:Disable-bookmark-links.png]]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Bookmark response list.png]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [http://152.46.17.220:8080 http://152.46.17.220:8080]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [http://152.46.17.220:8080 Deployed Application]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

File:Disable-bookmark-links.png

2020-03-23T23:22:09Z

Dnhancoc: Dnhancoc uploaded a new version of File:Disable-bookmark-links.png

File:Disable-bookmark-links.png

2020-03-23T23:05:12Z

Dnhancoc: Dnhancoc uploaded a new version of File:Disable-bookmark-links.png

File:Disable-bookmark-links.png

2020-03-23T22:57:48Z

Dnhancoc:

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T22:54:31Z

Dnhancoc: /* Code Modifications */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Example.jpg]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T22:53:42Z

Dnhancoc: /* Code Modifications */

==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.''' Previously, students could submit and view bookmarks even if bookmarks were disabled for the assignment. Now these options are hidden.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

[[File:Example.jpg]]

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [https://github.com/expertiza/expertiza/pull/1704/ Beta Branch Pull Request]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T21:19:43Z

Dnhancoc: Fixed formatting under Fix the ability to create bookmark questionnaires and use in assigments

<nowiki>Insert non-formatted text here</nowiki>
==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.'''

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assignments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [link to pull request]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T21:04:35Z

Dnhancoc: /* Code Modifications */

<nowiki>Insert non-formatted text here</nowiki>
==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Grey out add/view bookmarks link on the topic page if bookmarks are not enabled.'''

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<% if @use_bookmark %>
<<nowiki />%= link_to :controller=>'bookmarks', :action=> 'list', :id => topic.id do %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />p class="fa fa-stack-2x fa-inverse" style='font-size: 1.0em; padding-top: 2px; font-weight: bold;'>
<%= Bookmark.where(topic_id: topic.id).length.to_s %>
<<nowiki />/p>
<<nowiki />/span>
<% end %>
<%= link_to :controller=>'bookmarks', :action=> 'new', :id => topic.id , :assignment_id => params[:assignment_id] do %>
<<nowiki />span class="fa-stack fa-md" title='Add bookmark to topic'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x">
<<nowiki />i class="fa fa-plus fa-stack-1x fa-inverse" style='font-size: .5em'>
<<nowiki />/span>
<% end %>
<<nowiki />% else %>
<<nowiki />span class="fa-stack fa-md" title='View topic bookmarks'>
<<nowiki />i class="fa fa-bookmark fa-stack-1x fa-2x" style="opacity: 0.3;">

<% end %>

:app/views/sign_up_sheet/_table_header.html.erb
<<nowiki />th width="10%"> Bookmarks
<% unless @use_bookmark %> (disabled) <% end %>
<<nowiki />/th>

Commit can be found [https://github.com/hosungh/expertiza/commit/f0352ddf441d3773109b2e0208981f3fe122b5df here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assigments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [link to pull request]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T20:50:54Z

Dnhancoc: /* Code Modifications */

<nowiki>Insert non-formatted text here</nowiki>
==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assigments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [link to pull request]

CSC/ECE 517 Spring 2020 - E2005. Bookmark enhancements

2020-03-23T20:49:45Z

Dnhancoc: /* Code Modifications */

<nowiki>Insert non-formatted text here</nowiki>
==E2005. Bookmark Enhancements==

=='''Introduction'''==

===About Expertiza===
[http://expertiza.ncsu.edu/ Expertiza] is an open-source project that is built using the [http://rubyonrails.org/ Ruby on Rails] framework. At its core, it is a highly versatile tool that academic institutions can use to craft learning objectives centered around team projects, peer reviews, and highly-customizable assignments.

=='''Problem Statement'''==
The purpose of this project was to add meaningful enhancements and fixes to the bookmark feature in Expertiza, entities that can be attached to a topic to aid the authors who decide to take on a certain assignment. While the major functionality of the bookmark feature was already present by the time the team embarked on this project (most notably the ability to create/edit and rate bookmarks), many desired functions were conveniently broken or left out.

===Completed Stories===
Below is a breakdown of the stories that were drawn up and completed for this project:

1. Need a way to view all responses to the bookmark questionnaires.

2. Modify permissions for deleting bookmarks.The person who creates the bookmark, the team for whom the bookmark is meant, and the instructor, should be able to delete.

3. "View bookmarks" link on student_task/view breaks if the student has not selected a topic yet.

4. Bookmark rating questionnaire should include question asking the reviewer whether or not the bookmark appears to have been used by the author. Get the bookmark questionnaire functioning and add to the bookmark list page.

5. Fix issue in which users should not be able to review their own bookmark using the questionnaire, but currently can.

6. Add a number next to/inside the icon with the number of current bookmark in order to make it clear whether a bookmark exists for a topic.

7. Add a "View bookmarks" link to the assignment view page for easier access.

8. Add rating to the bookmark questionnaire and use that rating to calculate the average instead of using the current dropdown.

9. A student should not be able to rate his/her own bookmark.

10. Add URL to bookmark list for assignment topic on the assignment page, to make viewing bookmarks easier.

11. Instructors cannot currently see bookmarks (gets an error message saying instructors cannot create bookmarks).

12. "Back" button from Bookmarks list is broken.

13. When creating a bookmark with an empty description field, the notice says the bookmark was successfully created even though it fails.

14. "Bookmark ratings" should be a type of rubric when you go to Manage > Questionnaires. Although 'Bookmark Rating' is already a type of rubric, it isn't listed when hovering over Manage... > Questionnaires

15. Create a way to mark a bookmark that was rated to be helpful by all reviewers, on average.

16. Students can add/view bookmarks when "Allow participants to create bookmarks?" box is unchecked for the assignment.

=='''Code Modifications'''==

'''Fix the "Back" button:'''
When either backing out of creating or viewing/editing a bookmark, the back functionality does not work, both prompting errors. Issue has been fixed and users can once again go back to the appropriate page.

Changed files:
:app/views/bookmarks/list.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/new.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

:app/views/bookmarks/edit.html.erb
<%= link_to 'Back', '#', :onclick => 'pageBack()' %>

<script>
....
function pageBack() {
history.back()
}
</script>

Pull request can be found [https://github.com/hosungh/expertiza/pull/2?file-filters%5B%5D= here]

Commit for "Back" capability when updating bookmark can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Check whether text field is present when creating/updating bookmark:'''
Previously, when a bookmark was created/updated and the corresponding "Title", "URL", or "Description" text fields were not filled in, the bookmark was not created or updated sans any error or warning. In fact, the user would be taken to the list of bookmarks available, forcing him/her to go back to the page corresponding to the bookmark create/edit page. This fix prompts users with an error indicating which text field needs to be filled in in order to fulfill the particular bookmark create/edit function.

Changed files:
:app/views/bookmarks/new.html.erb
<%= label_tag 'Title' %> 
<%= text_field_tag :title, params[:title], :required => true %> 
<%= label_tag 'Url' %> 
<%= text_field_tag :url, params[:url], :required => true %> 
<%= label_tag 'Description' %> 
<%= text_area_tag :description, params[:description], :required => true %> 

:app/views/bookmarks/edit.html.erb
<%= label_tag 'Title' %> 
<%= f.text_field :title, :required => true %> 
<%= label_tag 'Url' %> 
<%= f.text_field :url, :required => true %> 
<%= label_tag 'Description' %> 
<%= f.text_area :description, :required => true %> 

Pull request can be found [https://github.com/hosungh/expertiza/pull/4?file-filters%5B%5D= here]

'''Change average bookmark rating to be based on questionnaire:'''
The rating system for the bookmarks before these changes were elementary in nature - there was a drop-down menu to choose your particular rating for a bookmark while there was an average calculator just to the left of the aforementioned column. The new changes introduced allows the "Your rating" and "Avg. rating" columns for a particular bookmark to be calculated based on the scores given to the various questions present in a given bookmark questionnaire. The "Avg. rating" is calculated based on the mean rating of all the bookmark questionnaires scored by every reviewer while "Your rating" is simply the mean of the scores that you (the user) gave to all the questions on the questionnaire.

Changed files:
:app/controllers/bookmarks_controller.rb
helper_method :specific_average_score
helper_method :total_average_score

def specific_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id,
reviewer_id: AssignmentParticipant.find_by(user_id: current_user.id).id).flat_map {|r| Response.where(map_id: r.id) }
score = Answer.get_total_score(response: responses, questions: questions)
if score.nil?
return '-'
else
(score * 5.0 / 100.0).round(2)
end
end
end

def total_average_score(bookmark)
if bookmark.nil?
return '-'
else
assessment = SignUpTopic.find(bookmark.topic_id).assignment
questions = assessment.questionnaires.where(type: 'BookmarkRatingQuestionnaire').flat_map(&:questions)
responses = BookmarkRatingResponseMap.where(
reviewed_object_id: assessment.id,
reviewee_id: bookmark.id).flat_map {|r| Response.where(map_id: r.id) }
totalScore = Answer.compute_scores(responses, questions)
if totalScore[:avg].nil?
return '-'
else
(totalScore[:avg] * 5.0 / 100.0).round(2)
end
end
end

:app/views/bookmarks/list.html.erb

<% totalAvg = total_average_score(bookmark) %>
<% if totalAvg != 0 %>
<%= totalAvg %>
<% else %>
<%= '-' %>
<% end %>


<% specAvg = specific_average_score(bookmark) %>
<% if specAvg != 0 %>
<%= specAvg %>
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/12?file-filters%5B%5D= here]

'''Addition of badges for exceptionally helpful bookmarks:'''
Originally, no badge system was setup for bookmarks that have proven to be helpful guides for other students taking on the same project. The new changes introduced allows bookmarks to be attached to bookmarks with exceptionally good average ratings (i.e, above a rating of 3). A badge is signified by a full star while the absence of a badge is represented by an empty star.

Changed files:
:app/views/bookmarks/list.html.erb
<th class="head">Badge</th>

<td>

<% if totalAvg.to_f > 3 %>

<% else %>

<% end %>
</td>

Pull request can be found [https://github.com/hosungh/expertiza/pull/14?file-filters%5B%5D= here]

'''Users cannot rate bookmarks they've uploaded. '''
We wanted to make sure that users cannot rate bookmarks that they uploaded.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for rating the bookmarks
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/1/files?w=1 here]

'''Users cannot review bookmarks they've uploaded using the questionnaire. '''
We also wanted to make sure that users cannot review bookmarks that they uploaded using the questionnaires.

Changed files:
:app/views/bookmarks/list.html.erb
<% unless session[:user].id == bookmark.user_id %>
# ... code for reviewing bookmarks using the questionnaire
<% else %>
<%= '-' %>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/5/files?w=1 here]

'''Users should be able to see the number of bookmarks from the topics list. '''
Previously, users could add bookmarks, but could not tell how many bookmarks were provided for each topic (if any) without clicking the "View bookmarks" icon. This UI change displays the number of bookmarks for the topic inside the view bookmarks icon from the topic list view so that users don't need to click through each topic individually.

Changed files:
:app/views/sign_up_sheet/_actions.html.erb
<nowiki></nowiki>
<nowiki><%= Bookmark.where(topic_id: topic.id).length.to_s %></nowiki>
<nowiki></nowiki>

Pull request can be found [https://github.com/hosungh/expertiza/pull/6/files here]

'''UI changes to make finding your bookmarks easier:'''
We added a "View Bookmarks" link to the student task view, that takes the student directly to the bookmarks that have been submitted for their topic. This code was then modified such that the link is greyed out if the student does not have a topic, and is hidden if bookmarks are not enabled for the assignment.

Changed files:
:app/controllers/student_task_controller.rb
:app/views/student_task/view.html.erb
<% if @use_bookmark %>
<<nowiki />li>>
<% if @topic_id and @assignment.submission_allowed(@topic_id) %>
<%= link_to "View bookmarks", :controller=>'bookmarks', :action=> 'list', :id => @topic_id %> (View bookmarks others have submitted for your topic)
<% else %>
<<nowiki />font color="gray">View bookmarks (You have to choose a topic first)
<% end %>
<<nowiki />/li>
<% end %>

Relevant commits can be found [https://github.com/hosungh/expertiza/commit/04b24b1dedd3414f58f52d394f2a5b9568e83872 here] [https://github.com/hosungh/expertiza/commit/15a775624307651755a70e63625a370478aa63b4 here] and [https://github.com/hosungh/expertiza/commit/f144594ae062369754d54288eff8959136510ccc here]

'''Modify Bookmark delete permissions. '''
Bookmarks should be deletable by the user who created the bookmark, a teammate of the user who provided the bookmark, and the instructor.

Changed files:
:app/views/bookmarks/list.html.erb

<% is_teammate = false %>
<% team = SignedUpTeam.find_by(topic_id: @topic.id) rescue nil %>
<% if team %>
<% teams_users = TeamsUser.where(['team_id = ?', team.team_id]) %>
<% is_teammate = teams_users.select {|tu| tu.user_id == session[:user].id}.size > 0 %>
<% end %>
<% if bookmark.user_id == session[:user].id or is_teammate or ['Instructor'].include? @current_role_name %>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

Pull request can be found [https://github.com/hosungh/expertiza/pull/13/files here]

'''Fix the ability to create bookmark questionnaires and use in assigments.'''
Previously, questionnaires for things like Teammate Reviews could be created and used in assignments. Users could fill these out and the scores would be stored for later reference by TAs and instructors. The questionnaire for bookmark reviews was previously not functional, but now instructors can create new bookmark questionnaires and assign them to assignments.

Changed files:
:app/controllers/questionnaires_controller.rb
@questionnaire = Object.const_get(params[:model].split.join).new if Questionnaire::QUESTIONNAIRE_TYPES.include? params[:model].split.join
....
if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)

:app/controllers/questionnaires_controller.rb
....
when "bookmark"
bookmark = Bookmark.find(@map.response_map.reviewee_id)
redirect_to controller: 'bookmarks', action: 'list', id: bookmark.topic_id
....
"BookmarkRatingResponseMap"

:app/models/bookmark_rating_response_map.rb
....
self.assignment.questionnaires.find_by(type: 'BookmarkRatingQuestionnaire')

:app/views/bookmarks/list.html.erb
....
<td>
<% assignment_participant = AssignmentParticipant.find_by(user_id: session[:user].id) %>
<% map = BookmarkRatingResponseMap.where(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id).first %>
<% if map.nil? %>
<% map = BookmarkRatingResponseMap.create(reviewed_object_id: @topic.assignment.id, reviewer_id: assignment_participant.id, reviewee_id: bookmark.id) %>
<% end %>
<% review = map.response.last %>
<% if review.nil? %>
<%= link_to "Review", {:controller => 'response', :action => 'new', :id => map.map_id, :return => "bookmark"} %>
<% else %>
<%= link_to "View", {:controller => 'response', :action => 'view', :id => review.id} %>
<%= link_to "Edit", {:controller => 'response', :action => 'edit', :id => review.id, :return => "bookmark"} %>
<% end %>
</td>
<nowiki><% if bookmark.user_id == session[:user].id %></nowiki>
<nowiki><td><%= link_to 'Edit', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<nowiki><td><%= link_to 'Edit Bookmark', :action => 'edit', :id => bookmark.id %></td></nowiki>
<nowiki><td><%= link_to 'Destroy Bookmark', bookmark, :confirm => "Delete bookmark \"#{bookmark.title}\"?", :method => :delete %></td></nowiki>
<% end %>

:app/views/response/view.html.erb
<% if !(@map.instance_of? TeammateReviewResponseMap) && !@map.survey? && !(@map.instance_of? BookmarkRatingResponseMap) %>
....

Pull request can be found [https://github.com/hosungh/expertiza/pull/3/files here]

'''Instructors should have the ability to view all bookmark responses. '''
Instructors should have a way to view all the responses to the bookmark questionnaires so that can see which bookmarks provided were deemed useful.

Changed files:
:app/helpers/report_formatter_helper.rb
def bookmark_rating_response_map(params, _session = nil)
assign_basics(params)
@reviewers = BookmarkRatingResponseMap.bookmark_response_report(@id)
@topics = @assignment.sign_up_topics
end

:app/models/bookmark_rating_response_map.rb
class BookmarkRatingResponseMap < ReviewResponseMap

def self.bookmark_response_report(id)
BookmarkRatingResponseMap.select("DISTINCT reviewer_id").where("reviewed_object_id = ?", id)
end

:app/views/reports/_bookmark_rating_report.html.erb
<%= create_report_table_header("Reviewed By" => "16%",
"Topic" => "14%",
"Bookmark Review" => "20%",
"Submitted By" => "20%",
"Last reviewed at" => "20%") %>
<%@l = -1 %>

<% @reviewers.each do |r| %>
<% @user = User.find(Participant.find(r.reviewer_id).user_id) %>
<% @bookmark_rating_response_maps = BookmarkRatingResponseMap.where(reviewer_id: r.reviewer_id, reviewed_object_id: @id) %>

<% maps = @bookmark_rating_response_maps.select { |m| !Response.where(map_id: m.id).first.blank? and m.reviewee and m.reviewee.user_id != @user.id }%>

<%@l = @l+1 %>
<% (@l % 2 == 0) ? @bgcolor = "#ffffff" : @bgcolor = "#f9f9f9" %>

<tr>

<% if maps.count > 0 %>

<td bgcolor=<%= @bgcolor %> rowspan= <%= maps.count %>>
<% @reviewer_name = @user.fullname(session[:ip]) %>
<%= link_to @reviewer_name, :controller => 'popup', :action => 'reviewer_details_popup', :id => r.reviewer_id, :assignment_id => @id %>
</td>

<% maps.each do |map| %>
<% @reviewee = map.reviewee %>

<td bgcolor=<%= @bgcolor %> align="left" colspan=1>
<% topic = SignUpTopic.find(@reviewee.topic_id) %>
<%= topic.topic_name %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> align="left" colspan=1>
<%= link_to @reviewee.title, {:controller => 'response', :action => 'view', :id => map.response.last.id}, :title => "Click here to view this bookmark review" %>
</td>


<td id = "green" bgcolor=<%= @bgcolor %> style="color:#DD3300" align="left" colspan=1>
<% reviewed_by_user = User.find(@reviewee.user_id).name %>
<%= link_to reviewed_by_user, impersonate_impersonate_path(:user => {:name => reviewed_by_user}), :method => :post, :title => "Click here to impersonate this user" %>
</td>


<td bgcolor=<%= @bgcolor %> align="left">
<% @bookmark_review_response = Response.where(map_id: map.id).first %>
<%= @bookmark_review_response.updated_at.to_time.strftime("%m/%d/%Y - %I:%M%p") %>
</td>

</tr>
<tr>
<% end %>
<% end %>
</tr>
<% end %>
</table>
</div>

:app/views/reports/_searchbox.html.erb
....
<option value='BookmarkRatingResponseMap' >
Bookmark Review Report
</option>
....
<% elsif @type == "BookmarkReviewResponseMap" %>
<nowiki><h1> Bookmark review report for <%= @assignment.name%> </h1></nowiki>
....

:app/views/reports/response_report.html.haml
- elsif @type == "BookmarkRatingResponseMap"
= render :partial => 'bookmark_rating_report'

Pull request can be found [https://github.com/hosungh/expertiza/pull/10/files here]

=='''Testing Plan'''==

'''Testing from the UI'''

* Create a Bookmark Questionnaire
# After logging in as the instructor, go to Manage > Questionnaires.
# Find 'Bookmark Rating' and click the '+' to create a new questionnaire.
# Give a name for this questionnaire, leave the min and max score at 0 and 5 respectively, and click 'Create'.
# Go to Manage > Questionnaires and click on 'Bookmark Rating' to view all of the questionnaires. Click the edit icon for the questionnaire you just created.
# Select 'Add 1 more Criterion question(s)'.
# For the question, enter "Does this bookmark appear to have been used by the author?" and leave the other fields blank. This question will be helpful in determining how useful the bookmark was.
# Click 'Save bookmark rating questionnaire'. Now this questionnaire can be used in assignments.

* Enable Bookmarks
# After logging in as the instructor, go to Manage > Assignments.
# Choose an assignment that will be used for testing and have bookmarks enabled and select the edit icon under Actions.
# Under Topics Tab select 'Allow participants to create bookmarks?'.
# Go to Rubrics tab, under 'Bookmark Rating' select the Bookmark review questionnaire that was previously created to use for reviewing the bookmarks.

* Add a Bookmark to a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# Choose a topic and select the 'Add bookmark to topic' icon from the Bookmarks column. The 'Add bookmark to topic' icon has a '+' sign.
# Fill in all the fields for the bookmark, including Title, Url, and Description and click 'Add new bookmark'.
# You should now see a page listing all bookmarks for this topic.

* Viewing all Bookmarks for a Topic
# Log in as a student who is a participant of the assignment with bookmarks enabled (or an instructor) and select that assignment.
# Select a "Signup sheet" to see the list of available topics.
# The number of bookmarks for each topic should be displayed visually inside the 'View topic bookmarks' icon in the bookmarks column.
# Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.

* Editing and Destroying Bookmarks for a Topic
# Perform this test with each of the following users: an instructor, a user who is assigned to the topic, and a teammate of the user who is assigned to the topic.
## Log in with the user and select the assignment with bookmarks enabled.
## Select a "Signup sheet" to see the list of available topics.
## Click the 'View topic bookmarks icon' to see a list of all bookmarks for this topic.
## The user should see links to 'Edit Bookmark' and 'Destroy Bookmark' next to a bookmark only if the user is an instructor, the user submitted the bookmark, or the user is a teammate of the user who submitted the bookmark.

'''Automated Testing with RSpec'''

The current version of Expertiza does not have any tests for the bookmark controller or model. We intend on adding comprehensive RSpec tests for all changes we have added to controller classes and unit tests for model classes.

===Code Coverage===

=='''Application Deployment'''==

This web application deployed on VCL is located at [insert link]

=='''Team Information'''==
Danielle Hancock

Eric Peden

Hosung Hwang

Mentor: Abhirav Kariya

=='''References'''==
1. [https://github.com/expertiza/expertiza/ Expertiza on GitHub]

2. [https://github.com/hosungh/expertiza/ Forked GitHub Repo]

3. [link to app deployment]

4. [link to pull request]