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

Merge branch 'master' of https://github.com/LukasNowy/SmartShopper

Browse Source
This commit is contained in:
LukasNowy 2019-03-12 11:56:50 +01:00
commit 543c6cc5ab
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,13 +30,21 @@ async function getmessageids(sl_id) {
} }
async function searchUsers(searchstring) { async function searchUsers(searchstring) {
try { try {
let users = await query('SELECT row_to_json("User") AS obj FROM "User";'); let users = await query('SELECT row_to_json("User") AS obj FROM "User";');
return users.filter(function (obj) { var output = [];
return obj.name.toUpperCase().includes(searchstring.toUpperCase())
}); for(let item of users) {
if(item.name != null) {
if(item.name.includes(searchstring)) {
output.push(item)
}
}
}
return output;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} }
@ -304,8 +312,6 @@ async function moveDoneItems(uid, sl_id, billcontent) {
} }
} }
moveDoneItemMan('dXMuv1J0f4O7RKn2bizGMTHUYkg1', '8l3vop0s', 'hcMssjPd', 'IkNZ76So');
async function moveDoneItemMan(uid, sl_id, group_id, item_id) { async function moveDoneItemMan(uid, sl_id, group_id, item_id) {
try { 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]); 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]);

14
express-server/public/ocrscan/ocrscan.js
View File

@ -42,7 +42,6 @@ $(document).ready(function () {
firebase.initializeApp(config); firebase.initializeApp(config);
getAllShoppinglists();
updateUser(); updateUser();
testSearch(); testSearch();
@ -147,16 +146,12 @@ $(document).ready(function () {
} }
function testSearch() { function testSearch() {
console.log("dpne");
$.ajax({ $.ajax({
type: "DELETE", type: "GET",
url: "/member", url: "/users?search=Luk",
data: {
sl_id: "PDADo1iJ",
uid: "VZT25Xd3rLXEmGGUcrtocbJ9QBu2"
},
success(data) { success(data) {
console.log(data); console.log("Users ", data);
}, },
error(err) { error(err) {
console.error(err); console.error(err);
@ -164,6 +159,7 @@ $(document).ready(function () {
}); });
} }
getAllShoppinglists();
function getAllShoppinglists() { function getAllShoppinglists() {
firebase.auth().onAuthStateChanged(function (user) { firebase.auth().onAuthStateChanged(function (user) {

1
express-server/routes/index.js
View File

@ -311,7 +311,6 @@ router.post("/maninvite", async (req, res) => {
res.status(400).send(err); res.status(400).send(err);
} }
}); });
router.delete("/member", (req, res) => { router.delete("/member", (req, res) => {