Commit c1313647 authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Fixed the info system values, fixed issue with loading spinner staying visible after reroute.

parent 47094dd7
Pipeline #97765 skipped with stage
This diff is collapsed.
......@@ -22,7 +22,7 @@
"comment": "not required",
"text": "Basis functions that are used to solve the Kohn-Sham equation."
},
"basis set type": {
"basis_set": {
"comment": "links to defining pages for every possible entry.",
"link": "https://en.wikipedia.org/wiki/Basis_set_(chemistry)",
"text": "Representation of Kohn\u2013Sham states.",
......@@ -158,7 +158,7 @@
"comment": "explaining that this is the volume of the primitive unit cell",
"text": "Volume of the primitive unit cell."
},
"code name": {
"code_name": {
"comment": "askhl: Program names about which I am not sure about are marked with leading question mark. Present names are those that are explicitly used e.g. as fixedStartValues in parsers (obtained from grep).",
"link": "https://en.wikipedia.org/wiki/List_of_quantum_chemistry_and_solid-state_physics_software",
"text": "Name of scientific software (code) used for the calculation.",
......@@ -305,7 +305,7 @@
}
}
},
"crystal system": {
"crystal_system": {
"comment": "to explaining page for every crystal system (wikipedia has pages for crystal systems, but hexagonal and trigonal are treated on the same page, so two links go to that page on purpose. --askhl)",
"link": "https://en.wikipedia.org/wiki/Crystal_system",
"values": {
......@@ -416,7 +416,7 @@
"num": "space group"
}
},
"functional type": {
"functional_type": {
"comment": "general explanation and link to defining or explaining page for every functional type",
"text": "Type of exchange\u2013correlation functional.",
"values": {
......@@ -474,11 +474,11 @@
}
}
},
"has band structure": {
"has_band_structure": {
"comment": "can be shown in the header as general explanation for all calculations",
"text": "Search for calculations that contain an electronic band structure."
},
"has dos": {
"has_dos": {
"comment": "can be shown in the header as general explanation for all calculations",
"text": "Search for calculations that contain a density of states."
},
......@@ -486,7 +486,7 @@
"comment": "can be shown in the header as general explanation for all calculations",
"text": "Search for calculations that contain a fermi surface."
},
"has thermal properties": {
"has_thermal_properties": {
"comment": "can be shown in the header as general explanation for all calculations",
"text": "Search for calculations that contain thermal properties."
},
......@@ -604,7 +604,7 @@
"comment": "",
"text": "Parameter specifying the shape of the distribution for the given smearing kind."
},
"space group": {
"space_group_number": {
"comment": "general explanation and link to explaining page for every space group.",
"link": "https://en.wikipedia.org/wiki/Space_group",
"text": "The space group is defined by the translational symmetry of a crystal, together with its point symmetries.",
......@@ -619,11 +619,18 @@
"specific heat cv": {
"text": "Temperature dependence of the heat capacity per unit cell at constant volume."
},
"structure type": {
"structure_type": {
"comment": "general explanation and link to explaining pages for every structure type (will fix this once the possible values of this are known. --askhl)",
"text": "Classification according to known structure types."
},
"system type": {
"structure_prototype": {
"text": "Formula for the prototypical material having this structure."
},
"strukturbericht": {
"text": "Classification of the material according to the historically grown 'strukturbericht'.",
"link": "https://en.wikipedia.org/wiki/Strukturbericht_designation"
},
"material_type": {
"comment": "explain how every structure type is defined in our system (need information about what system type can be. Also this may not make so much sense while we only have bulk. --askhl)",
"text": "Classification of materials into different high-level categories, based on their atomic configurations.",
"values": {
......
......@@ -75,6 +75,8 @@ function route() {
else command = hashPath;
if (routes.has(command)) {
// When entering a new page, reset the spinner.
LoadingPopup.reset();
routes.get(command)(param, subparam);
}
};
......
......@@ -71,11 +71,11 @@ class Overview {
<span class="material-type-field" ></span>
</div>
<div class="space-group-field" style="display: none">
<b><span info-sys-data="space-group">Space group</span></b>:
<b><span info-sys-data="space_group_number">Space group</span></b>:
<span class="space-group-value" ></span>
</div>
<div class="structure-type-field" style="display: none">
<b><span info-sys-data="structure-type">Structure type</span></b>:
<b><span info-sys-data="structure_type">Structure type</span></b>:
<span class="structure-type-value" ></span>
</div>
</div>
......@@ -109,11 +109,11 @@ class Overview {
<div class="info-fields-label" > Available calculations </div>
<div style="float: left; width: 45%" >
<b><span info-sys-data="functional-type">Functional</span></b>
<b><span info-sys-data="functional_type">Functional</span></b>
<div class="functional-field" > </div>
</div>
<div style="float: right; width: 45%" >
<b><span info-sys-data="code-name">Code</span></b>
<b><span info-sys-data="code_name">Code</span></b>
<div class="code-field"> </div>
</div>
<div style="clear: both;"></div>
......@@ -322,7 +322,7 @@ class Overview {
this.spaceGroupValue.textContent = data.space_group_number+
' ('+data.space_group_international_short_symbol+')';
InfoSys.addElementToInfoSystem(this.spaceGroupValue,
'space-group.value:'+data.space_group_number);
'space_group_number.value:' + data.space_group_number);
}
if (this.similarityFinder) {
......@@ -426,7 +426,7 @@ class Overview {
let container = document.createElement("div");
functionalMap.forEach((number, functional) => {
let span = document.createElement("span");
span.setAttribute("info-sys-data", "functional-type.value:" + util.getDefault(functional));
span.setAttribute("info-sys-data", "functional_type.value:" + util.getDefault(functional));
span.textContent = number + ' ' + util.getDefault(functional);
container.appendChild(span);
let linebreak = document.createElement("br");
......@@ -440,7 +440,7 @@ class Overview {
let container2 = document.createElement("div");
codeMap.forEach((number, codeName) => {
let span = document.createElement("span");
span.setAttribute("info-sys-data", "code-name.value:" + codeName);
span.setAttribute("info-sys-data", "code_name.value:" + codeName);
span.textContent = number + ' ' + codeName;
container2.appendChild(span);
let linebreak = document.createElement("br");
......
......@@ -62,11 +62,11 @@ class StructureDetails extends DetailsViewBase {
<span class="struct-field" ></span>
</div>
<div class="structure-type-field" style="display: none">
<b><span info-sys-data="structure-type">Structure type</span></b>:
<b><span info-sys-data="structure_type">Structure type</span></b>:
<span class="structure-type-value" ></span>
</div>
<div class="structure-prototype-field" style="display: none">
<b><span info-sys-data="structure-prototype">Structure prototype</span></b>:
<b><span info-sys-data="structure_prototype">Structure prototype</span></b>:
<span class="structure-prototype-value" ></span>
</div>
<div class="strukturbericht-field" style="display: none">
......@@ -81,11 +81,11 @@ class StructureDetails extends DetailsViewBase {
style="flex-basis: 70%; border-right: 1px solid #E4E4E4; ">
<div>
<b><span info-sys-data="crystal-system">Lattice</span></b>:
<b><span info-sys-data="crystal_system">Lattice</span></b>:
<span class="lattice-value" ></span>
</div>
<div>
<b><span info-sys-data="space-group">Space group</span></b>:
<b><span info-sys-data="space_group_number">Space group</span></b>:
<span class="space-group-value" ></span>
</div>
<div>
......@@ -248,9 +248,9 @@ class StructureDetails extends DetailsViewBase {
}
InfoSys.addElementToInfoSystem(this.spaceGroupValue,
'space-group.value:'+data.space_group_number);
'space_group_number.value:'+data.space_group_number);
InfoSys.addElementToInfoSystem(this.latticeValue,
'crystal-system.value:'+data.crystal_system);
'crystal_system.value:'+data.crystal_system);
InfoSys.addElementToInfoSystem(this.pointGroupValue,
'point-group.value:'+data.point_group);
//InfoSys.addElementToInfoSystem(this.wyckoffValue, 'wyckoff-position-population.value:'+);
......
/**
* Copyright 2016-2019 Iker Hurtado, Georg Huhs
*
......@@ -17,12 +15,6 @@
*
*/
/*
*/
"use strict";
let util = require('../common/util.js');
......@@ -252,10 +244,9 @@ class CheckboxesField{
this.checkboxes.forEach( checkbox => {
if (checkbox.checked){
//checkbox.parentElement.style.backgroundColor = 'red'
checkbox.parentElement.style.opacity = ''//(bool ? '' : '')
}else{
checkbox.parentElement.style.opacity = (bool ? NOT_SELECTED_OPACITY : '')
checkbox.parentElement.style.opacity = '';
} else {
checkbox.parentElement.style.opacity = (bool ? NOT_SELECTED_OPACITY : '');
}
});
}
......@@ -264,7 +255,7 @@ class CheckboxesField{
class TextField{
class TextField {
constructor(name, id){
this.fieldId = id;
......@@ -501,7 +492,6 @@ class MaxMinSlider{
}
setRange(min, max){
this.factor = (max-min)/80;
}
......
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