Commit 4291a0ae authored by Iker Hurtado's avatar Iker Hurtado
Browse files

Start implementing the new Methodology details page

parent 46401a39
Pipeline #24015 passed with stages
in 11 seconds
...@@ -1548,10 +1548,10 @@ ...@@ -1548,10 +1548,10 @@
this.navTree.setMarkedLeafIfNoneMarked(markedTreeLeafs.eStruct); this.navTree.setMarkedLeafIfNoneMarked(markedTreeLeafs.eStruct);
}else if (view === util.MAT_VIEW.methodology){ // Methodology }else if (view === util.MAT_VIEW.methodology){ // Methodology
this.currentDetailView= this.methodologyDetails; this.currentDetailView = this.methodologyDetails;
this.navTree.showCalcsGraphDataAvalability(false); //this.navTree.showCalcsGraphDataAvalability(false);
this.navTree.setHeight(600); //this.navTree.setHeight(600);
this.navTree.setMarkedLeafIfNoneMarked(null); //this.navTree.setMarkedLeafIfNoneMarked(null);
}else if (view === util.MAT_VIEW.thermalprops){ // Thermal properties }else if (view === util.MAT_VIEW.thermalprops){ // Thermal properties
this.currentDetailView= this.thermalDetails; this.currentDetailView= this.thermalDetails;
...@@ -1573,7 +1573,8 @@ ...@@ -1573,7 +1573,8 @@
this._setCellViewer(this.structureDetails.vizBox); this._setCellViewer(this.structureDetails.vizBox);
//this.currentDetailView.setMaterialData(materialData); //// WHY DOES It do always? //this.currentDetailView.setMaterialData(materialData); //// WHY DOES It do always?
this.currentDetailView.attachNavTree(this.navTree); if (view !== util.MAT_VIEW.methodology)
this.currentDetailView.attachNavTree(this.navTree);
this.currentDetailView.updateSelection(this.navTree.getTreeSelectedCalcs()); this.currentDetailView.updateSelection(this.navTree.getTreeSelectedCalcs());
...@@ -5981,6 +5982,7 @@ ...@@ -5981,6 +5982,7 @@
let DataStore = __webpack_require__(2); let DataStore = __webpack_require__(2);
let calcTypesMap = new Map(); let calcTypesMap = new Map();
calcTypesMap.set('Single point', 'single point'); calcTypesMap.set('Single point', 'single point');
calcTypesMap.set('GW', 'GW calculation'); calcTypesMap.set('GW', 'GW calculation');
...@@ -6002,14 +6004,7 @@ ...@@ -6002,14 +6004,7 @@
this.element.innerHTML+=` this.element.innerHTML+=`
<div style="float: left; width: 27%;"> <div>
<div class="view-box">
<div class="title">Calculation </div>
<div class="navTreeWrapper"></div>
</div>
</div>
<div style="float: right; width: 73%;">
<div class="view-box"> <div class="view-box">
<div class="title">Methodology</div> <div class="title">Methodology</div>
...@@ -6018,12 +6013,9 @@ ...@@ -6018,12 +6013,9 @@
<div class="dataTableWrapper"></div> <div class="dataTableWrapper"></div>
</div> </div>
</div> </div>
<div style="clear: both;"></div>
`; `;
this.navTreeWrapper = // There is no this.navTreeWrapper = this.element.querySelector('.navTreeWrapper');
this.element.querySelector('.navTreeWrapper');
this.dataTableWrapper = this.dataTableWrapper =
this.element.querySelector('.dataTableWrapper'); this.element.querySelector('.dataTableWrapper');
......
...@@ -118,6 +118,6 @@ ...@@ -118,6 +118,6 @@
</div> </div>
<!-- <script type='text/javascript' src='http://www.x3dom.org/download/x3dom.js'> </script>--> <!-- <script type='text/javascript' src='http://www.x3dom.org/download/x3dom.js'> </script>-->
<script type="text/javascript" src="bundle-es5.js" charset="utf-8"></script> <script type="text/javascript" src="bundle.js" charset="utf-8"></script>
</body> </body>
</html> </html>
...@@ -133,10 +133,10 @@ class MaterialMod{ ...@@ -133,10 +133,10 @@ class MaterialMod{
this.navTree.setMarkedLeafIfNoneMarked(markedTreeLeafs.eStruct); this.navTree.setMarkedLeafIfNoneMarked(markedTreeLeafs.eStruct);
}else if (view === util.MAT_VIEW.methodology){ // Methodology }else if (view === util.MAT_VIEW.methodology){ // Methodology
this.currentDetailView= this.methodologyDetails; this.currentDetailView = this.methodologyDetails;
this.navTree.showCalcsGraphDataAvalability(false); //this.navTree.showCalcsGraphDataAvalability(false);
this.navTree.setHeight(600); //this.navTree.setHeight(600);
this.navTree.setMarkedLeafIfNoneMarked(null); //this.navTree.setMarkedLeafIfNoneMarked(null);
}else if (view === util.MAT_VIEW.thermalprops){ // Thermal properties }else if (view === util.MAT_VIEW.thermalprops){ // Thermal properties
this.currentDetailView= this.thermalDetails; this.currentDetailView= this.thermalDetails;
...@@ -158,7 +158,8 @@ class MaterialMod{ ...@@ -158,7 +158,8 @@ class MaterialMod{
this._setCellViewer(this.structureDetails.vizBox); this._setCellViewer(this.structureDetails.vizBox);
//this.currentDetailView.setMaterialData(materialData); //// WHY DOES It do always? //this.currentDetailView.setMaterialData(materialData); //// WHY DOES It do always?
this.currentDetailView.attachNavTree(this.navTree); if (view !== util.MAT_VIEW.methodology)
this.currentDetailView.attachNavTree(this.navTree);
this.currentDetailView.updateSelection(this.navTree.getTreeSelectedCalcs()); this.currentDetailView.updateSelection(this.navTree.getTreeSelectedCalcs());
......
...@@ -8,6 +8,7 @@ let FilterComponent = require('../common/FilterComponent.js'); ...@@ -8,6 +8,7 @@ let FilterComponent = require('../common/FilterComponent.js');
let DataStore = require('./DataStore.js'); let DataStore = require('./DataStore.js');
let calcTypesMap = new Map(); let calcTypesMap = new Map();
calcTypesMap.set('Single point', 'single point'); calcTypesMap.set('Single point', 'single point');
calcTypesMap.set('GW', 'GW calculation'); calcTypesMap.set('GW', 'GW calculation');
...@@ -29,14 +30,7 @@ class MethodologyDetails extends DetailsViewBase { ...@@ -29,14 +30,7 @@ class MethodologyDetails extends DetailsViewBase {
this.element.innerHTML+=` this.element.innerHTML+=`
<div style="float: left; width: 27%;"> <div>
<div class="view-box">
<div class="title">Calculation </div>
<div class="navTreeWrapper"></div>
</div>
</div>
<div style="float: right; width: 73%;">
<div class="view-box"> <div class="view-box">
<div class="title">Methodology</div> <div class="title">Methodology</div>
...@@ -45,12 +39,9 @@ class MethodologyDetails extends DetailsViewBase { ...@@ -45,12 +39,9 @@ class MethodologyDetails extends DetailsViewBase {
<div class="dataTableWrapper"></div> <div class="dataTableWrapper"></div>
</div> </div>
</div> </div>
<div style="clear: both;"></div>
`; `;
this.navTreeWrapper = // There is no this.navTreeWrapper = this.element.querySelector('.navTreeWrapper');
this.element.querySelector('.navTreeWrapper');
this.dataTableWrapper = this.dataTableWrapper =
this.element.querySelector('.dataTableWrapper'); this.element.querySelector('.dataTableWrapper');
......
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