From 19d3dc311523fe355e5d9df048512defafd25f4a Mon Sep 17 00:00:00 2001 From: Walamana Date: Tue, 28 Nov 2017 21:09:09 +0100 Subject: [PATCH] more syncing Signed-off-by: Walamana --- app.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index 7f4efad..998605f 100644 --- a/app.js +++ b/app.js @@ -124,9 +124,14 @@ app.get("/ministranten", (req, res) =>{ minis.splice(0, 1); } + var finished = 0; for(var i = 0; i < minis.length; i++){ - attachToMini(minis[i], (mini) => { - res.send(JSON.stringify(minis)); + attachToMini(minis[i], i, (mini, pos) => { + minis[pos] = mini; + finished++; + if(finished == minis.length){ + res.send(JSON.stringify(minis)); + } }); } @@ -134,13 +139,13 @@ app.get("/ministranten", (req, res) =>{ }); }); -var attachToMini = function(mini, then){ +var attachToMini = function(mini, pos, then){ mini.registered = []; con.query("SELECT * FROM `" + mini.Name.toLowerCase() + "` LIMIT 0 , 30", (err, data) => { for(var j = 0; j < data.length; j++){ mini.registered[data[j]["GottesdienstIDs"]] = data[j]["Anwesend"]; } - then(mini); + then(mini, pos); }); }