Commit 67cf0ecf authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Fixed layout issues.

parent 7c273bcf
Pipeline #78516 skipped with stage
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -193,7 +193,9 @@ class MaterialMod { ...@@ -193,7 +193,9 @@ class MaterialMod {
this.structureViewer.bondsCheckbox.checked = true; this.structureViewer.bondsCheckbox.checked = true;
document.getElementById('methodology-ov').style.visibility = 'hidden'; document.getElementById('methodology-ov').style.visibility = 'hidden';
document.getElementById('structure-ov').style.visibility = 'hidden'; document.getElementById('structure-ov').style.visibility = 'hidden';
document.getElementById('e-structure-ov').style.display = 'none';
document.getElementById('e-structure-ov').style.visibility = 'hidden'; document.getElementById('e-structure-ov').style.visibility = 'hidden';
document.getElementById('thermal-props-ov').style.visibility = 'hidden';
// Request basic material data // Request basic material data
LoadingPopup.show("load_basic"); LoadingPopup.show("load_basic");
......
...@@ -187,7 +187,7 @@ class Overview { ...@@ -187,7 +187,7 @@ class Overview {
--> -->
</div> </div>
<div id="thermal-props-ov" class="view-box" style="display: none"> <div id="thermal-props-ov" class="view-box" style="visibility: hidden">
<div class="title">Vibrational and thermal properties <div class="title">Vibrational and thermal properties
<img style="float: right" class="to-detail thermal-props" src="img/more.svg" /> <img style="float: right" class="to-detail thermal-props" src="img/more.svg" />
<div style="clear: both;"></div> <div style="clear: both;"></div>
...@@ -301,7 +301,7 @@ class Overview { ...@@ -301,7 +301,7 @@ class Overview {
} }
setVisible() { setVisible() {
this.element.style.display= 'block'; this.element.style.display = 'block';
} }
...@@ -461,6 +461,8 @@ class Overview { ...@@ -461,6 +461,8 @@ class Overview {
if (calcWithBS === undefined && calcWithDOS === undefined) { if (calcWithBS === undefined && calcWithDOS === undefined) {
DataStore.hasElecStructureData = false; DataStore.hasElecStructureData = false;
} else { } else {
console.log("HERE");
document.getElementById('e-structure-ov').style.display = 'block';
let isReady = () => { let isReady = () => {
if (this.dosLoaded && this.bsLoaded) { if (this.dosLoaded && this.bsLoaded) {
document.getElementById('e-structure-ov').style.visibility = 'visible'; document.getElementById('e-structure-ov').style.visibility = 'visible';
...@@ -480,6 +482,7 @@ class Overview { ...@@ -480,6 +482,7 @@ class Overview {
if (calcWithBS === undefined){ if (calcWithBS === undefined){
this.bandPlotter.setNoData(); this.bandPlotter.setNoData();
this.bsCalcIdBox.innerHTML = ''; this.bsCalcIdBox.innerHTML = '';
this.bsLoaded = true;
} else { } else {
let url = util.getMaterialCalcURL(this.materialId, calcWithBS.calc_id); let url = util.getMaterialCalcURL(this.materialId, calcWithBS.calc_id);
LoadingPopup.show("overview_electronic_band_structure"); LoadingPopup.show("overview_electronic_band_structure");
...@@ -502,6 +505,7 @@ class Overview { ...@@ -502,6 +505,7 @@ class Overview {
if (calcWithDOS === undefined){ if (calcWithDOS === undefined){
this.dosPlotter.setNoData(); this.dosPlotter.setNoData();
this.dosCalcIdBox.innerHTML = ''; this.dosCalcIdBox.innerHTML = '';
this.dosLoaded = true;
} else { } else {
let url = util.getMaterialCalcURL(this.materialId, calcWithDOS.calc_id); let url = util.getMaterialCalcURL(this.materialId, calcWithDOS.calc_id);
LoadingPopup.show("overview_electronic_dos"); LoadingPopup.show("overview_electronic_dos");
...@@ -522,7 +526,7 @@ class Overview { ...@@ -522,7 +526,7 @@ class Overview {
} }
} }
if (calcWithHeat === undefined){ if (calcWithHeat === undefined) {
document.getElementById('thermal-props-ov').style.display = 'none'; document.getElementById('thermal-props-ov').style.display = 'none';
DataStore.hasThermalData = false; DataStore.hasThermalData = false;
} else { } else {
...@@ -550,6 +554,7 @@ class Overview { ...@@ -550,6 +554,7 @@ class Overview {
this.heatCalcIdBox.innerHTML = 'From calculation <b>'+util.getShortCode(calcWithHeat.calc_id)+'</b>'+ this.heatCalcIdBox.innerHTML = 'From calculation <b>'+util.getShortCode(calcWithHeat.calc_id)+'</b>'+
'</b> <span style="font-size: 0.8em">('+calcWithHeat.functional_type+' - '+calcWithHeat.code_name+')</span>'; '</b> <span style="font-size: 0.8em">('+calcWithHeat.functional_type+' - '+calcWithHeat.code_name+')</span>';
this.phononLoaded = true; this.phononLoaded = true;
document.getElementById('thermal-props-ov').style.visibility = 'visible';
} }
LoadingPopup.hide(); LoadingPopup.hide();
}); });
......
...@@ -181,6 +181,7 @@ class ThermalPropsDetails extends DetailsViewBase{ ...@@ -181,6 +181,7 @@ class ThermalPropsDetails extends DetailsViewBase{
this.heatPlotter.setNoData(); this.heatPlotter.setNoData();
this.helmholtzPlotter.setNoData(); this.helmholtzPlotter.setNoData();
} }
document.getElementById('thermal-props-ov').style.visibility = 'visible';
LoadingPopup.hide("thermal_properties"); LoadingPopup.hide("thermal_properties");
}); });
} }
......
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