Skip to content

GitLab

Commit 90a85e29 authored by Iker Hurtado's avatar Iker Hurtado
Browse files

Deliverable 2.1 - version 1.6

parent b25df796
Show whitespace changes
Inline Side-by-side
client/bundle.js
View file @ 90a85e29
...@@ -345,14 +345,14 @@ ...@@ -345,14 +345,14 @@
<button class="next" disabled>NEXT RESULTS &gt;&gt;</button></div>\ <button class="next" disabled>NEXT RESULTS &gt;&gt;</button></div>\
<div style="clear: both;"></div>\ <div style="clear: both;"></div>\
</div>\ </div>\
<table> <thead> \ <table> <thead > \
<th>Formula</th> \ <tr class="rsHead"><th>Formula</th> \
<th>Number of Atoms</th> \ <th>Number of Atoms</th> \
<th>Space Group</th> \ <th>Space Group</th> \
<th>Code name</th> \ <th>Code Name</th> \
<th>Basis set type</th> \ <th>Basis Set Type</th> \
<th>XC treatment</th> \ <th>XC Treatment</th> \
</thead><tbody> \ </tr></thead><tbody> \
</tbody></table>'; </tbody></table>';
//this.resultsNrTag= document.getElementById("resultsNr"); //this.resultsNrTag= document.getElementById("resultsNr");
...@@ -405,9 +405,12 @@ ...@@ -405,9 +405,12 @@
this.resultsNrTag.innerHTML= data[0]['nr_results']+' results found'; this.resultsNrTag.innerHTML= data[0]['nr_results']+' results found';
} }
data.forEach(function(el){ data.forEach(function(el){
html+= '<tr><td>'+el["formula"]+'</td><td>'+el["nr_atoms"]+'</td><td>'+ html+= '<tr class="rsCol" ><td class="left">'+el["formula"]+'</td>\
el["space_group"]+'</td><td>'+el["code_name"]+'</td><td>'+ <td class="right">'+el["nr_atoms"]+'</td>\
el["basis_set_type"]+'</td><td>'+el["xc_treatment_basis"]+'</td></tr>'; <td class="right">'+el["space_group"]+'</td>\
<td class="left">'+el["code_name"]+'</td>\
<td class="left">'+el["basis_set_type"]+'</td>\
<td class="left">'+el["xc_treatment_basis"]+'</td></tr>';
//console.log("data: "+JSON.stringify(el)+" "+el["code version"]); //console.log("data: "+JSON.stringify(el)+" "+el["code version"]);
}); });
......
client/css/styles.css
View file @ 90a85e29
...@@ -181,5 +181,16 @@ tr:nth-child(odd) td { background: #FEFEFE; } ...@@ -181,5 +181,16 @@ tr:nth-child(odd) td { background: #FEFEFE; }
#paginationWg button:disabled{ color: #CCC;cursor: default;} #paginationWg button:disabled{ color: #CCC;cursor: default;}
#paginationWg span{ display:inline-block; margin:0 auto !important; } #paginationWg span{ display:inline-block; margin:0 auto !important; }
tr.rsHead th{ padding: 2px 12px;text-align: left;}
tr.rsCol td{ padding: 2px 12px;}
tr.rsCol td.left{
text-align: left;
}
tr.rsCol td.right{
text-align: right;
}
/*#paginationWg .left { float: left } /*#paginationWg .left { float: left }
#paginationWg .right { float: right }*/ #paginationWg .right { float: right }*/
client/index.html
View file @ 90a85e29
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>NoMaD</title> <title>NOMAD</title>
<link rel="stylesheet" href="client/css/styles.css"/> <link rel="stylesheet" href="client/css/styles.css"/>
......
client/src/ui/resultset.js
View file @ 90a85e29
...@@ -25,14 +25,14 @@ ResultSet.prototype._init = function() { ...@@ -25,14 +25,14 @@ ResultSet.prototype._init = function() {
<button class="next" disabled>NEXT RESULTS &gt;&gt;</button></div>\ <button class="next" disabled>NEXT RESULTS &gt;&gt;</button></div>\
<div style="clear: both;"></div>\ <div style="clear: both;"></div>\
</div>\ </div>\
<table> <thead> \ <table> <thead > \
<th>Formula</th> \ <tr class="rsHead"><th>Formula</th> \
<th>Number of Atoms</th> \ <th>Number of Atoms</th> \
<th>Space Group</th> \ <th>Space Group</th> \
<th>Code name</th> \ <th>Code Name</th> \
<th>Basis set type</th> \ <th>Basis Set Type</th> \
<th>XC treatment</th> \ <th>XC Treatment</th> \
</thead><tbody> \ </tr></thead><tbody> \
</tbody></table>'; </tbody></table>';
//this.resultsNrTag= document.getElementById("resultsNr"); //this.resultsNrTag= document.getElementById("resultsNr");
...@@ -85,9 +85,12 @@ ResultSet.prototype.addResults = function(data) { ...@@ -85,9 +85,12 @@ ResultSet.prototype.addResults = function(data) {
this.resultsNrTag.innerHTML= data[0]['nr_results']+' results found'; this.resultsNrTag.innerHTML= data[0]['nr_results']+' results found';
} }
data.forEach(function(el){ data.forEach(function(el){
html+= '<tr><td>'+el["formula"]+'</td><td>'+el["nr_atoms"]+'</td><td>'+ html+= '<tr class="rsCol" ><td class="left">'+el["formula"]+'</td>\
el["space_group"]+'</td><td>'+el["code_name"]+'</td><td>'+ <td class="right">'+el["nr_atoms"]+'</td>\
el["basis_set_type"]+'</td><td>'+el["xc_treatment_basis"]+'</td></tr>'; <td class="right">'+el["space_group"]+'</td>\
<td class="left">'+el["code_name"]+'</td>\
<td class="left">'+el["basis_set_type"]+'</td>\
<td class="left">'+el["xc_treatment_basis"]+'</td></tr>';
//console.log("data: "+JSON.stringify(el)+" "+el["code version"]); //console.log("data: "+JSON.stringify(el)+" "+el["code version"]);
}); });
......
Markdown is supported
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