Merge pull request #2 from TNanukem/dev

Algorithm comparison

Author: TNanukem

src/helpers/data.js

@@ -42,6 +42,45 @@ const Data = {
       req.session.next_page = "simulation";
       res.redirect("login");
     }
+  },
+
+  async renderSimulationCompare(req, res){
+    if(req.session.authenticated == true){
+      try{
+          var {rows} = await pool.query('SELECT name, version, id FROM algorithms WHERE id in (SELECT algorithm_id FROM development WHERE researcher_id = $1)', [req.session.user_id]);
+
+          algorithms = [];
+
+          for(i = 0; i < rows.length; i++){
+            algorithms.push(String(rows[i].id)+'.'+rows[i].name + ' v ' + String(rows[i].version));
+          }
+
+          var {rows} = await pool.query('SELECT parameters_id FROM configuration WHERE researcher_id = $1', [req.session.user_id]);
+
+          parameters = [];
+
+          for(i = 0; i < rows.length; i++){
+            parameters.push(rows[i].parameters_id);
+          }
+
+          var {rows} = await pool.query('SELECT doi FROM publications');
+
+          published = []
+
+          for(i = 0; i < rows.length; i++){
+            published.push(rows[i].doi);
+          }
+
+
+      }catch(error){
+        console.log(error)
+      }
+      res.render('simulation_compare', {algorithms: algorithms, parameters: parameters, published: published});
+    }
+    else {
+      req.session.next_page = "simulation_compare";
+      res.redirect("login");
+    }
   }
 
 }

src/helpers/simulation.js

@@ -146,5 +146,10 @@ const User = {
     }
 
   },
+
+  async logout(req, res){
+    req.session.authenticated = false;
+    res.redirect("/");
+  },
 }
 module.exports = User;

src/helpers/user.js

@@ -57,6 +57,13 @@ var upload = multer({
 app.use(express.static('public'));
 app.listen(3000);
 
+app.use((req, res, next) => {
+  res.locals.session = req.session;
+  global.session = req.session;
+  next();
+});
+
+
 // -------------------------- END OF CONFIGURATION -----------------------------
 
 
@@ -89,6 +96,13 @@ app.get('/need_confirmation', function(req, res){
   res.render('need_confirmation');
 })
 
+// Logout page routing
+app.get('/logout', User.logout);
+
+// Tutorial page routing
+app.get('/tutorial', function(req, res){
+  res.render('tutorial')
+})
 
 // Experiment configuration page routing
 app.get('/config', function(req, res) {
@@ -148,6 +162,10 @@ app.post('/algorithm', function(req, res){
 // Simulation page routing
 app.post('/simulation', Data.renderSimulation);
 
+app.post('/simulation_compare', Data.renderSimulationCompare);
+
+app.post('/simulation_compare_run', Simulation.runSimulationCompare);
+
 app.post('/simulation_run', Simulation.runSimulation);
 
 app.get('/downloadSimulation', Simulation.downloadSimulationResults);

src/index.js

@@ -1,9 +1,9 @@
 body {
   font-family: 'Open Sans', sans-serif;
+
 }
 
 body div{
-  float: left;
   text-align: center;
 }
 
@@ -15,6 +15,7 @@ body p{
   margin-bottom: -15px;
   text-align: center !important;
   font-size: 30px;
+  z-index: -9999;
 }
 
 input[type="checkbox"] {
@@ -26,6 +27,12 @@ input[type="text"] {
   text-align: center;
 }
 
+div.col-md-6{
+  width: 100%;
+  text-align: center;
+  float: right !important;
+}
+
 div.checkbox_div{
   float:none !important;
   text-align: center !important;
@@ -50,7 +57,6 @@ div.checkbox_div input{
 .center input{
   text-align: center;
   float:none !important;
-  margin-left: 90%;
 }
 
 .icons {

src/public/css/config.css

@@ -0,0 +1,3 @@
+/* img {
+  zoom: 50%;
+} */

src/public/css/tutorial.css

@@ -13,6 +13,8 @@ function checkbox(id_check, id_div, id_text){
     text.style.display = "block";
     div.style.float = "initial";
     div.style.display = "none"
+    text.style.marginLeft = "auto"
+    text.style.marginRight = "auto"
   }
 }
 

src/public/images/algorithm_upload.png

@@ -14,3 +14,16 @@ function validation(id_check, exact, max, min){
     max.required = false;
   }
 }
+
+function maxMinValidation(max, min){
+  // var max = document.getElementById(max);
+  // var min = document.getElementById(min);
+  // window.alert(min.value + "vs" + max.value);
+  // if(min.value >= max.value){
+  //   min.setCustomValidity("Minimun value has to be smaller than the maximum value");
+  //   window.alert(min.value + "vs" + max.value);
+  // } else {
+  //   min.setCustomValidity("");
+  //   window.alert('tudo certo');
+  // }
+}

src/public/images/configure.png

@@ -14,3 +14,14 @@ function showParameters(value){
 
   }
 }
+
+function parameterSelection(checkbox, div){
+  var check = document.getElementById(checkbox);
+  var div = document.getElementById(div)
+
+  if(check.checked == true){
+    div.style.display = "none";
+  } else {
+    div.style.display = "block";
+  }
+}

src/public/images/simulation.png

@@ -0,0 +1,10 @@
+function comparePasswords(){
+  var password = document.getElementById("InputPassword");
+  var comparison = document.getElementById("ConfirmPassword");
+
+  if(password.value == comparison.value){
+    comparison.setCustomValidity("");
+  } else {
+    comparison.setCustomValidity("The passwords must match");
+  }
+}