From f914926417c416e4813c19986bbe57485b2647c0 Mon Sep 17 00:00:00 2001
From: Filippo Stella <filippo.stella.360@gmail.com>
Date: Mon, 3 Aug 2020 15:09:22 +0200
Subject: [PATCH] Merging Changes

---
 app.js                           |  2 +-
 public/js/dash.js                |  3 +--
 public/stylesheets/dashStyle.css |  8 ++++++++
 routes/api.js                    |  5 +++--
 routes/login.js                  |  2 +-
 views/dash.ejs                   | 20 ++++++++++----------
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index 014568b..3fed0ad 100644
--- a/app.js
+++ b/app.js
@@ -47,7 +47,7 @@ app.use(session({
   cookie: {
     secure: false, //change to true with HTTPS
     sameSite: true,
-    maxAge: 600000 // Time is in miliseconds
+    maxAge: 1000 * 60 * 60 * 2// Time is in miliseconds
   },
 }));
 
diff --git a/public/js/dash.js b/public/js/dash.js
index 7604dde..541b4df 100644
--- a/public/js/dash.js
+++ b/public/js/dash.js
@@ -39,9 +39,8 @@ function sidenavEventsListeners() {
                     for (let i = 0; i < data.products.length; i++) {
                         let tr = tbody.insertRow();
                         tr.insertCell().appendChild(document.createTextNode(data.products[i].Name));
-                        tr.insertCell().appendChild(document.createTextNode(data.products[i].Price + value));
+                        tr.insertCell().appendChild(document.createTextNode(data.products[i].Price+value+" ("+data.products[i].shop+")"));
                         tr.insertCell().appendChild(document.createTextNode(data.products[i].LastUpdate.toString()));
-                        //tr.insertCell().appendChild(document.createTextNode(data.products[i].Barcode));
                         tr.insertCell().innerHTML = '<a href="#" onclick="prodDetails(' + data.products[i].Barcode + ')"><i class="material-icons">read_more</i></a>';
                     }
                 } else {
diff --git a/public/stylesheets/dashStyle.css b/public/stylesheets/dashStyle.css
index b0d8e51..a94698d 100644
--- a/public/stylesheets/dashStyle.css
+++ b/public/stylesheets/dashStyle.css
@@ -69,4 +69,12 @@ nav.top-nav {
 
 .dropdown_offset {
     top: 55px !important;
+}
+
+.scrollable{
+    overflow: auto;
+}
+
+.minWidth{
+    min-width: 600px;
 }
\ No newline at end of file
diff --git a/routes/api.js b/routes/api.js
index 5f45324..f209fe5 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -177,7 +177,7 @@ router.get('/productslistcomplete', chechAuth, function (req, res, next) {
         }
     });
 
-    connection.query("SELECT product.Barcode, product.Name, sold.Price, sold.LastUpdate FROM product, sold WHERE product.Barcode = sold.ProductBarcode GROUP BY product.Barcode HAVING sold.Price = MIN(sold.Price)", function (err, result) {
+    connection.query("SELECT product.Barcode, product.Name, sold.Price, DATE_FORMAT(sold.LastUpdate,'%d-%m-%Y') AS LastUpdate, shop.Name AS 'shopName', shop.City FROM product, sold, shop WHERE sold.ShopID = shop.ID AND product.Barcode = sold.ProductBarcode GROUP BY product.Barcode HAVING sold.Price = MIN(sold.Price)", function (err, result) {
         if (err) {
             return res.json({
                 "status": false,
@@ -194,7 +194,8 @@ router.get('/productslistcomplete', chechAuth, function (req, res, next) {
                         'Barcode': result[i].Barcode,
                         'Name': result[i].Name,
                         'Price': result[i].Price,
-                        'LastUpdate': result[i].LastUpdate
+                        'LastUpdate': result[i].LastUpdate,
+                        'shop': result[i].shopName + ", " + result[i].City
                     });
                 }
                 res.json(ris);
diff --git a/routes/login.js b/routes/login.js
index d4feeb2..5240b32 100644
--- a/routes/login.js
+++ b/routes/login.js
@@ -41,7 +41,7 @@ router.post('/login', redirectDash, function (req, res, next) {
     ], function (err, result) {
         if (err) {
             console.log("Query Error" + err);
-            res.json({
+            return res.json({
                 "status": false,
                 "message": err
             });
diff --git a/views/dash.ejs b/views/dash.ejs
index efde367..883a0ee 100644
--- a/views/dash.ejs
+++ b/views/dash.ejs
@@ -86,7 +86,7 @@
                     <div class="row">
                         <h2>Products List</h2>
                     </div>
-                    <table class="striped responsive-table">
+                    <table class="striped scrollable minWidth">
                         <thead>
                         <tr>
                             <th>Name</th>
@@ -107,7 +107,7 @@
                     <div class="row">
                         <h2>Shops List</h2>
                     </div>
-                    <table class="striped responsive-table">
+                    <table class="striped scrollable minWidth">
                         <thead>
                         <tr>
                             <th>Name</th>
@@ -115,7 +115,7 @@
                             <th>Details</th>
                         </tr>
                         </thead>
-                        <tbody id="sListTableBody"></tbody>
+                        <tbody id="sListTableBody" class="scrollable minWidth"></tbody>
                     </table>
                 </div>
             </div>
@@ -261,13 +261,13 @@
                     </div>
                     <div class="row">
                         <p>Details</p>
-                        <table class="">
+                        <table class="scrollable minWidth">
                             <tbody id="modalProdDetailsTableBody"></tbody>
                         </table>
                     </div>
                     <div class="row">
                         <p>Sold in</p>
-                        <table class="striped">
+                        <table class="striped scrollable minWidth">
                             <thead>
                             <tr>
                                 <th>Name</th>
@@ -292,13 +292,13 @@
                     </div>
                     <div class="row">
                         <p>Details</p>
-                        <table class="responsive-table">
+                        <table class="scrollable minWidth">
                             <tbody id="modalShopDetailsTableBody"></tbody>
                         </table>
                     </div>
                     <div class="row">
                         <p>Products Sold In This Shop</p>
-                        <table class="striped responsive-table">
+                        <table class="striped scrollable minWidth">
                             <thead>
                             <tr>
                                 <th>Barcode</th>
@@ -322,7 +322,7 @@
                         <h3>Select a Product From The List</h3>
                     </div>
                     <div class="row">
-                        <table class="striped responsive-table">
+                        <table class="striped scrollable minWidth">
                             <thead>
                             <tr>
                                 <th>Select</th>
@@ -350,7 +350,7 @@
                         <h3>Select a Shop From The List</h3>
                     </div>
                     <div class="row">
-                        <table class="striped responsive-table">
+                        <table class="striped scrollable minWidth">
                             <thead>
                             <tr>
                                 <th>Select</th>
@@ -378,7 +378,7 @@
                         <h3>List of Currently Active Api Keys</h3>
                     </div>
                     <div class="row">
-                        <table class="striped responsive-table">
+                        <table class="striped scrollable minWidth">
                             <thead>
                             <tr>
                                 <th>Api Key</th>