Revert "Added number of reviews parameter for peer review assignment"

This reverts commit 20d3151.
MarkUsProject · Jun 20, 2016 · 03dce2a · 03dce2a
1 parent 4c1551e
commit 03dce2a
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 31 deletions.
diff --git a/app/controllers/api/assignments_controller.rb b/app/controllers/api/assignments_controller.rb
@@ -11,7 +11,7 @@ class AssignmentsController < MainApiController
                         :display_grader_names_to_students, :group_name_autogenerated,
                         :marking_scheme_type, :repository_folder, :is_hidden,
                         :vcs_submit, :token_period, :unlimited_tokens,
-                        :token_start_date, :has_peer_review, :number_of_peer_reviews_per_group]
+                        :token_start_date, :has_peer_review ]
 
     # Returns a list of assignments and their attributes
     # Optional: filter, fields

diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
@@ -36,7 +36,7 @@ class AssignmentsController < ApplicationController
                     :remark_message, :assign_graders_to_criteria, :enable_test,
                     :allow_remarks, :display_grader_names_to_students,
                     :group_name_autogenerated, :marking_scheme_type, :is_hidden,
-                    :vcs_submit, :has_peer_review, :number_of_peer_reviews_per_group]
+                    :vcs_submit, :has_peer_review]
 
   # Publicly accessible actions ---------------------------------------
 
@@ -990,7 +990,6 @@ def assignment_params
         :section_groups_only,
         :enable_test,
         :has_peer_review,
-        :number_of_peer_reviews_per_group,
         :assign_graders_to_criteria,
         :group_name_displayed,
         :invalid_override,

diff --git a/app/controllers/peer_reviews_controller.rb b/app/controllers/peer_reviews_controller.rb
@@ -69,7 +69,7 @@ def random_assign(assignment, num_groups_min)
     reviewer_groups = get_groupings_table_info(assignment)
     reviewee_groups = get_groupings_table_info(assignment.parent_assignment)
 
-    assigner = PeerReviewRandomAssigner.new(assignment, reviewer_groups, reviewee_groups)
+    assigner = PeerReviewRandomAssigner.new(assignment, reviewer_groups, reviewee_groups, num_groups_min)
     begin
       assigner.randomly_assign_groups()
       head :ok

diff --git a/app/helpers/peer_review_random_assigner.rb b/app/helpers/peer_review_random_assigner.rb
@@ -10,15 +10,15 @@ class NotEnoughGroupsToAssignTo < RandomAssignmentException
 end
 
 class PeerReviewRandomAssigner
-  def initialize(pr_assignment, reviewer_groupings_map, reviewee_groupings_map)
-    if pr_assignment.number_of_peer_reviews_per_group < 1
+  def initialize(pr_assignment, reviewer_groupings_map, reviewee_groupings_map, num_groups_min)
+    if num_groups_min < 1
       raise InvalidMinimumGroupSize
     end
 
     @pr_assignment = pr_assignment
     @reviewer_groupings_map = reviewer_groupings_map
     @reviewee_groupings_map = reviewee_groupings_map
-    @num_groups_min = pr_assignment.number_of_peer_reviews_per_group
+    @num_groups_min = num_groups_min
   end
 
   # Assigns everyone from a peer review assignment to have at least the

diff --git a/app/models/assignment.rb b/app/models/assignment.rb
@@ -7,8 +7,6 @@ class Assignment < ActiveRecord::Base
     rubric: 'rubric'
   }
 
-  MAX_PEER_REVIEWS_PER_PERSON = 5
-
   has_many :rubric_criteria,
            -> { order(:position) },
            class_name: 'RubricCriterion',
@@ -72,7 +70,6 @@ class Assignment < ActiveRecord::Base
   validates_uniqueness_of :short_identifier, case_sensitive: true
   validates_numericality_of :group_min, only_integer: true, greater_than: 0
   validates_numericality_of :group_max, only_integer: true, greater_than: 0
-  validates_numericality_of :number_of_peer_reviews_per_group, only_integer: true, greater_than: 0
 
   has_one :submission_rule, dependent: :destroy, inverse_of: :assignment
   accepts_nested_attributes_for :submission_rule, allow_destroy: true

diff --git a/app/views/assignments/_form.html.erb b/app/views/assignments/_form.html.erb
@@ -155,7 +155,6 @@
       <%= f.label :enable_test,
                     t('automated_tests.enable_test') %>
     </div>
