CHANGED: /recent merges the successful scan and not found into 1 single list

Author: Doug Wright

app.js

@@ -6,28 +6,22 @@ const { loadDatabase, searchDatabase } = require('./googleSpreadsheet');
 
 const app = express();
 
-const recentScans = {
-  assigned: [],
-  unassigned: [],
-};
-
+const allScans = [];
 
 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) {
-    recentScans.unassigned.unshift({ time: now, status: 'missing', uuid });
+    allScans.unshift({ time: now, status: 'missing', uuid });
     return;
   }
-  recentScans.unassigned.map(item => item.status = (item.uuid === uuid) ? 'fixed' : item.status);
-  recentScans.assigned.unshift({ time: now, fixture, uuid });
+  allScans.map(item => item.status = (item.uuid === uuid) ? 'fixed' : item.status);
+  allScans.unshift({ time: now, fixture, uuid });
 }
 
-
 app.set('view engine', 'ejs');
 
 app.use(express.static(`${__dirname}/public`));
@@ -57,7 +51,7 @@ app.get('/qrlist', (req, res) => {
 });
 
 app.get('/recent', (req, res) => {
-  res.render('recent', { data: recentScans });
+  res.render('recent', { allScans });
 });
 
 app.get('/:uuid', (req, res) => {

views/recent.ejs

@@ -2,24 +2,23 @@
 <div class="resultContainer col-xs-12">
   <h1>Recently scanned QR code</h1>
   <article class="col-xs-12">
-    <h2>Not Found</h2>
     <ul class='recent-list'>
-      <% for(var i = 0; i<data.unassigned.length; i++){%>
-        <li>
-          <a href="/<%- data.unassigned[i].uuid %>"><%- data.unassigned[i].time.toTimeString() %> - <%- data.unassigned[i].status %> </a> :<br/>
-          <%- data.unassigned[i].uuid %>
-        </li>
-      <%}%>
-    </ul>
-  </article>
-  <article class="col-xs-12">
-    <h2>Recent Item</h2>
-    <ul class='recent-list'>
-      <% for(var i = 0; i<data.assigned.length; i++){%>
-        <li>
-          <a href="/<%- data.assigned[i].uuid %>"><%- data.assigned[i].time.toTimeString() %> - <%- data.assigned[i].fixture %> </a>: <br/>
-          <%- data.assigned[i].uuid %>
-        </li>
+      <% 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>