Display member statut in core page
This commit is contained in:
1 parent
9aa3da5191
commit
49b53451b7
2 files changed
+26
-2
No files matched your search
+17
-2
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
class Netig
|
class Netig
|
||||||
hash_branch "noyau" do |r|
|
hash_branch "noyau" do |r|
|
||||||
require_core_member!(r)
|
require_core_member!(r)
|
||||||
@@ -25,10 +24,26 @@ class Netig
|
|||||||
.order(Sequel[:members][:id])
|
.order(Sequel[:members][:id])
|
||||||
.all
|
.all
|
||||||
|
|
||||||
|
memberships_by_member = DB[:memberships]
|
||||||
|
.order(Sequel.desc(:requested_at), Sequel.desc(:id))
|
||||||
|
.all
|
||||||
|
.group_by { |membership| membership[:member_id] }
|
||||||
|
|
||||||
|
@members.each do |member|
|
||||||
|
memberships = memberships_by_member.fetch(member[:id], [])
|
||||||
|
|
||||||
|
membership = memberships.find do |item|
|
||||||
|
%w[pending accepted].include?(item[:status])
|
||||||
|
end
|
||||||
|
|
||||||
|
membership ||= memberships.first
|
||||||
|
|
||||||
|
member[:membership_status] = membership && membership[:status]
|
||||||
|
end
|
||||||
|
|
||||||
view "noyau/members"
|
view "noyau/members"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
<th>Identité</th>
|
<th>Identité</th>
|
||||||
<th>Type</th>
|
<th>Type</th>
|
||||||
<th>Membre du Noyau</th>
|
<th>Membre du Noyau</th>
|
||||||
|
<th>Adhésion</th>
|
||||||
<th>Adresse électronique</th>
|
<th>Adresse électronique</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -28,6 +29,14 @@
|
|||||||
"Personne physique" : "Personne morale" %>
|
"Personne physique" : "Personne morale" %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= member[:core_member] ? "Oui" : "Non" %></td>
|
<td><%= member[:core_member] ? "Oui" : "Non" %></td>
|
||||||
|
<td>
|
||||||
|
<%= case member[:membership_status]
|
||||||
|
when "pending" then "En attente"
|
||||||
|
when "accepted" then "Acceptée"
|
||||||
|
when "rejected" then "Refusée"
|
||||||
|
else "Aucune demande"
|
||||||
|
end %>
|
||||||
|
</td>
|
||||||
<td><%= member[:email] %></td>
|
<td><%= member[:email] %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in new issue
Block a user