dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

detailansicht verbessert

Browse Source
This commit is contained in:
Lukas Nowy
2019-02-18 01:43:35 +01:00
parent 6550aa5e51
commit 4bfe8ce31a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
express-server/db-connect/db-connect.js
View File

@@ -158,13 +158,14 @@ async function editShoppinglist(sl_id, newname, newdescription, newcolor) {
//get shoppinglist content //get shoppinglist content
async function displayShoppinglist(sl_id) { async function displayShoppinglist(sl_id) {
try { try {
let shoppinglist = await query('SELECT row_to_json("Shoppinglist") AS obj FROM "Shoppinglist" WHERE sl_id = $1;', [sl_id]);
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 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]); 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]);
let members = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_member" USING (username) WHERE sl_id = $1', [sl_id]); let members = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_member" USING (username) WHERE sl_id = $1', [sl_id]);
let admin = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_admin" USING (username) WHERE sl_id = $1', [sl_id]); let admin = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_admin" USING (username) WHERE sl_id = $1', [sl_id]);
return items_in_groups(groups, items, sl_id, admin[0].username, admin[0].message_id, members); return items_in_groups(groups, items, sl_id, admin[0].username, admin[0].message_id, members, shoppinglist[0].name, shoppinglist[0].description);
} }
catch (error) { catch (error) {
@@ -429,10 +430,12 @@ function generate_item_id() {
return output; return output;
} }
function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members) { function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members, name, description) {
let result = { let result = {
sl_id: sl_id, sl_id: sl_id,
name: name,
description: description,
admin: { admin: {
uid: admin_uid, uid: admin_uid,
mid: admin_mid mid: admin_mid