Merge pull request #29 from coderbunker/scanList

Scan list

Author: Doug Wright

app.js

@@ -6,17 +6,21 @@ const { loadDatabase, searchDatabase } = require('./googleSpreadsheet');
 
 const app = express();
 
-const recentScans = {
-  assigned: [],
-  unassigned: [],
-};
+const allScans = [];
 
-const date = new Date();
-const minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes();
-const hour = date.getHours();
-const dayOfWeek = date.getDay();
-const week = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
-const scanTime = week[dayOfWeek] + ' ' + hour + ':' + minutes;
+function logScanned(uuid, fixture) {
+  // TRICK: fixture tells if the the uuid was found in database or not
+  if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(uuid)) {
+    return;
+  }
+  const now = new Date();
+  if (!fixture) {
+    allScans.unshift({ time: now, status: 'missing', uuid });
+    return;
+  }
+  allScans.map(item => item.status = (item.uuid === uuid) ? 'fixed' : item.status);
+  allScans.unshift({ time: now, fixture, uuid });
+}
 
 app.set('view engine', 'ejs');
 
@@ -47,21 +51,21 @@ app.get('/qrlist', (req, res) => {
 });
 
 app.get('/recent', (req, res) => {
-  res.render('recent', { data: recentScans });
+  res.render('recent', { allScans });
 });
 
 app.get('/:uuid', (req, res) => {
   loadDatabase((allItems) => {
     const matches = searchDatabase(req.params, allItems);
     if (matches.length === 0) {
-      recentScans.unassigned.push([scanTime, req.params.uuid]);
+      logScanned(req.params.uuid);
       res.render('notFound', {
         item: '',
         id: req.params.uuid,
       });
       return;
     }
-    recentScans.assigned.push([scanTime, matches[0].fixture, req.params.uuid]);
+    logScanned(req.params.uuid, matches[0].fixture);
     matches.similarItems = searchDatabase({ fixture: matches[0].fixture }, allItems)
       .filter(item => item.uuid !== matches[0].uuid)
       .splice(0, 3);

public/main.css

@@ -10,12 +10,13 @@
     position: relative;
 }
 
-
 .recent-list {
     list-style-type: none;
-    padding-bottom: 5px;
-} 
-
+    padding-left: 0;
+}
+.recent-list li {
+  padding-bottom: 5px;
+}
 
 #appTitle {
     color: white;
@@ -94,7 +95,3 @@ article {
   padding-top: 1em;
   padding-bottom: 1em;
 }
-
-/*@media print {
-  font-size: 0.2em;
-}*/

views/notFound.ejs

@@ -1,8 +1,11 @@
 <% include ./partials/header %>
 
-  <div class="notFound">
-    <img src="/emoji.png" alt="">
-    <p>Sorry, item with the id <strong><%= id %></strong> not found</p>
+  <div class="col-xs-12">
+    <img class="col-xs-12" src="/emoji.png" alt="">
+    <p>Sorry, item not found with the id:</p>
+    <p>
+      <strong><%= id %></strong>
+    </p>
   </div>
-  
+
 <% include ./partials/footer %>

views/recent.ejs

@@ -1,28 +1,26 @@
 <% include ./partials/header %>
-
 <div class="resultContainer col-xs-12">
   <h1>Recently scanned QR code</h1>
   <article class="col-xs-12">
-    <h2>Not Found</h2>
-    
-      <% for(var i = 0; i<data.unassigned.length; i++){%>
-        <li class="recent-list">
-        <a href="<%- data.unassigned[i][1] %>"><%- data.unassigned[i][0] %></a>
-          <br />
-          <%- data.unassigned[i][1] %>
-        </li>
-      <%}%>
-    
-  </article>
-  <article class="col-xs-12">
-    <h2>Recent Item</h2>
-      <% for(var i = 0; i<data.assigned.length; i++){%>
-        <li class="recent-list">
-          <a href="/<%- data.assigned[i][2] %>"><%- data.assigned[i][0] %> <%- data.assigned[i][1] %></a><br />
-          <%- data.assigned[i][2] %> <br />
-          </a>
-        </li>
+    <ul class='recent-list'>
+      <% for(var i = 0; i <allScans.length; i++){%>
+        <% if(allScans[i].fixture) { %>
+          <li>
+            <a href="/<%- allScans[i].uuid %>"><%- allScans[i].time.toTimeString() %> - <%- allScans[i].fixture %> </a> :<br/>
+            <%- allScans[i].uuid %>
+          </li>
+        <% } else { %>
+          <li>
+            <a href="/<%- allScans[i].uuid %>"><%- allScans[i].time.toTimeString() %>
+             </a>
+            <span style="color:<%- allScans[i].status==='fixed'?'orange':'red'%>" >
+              :<br/>
+              <%- allScans[i].uuid %>
+            </span>
+          </li>
+        <%}%>
       <%}%>
+    </ul>
   </article>
 </div>
 <% include ./partials/footer %>