walamana/minis-data-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All altar boys are now shown in the ministranten route

Browse Source 
Signed-off-by: walamana <joniogerg@gmail.com>
This commit is contained in:
walamana 2018-08-29 23:41:16 +02:00
parent 6a593ae271
commit 8729c7b906
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app.js
View File

@ -223,33 +223,50 @@ app.get("/ministranten", (req, res) =>{
res.send("{error: 'Invalid group id'}"); res.send("{error: 'Invalid group id'}");
} }
} }
con.query("SELECT `ministranten`.`USERNAME`, `ministranten`.`VORNAME`, `ministranten`.`NACHNAME`, `anwesenheit`.`ANWESENHEIT`, `anwesenheit`.`gottesdienst_ID` FROM `ministranten` LEFT JOIN `anwesenheit` ON `anwesenheit`.`USERNAME` = `ministranten`.`USERNAME`, `gottesdienst` WHERE `gottesdienst`.`ID` = `anwesenheit`.`gottesdienst_ID` AND `gottesdienst`.`gruppe_ID` = " + groupID + " ORDER BY `ministranten`.`NACHNAME`, `ministranten`.`VORNAME`, `anwesenheit`.`gottesdienst_ID` DESC LIMIT 30", (err, results) => { con.query("SELECT `ministranten`.`USERNAME`, `ministranten`.`VORNAME`, `ministranten`.`NACHNAME`, `anwesenheit`.`ANWESENHEIT`, `anwesenheit`.`gottesdienst_ID` FROM `ministranten` LEFT JOIN `anwesenheit` ON `anwesenheit`.`USERNAME` = `ministranten`.`USERNAME`, `gottesdienst` WHERE `gottesdienst`.`ID` = `anwesenheit`.`gottesdienst_ID` AND `gottesdienst`.`gruppe_ID` = " + groupID + " ORDER BY `ministranten`.`NACHNAME`, `ministranten`.`VORNAME`, `anwesenheit`.`gottesdienst_ID`", (err, results) => {
if (err) throw err;
var minis = [];
var curMini; con.query("SELECT `ministranten`.`USERNAME`, `ministranten`.`VORNAME`, `ministranten`.`NACHNAME` FROM `ministranten` ORDER BY `ministranten`.`NACHNAME`, `ministranten`.`VORNAME`", (err, allMinis) => {
for(var i = 0; i < results.length; i++){
var result = results[i]; if (err) throw err;
if(result["USERNAME"] == "admin"){ var minis = [];
continue;
} for(var i = 0; i < allMinis.length; i++){
if(!curMini || curMini.username != result["USERNAME"]){
if(curMini != undefined || curMini != null){ var result = allMinis[i];
minis.push(curMini); if(result["USERNAME"] == "admin"){
continue;
} }
curMini = { minis.push({
firstname: result["VORNAME"], firstname: result["VORNAME"],
lastname: valid ? result["NACHNAME"] : result["NACHNAME"].substring(0, 1) + ".", lastname: valid ? result["NACHNAME"] : result["NACHNAME"].substring(0, 1) + ".",
username: result["USERNAME"], username: result["USERNAME"],
registered: {} registered: {}
} })
}
curMini.registered[result["gottesdienst_ID"]] = result["ANWESENHEIT"];
}
minis.push(curMini);
res.send(JSON.stringify(minis));
// if(result["USERNAME"].includes(curMini.username))
// curMini.registered[result["gottesdienst_ID"]] = result["ANWESENHEIT"];
}
var curMini = null;
for(let result of results){
if(!curMini || curMini.username != result["USERNAME"]){
var skip = false;
for(let mini of minis){
if(skip) continue;
if(result["USERNAME"] == mini.username){
curMini = mini;
skip = true;
}
}
}
curMini.registered[result["gottesdienst_ID"]] = result["ANWESENHEIT"];
}
res.send(JSON.stringify(minis));
})
}); });
}); });