From c302e88cd3e46a09cbc4bf64f423a5b248e1da3c Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Fri, 20 Mar 2020 16:32:35 +0100
Subject: [PATCH] project_overview ported
---
routes/methods.js | 14 +++++++++++-
routes/routes-project.js | 47 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/routes/methods.js b/routes/methods.js
index 59709d7d..cefda4b7 100644
--- a/routes/methods.js
+++ b/routes/methods.js
@@ -149,7 +149,19 @@ var methods = {
dbconn.project.query('CALL getAllLists', function (err, rows, fields){
if (err) throw err;
callback(rows[0], err);
- })
+ })
+ },
+ getProjectOverviewById: function(projectId, callback) {
+ dbconn.project.query('CALL GetProjectInformationByProjectID(' + projectId+ ')', function (err, rows, fields){
+ if (err) throw err;
+ callback(rows[0], err);
+ })
+ },
+ getProjectImagesById: function(projectId, callback) {
+ dbconn.project.query('CALL getImagesByProjectID(' + projectId+ ')', function (err, rows, fields){
+ if (err) throw err;
+ callback(rows[0], err);
+ })
},
addProjectOverview: function(data, callback) {
dbconn.project.query('INSERT INTO project_overview SET ?', data, function (err, results, fields){
diff --git a/routes/routes-project.js b/routes/routes-project.js
index bea8584c..0c92d98f 100644
--- a/routes/routes-project.js
+++ b/routes/routes-project.js
@@ -1,5 +1,6 @@
const methods = require('./methods')
const async = require('async')
+const helpers = require('./helpers')
module.exports = function (app) {
@@ -230,5 +231,49 @@ module.exports = function (app) {
app.post('/updateprojectoverview', function (req, res) {
// only their own project
})
-
+
+ app.get('/projectoverview', function(req, res){
+ async.waterfall([
+ function(done) {
+ methods.getProjectOverviewById(req.query.projectID, function(projectOverview, err) {
+ if (!err) {
+ done(err, projectOverview)
+ }
+ })
+ },
+ function(projectOverview,done){
+ methods.getProjectImagesById(req.query.projectID, function(projectImages, err) {
+ if (!err) {
+ done(err, projectImages, projectOverview)
+ }
+ })
+ },
+ // render projectOverview page
+ function(projectImages, projectOverview, done) {
+
+ console.log(projectImages);
+ partnerWebsites = helpers.stringToArray(projectOverview[0].partner_website);
+ partnerNames = helpers.stringToArray(projectOverview[0].partner_name);
+ awardSites = helpers.stringToArray(projectOverview[0].award_website);
+ awardNames = helpers.stringToArray(projectOverview[0].award_name);
+ sponsorWebsites = helpers.stringToArray(projectOverview[0].sponsor_website);
+ sponsorImgs = helpers.stringToArray(projectOverview[0].sponsor_img);
+ sponsorNames = helpers.stringToArray(projectOverview[0].sponsor_name);
+
+ 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
+ });
+ }
+ ])
+ })
};
\ No newline at end of file
--
GitLab