Fixed expertiza#970 by modifying some code for meta-reviews

app/controllers/review_mapping_controller.rb

@@ -170,9 +170,11 @@ def add_metareviewer
   def assign_metareviewer_dynamically
     assignment = Assignment.find(params[:assignment_id])
     metareviewer = AssignmentParticipant.where(user_id: params[:metareviewer_id], parent_id: assignment.id).first
-
-    assignment.assign_metareviewer_dynamically(metareviewer)
-
+    begin
+      assignment.assign_metareviewer_dynamically(metareviewer)
+    rescue StandardError => e
+      flash[:error] = e
+    end
     redirect_to controller: 'student_review', action: 'list', id: metareviewer.id
   end
 

app/models/metareview_response_map.rb

@@ -7,14 +7,7 @@ class MetareviewResponseMap < ResponseMap
   # a person who is doing meta review has to be able to see all the versions of review.
   def get_all_versions
     if self.review_mapping.response
-      @sorted_array = []
-      @prev = Response.all
-      @prev.each do |element|
-        @sorted_array << element if element.map_id == self.review_mapping.map_id
-      end
-      @sorted = @sorted_array.sort {|m1, m2| m1.version_num and m2.version_num ? m1.version_num <=> m2.version_num : (m1.version_num ? -1 : 1) }
-      # return all the lists in ascending order.
-      @sorted
+      Response.where(map_id: self.reviewed_object_id).order('updated_at')
     else
       nil # "<I>No review was performed.</I><br/><hr/><br/>"
     end

app/views/response/response.html.erb

@@ -329,14 +329,15 @@
 <% end %>
 
 <!-- display all versions available -->
-<% @responses_versions = Array.new %>
-<% @responses_versions = @map.get_all_versions() %>
-
-<% if @responses_versions.empty? %>
-    <I>No previous review was performed.</I><br/><hr/><br/>
-<% else %>
-    <%= render :partial => 'review', :locals => {:versions => @responses_versions} %>
+<% @review_versions = @map.get_all_versions %>
+<% unless @review_versions.empty? %>
+  <%@review_versions.each do |response| %>
+    <%= response.display_as_html %>
+    <br/>
+  <% end %>
+  <hr/>
 <% end %>
+
 <h2>Directions for the reviewer</h2>
 <input type="checkbox" id="autosave_cbx" checked>
 <label id="autosave_cbx_lbl" for="autosave_cbx"></label>

app/views/response/view.html.erb

@@ -8,21 +8,21 @@
   <% topic_id = SignedUpTeam.topic_id(@participant.parent_id, @participant.user_id) %>
   <%= render :partial => 'submitted_content/main', :locals => {:participant => @contributor.participants.first, :stage => @assignment.get_current_stage(topic_id)} %>
 <% end %>
-
-<!-- Added a checkbox to enable students to mark their review as a sample for others, by E2022 @SujalAhrodia -->
-<input type="checkbox" id="sample_cbx" checked="false"/>
-<label id="sample_cbx_lbl" for="sample_cbx">I agree to share my review as a sample for others</label>
-
-<% @review_versions = @map.get_all_versions() %>
-<% if !@review_versions.empty? %>
-    <%= @review_versions.each do |response| %>
+<% @review_versions = @map.get_all_versions %>
+<% unless @review_versions.empty? %>
+    <hr>
+    <h3>Reviews used for Meta-Reviewing</h3>
+    <% @review_versions.each do |response| %>
     	<%= response.display_as_html() %>
         <br/>
     <% end %>
-    <hr/>
+    <hr>
 <% end %>
 
 <% file_url = nil %>
+  <%if @map.type == 'MetareviewResponseMap'%>
+    <h3>Meta-Review Performed</h3>
+  <%end%>
 <%= @response.display_as_html(nil, nil, file_url) %>
 <br/>
 

app/views/student_review/_responses.html.erb

@@ -78,7 +78,7 @@
                     <% end %>
                     <td><%= "  -- latest update at #{@latest_response.updated_at.strftime("%a, %b %d, %Y %I:%M:%S %p")}" %></td>
           <%end%>
-            <% elsif @assignment.get_current_stage(topic_id) != "Complete" && @assignment.can_review(topic_id) && latest_submission%>
+            <% elsif @assignment.get_current_stage(topic_id) != "Complete" && ((map.type.to_s == "MetareviewResponseMap" && @assignment.metareview_allowed(topic_id)) || @assignment.can_review(topic_id)) && latest_submission%>
                 <td><%= link_to "Begin", {:controller => 'response', :action => 'new', :id => map.id} %></td>
                 <td>&nbsp;&nbsp;</td>
 

app/views/student_review/list.html.erb

@@ -1,5 +1,5 @@
 <h2>Reviews for "<%= @assignment.name %>"</h2>
-
+<br>
 <!-- Added the feature to find the reviews and meta-reviews left for students by E1839 @Rayan Dasoriya -->
 <% if @assignment.num_reviews_allowed.nil? || @assignment.num_reviews_allowed == -1%>
     <h4>Your instructor expects you to do <%= @assignment.num_reviews_required %> reviews. You are not allowed to do any extra reviews. </h4>
@@ -9,15 +9,17 @@
 <% else %>
 
     <h4>You may perform between <%= @assignment.num_reviews_required %> to <%= @assignment.num_reviews_allowed %> reviews</h4>
+    <h4>You are required to do <%= @assignment.num_reviews_required %> reviews</h4>
 <% end %>
-<h4>You are required to do <%= @assignment.num_reviews_required %> reviews</h4>
+
 <br>
 <%if @assignment.num_reviews_required - @num_reviews_completed > -1 %>
   <h4> Number of required reviews left : <%=  @assignment.num_reviews_required - @num_reviews_completed %></h4>
 <%else %>
   <h4> Number of required reviews left : 0</h4>
 <%end %>
-<h4> Number of total reviews which can be done: <%= @assignment.num_reviews_allowed - @num_reviews_completed %></h4>
+<%tot_reviews_left = @assignment.num_reviews_allowed - @num_reviews_completed %>
+<h4> Number of reviews which can be done: <%= tot_reviews_left < 0? 0 : tot_reviews_left %></h4>
 <br>
 
 <% if !@response_ids.empty? %>
@@ -46,14 +48,14 @@
 <% else %>
     <p><em>Reviews cannot be performed at this time</em></p >
 <% end %>
-
+<br>
 <% if @assignment.metareview_allowed(@topic_id) or @assignment.get_current_stage() == "Complete" %>
     <h2>Metareviews for "<%= @assignment.name %>"</h2>
-
+  <br>
     <% if @assignment.num_metareviews_allowed.nil? || @assignment.num_metareviews_allowed == -1%>
 
     <% else %>
-        <h4>Number of Meta-Reviews Allowed: "<%= @assignment.num_metareviews_allowed %>"</h4>
+        <h4>Number of Meta-Reviews Allowed: <%= @assignment.num_metareviews_allowed %></h4>
     <% end %>
     <h4>You are required to do <%= @assignment.num_metareviews_required %> meta-reviews</h4>
     <h4> Number of Meta-Reviews left: <%= @assignment.num_metareviews_allowed - @num_metareviews_completed %></h4>