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