Add disabled option for sandwiches and departments

locales/en.json

@@ -74,7 +74,8 @@
 		"lastDate": "Last date",
 		"paid": "Paid",
 		"given": "Given",
-		"chooseUser": "Choose an user"
+		"chooseUser": "Choose an user",
+		"enable": "Enable"
 	},
 	"payment": {
 		"payment": "Payment",

locales/fr.json

@@ -74,7 +74,8 @@
 		"lastDate": "Dernière date",
 		"paid": "Payé",
 		"given": "Donné",
-		"chooseUser": "Choisissez un utilisateur"
+		"chooseUser": "Choisissez un utilisateur",
+		"enable": "Activer"
 	},
 	"payment": {
 		"payment": "Paiement",

models/department.js

@@ -13,6 +13,11 @@ module.exports = (sequelize, DataTypes) => {
     name: {
       type: DataTypes.STRING,
       primaryKey: true
+    },
+    enable: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: true
     }
   }, {
     sequelize,

models/sandwich.js

@@ -16,6 +16,11 @@ module.exports = (sequelize, DataTypes) => {
     price: {
       type: DataTypes.FLOAT,
       allowNull: false
+    },
+    enable: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: true
     }
   }, {
     sequelize,

routes/admin/departments/add.js

@@ -15,7 +15,7 @@ router.get("/", sessionCheck(3), (req, res) => {
     if (await models.Department.findByPk(req.body.name))
         return error(req, res, "Fail to add department", 400, "Name already used");
 
-    await models.Department.create({name: req.body.name});
+    await models.Department.create({name: req.body.name, enable: !!req.body.enable});
     res.redirect("/admin/departments");
 });
 

routes/admin/departments/edit.js

@@ -24,7 +24,10 @@ router.get("/", sessionCheck(3), async (req, res) => {
     if (!department)
         return error(req, res, "Fail to edit department !", 400, "Invalid department name");
 
+    if (department.enable !== req.body.enable)
+        department.enable = !!req.body.enable;
     await department.save();
+
     if (req.body.newName && req.body.newName !== department.name)
         await models.Department.update({name: req.body.newName}, {where: {name: req.body.name}});
 

routes/admin/index.js

@@ -6,9 +6,7 @@ let models = require("../../models");
 
 router.get("/", sessionCheck(3), async (req, res) => {
     res.render("admin/index", {
-        title: "SOD - Administration",
+        title: "SOD - Administration"
-        sandwiches: await models.Sandwich.findAll(),
-        users: await models.User.findAll()
     });
 })
     .use("/orders", require("./orders"))

routes/admin/orders/add.js

@@ -8,8 +8,8 @@ const addOrder = require("../../utils/addOrder");
 router.get("/", sessionCheck(3), async (req, res) => {
     res.render("admin/orders/add", {
         title: "SOD - Orders administration",
-        departments: await models.Department.findAll(),
+        departments: await models.Department.findAll({where: {enable: true}}),
-        sandwiches: await models.Sandwich.findAll(),
+        sandwiches: await models.Sandwich.findAll({where: {enable: true}}),
         users: await models.User.findAll()
     });
 }).post("/", sessionCheck(3), async (req, res) => {

routes/admin/sandwiches/add.js

@@ -15,7 +15,7 @@ router.get("/", sessionCheck(3), (req, res) => {
     if (await models.Sandwich.findByPk(req.body.name))
         return error(req, res, "Fail to add sandwich", 400, "Name already used");
 
-    await models.Sandwich.create({name: req.body.name, price: req.body.price});
+    await models.Sandwich.create({name: req.body.name, price: req.body.price, enable: !!req.body.enable});
     res.redirect("/admin/sandwiches");
 });
 

routes/admin/sandwiches/edit.js

@@ -26,9 +26,13 @@ router.get("/", sessionCheck(3), async (req, res) => {
 
     if (req.body.price && req.body.price !== sandwich.price)
         sandwich.price = req.body.price;
+    if(req.body.enable !== sandwich.enable)
+        sandwich.enable = !!req.body.enable;
     await sandwich.save();
+
     if (req.body.newName && req.body.newName !== sandwich.name)
         await models.Sandwich.update({name: req.body.newName}, {where: {name: req.body.name}});
+
     res.redirect("/admin/sandwiches");
 });
 

routes/admin/users/add.js

@@ -7,7 +7,7 @@ let userCreate = require("../../utils/userCreate");
 router.get("/", sessionCheck(3), async (req, res) => {
     res.render("admin/users/add", {
         title: "SOD - Users administration",
-        departments: await models.Department.findAll()
+        departments: await models.Department.findAll({where: {enable: true}})
     });
 }).post("/", sessionCheck(3), async (req, res) => {
     let user = await userCreate(req, res);

routes/index.js

@@ -20,8 +20,8 @@ router.get("/", async (req, res) => {
 
   res.render("index", {
     title: "SOD - Home",
-    departments: await models.Department.findAll(),
+    departments: await models.Department.findAll({where: {enable: true}}),
-    sandwiches: await models.Sandwich.findAll(),
+    sandwiches: await models.Sandwich.findAll({where: {enable: true}}),
     date: {
       firstDate: firstDate,
       lastDate: lastDate

routes/profile.js

@@ -9,7 +9,7 @@ let error = require("./utils/error");
 router.get("/", sessionCheck(0), async (req, res) => {
     res.render("profile", {
         title: "SOD - Profile",
-        departments: await models.Department.findAll(),
+        departments: await models.Department.findAll({where: {enable: true}}),
         orders: await models.Order.findAll({
             where: {UserUsername: req.session.user.username, paid: true},
             include: models.Sandwich,

routes/register.js

@@ -9,7 +9,7 @@ router.get("/", async (req, res) => {
     if (req.session.user)
         res.redirect("/");
     else
-        res.render("register", {title: "SOD - register", departments: await models.Department.findAll()});
+        res.render("register", {title: "SOD - register", departments: await models.Department.findAll({where: {enable: true}})});
 })
     .post("/", reCaptcha, async (req, res) => {
         let user = await userCreate(req, res);

routes/utils/addOrder.js

@@ -6,7 +6,7 @@ module.exports = async (req, res, args, dateCheck = true) => {
         args.sandwiches.length !==  args.dates.length)
         return error(req, res, "Invalid order !", 400, "Missing arguments");
 
-    let department = await models.Department.findByPk(args.department);
+    let department = await models.Department.findByPk(args.department, {where: {enable: true}});
     if (!department)
         return error(req, res, "Invalid order !", 400, "Invalid department");
 
@@ -20,7 +20,7 @@ module.exports = async (req, res, args, dateCheck = true) => {
         if (!args.dates[s])
             return error(req, res, "Invalid order !", 400, "Sandwich without date");
 
-        let sandwich = await models.Sandwich.findByPk(args.sandwiches[s]);
+        let sandwich = await models.Sandwich.findByPk(args.sandwiches[s], {where: {enable: true}});
         if (!sandwich)
             return error(req, res, "Invalid order !", 400, "Invalid sandwich: "+args.sandwiches[s]);
 

routes/utils/userCreate.js

@@ -18,7 +18,7 @@ module.exports = async (req, res) => {
     if (await models.User.findOne({where: {email: req.body.email}}))
         return error(req, res, "Invalid register !", 400, "Email already used");
 
-    let department = await models.Department.findByPk(req.body.department);
+    let department = await models.Department.findByPk(req.body.department, {where: {enable: true}});
     if (!department)
         return error(req, res, "Invalid register !", 400, "Invalid department");
 

views/admin/departments/add.pug

@@ -9,6 +9,12 @@ block content
                     div.input-field.col.s12
                         label(for="name")=__("admin.name")+":"
                         input#name(type="text" name="name" required)
+                div.row
+                    div.input-field.col.s12
+                        p
+                            label(for="enable")
+                                input#enable(type="checkbox" name="enable" checked)
+                                span=__("admin.enable")
                 div.row.center
                     div.input-field.col.s12
                         +submit(__("admin.add"))

views/admin/departments/edit.pug

@@ -8,8 +8,14 @@ block content
                 input.hide(type="text" name="name" value=department.name required)
                 div.row
                     div.input-field.col.s12
-                    label(for="name")=__("admin.name")+":"
+                        input#name(type="text" name="newName" value=department.name required)
-                    input#name(type="text" name="newName" value=department.name required)
+                        label(for="name")=__("admin.name")+":"
+                div.row
+                    div.input-field.col.s12
+                        p
+                            label(for="enable")
+                                input#enable(type="checkbox" name="enable" checked=department.enable)
+                                span=__("admin.enable")
                 div.row.center
                     div.input-field.col.s12
                         +submit(__("save"))

views/admin/sandwiches/add.pug

@@ -13,6 +13,12 @@ block content
                     div.input-field.col.s12
                         label(for="price")=__("admin.price") + ":"
                         input#price(type="number" min="0" step="any" name="price" value="0" required)
+                div.row
+                    div.input-field.col.s12
+                        p
+                            label(for="enable")
+                                input#enable(type="checkbox" name="enable" checked)
+                                span=__("admin.enable")
                 div.row.center
                     div.input-field.col.s12
                         +submit(__("admin.add"))

views/admin/sandwiches/edit.pug

@@ -14,6 +14,12 @@ block content
                     div.input-field.col.s12
                         label(for="price")=__("admin.price") + ":"
                         input#price(type="number" min="0" step="any" name="price" value=sandwich.price required)
+                div.row
+                    div.input-field.col.s12
+                        p
+                            label(for="enable")
+                                input#enable(type="checkbox" name="enable" checked=sandwich.enable)
+                                span=__("admin.enable")
                 div.row.center
                     div.input-field.col.s12
                         +submit(__("save"))