Add dormant/active chapter counts to districts

utmsigep · Feb 3, 2024 · bff0721 · bff0721
1 parent 6224e88
commit bff0721
Show file tree

Hide file tree

Showing 5 changed files with 3,621 additions and 2,165 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/app/models/chapter.rb b/app/models/chapter.rb
@@ -5,6 +5,9 @@ class Chapter < ApplicationRecord
   belongs_to :district, optional: true
   validates_presence_of :name
 
+  scope :active, -> { where(status: 1) }
+  scope :inactive, -> { where(status: 0) }
+
   include GenerateCsv
 
   def institution_name=(val)

diff --git a/app/views/admin/districts/index.html.erb b/app/views/admin/districts/index.html.erb
@@ -16,7 +16,8 @@
       <th>District</th>
       <th>Short Name</th>
       <th>District Governor</th>
-      <th>Chapter Count</th>
+      <th>Active Chapters</th>
+      <th>Dormant Chapters</th>
       <th>Total Manpower</th>
     </thead>
     <tbody>
@@ -25,7 +26,8 @@
         <td data-order="<%= district.position %>"><%= link_to district.name, admin_district_path(district) %></td>
         <td><%= district.short_name %></td>
         <td><%= district.staff_name %></td>
-        <td class="text-end"><%= district.chapters.length %></td>
+        <td class="text-end"><%= district.chapters.active.length %></td>
+        <td class="text-end"><%= district.chapters.inactive.length %></td>
         <td class="text-end"><%= district.chapters.sum(:manpower) %></td>
       </tr>
       <% end %>

diff --git a/package.json b/package.json
@@ -1,6 +1,5 @@
 {
   "name": "app",
-  "private": "true",
   "dependencies": {
     "@hotwired/stimulus": "^3.2.1",
     "@hotwired/turbo-rails": "^7.3.0",