Commit 71fc7a71 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

async/await

Showing with 54 additions and 72 deletions
+54 -72
//const SamlStrategy = require('passport-saml').Strategy //const SamlStrategy = require('passport-saml').Strategy
import async from 'async'
import methods from '../functions/methods' import methods from '../functions/methods'
import gitlab from '../functions/gitlab' import gitlab from '../functions/gitlab'
import helpers from '../functions/helpers' import helpers from '../functions/helpers'
...@@ -12,81 +11,64 @@ module.exports = function (app:any, lang:string) { ...@@ -12,81 +11,64 @@ module.exports = function (app:any, lang:string) {
res.render(lang+'/project/project-simplified') res.render(lang+'/project/project-simplified')
}) })
app.get('/mailinglists', function (req:any, res:any) { app.get('/mailinglists', async function (req:any, res:any) {
async.waterfall([ let mailList = await methods.getAllMailinglists()
function(done:any) { if (mailList) {
methods.getAllMailinglists(function(mailinglistOverview:any, err:any) { let allMailingLists = [] // JSON object
if (!err) { for (let i = 0; i < mailList.length; i++) {
done(err, mailinglistOverview) // add data to JSON object
} allMailingLists.push({
}) id: mailList[i].id,
}, name: mailList[i].name,
// create JSON object of mailinglists for front-end src: mailList[i].src,
function(mailinglistOverview:any) { projectstatus: mailList[i].projectstatus,
var allMailingLists = [] // JSON object project_title: mailList[i].project_title,
for (let i = 0; i < mailinglistOverview.length; i++) { keywords: mailList[i].keywords
// add data to JSON object
allMailingLists.push({
id: mailinglistOverview[i].id,
name: mailinglistOverview[i].name,
src: mailinglistOverview[i].src,
projectstatus: mailinglistOverview[i].projectstatus,
project_title: mailinglistOverview[i].project_title,
keywords: mailinglistOverview[i].keywords
});
}
res.render(lang+'/project/mailinglists', {
//isUserAuthenticated: req.isAuthenticated(),
//user: req.user,
mailinglists: allMailingLists
}); });
} }
])
res.render(lang+'/project/mailinglists', {
//isUserAuthenticated: req.isAuthenticated(),
//user: req.user,
mailinglists: allMailingLists
});
} else {
res.render(lang+'/project/mailinglists', {
//isUserAuthenticated: req.isAuthenticated(),
//user: req.user,
mailinglists: null
})
}
}) })
app.get('/projectoverview', function(req:any, res:any){ app.get('/projectoverview', async function(req:any, res:any){
async.waterfall([ let projectOverview = await methods.getProjectOverviewById(req.query.projectID)
function(done:any) { if (projectOverview.length > 0) {
methods.getProjectOverviewById(req.query.projectID, function(projectOverview:any, err:any) { let partnerWebsites = helpers.stringToArray(projectOverview[0].partner_website)
if (!err) { let partnerNames = helpers.stringToArray(projectOverview[0].partner_name)
done(err, projectOverview) let awardSites = helpers.stringToArray(projectOverview[0].award_website)
} let awardNames = helpers.stringToArray(projectOverview[0].award_name)
}) let sponsorWebsites = helpers.stringToArray(projectOverview[0].sponsor_website)
}, let sponsorImgs = helpers.stringToArray(projectOverview[0].sponsor_img)
function(projectOverview:any, done:any){ let sponsorNames = helpers.stringToArray(projectOverview[0].sponsor_name)
methods.getProjectImagesById(req.query.projectID, function(projectImages:any, err:any) {
if (!err) { let projectImages = await methods.getProjectImagesById(req.query.projectID)
done(err, projectImages, projectOverview) res.render(lang+'/project/projectOverview', {
} //isUserAuthenticated: req.isAuthenticated(),
}) //user: req.user,
}, projectOV: projectOverview,
// render projectOverview page projectImgs: projectImages,
function(projectImages:any, projectOverview:any) { partnerWS: partnerWebsites,
//console.log(projectImages) partnerN: partnerNames,
let partnerWebsites = helpers.stringToArray(projectOverview[0].partner_website) awardWS: awardSites,
let partnerNames = helpers.stringToArray(projectOverview[0].partner_name) awardN: awardNames,
let awardSites = helpers.stringToArray(projectOverview[0].award_website) sponsorWS: sponsorWebsites,
let awardNames = helpers.stringToArray(projectOverview[0].award_name) sponsorIMG: sponsorImgs,
let sponsorWebsites = helpers.stringToArray(projectOverview[0].sponsor_website) sponsorN: sponsorNames
let sponsorImgs = helpers.stringToArray(projectOverview[0].sponsor_img) });
let sponsorNames = helpers.stringToArray(projectOverview[0].sponsor_name) } else {
res.redirect('/')
res.render(lang+'/project/projectOverview', { }
//isUserAuthenticated: req.isAuthenticated(),
//user: req.user,
projectOV: projectOverview,
projectImgs: projectImages,
partnerWS: partnerWebsites,
partnerN: partnerNames,
awardWS: awardSites,
awardN: awardNames,
sponsorWS: sponsorWebsites,
sponsorIMG: sponsorImgs,
sponsorN: sponsorNames
});
}
])
}) })
// Projektdaten // Projektdaten
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment