From 7926b569500ffc17a4af1ab820cddcb4b5c4e4d9 Mon Sep 17 00:00:00 2001 From: LukasNowy Date: Sat, 9 Mar 2019 23:33:09 +0100 Subject: [PATCH] crud, login --- express-server/db-connect/db-connect.js | 37 +++++++++++++++++++++++- express-server/public/ocrscan/ocrscan.js | 10 +++++++ express-server/routes/index.js | 17 +++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index 2adfa362..3b42a995 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -304,6 +304,40 @@ async function moveDoneItems(uid, sl_id, billcontent) { } } +moveDoneItemMan('dXMuv1J0f4O7RKn2bizGMTHUYkg1', '8l3vop0s', 'hcMssjPd', 'IkNZ76So'); + +async function moveDoneItemMan(uid, sl_id, group_id, item_id) { + try { + let name = await query('SELECT row_to_json("Item") as obj FROM "Item" WHERE item_id = $3 AND group_id = $2 AND sl_id = $1', [sl_id, group_id, item_id]); + console.log(name); + var today = new Date(); + var dd = today.getDate(); + var mm = today.getMonth() + 1; + var yyyy = today.getFullYear(); + + if (dd < 10) { + dd = '0' + dd + } + + if (mm < 10) { + mm = '0' + mm + } + + today = mm + '/' + dd + '/' + yyyy; + + await nonQuery('INSERT INTO "Done_Purchase" (purchased_item_id, username, name, date, count) VALUES($1,$2,$3,$4,$5);', + [generate_item_id(), uid, name, today, 1]); + + await nonQuery('DELETE FROM "Item" WHERE item_id = $1 AND group_id = $2 AND sl_id = $3;', [item_id, group_id, sl_id]); + } + + catch(error) { + console.error(error); + } + + +} + //GET Done_Purchases async function getDonePurchases(uid) { @@ -530,5 +564,6 @@ module.exports = { getDonePurchases, getShoppinglistsByLink, searchUsers, - removeMember + removeMember, + moveDoneItemMan } \ No newline at end of file diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js index 88344792..b6854f2c 100644 --- a/express-server/public/ocrscan/ocrscan.js +++ b/express-server/public/ocrscan/ocrscan.js @@ -210,6 +210,16 @@ $(document).ready(function () { }], $(".r1")); }); + /*$.ajax({ + type: "POST", + url : "/movedoneitem", + data : { + sl_id : 'hcMssjPd', + group_id: 'hcMssjPd', + item_id: 'EHmY4ymD' + } + })*/ + function run(v, elem) { //Reverse the array var reversed = JSON.parse(JSON.stringify(v)).reverse(); diff --git a/express-server/routes/index.js b/express-server/routes/index.js index 059b92e7..5a38a682 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -197,6 +197,23 @@ router.delete("/shoppinglist", async (req, res) => { } }); +router.post("/movedoneitem", (req, res) => { + var token = req.body.idtoken; + var uid; + firebaseAdmin.auth().verifyIdToken(token) + .then(async function (decodedToken) { + uid = decodedToken.uid; + + try { + res.status(200).send(await postgres.moveDoneItemMan(uid, req.body.sl_id, req.body.group_id, req.body.item_id)); + } catch (err) { + res.status(400).send(await err); + } + }).catch(function (error) { + console.log(error) + }); +}); + //Group erstellen router.post("/group", async (req, res) => {