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

Updated attach to ministrand Method

Browse Source 
Signed-off-by: Walamana <joniogerg@gmail.com>
This commit is contained in:
Walamana 2017-11-29 20:05:41 +01:00
parent cdfd9705a5
commit 7fd1fb1649
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
process.env
test.txt

13
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceRoot}/app.js",
"env": {"PORT": "3000"},
"cwd": "${workspaceRoot}"
}
]
}

31
app.js
View File

@ -21,12 +21,7 @@ var con = mysql.createConnection({
host: "localhost",
user: "minis",
password: "Wnc4q_75",
database: "minis"/*,
ssl: {
key: fs.readFileSync(process.cwd() + "/private.key"),
cert: fs.readFileSync(process.cwd() + "/primary.crt"),
ca: fs.readFileSync(process.cwd() + "/mysql-ca.crt")
}*/
database: "minis"
});
con.connect(err => {
@ -105,12 +100,20 @@ app.get("/groups", (req, res) => {
});
app.get("/ministranten", (req, res) =>{
con.query("SELECT UserToken FROM ministranten WHERE UserToken='" + req.cookies.loginToken + "'", (err, result) => {
var loggedIn = result.length == 1;
con.query("SELECT Name, Username FROM `ministranten`", (err, result) => {
if (err) throw err;
var minis = result;
var finished = 0;
minis.splice(0, 1);
for(var i = 0; i < minis.length; i++){
attachToMini(minis[i], i, (mini, pos) => {
minis[pos] = mini;
finished++;
if(finished == minis.length){
if(!loggedIn){
for(var i = 0; i < minis.length; i++){
if(minis[i]["Name"] == "admin"){
@ -120,21 +123,13 @@ app.get("/ministranten", (req, res) =>{
}
minis[i]["Name"] = minis[i]["Name"].split(" ")[0].substring(0, 1) + ". " + minis[i]["Name"].split(" ")[1];
}
}else{
minis.splice(0, 1);
}
var finished = 0;
for(var i = 0; i < minis.length; i++){
attachToMini(minis[i], i, (mini, pos) => {
minis[pos] = mini;
finished++;
if(finished == minis.length){
res.send(JSON.stringify(minis));
}
});
}
});
});
});
@ -142,6 +137,9 @@ app.get("/ministranten", (req, res) =>{
var attachToMini = function(mini, pos, then){
mini.registered = [];
con.query("SELECT * FROM `" + mini.Name.toLowerCase() + "` LIMIT 0 , 30", (err, data) => {
if(data == null){
then(mini, pos);
}
for(var j = 0; j < data.length; j++){
mini.registered[j] = {
@ -155,6 +153,7 @@ var attachToMini = function(mini, pos, then){
app.listen(process.env.PORT);
console.log("Starting api-server on " + process.env.PORT);