-
     <div>
       <%= f.check_box :has_peer_review,
                       onclick: 'set_onbeforeunload(true);' %>

diff --git a/app/views/assignments/_peer_review_form.html.erb b/app/views/assignments/_peer_review_form.html.erb
@@ -123,12 +123,6 @@
                         onclick: 'set_onbeforeunload(true);' %>
         <%= f.label :is_hidden, t('assignment.is_hidden') %>
       </div>
-
-      <div>
-        <%= f.label :number_of_peer_reviews_per_group, t('assignment.number_of_peer_reviews_per_group') %>
-        <%= f.number_field :number_of_peer_reviews_per_group, min: 1, max: Assignment::MAX_PEER_REVIEWS_PER_PERSON,
-                           onchange: 'set_onbeforeunload(true);' %>
-      </div>
     </fieldset>
 
     <%# Marking scheme %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -232,7 +232,6 @@ en:
         has_peer_review: "Enable student-to-student peer review"
         configure_peer_review: "Configure peer review"
         peer_review_record_missing: "Error: Peer review assignment missing from database"
-        number_of_peer_reviews_per_group: "Number of peer reviews per group"
     peer_review:
         problem: "An unexpected problem occured"
         number_of_reviews_header: "Num reviews"

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -210,7 +210,6 @@ fr:
         has_peer_review: "Activer élèves-étudiants d'examen par les pairs"
         configure_peer_review: "Configurer examen par les pairs"
         peer_review_record_missing: "Erreur: Examen par les pairs cession manquant dans la base de données"
-        number_of_peer_reviews_per_group: "Nombre d'examens par les pairs par groupe"
     peer_review:
         problem: "Un problème inattendu est survenue"
         number_of_reviews_header: "Nombre d'avis"

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -208,7 +208,6 @@ Aplicar pênalti no final / Deduzir fichas de carência ( Deixando esta caixa de
         has_peer_review: "Ativar aluno-aluno de revisão por pares"
         configure_peer_review: "Configurar revisão por pares"
         peer_review_record_missing: "Erro: Par atribuição de avaliação em falta a partir do banco de dados"
-        number_of_peer_reviews_per_group: "Número de avaliações pelos pares por grupo"
     peer_review:
         problem: "Um problema inesperado ocorreu"
         number_of_reviews_header: "Número de comentários"

diff --git a/db/migrate/20160617194400_add_number_of_peer_reviews_per_group.rb b/db/migrate/20160617194400_add_number_of_peer_reviews_per_group.rb
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160617194400) do
+ActiveRecord::Schema.define(version: 20160518004516) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -117,7 +117,6 @@
     t.float    "token_period"
     t.integer  "parent_assignment_id"
     t.boolean  "has_peer_review",                  default: false,    null: false
-    t.integer  "number_of_peer_reviews_per_group", default: 3,        null: false
   end
 
   add_index "assignments", ["short_identifier"], name: "index_assignments_on_short_identifier", unique: true, using: :btree

diff --git a/spec/controllers/assignments_controller_spec.rb b/spec/controllers/assignments_controller_spec.rb
@@ -148,8 +148,7 @@
                         :enable_test, :allow_remarks,
                         :display_grader_names_to_students,
                         :group_name_autogenerated, :marking_scheme_type,
-                        :is_hidden, :vcs_submit, :has_peer_review,
-                        :number_of_peer_reviews_per_group]
+                        :is_hidden, :vcs_submit, :has_peer_review]
       # generate the expected csv string
       csv_data = []
       DEFAULT_FIELDS.map do |f|

diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb
@@ -21,7 +21,6 @@
     tokens_per_period 0
     unlimited_tokens false
     enable_test false
-    number_of_peer_reviews_per_group 3
 
     factory :flexible_assignment do
       marking_scheme_type Assignment::MARKING_SCHEME_TYPE[:flexible]

diff --git a/test/blueprints/blueprints.rb b/test/blueprints/blueprints.rb
@@ -70,7 +70,6 @@
   allow_web_submits {true}
   vcs_submit { false }
   has_peer_review { false }
-  number_of_peer_reviews_per_group { 3 }
   display_grader_names_to_students {false}
   section_due_dates_type(false)
   enable_test {true}