From aeca9412bfafa422b4d00d3858758cea38e0d899 Mon Sep 17 00:00:00 2001 From: LukasNowy Date: Sun, 7 Apr 2019 23:12:57 +0200 Subject: [PATCH] Errors fixed, OCR UI fixed --- express-server/db-connect/db-connect.js | 76 +++++++----------------- express-server/public/ocrscan/ocrscan.js | 12 ++++ express-server/views/ocrscan.ejs | 4 +- 3 files changed, 34 insertions(+), 58 deletions(-) diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index bd9e5ad0..7b07b4d3 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -120,7 +120,7 @@ async function newShoppinglist(name, description, username, color) { //generate sl_id - let sl_id = generate_sl_id(); + let sl_id = genID(10); //insert user if not exists @@ -221,7 +221,7 @@ async function deleteShoppinglist(sl_id,uid) { async function addGroup(sl_id, name, color, hidden) { try { - let grid = generate_group_id(); + let grid = genID(10); 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) { console.error(error); @@ -236,7 +236,7 @@ async function addGroup(sl_id, name, color, hidden) { async function addItem(group_id, sl_id, name, count) { try { - let itid = generate_item_id(); + let itid = genID(10) await nonQuery('INSERT INTO "Item" VALUES ($1, $2, $3, $4, $5);', [itid, group_id, sl_id, name, count]); } catch (error) { console.error(error); @@ -350,7 +350,7 @@ async function moveDoneItems(uid, sl_id, billcontent) { for (let item of removeableItems) { await nonQuery('INSERT INTO "Done_Purchase" (purchased_item_id, username, name, date, count) VALUES($1,$2,$3,$4,$5);', - [generate_item_id(), uid, item.item.name, today, item.count]); + [genID(10), uid, item.item.name, today, item.count]); } @@ -386,7 +386,7 @@ async function moveDoneItemMan(uid, sl_id, group_id, item_id) { 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, item[0].name, today, item[0].count]); + [genID(10), uid, item[0].name, today, item[0].count]); await nonQuery('DELETE FROM "Item" WHERE item_id = $1 AND group_id = $2 AND sl_id = $3;', [item_id, group_id, sl_id]); @@ -424,6 +424,7 @@ async function getUserDB(uid) { } async function deleteDonePurchase(pid, uid) { + try { await nonQuery('DELETE FROM "Done_Purchase" WHERE purchased_item_id = $1 ', [pid]); return getDonePurchases(uid); @@ -483,6 +484,17 @@ async function createInvite(sl_id) { } } +//Create invite link for your own shoppinglist +function generateInviteLink(actsl_id) { + var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + var output = ""; + + for (let i = 0; i < 50; i++) { + output += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return output +} + //User manuell einladen async function manInvite(sl_id, uid) { @@ -496,6 +508,7 @@ async function manInvite(sl_id, uid) { //member von shoppinglist entfernen async function removeMember(uid, sl_id) { + console.log(uid, " ", sl_id) try { await nonQuery('DELETE FROM "Shoppinglist_member" WHERE username = $1 AND sl_id = $2', [uid, sl_id]); @@ -507,33 +520,6 @@ async function removeMember(uid, sl_id) { - - - -//sl_id generieren -function generate_sl_id() { - var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - var output = ""; - - for (let i = 0; i < 8; i++) { - output += possible.charAt(Math.floor(Math.random() * possible.length)); - } - - return output; -} - -//group_id generieren -function generate_group_id() { - var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - var output = ""; - - for (let i = 0; i < 8; i++) { - output += possible.charAt(Math.floor(Math.random() * possible.length)); - } - - return output; -} - //Random ID generate function genID(length) { var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; @@ -546,18 +532,6 @@ function genID(length) { return output; } -//item_id generieren -function generate_item_id() { - var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - var output = ""; - - for (let i = 0; i < 8; i++) { - output += possible.charAt(Math.floor(Math.random() * possible.length)); - } - - return output; -} - function items_in_groups(groups, items, sl_id, sl_admin, sl_members, name, description, invitelink, color) { let result = { @@ -592,17 +566,6 @@ function items_in_groups(groups, items, sl_id, sl_admin, sl_members, name, descr return result; } -//Create invite link for your own shoppinglist -function generateInviteLink(actsl_id) { - var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - var output = ""; - - for (let i = 0; i < 50; i++) { - output += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return output -} - function users_to_array(admin, members) { let users = []; @@ -694,5 +657,6 @@ module.exports = { moveDoneItemMan, getUser, getUserDB, - realUpdateUser + realUpdateUser, + deleteDonePurchase } \ No newline at end of file diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js index 9b3ca4a4..b85cabf6 100644 --- a/express-server/public/ocrscan/ocrscan.js +++ b/express-server/public/ocrscan/ocrscan.js @@ -92,6 +92,18 @@ $(document).ready(function () { }); }); + $(document).on("click", ".ble", function () { + firebase.auth().onAuthStateChanged(function (user) { + if (user) { + firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) { + window.location.href = "/dash/" + idtoken + }).catch((error) => console.error("Get id token client error: ", error)); + } else { + console.log("Check Auth error", user) + } + }); + }); + function analyzeUploaded() { $("#modalEND").modal("open"); diff --git a/express-server/views/ocrscan.ejs b/express-server/views/ocrscan.ejs index d1e0c3e8..6b38029a 100644 --- a/express-server/views/ocrscan.ejs +++ b/express-server/views/ocrscan.ejs @@ -39,9 +39,9 @@
file_upload
-
+
-
camera
+
arrow_back