Add logic to group attendees by OS additionally to language and add OS tag to groups view

Author: AstiV

app/assets/stylesheets/application.css

@@ -500,7 +500,7 @@ input.grey {
 
 .grid-wrapper {
   display: grid;
-  grid-template-columns: 250px 250px;
+  grid-template-columns: 200px 200px 200px;
   margin-bottom: .5em;
 }
 
@@ -523,7 +523,11 @@ input.grey {
   background: linear-gradient(to right, #28B4F0, #F0A0C8);
 }
 
-.language-tag {
+.cc-gradient-reverse {
+  background: linear-gradient(to right, #F0A0C8, #28B4F0);
+}
+
+.tag {
   padding: 0 .7em;
   font-size: 12px;
   width: fit-content;

app/controllers/admin/groups_controller.rb

@@ -3,6 +3,8 @@ class Admin::GroupsController < ApplicationController
   before_action :require_admin
   before_action :find_event
 
+  GROUP_SIZE = 4
+
   def index
     @event_groups = @event.event_groups
     @coaches_count = @event.coach_applications.approved.size
@@ -32,10 +34,14 @@ def regenerate
 
   private
 
+  def fetch_by_key(object, key)
+    object[key] || []
+  end
+
   def fill_groups
     # create a group for each pair of coaches
     @coaches = @event.coach_applications.approved.to_a
-    @coaches.each_slice(2).with_index do |group, index|
+    @coaches.each_slice(1).with_index do |group, index|
       event_group = EventGroup.create(event: @event, name: "Group #{index + 1}")
       group.each do |coach_application|
         event_group.coach_applications << coach_application
@@ -46,27 +52,58 @@ def fill_groups
     @attendees = @event.applications.application_selected.confirmed.to_a
 
     grouped_attendees_by_language = @attendees.group_by do |element|
-      [element.language_de, element.language_en]
+      [element.language_de, element.language_en, element.os]
     end
 
-    attendees_de = grouped_attendees_by_language[[true, false]]
-    attendees_en = grouped_attendees_by_language[[false, true]]
-    attendees_de_en = grouped_attendees_by_language[[true, true]]
-
-    de_groups = attendees_de.in_groups_of(6, false)
-    en_groups = attendees_en.in_groups_of(6, false)
+    attendees_de_mac = fetch_by_key(grouped_attendees_by_language, [true, false, "mac"])
+    attendees_de_windows = fetch_by_key(grouped_attendees_by_language, [true, false, "windows"])
+    attendees_de_linux = fetch_by_key(grouped_attendees_by_language, [true, false, "linux"])
+
+    attendees_en_mac = fetch_by_key(grouped_attendees_by_language, [false, true, "mac"])
+    attendees_en_windows = fetch_by_key(grouped_attendees_by_language, [false, true, "windows"])
+    attendees_en_linux = fetch_by_key(grouped_attendees_by_language, [false, true, "linux"])
+
+    attendees_de_en_mac = fetch_by_key(grouped_attendees_by_language, [true, true, "mac"])
+    attendees_de_en_windows = fetch_by_key(grouped_attendees_by_language, [true, true, "windows"])
+    attendees_de_en_linux = fetch_by_key(grouped_attendees_by_language, [true, true, "linux"])
+
+    attendees_de_mac_groups = attendees_de_mac.in_groups_of(GROUP_SIZE, false)
+    attendees_de_windows_groups = attendees_de_windows.in_groups_of(GROUP_SIZE, false)
+    attendees_de_linux_groups = attendees_de_linux.in_groups_of(GROUP_SIZE, false)
+    attendees_en_mac_groups = attendees_en_mac.in_groups_of(GROUP_SIZE, false)
+    attendees_en_windows_groups = attendees_en_windows.in_groups_of(GROUP_SIZE, false)
+    attendees_en_linux_groups = attendees_en_linux.in_groups_of(GROUP_SIZE, false)
+
+    [attendees_de_mac_groups, attendees_en_mac_groups].each do |groups|
+      if groups.try :nonzero?
+        if (groups.last.size < GROUP_SIZE)
+          groups.last.concat(attendees_de_en_mac.pop(GROUP_SIZE - groups.last.size))
+        end
+      end
+    end
 
-    if (de_groups.last.size < 6)
-      de_groups.last.concat(attendees_de_en.pop(6 - de_groups.last.size))
+    [attendees_de_linux_groups, attendees_en_linux_groups].each do |groups|
+      if groups.try :nonzero?
+        if(groups.last.size < GROUP_SIZE)
+          groups.last.concat(attendees_de_en_linux.pop(GROUP_SIZE - groups.last.size))
+        end
+      end 
     end
 
-    if (en_groups.last.size < 6)
-      en_groups.last.concat(attendees_de_en.pop(6 - en_groups.last.size))
+    [attendees_de_windows_groups, attendees_en_windows_groups].each do |groups|
+      if groups.try :nonzero?
+        if(groups.last.size < GROUP_SIZE)
+          groups.last.concat(attendees_de_en_windows.pop(GROUP_SIZE - groups.last.size))
+        end
+      end
     end
 
-    de_en_groups = attendees_de_en.in_groups_of(6, false)
+    de_en_groups_mac = attendees_de_en_mac.in_groups_of(GROUP_SIZE, false)
+    de_en_groups_windows = attendees_de_en_windows.in_groups_of(GROUP_SIZE, false)
+    de_en_groups_linux = attendees_de_en_windows.in_groups_of(GROUP_SIZE, false)
+
+    all_groups = attendees_de_mac_groups + attendees_de_windows_groups + attendees_de_linux_groups + attendees_en_mac_groups + attendees_en_windows_groups + attendees_en_linux_groups + de_en_groups_mac + de_en_groups_windows + de_en_groups_linux
 
-    all_groups = de_groups + en_groups + de_en_groups
 
     # FIXME: This can cause attendees to not be assigned to event groups
     @event.event_groups.each do |event_group|

app/views/admin/groups/index.html.erb

@@ -22,7 +22,7 @@
                 <span>
                   <%= application.name %>
                 </span>
-                <span class="language-tag cc-gradient">
+                <span class="tag cc-gradient">
                   <% if application.language_de === true && application.language_en === true %>
                     both languages
                   <% elsif application.language_de === true && application.language_en === false %>
@@ -31,6 +31,15 @@
                     English
                   <% end %>
                 </span>
+                <span class="tag cc-gradient-reverse">
+                  <% if application.os === "mac" %>
+                    Mac
+                  <% elsif application.os === "windows" %>
+                    Windows
+                  <% elsif application.os === "linux" %>
+                    Linux
+                  <% end %>
+                </span>
               </div>
             <% end %>
           </td>
@@ -40,7 +49,7 @@
                   <span>
                     <%= application.coach.name %>
                   </span>
-                  <span class="language-tag cc-gradient">
+                  <span class="tag cc-gradient">
                     <% if application.coach.language_de === true && application.coach.language_en === true %>
                       both languages
                     <% elsif application.coach.language_de === true && application.coach.language_en === false %>