Merge c952ed4 into 4c3174c

app/controllers/review_bids_controller.rb

@@ -50,6 +50,8 @@ def show
     @num_participants = AssignmentParticipant.where(parent_id: @assignment.id).count
     @selected_topics = nil # this is used to list the topics assigned to review. (ie select == assigned i believe)
     @bids = ReviewBid.where(participant_id: @participant, assignment_id: @assignment.id)
+    @count = ReviewBid.all.count
+    #(:conditions => "priority = 1")
     signed_up_topics = []
     @bids.each do |bid|
       sign_up_topic = SignUpTopic.find_by(id: bid.signuptopic_id)
@@ -99,7 +101,7 @@ def assign_bidding
     # list of reviewer id's from a specific assignment
     reviewer_ids = AssignmentParticipant.where(parent_id: assignment_id).ids
     bidding_data = ReviewBid.bidding_data(assignment_id, reviewer_ids)
-    matched_topics = run_bidding_algorithm(bidding_data)
+    matched_topics = assign_reviewers(bidding_data)
     ReviewBid.assign_review_topics(assignment_id, reviewer_ids, matched_topics)
     Assignment.find(assignment_id).update(can_choose_topic_to_review: false) # turns off bidding for students
     redirect_back fallback_location: root_path
@@ -109,7 +111,7 @@ def assign_bidding
   # passing webserver: student_ids, topic_ids, student_preferences, time_stamps
   # webserver returns:
   # returns matched assignments as json body
-  def run_bidding_algorithm(bidding_data)
+  def assign_reviewers(bidding_data)
     # begin
     url = 'http://app-csc517.herokuapp.com/match_topics' # hard coding for the time being
     response = RestClient.post url, bidding_data.to_json, content_type: 'application/json', accept: :json

app/views/assignments/edit/_topics.html.erb

@@ -21,7 +21,7 @@
 <%= label_tag('assignment_form[assignment][can_choose_topic_to_review]', 'Allow reviewer to choose which topic to review?') %>
 
 <br>
-<% if @assignment_form.assignment.can_choose_topic_to_review? == true %>
+
   <input name="assignment_form[assignment][review_choosing_algorithm]" type="hidden" value="Simple Choose"/>
   <%= label_tag('assignment_form[assignment][review_choosing_algorithm]', 'Method for reviewer to choose which topic to review:') %>
   <%= select('assignment_form[assignment]', 'review_choosing_algorithm',[['Simple Choose', 'Simple Choose'],['Bidding','Bidding']], {:selected => @assignment_form.assignment.review_choosing_algorithm})%>
@@ -31,7 +31,7 @@
   <% if @assignment_form.assignment.review_choosing_algorithm == "Bidding" %>
     <%= button_to 'Run Review Algorithm', :controller=>'review_bids', :action=>'assign_bidding', :assignment_id => @assignment_form.assignment.id %>
   <% end %>
-<% end %>
+
 
 <br>
 <input name="assignment_form[assignment][use_bookmark]" type="hidden" value="false"/>

app/views/sign_up_sheet/review_bids_others_work.html.erb

@@ -4,7 +4,7 @@
        <%= flash[:notice] %>
        </div>
 <% end %>
-
+<h2>Reviews for</h2>
 <h2>Reviews for "<%= @assignment.name %>"</h2>
 
 <!-- add headers that provide information regarding review numbers -->
@@ -34,13 +34,11 @@
             <td>
               <b><%= "#{title} #{review_no}." %></b>
               <!--In ‘review_bids/index’ page, if the topic_identifier is empty, ‘:’ sign should not be displayed.-->
-              <% if !topic_id.nil? %>
-                  <% if SignUpTopic.find(topic_id).topic_identifier != '' %>
-                      <%= " #{SignUpTopic.find(topic_id).topic_identifier}: #{SignUpTopic.find(topic_id).topic_name}" %>
-                  <% else %>
-                      <%= " #{SignUpTopic.find(topic_id).topic_name}" %>
-                  <% end %>
-              <% end %>
+                <% if !topic_id.nil? && SignUpTopic.find(topic_id).topic_identifier != '' %>
+                    <%= " #{SignUpTopic.find(topic_id).topic_identifier}: #{SignUpTopic.find(topic_id).topic_name}" %>
+                <% elsif !topic_id.nil? %>
+                    <%= " #{SignUpTopic.find(topic_id).topic_name}" %>
+                <% end %>
 
               <%if !@assignment.is_anonymous%>
                 &nbsp; (author: <%= participant.fullname%>)

app/views/sign_up_sheet/review_bids_show.html.erb

@@ -1,7 +1,9 @@
 <h1>Bidding sheet for <%= @assignment.name %> reviews</h1>
+<h3> Number of bids <%= @count %></h3>
 <div style="display:block">
   <h3 style="width: 40%; float: left">Topics</h3>
   <h3 style="width: 40%; float:right">Review Bid Selections</h3>
+
 </div>
 
 <div style="display:block">

spec/controllers/review_bids_controller_spec.rb

@@ -75,10 +75,10 @@
     end
   end
 
-  describe '#run_bidding_algorithm' do
+  describe '#assign_reviewers' do
     render_views
-    it 'connects to the webservice to run bidding algorithm' do
-      post :run_bidding_algorithm
+    it 'connects to the webservice to assign reviewers' do
+      post :assign_reviewers
       expect(response).to have_http_status(302)
     end
   end

spec/helpers/review_bids_helper_spec.rb

@@ -8,4 +8,13 @@
       end
     end
   end
-end
+  describe '#get_topic_bg_color_review_bids' do
+    context 'when bid size is 0' do
+      it 'changes colour' do
+        allow(ReviewBid).to receive(:where).and_return([])
+        num_bids=0
+        expect(helper.get_topic_bg_color_review_bids(topic,2)).to eq("rgb(47,352,0)")
+      end
+    end
+  end
+end