From 5589b0df3f7ffc39e433cf1171a56d2b37c65047 Mon Sep 17 00:00:00 2001 From: Lukas Nowy Date: Sun, 9 Dec 2018 19:17:12 +0100 Subject: [PATCH] hidden, color property --- express-server/db-connect/db-connect.js | 8 ++++---- express-server/routes/index.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index b94e887d..431d1eff 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -32,7 +32,7 @@ async function getShoppinglistsShared(username) { //INSERT new Shoppinglist -async function newShoppinglist(name, description, username) { +async function newShoppinglist(name, description, username, color) { //generate sl_id @@ -50,7 +50,7 @@ async function newShoppinglist(name, description, username) { //insert shoppinglist try { - await nonQuery('INSERT INTO "Shoppinglist" (sl_id, name, description) VALUES ($1, $2, $3);', [sl_id, name, description]); + await nonQuery('INSERT INTO "Shoppinglist" (sl_id, name, description, color) VALUES ($1, $2, $3, $4);', [sl_id, name, description, color]); } catch (error) { @@ -109,10 +109,10 @@ async function deleteShoppinglist(sl_id) { //add group into shoppinglist -async function addGroup(sl_id, name, color) { +async function addGroup(sl_id, name, color, hidden) { try { let grid = generate_group_id(); - await nonQuery('INSERT INTO "Group" VALUES ($1, $2, $3, $4);', [grid, sl_id, name, color]); + await nonQuery('INSERT INTO "Group" (group_id, sl_id, name, color, hidden) VALUES ($1, $2, $3, $4, $5);', [grid, sl_id, name, color, hidden]); } catch (error) { diff --git a/express-server/routes/index.js b/express-server/routes/index.js index 5980260b..87ecf783 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -97,7 +97,7 @@ router.get("/sharedshoppinglists", async function(req, res, next) { router.post("/shoppinglist", async function(req, res, next) { try { - res.status(200).send(await postgres.newShoppinglist(req.body.name, req.body.description, req.session.passport.user.profile.id)); + res.status(200).send(await postgres.newShoppinglist(req.body.name, req.body.description, req.session.passport.user.profile.id, req.body.color)); } catch(err) { @@ -133,7 +133,7 @@ router.delete("/shoppinglist", async (req, res) => { router.post("/group", async (req, res) => { try { - res.status(200).send(await postgres.addGroup(req.body.sl_id, req.body.name, req.body.color)); + res.status(200).send(await postgres.addGroup(req.body.sl_id, req.body.name, req.body.color, req.body.hidden)); } catch(err) {