User can now view summary of books borrowed by others

dwij2812 · Jun 6, 2019 · 49334f3 · 49334f3
1 parent a65fbda
commit 49334f3
Show file tree

Hide file tree

Showing 40 changed files with 270 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -41,7 +41,7 @@ app.use(require('express-formidable')({
 }));
 
 app.locals.blog = {
-    title: 'Welcome to Accord :: CheckOut'
+    title: 'Accord CheckOut'
 };
 
 app.use(function (req, res, next) {

diff --git a/logs/success.log b/logs/success.log
diff --git a/models/borrowParts.js b/models/borrowParts.js
@@ -55,5 +55,12 @@ module.exports = {
         return BorrowParts
                     .count({bool: false})
                     .exec();
+    },
+    BorrowSummary: function(){
+        return BorrowParts
+            .find({ bool:false })
+            .sort({ _id: -1 })
+            .addCreatedAt()
+            .exec();
     }
 }
diff --git a/public/img/upload_08580f3680659374be3b3fd1c35f50bd b/public/img/upload_08580f3680659374be3b3fd1c35f50bd
diff --git a/public/img/upload_0d7222a2f3f20fab0f4cc8f36473d847 b/public/img/upload_0d7222a2f3f20fab0f4cc8f36473d847
diff --git a/public/img/upload_0e0cf0787cd471d3607248eba23af790 b/public/img/upload_0e0cf0787cd471d3607248eba23af790
diff --git a/public/img/upload_13b07578a17a4cc573a6c0f18ae65d38 b/public/img/upload_13b07578a17a4cc573a6c0f18ae65d38
diff --git a/public/img/upload_172ff4aef229ff140fe573b861208f07 b/public/img/upload_172ff4aef229ff140fe573b861208f07
diff --git a/public/img/upload_2132b416d49578e394d28bc105dded06 b/public/img/upload_2132b416d49578e394d28bc105dded06
diff --git a/public/img/upload_2c629f248f4abffe9beef2dc77268cae b/public/img/upload_2c629f248f4abffe9beef2dc77268cae
diff --git a/public/img/upload_357028225defad6709b193aaf8989a1a b/public/img/upload_357028225defad6709b193aaf8989a1a
diff --git a/public/img/upload_46898d97ea55cce0e8480d34e9912894 b/public/img/upload_46898d97ea55cce0e8480d34e9912894
diff --git a/public/img/upload_4fac044dcc05b2bb7900e49aa10d5b58 b/public/img/upload_4fac044dcc05b2bb7900e49aa10d5b58
diff --git a/public/img/upload_528fca499c5036806b8c3555fc2c1622 b/public/img/upload_528fca499c5036806b8c3555fc2c1622
diff --git a/public/img/upload_609ec4ad990a4c30ab7c94250c41b7ca b/public/img/upload_609ec4ad990a4c30ab7c94250c41b7ca
diff --git a/public/img/upload_83fb834f8b29e462eccbb9242946ca39 b/public/img/upload_83fb834f8b29e462eccbb9242946ca39
diff --git a/public/img/upload_884f8d4c64aa15719760ba2afc1c9780 b/public/img/upload_884f8d4c64aa15719760ba2afc1c9780
diff --git a/public/img/upload_944bc8bde1f296ae0c30ffd1efb517db b/public/img/upload_944bc8bde1f296ae0c30ffd1efb517db
diff --git a/public/img/upload_9d2649c589a7ac995371cb44be4f7a94 b/public/img/upload_9d2649c589a7ac995371cb44be4f7a94
diff --git a/public/img/upload_a53eb36f24a9c958f4b8010d3e0be25f b/public/img/upload_a53eb36f24a9c958f4b8010d3e0be25f
diff --git a/public/img/upload_aa362696c13de522d619f5a789cdfc1d b/public/img/upload_aa362696c13de522d619f5a789cdfc1d
diff --git a/public/img/upload_ae9e139caf4b705d71c9fdac77704b6e b/public/img/upload_ae9e139caf4b705d71c9fdac77704b6e
diff --git a/public/img/upload_b1e0c7111025d82ade361523daf75e46 b/public/img/upload_b1e0c7111025d82ade361523daf75e46
diff --git a/public/img/upload_b21f8bf9d9f047a0b6f24889370f86ad b/public/img/upload_b21f8bf9d9f047a0b6f24889370f86ad
diff --git a/public/img/upload_b29b5d8fe94777d7da366de73b354cbe b/public/img/upload_b29b5d8fe94777d7da366de73b354cbe
diff --git a/public/img/upload_c57e53485fbaf6e1893cb1fbc55700cd b/public/img/upload_c57e53485fbaf6e1893cb1fbc55700cd
diff --git a/public/img/upload_cbb717d6414d5cf5d5fd928382b4bcea b/public/img/upload_cbb717d6414d5cf5d5fd928382b4bcea
diff --git a/public/img/upload_ce05d3b7806838ea64e2a179f1adb382 b/public/img/upload_ce05d3b7806838ea64e2a179f1adb382
diff --git a/public/img/upload_d8869c4382173c7194771ab0447127bd b/public/img/upload_d8869c4382173c7194771ab0447127bd
diff --git a/public/img/upload_df91bfb3e658da8001c1601f8e74adc4 b/public/img/upload_df91bfb3e658da8001c1601f8e74adc4
diff --git a/public/img/upload_e206983da6e20e6811521b1d5521bb8f b/public/img/upload_e206983da6e20e6811521b1d5521bb8f
diff --git a/public/img/upload_ec248a79c8a949d3122a901547f13748 b/public/img/upload_ec248a79c8a949d3122a901547f13748
diff --git a/public/img/upload_ee219e10177802d9447112c812712d2f b/public/img/upload_ee219e10177802d9447112c812712d2f
diff --git a/public/img/upload_f3d640c7f18ccc7a413e8c97bb18d771 b/public/img/upload_f3d640c7f18ccc7a413e8c97bb18d771
diff --git a/public/img/upload_f7445b75d43044d8d94b4113bb88837e b/public/img/upload_f7445b75d43044d8d94b4113bb88837e
diff --git a/public/img/upload_f9cb66fc564d4e426a4a3a574ff26521 b/public/img/upload_f9cb66fc564d4e426a4a3a574ff26521
diff --git a/routes/borrow_summary.js b/routes/borrow_summary.js
@@ -0,0 +1,47 @@
+var express = require('express');
+var router = express.Router();
+var async = require('asyncawait/async');
+var await = require('asyncawait/await');
+var UserModel = require('../models/users');
+var BorrowPartModel = require('../models/borrowParts');
+var BorrowParts = require('../lib/mongo').BorrowPart;
+var checkIsAdmin = require('../middlewares/check').checkIsAdmin;
+var InventoryModel = require('../models/inventory');
+
+router.get('/',  async (function (req, res, next) {
+    var result = [];
+    try {
+        var users = await (BorrowPartModel.BorrowSummary());
+        users.forEach(async (function(user){
+            var userInfo = await (UserModel.getUserByDefaultId(user.userId));
+            var partInfo = await (InventoryModel.getPartById(user.partId));
+            result.push({
+                userId: user.userId,
+                name: userInfo.name,
+                id: userInfo.id,
+                avatar: userInfo.avatar,
+                borrowTime: user.created_at,
+                borrowId: user._id,
+                partId: user.partId,
+                returnTime: user.return_time,
+                bool: user.bool,
+                approval: user.approval,
+                partname: partInfo.name,
+                partmodel_no: partInfo.model_no,
+                partpic: partInfo.image
+            })
+        }));
+
+        setTimeout(function() {
+            res.render('borrow_summary', {
+                borrowUser: result
+            });
+        }, 1000);  
+
+    } catch (error) {
+        next();
+    }
+
+}));
+
+module.exports = router;
diff --git a/routes/index.js b/routes/index.js
@@ -13,6 +13,7 @@ module.exports = function (app) {
     app.use('/quick_borrow', require('./quick_borrow'));
     app.use('/approval', require('./approval'));
     app.use('/userApproval', require('./userApproval'));
+    app.use('/borrow_summary', require('./borrow_summary'));
     // 404 page
     app.use(function (req, res) {
         if (!res.headersSent) {

diff --git a/views/borrow_summary.ejs b/views/borrow_summary.ejs
@@ -0,0 +1,25 @@
+<%- include('./layout/header') %>
+<div class="ui items" style="padding: 0 100px;">
+    <% borrowUser.forEach(function(user){ %>
+    <div class="item">
+        <a class="ui tiny image" href="/profile/<%= user.userId%>"  style="width: 72px; height: 72px; overflow: hidden; background: #eee;">
+            <img src="/img/<%= user.avatar%>">
+        </a>
+        <a class="ui tiny image" style="width: 72px; height: 72px; overflow: hidden; background: #eee;">
+            <img src="<%= user.partpic%>">
+        </a>
+        <div class="content">
+            <a class="header" href="/profile/<%= user.userId%>"><%= user.name%></a>
+            <div class="description">
+                <p><span style="color: #666;">Employee Id</span> : <%= user.id%></p>
+                <p><span style="color: #666;">Book Name</span> : <%= user.partname%></p>
+                <p><span style="color: #666;">Author</span> : <%= user.partmodel_no%></p>
+                <p><span style="color: #666;">Borrow Time</span>: <%= user.borrowTime%></p>
+                <p><span style="color: #666;">Admin Approval Created</span>: <%= user.approval == false ? "NA" : "Approval Pending By Admin"%></p>
+            </div>
+        </div>
+    </div>
+    <hr>
+    <% }) %>
+</div>
+<%- include('./layout/footer') %>
diff --git a/views/home.ejs b/views/home.ejs
@@ -18,36 +18,25 @@
                             </div>
                             <div style=" margin-left: 30px;">
                                 <h2><%= borrowCount %></h2>
-                                Books Awaiting Return
+                                <a href="/profile/<%= user._id %>">Books Awaiting Return</a>
                             </div>
                         </div>
                         <div class="column">
                             <% if (user.isAdmin) { %>
                                 <div style=" margin-left: 30px;">
                                     <h2><%= approvalCount %></h2>
-                                    Return Approvals Pending
+                                    <a href="/approval">Return Approvals Pending</a>
                                 </div>
                             <% } %>
                         </div>
                         <div class="column">
                             <% if (user.isAdmin) { %>
                                 <div style=" margin-left: 30px;">
                                     <h2><%= userApprovalCount %></h2>
-                                    User Account Approvals Pending
+                                    <a href="/userApproval">User Account Approvals Pending</a>
                                 </div>
                             <% } %>
                         </div>
-                        <div class="column">
-                                <a class="item" href="/profile/<%= user._id %>"><i class="user icon"></i>Manage your Account</a> 
-                                <% if (user.isAdmin) { %>
-                                    <br>
-                                    <a class="item" href="/approval"><i class="clock icon"></i>Return Approvals</a>
-                                    <br>
-                                    <a class="item" href="/inventory"><i class="configure icon"></i>Manage Inventory</a>
-                                    <br>
-                                    <a class="item" href="/userApproval"><i class="add user icon"></i>Approve Users</a>
-                                <% } %>             
-                        </div>
                         
                     </div>
                 </div>
@@ -89,10 +78,17 @@
                                     </div>  
                         </div>
                         <div class="column">
+                            <% if (user.isAdmin) { %>
                                 <div style=" margin-left: 30px;">
                                     <h2><%= TotalBorrowCount %></h2>
-                                    Copies Borrowed
+                                    <a href="/inventory">Copies Borrowed</a>
                                 </div>
+                            <% }else{ %>
+                                <div style=" margin-left: 30px;">
+                                        <h2><%= TotalBorrowCount %></h2>
+                                        <a href="/borrow_summary">Copies Borrowed</a>
+                                </div>
+                            <% } %>
                         </div>                        
                     </div>
                 </div>