From c9c7cf54f204139bb825dcc1957a5c203470075c Mon Sep 17 00:00:00 2001
From: Luke Berndt <luke@robotastic.com>
Date: Tue, 2 Jul 2024 21:59:44 -0400
Subject: [PATCH] update for active users

---
 admin/server/controllers/systems.js  |  2 +-
 admin/src/ActiveUsers/ActiveUsers.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin/server/controllers/systems.js b/admin/server/controllers/systems.js
index 5059d80..33618c6 100644
--- a/admin/server/controllers/systems.js
+++ b/admin/server/controllers/systems.js
@@ -35,7 +35,7 @@ exports.listActiveUsers = async function (req,res,next) {
 
     if (!users.hasOwnProperty(system.userId.toString())) {
       const user = await User.findById(system.userId, "_id email firstName lastName lastLogin");
-      users[system.userId.toString()] = user.email;
+      users[system.userId.toString()] = { email: user.email, firstName: user.firstName, lastName: user.lastName };   
     }
 
   }
diff --git a/admin/src/ActiveUsers/ActiveUsers.js b/admin/src/ActiveUsers/ActiveUsers.js
index 7facb25..9de1e4f 100644
--- a/admin/src/ActiveUsers/ActiveUsers.js
+++ b/admin/src/ActiveUsers/ActiveUsers.js
@@ -22,10 +22,20 @@ const ActiveUsers = () => {
           <Header as="h1">Email of Active Users</Header>
 
 
+          <Header as="h3">List</Header>
           {users &&
             users.map((user) =>
 
-            <span>{user}, </span>
+            <span>{user.firstName} {user.lastName} &lt;{user.email}&gt;, </span>
+          )}
+
+          <Header as="h3">CSV</Header>
+
+          First Name, Last Name, Email
+          {users &&
+            users.map((user) =>
+           <span>{user.firstName}, {user.lastName}, {user.email} <br/></span>
+          
           )}
 
         </Container>