rooms update

Vicra · Oct 20, 2019 · 6d13e20 · 6d13e20
1 parent f50ca9e
commit 6d13e20
Show file tree

Hide file tree

Showing 8 changed files with 1,062 additions and 1,075 deletions.
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -21,6 +21,15 @@ function renderMain(request,h)
     });    
 }
 
+function getUsers(request,h)
+{
+    return fw.promise(async (resolve,reject) => 
+    {
+        const users = await usersService.getUsers();
+        resolve(users);
+    });  
+}
+
 /**
  * Render View page
  * @param {Object} request
@@ -186,5 +195,6 @@ module.exports =
     renderAdd,
     addUser,
     editUser,
-    deleteUser
+    deleteUser,
+    getUsers
 }
diff --git a/app/models/services/roomService.js b/app/models/services/roomService.js
@@ -46,7 +46,7 @@ async function hasArticles(data)
 async function getTodayDashboard()
 {
     var rooms = await roomDAO.getRooms();
-    var todayEvents = await eventDAO.getRooms();
+    var todayEvents = await eventDAO.getTodayEvents();
     var returnObject = [];
     for (var i = 0; i < rooms.length; i++) {
         for (var j = 0; j < todayEvents.length; j++) {