Skip to content
Snippets Groups Projects
Commit 526060e1 authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Small updates to the search options.

parent bdffb455
Branches
No related tags found
No related merge requests found
Pipeline #84690 skipped
Stage: Deployment staging
Show whitespace changes
Inline Side-by-side
client/bundle.js
+ 1
− 1
View file @ 526060e1
Source diff could not be displayed: it is too large. Options to address this: view the blob.
client/src/material-mod/Overview.view.js
+ 5
− 5
View file @ 526060e1
...@@ -67,8 +67,8 @@ class Overview { ...@@ -67,8 +67,8 @@ class Overview {
</div> </div>
<div class="footer"> <div class="footer">
<div ><b><span>System type</span></b>: <div ><b><span>Material type</span></b>:
<span class="system-type-field" ></span> <span class="material-type-field" ></span>
</div> </div>
<div class="space-group-field" style="display: none"> <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">Space group</span></b>:
...@@ -214,7 +214,7 @@ class Overview { ...@@ -214,7 +214,7 @@ class Overview {
this.materialTitle= this.element.getElementsByClassName('material-title')[0]; this.materialTitle= this.element.getElementsByClassName('material-title')[0];
this.systemType= this.element.querySelector('.system-type-field'); this.systemType= this.element.querySelector('.material-type-field');
this.spaceGroupField = this.element.querySelector('.space-group-field'); this.spaceGroupField = this.element.querySelector('.space-group-field');
this.spaceGroupValue = this.element.querySelector('.space-group-value'); this.spaceGroupValue = this.element.querySelector('.space-group-value');
this.structTypeField= this.element.querySelector('.structure-type-field'); this.structTypeField= this.element.querySelector('.structure-type-field');
...@@ -311,8 +311,8 @@ class Overview { ...@@ -311,8 +311,8 @@ class Overview {
this.materialTitle.innerHTML= util.getMaterialTitle(data); this.materialTitle.innerHTML= util.getMaterialTitle(data);
this.materialId = data.material_id; this.materialId = data.material_id;
let isBulk = (data.system_type === 'bulk'); let isBulk = (data.material_type === 'bulk');
this.systemType.textContent= data.system_type; this.systemType.textContent= data.material_type;
this.structTypeField.style.display = this.structTypeField.style.display =
(isBulk && data.structure_type !== null ? 'block' : 'none'); (isBulk && data.structure_type !== null ? 'block' : 'none');
this.spaceGroupField.style.display = (isBulk ? 'block' : 'none'); this.spaceGroupField.style.display = (isBulk ? 'block' : 'none');
... ...
......
client/src/material-mod/StructureDetails.view.js
+ 6
− 6
View file @ 526060e1
...@@ -194,9 +194,9 @@ class StructureDetails extends DetailsViewBase { ...@@ -194,9 +194,9 @@ class StructureDetails extends DetailsViewBase {
this.updateMarkedLeaf(leafId); this.updateMarkedLeaf(leafId);
}); });
this.isBulk = (data.system_type === 'bulk'); this.isBulk = (data.material_type === 'bulk');
this.systemTypeField.textContent= data.system_type; this.systemTypeField.textContent= data.material_type;
this.structTypeField.style.display = this.structTypeField.style.display =
(this.isBulk && data.structure_type !== null ? 'block' : 'none'); (this.isBulk && data.structure_type !== null ? 'block' : 'none');
this.structPrototypeField.style.display = this.structPrototypeField.style.display =
...@@ -472,8 +472,8 @@ class TreeLeafViewer { ...@@ -472,8 +472,8 @@ class TreeLeafViewer {
// and calculation data. // and calculation data.
let materialData = DataStore.getMaterialData(); let materialData = DataStore.getMaterialData();
let materialId = materialData.material_id; let materialId = materialData.material_id;
let is2Dsystem = (materialData.system_type === '2D'); let is2Dsystem = (materialData.material_type === '2D');
let isBulk = (materialData.system_type === 'bulk'); let isBulk = (materialData.material_type === 'bulk');
let calc = DataStore.getCalc(calcId); let calc = DataStore.getCalc(calcId);
let thereIsWyckoffData = DataStore.getMaterialData().has_free_wyckoff_parameters; let thereIsWyckoffData = DataStore.getMaterialData().has_free_wyckoff_parameters;
...@@ -725,8 +725,8 @@ class SummaryByFunctionalsComponent { ...@@ -725,8 +725,8 @@ class SummaryByFunctionalsComponent {
* Called when a functional is selected. * Called when a functional is selected.
*/ */
_setData() { _setData() {
let is2Dsystem = (DataStore.getMaterialData().system_type === '2D'); let is2Dsystem = (DataStore.getMaterialData().material_type === '2D');
let isBulk = (DataStore.getMaterialData().system_type === 'bulk'); let isBulk = (DataStore.getMaterialData().material_type === 'bulk');
let functional = this.functional; let functional = this.functional;
let calcs = Array.from(this.calcMapByFunctional.get(this.functional)); let calcs = Array.from(this.calcMapByFunctional.get(this.functional));
let matId = DataStore.getMaterialData().material_id; let matId = DataStore.getMaterialData().material_id;
... ...
......
client/src/search-mod/MaterialList.view.js
+ 2
− 2
View file @ 526060e1
...@@ -233,7 +233,7 @@ class MaterialList { ...@@ -233,7 +233,7 @@ class MaterialList {
<thead> <tr> <thead> <tr>
<th style="width: 24%;"></th> <th style="width: 24%;"></th>
<th style="width: 20%;"> <th style="width: 20%;">
<span info-sys-data="system-type">System type</span> <span info-sys-data="material-type">Material type</span>
</th> </th>
<th style="width: 16%;"> <th style="width: 16%;">
<span info-sys-data="space-group">Space group</span> <span info-sys-data="space-group">Space group</span>
...@@ -260,7 +260,7 @@ class MaterialList { ...@@ -260,7 +260,7 @@ class MaterialList {
`<tr class="mat-row" data-mat-id="${mat.material_id}"> `<tr class="mat-row" data-mat-id="${mat.material_id}">
<td > ${label} </td> <td > ${label} </td>
<td style="text-align:center" > <td style="text-align:center" >
<!--<span info-sys-data="system-type">-->${mat.system_type} <!--</span>--> <!--<span info-sys-data="material-type">-->${mat.material_type} <!--</span>-->
</td> </td>
<td style="text-align:center" > <td style="text-align:center" >
${mat.space_group_number === undefined ? '' : mat.space_group_number} ${mat.space_group_number === undefined ? '' : mat.space_group_number}
... ...
......
client/src/search-mod/PropertiesBox.view.js
+ 21
− 27
View file @ 526060e1
...@@ -64,10 +64,10 @@ class PropertiesBox { ...@@ -64,10 +64,10 @@ class PropertiesBox {
</div> </div>
<div class="field"> <div class="field">
<div class="field-title">System type</div> <div class="field-title">Material type</div>
<input type="checkbox" class="system-type-field" value="bulk"> Bulk<br> <input type="checkbox" class="material-type-field" value="bulk"> Bulk<br>
<input type="checkbox" class="system-type-field" value="2D"> 2D<br> <input type="checkbox" class="material-type-field" value="2D"> 2D<br>
<input type="checkbox" class="system-type-field" value="1D"> 1D<br> <input type="checkbox" class="material-type-field" value="1D"> 1D<br>
</div> </div>
<!-- <!--
...@@ -184,12 +184,6 @@ class PropertiesBox { ...@@ -184,12 +184,6 @@ class PropertiesBox {
<select class="code-name-field" > <select class="code-name-field" >
<option></option> <option></option>
</select> </select>
<!--
<input type="checkbox" class="code-name-field" value="VASP">VASP<br>
<input type="checkbox" class="code-name-field" value="quantum-espresso">Quantum Espresso<br>
<input type="checkbox" class="code-name-field" value="FHI-aims">FHI-aims<br>
<input type="checkbox" class="code-name-field" value="exciting">exciting<br>
-->
</div> </div>
</div> </div>
...@@ -198,21 +192,21 @@ class PropertiesBox { ...@@ -198,21 +192,21 @@ class PropertiesBox {
<div style="float: right; width: 47%;"> <div style="float: right; width: 47%;">
<div class="field"> <div class="field">
<div class="field-title"><span info-sys-data="basis-set-type">Basis set</span></div> <div class="field-title"><span info-sys-data="basis-set">Basis set</span></div>
<input type="checkbox" class="basis-set-type-field" value="(L)APW+lo"> <input type="checkbox" class="basis-set-field" value="(L)APW+lo">
<span info-sys-data="basis-set-type.value:(L)APW+lo">(L)APW+lo</span><br> <span info-sys-data="basis-set.value:(L)APW+lo">(L)APW+lo</span><br>
<input type="checkbox" class="basis-set-type-field" value="FLAPW"> <input type="checkbox" class="basis-set-field" value="LCAO">
<span info-sys-data="basis-set-type.value:FLAPW">FLAPW</span><br> <span info-sys-data="basis-set.value:LCAO">LCAO</span><br>
<input type="checkbox" class="basis-set-type-field" value="gaussians"> <input type="checkbox" class="basis-set-field" value="gaussians">
<span info-sys-data="basis-set-type.value:gaussians">gaussians</span><br> <span info-sys-data="basis-set.value:gaussians">gaussians</span><br>
<input type="checkbox" class="basis-set-type-field" value="numeric AOs"> <input type="checkbox" class="basis-set-field" value="numeric AOs">
<span info-sys-data="basis-set-type.value:numeric AOs">numeric AOs</span><br> <span info-sys-data="basis-set.value:numeric AOs">numeric AOs</span><br>
<input type="checkbox" class="basis-set-type-field" value="plane waves"> <input type="checkbox" class="basis-set-field" value="plane waves">
<span info-sys-data="basis-set-type.value:plane waves">plane waves</span><br> <span info-sys-data="basis-set.value:plane waves">plane waves</span><br>
<input type="checkbox" class="basis-set-type-field" value="psinc functions"> <input type="checkbox" class="basis-set-field" value="psinc functions">
<span info-sys-data="basis-set-type.value:psinc functions">psinc functions</span><br> <span info-sys-data="basis-set.value:psinc functions">psinc functions</span><br>
<input type="checkbox" class="basis-set-type-field" value="real-space grid"> <input type="checkbox" class="basis-set-field" value="real-space grid">
<span info-sys-data="basis-set-type.value:real-space grid">real-space grid</span><br> <span info-sys-data="basis-set.value:real-space grid">real-space grid</span><br>
</div> </div>
</div> </div>
...@@ -309,7 +303,7 @@ class PropertiesBox { ...@@ -309,7 +303,7 @@ class PropertiesBox {
if (tabString === 'structure'){ if (tabString === 'structure'){
this.addPropsFromTextFields(propsMap,['space-group-number'], reset); this.addPropsFromTextFields(propsMap,['space-group-number'], reset);
this.addPropsFromDropdownList(propsMap,['structure-type'], reset); this.addPropsFromDropdownList(propsMap,['structure-type'], reset);
this.addPropsFromCheckboxes(propsMap,['system-type','crystal-system'], reset); this.addPropsFromCheckboxes(propsMap,['material-type', 'crystal-system'], reset);
// this.addMassDensityProps(propsMap, reset); // this.addMassDensityProps(propsMap, reset);
}else if (tabString === 'results'){ }else if (tabString === 'results'){
// this.addBandgapProps(propsMap, reset); // this.addBandgapProps(propsMap, reset);
...@@ -317,7 +311,7 @@ class PropertiesBox { ...@@ -317,7 +311,7 @@ class PropertiesBox {
'has-fermi-surface', 'has-thermal-properties'], reset); 'has-fermi-surface', 'has-thermal-properties'], reset);
}else if (tabString === 'method'){ }else if (tabString === 'method'){
this.addPropsFromCheckboxes(propsMap,['functional-type','basis-set-type'], reset); this.addPropsFromCheckboxes(propsMap,['functional-type','basis-set'], reset);
this.addPropsFromDropdownList(propsMap,['code-name'], reset); this.addPropsFromDropdownList(propsMap,['code-name'], reset);
}//else if (this.tabSelected.className === 'contributors-tab'){ }//else if (this.tabSelected.className === 'contributors-tab'){
//this.addPropsFromTextFields(propsMap,['contributors']);} //this.addPropsFromTextFields(propsMap,['contributors']);}
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment