X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/92855ded461fee0d84ec31dc2a45e0657dfe7688..47ea7c948ab73a626681f1f75f42a67921c0ca9f:/users.mlt

diff --git a/users.mlt b/users.mlt
index 6957f7b..5d960da 100644
--- a/users.mlt
+++ b/users.mlt
@@ -94,11 +94,7 @@ elseif $"mod" <> "" then
       	| _ => %><h3>Couldn't find "paying" or "retired" group by name!</h3><%
 	end
 
-elseif $"cmd" = "grandfather" then
-	Init.grandfatherUsers()
-	%><h3>Grandfathered</h3>
-
-<% elseif $"cmd" = "addform" then
+elseif $"cmd" = "addform" then
         showNormal := false %>        
 <h3>New member</h3>
 
@@ -124,30 +120,6 @@ elseif $"cmd" = "grandfather" then
 </table>
 </form>
 
-<% elseif $"cmd" = "unmigrated" then
-   showNormal := false;
-   ref negative = 0;
-   val users = Init.unmigratedUsers () %>
-
-<h3>Unmigrated members (<% length users %>)</h3>
-
-<table>
-<% foreach user in users do %>
-	<tr> <td><a href="user?id=<% #id user %>"><% Web.html (#name user) %></a></td>
-<% val bal = Balance.lookupBalance (#bal user);
-if Balance.isNegative bal then
-   negative := negative + 1
-end %>
-<td><% #amount bal %></td><td>
-<%if #name bal <> #name user then %>
- <i><% Web.html (#name bal) %></i>
-<% end %>
-</td> </tr>
-<% end %>
-</table>
-
-<p><% negative %> have negative balances.</p>
-
 <% elseif $"cmd" = "diff" then
    showNormal := false;
 
@@ -178,23 +150,31 @@ end %>
 <% if showNormal then %>
 
 <a href="users?cmd=addform">Add a user manually</a><br>
+<% if $"showretired" = "1" then %>
+<a href="users?showretired=0">Hide Retired Members</a><br>
+<% else %>
+<a href="users?showretired=1">Show Retired Members</a><br>
+<% end %>
 
 <h3>Manage current members</h3>
 
 <table class="data">
-<% foreach user in Init.listUsers () do %>
-	<tr> <td><a href="user?id=<% #id user %>"><% Web.html (#name user) %></a></td> <td>
+<% foreach user in List.filter (fn u => ($"showretired" = "1") or not (Group.userInGroupName (#id u, "retired"))) (Init.listUsers ()) do %>
+	<tr>
+	  <td><a href="user?id=<% #id user %>"><% Web.html (#name user) %></a></td>
+	  <td>
 <% val bal = Balance.lookupBalance (#bal user);
 if #name bal <> #name user then %>
 <i><% Web.html (#name bal) %></i>
 <% end %>
-	</td><td><a href="users?mod=<% #id user %>">[Modify]</a> <a href="users?del=<% #id user %>">[Delete]</a>
-	<a href="users?retire=<% #id user %>">[Retire]</a></td> </tr>
+	  </td>
+	  <td><a href="users?mod=<% #id user %>">[Modify]</a> <a href="users?del=<% #id user %>">[Delete]</a>
+	<a href="users?retire=<% #id user %>">[Retire]</a></td>
+	</tr>
 <% end %>
 </table>
 
-<br><a href="users?cmd=grandfather">Grandfather old users to have applications</a><br>
-<a href="users?cmd=unmigrated">Who hasn't migrated yet?</a><br>
+<br>
 <a href="users?cmd=diff">How does the set of users in AFS compare with the set of active portal users?</a><br>
 
 <% end %>