Fixing bugs on Rooms and Articles Views

Vicra · Aug 10, 2018 · 3e56536 · 3e56536
1 parent 750cc23
commit 3e56536
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 374 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+logs/
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/controllers/articles.js b/app/controllers/articles.js
@@ -109,7 +109,7 @@ function editArticle(request, h)
         if(request.payload.name != article[0].name)
         {
             const articleExists = await articleService.getArticleByName(request.payload.name);
-            if(articleExists.length > 0)
+            if(articleExists.length > 0 && articleExists.name == request.payload.name)
             {
                 stResponse.message = "Article name is already in use.";
                 resolve(stResponse);

diff --git a/app/controllers/rooms.js b/app/controllers/rooms.js
@@ -42,7 +42,8 @@ function renderView(request,h)
         resolve(h.view('views/rooms/view', {
             room:room[0], 
             session: request.auth.credentials,
-            articles: await articleService.getArticlesByRoomId(request.query.id)
+            articles: await articleService.getArticlesByRoomId(request.query.id),
+            hasArticles: await roomService.hasArticles(request.query.id)
         }));
     });
 }

diff --git a/app/models/DAO/articleDAO.js b/app/models/DAO/articleDAO.js
@@ -24,8 +24,8 @@ async function getArticleByName(name)
 {
     const SQL = 
     `SELECT * FROM Articles
-    WHERE UPPER(name) = ?`;
-    return await fw.db.execute('local',SQL,[`${name.toUpperCase()}`]);
+    WHERE name = ?`;
+    return await fw.db.execute('local',SQL,[name]);
 }
 
 async function getArticleById(id)
@@ -92,7 +92,7 @@ async function deleteArticle(id)
     const deleteRoomArticlesSQL = 
     `DELETE FROM Rooms_Articles
     WHERE article_id = ?`;
-    return await fw.db.execute('local',deleteRoomArticlesSQL,[id]);
+    await fw.db.execute('local',deleteRoomArticlesSQL,[id]);
 
     const deleteArticleSQL = 
     `DELETE FROM Articles

diff --git a/app/models/DAO/roomDAO.js b/app/models/DAO/roomDAO.js
@@ -122,6 +122,15 @@ async function deleteRoom(id)
     return;
 }
 
+async function hasArticles(id)
+{
+    const SQL = 
+    `SELECT * 
+    FROM Rooms_Articles 
+    WHERE room_id = ?`;
+    var response = await fw.db.execute('local',SQL,[id]);
+    return (response.length) ? true : false;
+}
 
 module.exports = 
 {
@@ -130,5 +139,6 @@ module.exports =
     getRoom,
     addRoom,
     updateRoom,
-    deleteRoom
+    deleteRoom,
+    hasArticles
 }
diff --git a/app/models/services/articleService.js b/app/models/services/articleService.js
@@ -12,9 +12,9 @@ async function getArticles()
     return await articleDAO.getArticles();
 }
 
-async function getArticleByName(email)
+async function getArticleByName(name)
 {
-    return await articleDAO.getArticleByName(email);
+    return await articleDAO.getArticleByName(name);
 }
 
 async function getArticleById(id)

diff --git a/app/models/services/roomService.js b/app/models/services/roomService.js
@@ -37,12 +37,18 @@ async function deleteRoom(data)
     return await roomDAO.deleteRoom(data);
 }
 
+async function hasArticles(data)
+{
+    return await roomDAO.hasArticles(data);
+}
+
 module.exports = 
 {
     getRooms,
     getRoom,
     getRoomByName,
     addRoom,
     updateRoom,
-    deleteRoom
+    deleteRoom,
+    hasArticles
 }
diff --git a/app/templates/views/articles/add.hbs b/app/templates/views/articles/add.hbs
@@ -35,7 +35,6 @@ function submitform()
     var formData = serializeObject(frm);
 
     showLoader();
-    console.log(formData);
     $.post('/articles/add',formData,
     function(data)
     {

diff --git a/app/templates/views/rooms/view.hbs b/app/templates/views/rooms/view.hbs
@@ -24,23 +24,25 @@
         <input type="text" class="form-control" value="{{room.people_count}}" readonly>
       </div>
       <hr>
-      {{#ifCond articles.length ">" 0}}
+      {{#ifCond hasArticles "==" true}}
         <h5 class="card-title">Room Equipment</h5>
       {{/ifCond}}
-      {{#ifCond articles.length "==" 0}}
+      {{#ifCond hasArticles "==" false}}
         <div class="form-group">
           <label for="formGroupExampleInput">No equipment available for this room.</label>
         </div>
       {{/ifCond}}
       {{#each articles}}
-        <ul>
-          <li>
-            <div class="form-group">
-              <label for="formGroupExampleInput">{{amount}} {{name}} item(s)</label>
-            </div>
-          </li>
-        </ul>
-        {{/each}}
+        {{#ifCond amount ">" 0}}
+          <ul>
+            <li>
+              <div class="form-group">
+                <label for="formGroupExampleInput">{{amount}} {{name}} item(s)</label>
+              </div>
+            </li>
+          </ul>
+        {{/ifCond}}
+      {{/each}}
     </form>        
     </p>
     <a href="/rooms/edit?id={{room.id}}" class="btn btn-primary"><span data-feather="edit"></span> Edit</a>

diff --git a/logs/debug.log b/logs/debug.log
diff --git a/logs/errors.log b/logs/errors.log
diff --git a/logs/node-out.log b/logs/node-out.log
diff --git a/logs/requests.log b/logs/requests.log
diff --git a/sessions/.DS_Store b/sessions/.DS_Store