Make order in view match order of sample flow

benwbrum · Mar 4, 2022 · 7be6b2a · 7be6b2a
1 parent 75d0cec
commit 7be6b2a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/app/controllers/quality_samplings_controller.rb b/app/controllers/quality_samplings_controller.rb
@@ -15,8 +15,8 @@ def index
   # GET /quality_samplings/1
   def show
     @work_samplings, @user_samplings = @quality_sampling.sampling_objects
-    @works = Work.find(@work_samplings.keys)
-    @users = User.find(@user_samplings.keys)
+    @works = Work.find(@work_samplings.keys).sort{|a,b| a.id <=> b.id }
+    @users = User.find(@user_samplings.keys).sort{|a,b| a.id <=> b.id }
     @max_approval_delta = @quality_sampling.max_approval_delta
   end
 

diff --git a/app/models/quality_sampling.rb b/app/models/quality_sampling.rb
@@ -33,7 +33,7 @@ def calculate_set
     review_triples_by_user = review_triples.select{ |triple| !triple[1].nil? }.group_by{ |triple| triple[1] }# user_id
 
     # for each user, add the relevant pages to the sample
-    review_triples_by_user.each do |user_id, review_triples_for_user|
+    review_triples_by_user.sort.each do |user_id, review_triples_for_user|
       # how many of this user's pages are in the set?
       user_page_ids = all_triples_by_user[user_id].map{|user_triple| user_triple[2]}
       user_pages_in_set = working_set & user_page_ids
@@ -46,7 +46,7 @@ def calculate_set
     end
 
     # do the same for works
-    review_triples_by_work.each do |work_id, review_triples_for_work|
+    review_triples_by_work.sort.each do |work_id, review_triples_for_work|
       # how many of this work's pages are in the set?
       work_page_ids = all_triples_by_work[work_id].map{|work_triple| work_triple[2]}
       work_pages_in_set = working_set & work_page_ids

diff --git a/app/views/quality_samplings/show.html.slim b/app/views/quality_samplings/show.html.slim
@@ -24,25 +24,26 @@
           th =t('.actions')
       -@users.each do |user|
         -page_sampling = @user_samplings[user.id]
-        tr
-          td
-            =user.display_name
-          td.aright
-            =page_sampling.total_page_count
-          td.aright
-            =page_sampling.reviewed_page_count
-          -if page_sampling.reviewed_page_count > 0
-            td.aright
-              =page_sampling.corrected_page_count
+        -if true || page_sampling.reviewed_page_count < page_sampling.total_page_count
+          tr
             td
-              span(class="#{approval_delta_to_style(page_sampling.mean_approval_delta, @max_approval_delta)}") =approval_delta_to_display(page_sampling.mean_approval_delta, @max_approval_delta)
-          -else
+              =user.display_name
             td.aright
-              i =t('.not_applicable')
+              =page_sampling.total_page_count
+            td.aright
+              =page_sampling.reviewed_page_count
+            -if page_sampling.reviewed_page_count > 0
+              td.aright
+                =page_sampling.corrected_page_count
+              td
+                span(class="#{approval_delta_to_style(page_sampling.mean_approval_delta, @max_approval_delta)}") =approval_delta_to_display(page_sampling.mean_approval_delta, @max_approval_delta)
+            -else
+              td.aright
+                i =t('.not_applicable')
+              td
+                i =t('.not_applicable')
             td
-              i =t('.not_applicable')
-          td
-            =link_to(t('.review'), collection_user_contribution_list_path(@collection.owner, @collection, user), class: 'button')
+              =link_to(t('.review'), collection_user_contribution_list_path(@collection.owner, @collection, user), class: 'button')