From 07ecceb27e0da6217abcf0ae6b7fddc0c370b2cd Mon Sep 17 00:00:00 2001 From: Lukas Nowy Date: Sat, 1 Dec 2018 12:13:10 +0100 Subject: [PATCH] detailansicht verbessert --- express-server/db-connect/db-connect.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index 8d7fa015..24a9d8d3 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -84,7 +84,7 @@ async function displayShoppinglist(sl_id) { try { let groups = await query('SELECT row_to_json("Group") AS obj FROM "Group" JOIN "Shoppinglist" USING (sl_id) WHERE sl_id = $1;', [sl_id]); let items = await query('SELECT row_to_json("Item") AS obj FROM "Item" JOIN "Group" USING (group_id) WHERE "Group".sl_id = $1;', [sl_id]); - return items_in_groups(groups, items); + return items_in_groups(groups, items, sl_id); } @@ -173,13 +173,16 @@ function generate_item_id() { return output; } -function items_in_groups(groups, items) { +function items_in_groups(groups, items, sl_id) { - let result = []; + let result = { + sl_id: sl_id, + groups: [] + }; for(let item of groups) { - result.push({ + result.groups.push({ group_id: item.group_id, name: item.name, color: item.color,