last touches

middleware/food/getFoodList.js

@@ -14,7 +14,6 @@ module.exports = function (objectrepository) {
         FoodModel.find({},(err,foods) =>{
            if(err) return next(err);
 
-
            res.locals.foods = foods;
 
            return next();

middleware/food/handleNoFood.js

+const requireOption = require('../common/requireOption');
+
+
+/**
+ * Handles the no food error (When one ants to add storage item, but there are no food types in database)
+ */
+
+module.exports = function (objectrepository) {
+
+    const FoodModel = requireOption(objectrepository, 'FoodModel');
+
+    return function (req, res, next) {
+       if(req.query.nofood) res.locals.warning = "Először létre kell hozni egy étel típust az adatbázisban!";
+
+        return next();
+        
+    }
+  };
\ No newline at end of file

middleware/storage/checkFoodList.js

+
+const requireOption = require('../common/requireOption');
+/**
+ * Deletes food from database, using foodid param
+ */
+module.exports = function (objectrepository) {
+
+    return function (req, res, next) {
+        if(res.locals.foods.length == 0){
+            return res.redirect('/foods/new?nofood=1');
+        }
+        return next();
+    };
+  
+  };

routes/foods.js

@@ -7,7 +7,7 @@ const getFoodListMW = require('../middleware/food/getFoodList');
 const saveFoodMW = require('../middleware/food/saveFood');
 const getFoodMW = require('../middleware/food/getFood');
 const deleteFoodMW = require('../middleware/food/deleteFood');
-
+const handleNoFoodMW = require('../middleware/food/handleNoFood');
 module.exports = function (app, objectRepository) {
 
     app.get('/foods',
@@ -18,6 +18,7 @@ module.exports = function (app, objectRepository) {
    
     app.use('/foods/new',
         authMW(objectRepository),
+        handleNoFoodMW(objectRepository),
         saveFoodMW(objectRepository),
         renderMW(objectRepository,'foodeditcreate')
     );

routes/storage.js

@@ -8,6 +8,7 @@ const getFoodListMW = require('../middleware/food/getFoodList');
 const addStorageItemMW = require('../middleware/storage/addStorageItem');
 const deletStorageItemMW = require('../middleware/storage/deleteStorageItem');
 const updateBunkerStatsMW = require('../middleware/storage/updateBunkerStats');
+const checkFoodListMW = require('../middleware/storage/checkFoodList');
 
 module.exports = function (app,objectRepository) {
 
@@ -16,6 +17,7 @@ module.exports = function (app,objectRepository) {
         authMW(objectRepository),
         getBunkerMW(objectRepository),
         getFoodListMW(objectRepository),
+        checkFoodListMW(objectRepository),
         addStorageItemMW(objectRepository),
         updateBunkerStatsMW(objectRepository),
         function(req,res,next){

views/foodeditcreate.ejs

@@ -4,7 +4,6 @@
 <% if(typeof warning != 'undefined'){ %> 
 
     <div class="alert alert-warning" role="alert">
-        <h2>A mentés nem sikerült</h2>
         <p><%= warning %></p> 
     </div>