diff --git a/client/bundle-es5.js b/client/bundle-es5.js
index 733ae1c1498e92783ba2eedaa183726372c90415..a69906192e0b93dcec8232f2a019cfce0ef38d08 100644
--- a/client/bundle-es5.js
+++ b/client/bundle-es5.js
@@ -1992,11 +1992,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var util = __webpack_require__(0);
var NavTree = __webpack_require__(20);
var Overview = __webpack_require__(21);
- var StructureDetails = __webpack_require__(23);
- var ElectronicStructDetails = __webpack_require__(25);
- var MethodologyDetails = __webpack_require__(27);
- var ThermalPropsDetails = __webpack_require__(29);
- var ElasticConstDetails = __webpack_require__(32);
+ var StructureDetails = __webpack_require__(24);
+ var ElectronicStructDetails = __webpack_require__(26);
+ var MethodologyDetails = __webpack_require__(28);
+ var ThermalPropsDetails = __webpack_require__(30);
+ var ElasticConstDetails = __webpack_require__(33);
var DataStore = __webpack_require__(1);
var LoadingPopup = __webpack_require__(4);
@@ -2190,7 +2190,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
_this5.thermalDetails.setMaterialData();
_this5.elasticDetails.setMaterialData();
//console.log("MATDATA LOADED: ");
- if (_this5.structureViewer !== null) _this5.structureViewer.load(util.getCellDataForViewer(materialData));
+ if (_this5.structureViewer !== null) {
+ _this5.structureViewer.load(util.getCellDataForViewer(materialData));
+ _this5.structureViewer.setMaterialId(materialData.id);
+ }
util.serverReq(util.getMaterialXsURL('calculations', matId), function (e4) {
DataStore.setCalculations(JSON.parse(e4.target.response).results);
@@ -2284,6 +2287,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, {
key: 'setMaterialId',
value: function setMaterialId(id) {
+ console.log('pass material id ' + id);
this.vrDropDown.setMaterialId(id);
}
}, {
@@ -3113,7 +3117,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var PubSub = __webpack_require__(18);
var Router = __webpack_require__(19);
var MaterialMod = __webpack_require__(9);
- var SearchModule = __webpack_require__(33);
+ var SearchModule = __webpack_require__(34);
var UserGuidance = __webpack_require__(14);
var DataStore = __webpack_require__(1);
@@ -4547,104 +4551,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
module.exports = SwitchComponent;
/***/
-},
+},,
/* 23 */
-/***/function (module, exports, __webpack_require__) {
-
-<<<<<<< HEAD
-=======
- var util = __webpack_require__(0);
-
- var SimilarityFinder = function () {
- function SimilarityFinder() {
- var _this21 = this;
-
- _classCallCheck(this, SimilarityFinder);
-
- this.folded = true;
- this.element = document.createElement('span');
- //this.element.className = className;
- this.element.setAttribute("info-sys-data", "similar-materials");
- this.element.style = "float : right; border: 2px solid #DDD; padding: 2px 2px 0px 3px;";
- this.element.innerHTML += '\n <span style=" vertical-align: 30%;" ><b>Similar materials</b></span>\n <img style="cursor: pointer" src="' + util.IMAGE_DIR + 'folded.png" />\n\n <div class="vr-download-panel" style="position: relative; display: none;">\n\n </div>\n ';
-
- // Focus related properties (in order to hide the box when the user click out)
- this.element.tabIndex = '0'; // enabled the support of focusing
- this.element.style.outline = 'none'; // The outline is not shown when it gains the focus
-
- this.foldingPanel = this.element.querySelector('.vr-download-panel');
- this.foldBtn = this.element.querySelector('img');
-
- this.foldBtn.addEventListener('click', function (e) {
- _this21.folded = !_this21.folded;
- _this21.foldBtn.src = _this21.folded ? util.IMAGE_DIR + 'folded.png' : util.IMAGE_DIR + 'unfolded.png';
- //this.foldBtn.className = (this.folded ? 'on' : 'off');
- _this21.foldingPanel.style.display = _this21.folded ? 'none' : 'block';
- });
-
- this.element.addEventListener('blur', function (e) {
- setTimeout(function () {
- _this21.folded = true;
- _this21.foldBtn.src = util.IMAGE_DIR + 'folded.png';
- _this21.foldingPanel.style.display = 'none';
- }, 300);
- });
-
- //this.cellViewer.toggleLatticeParameters(false);
- }
-
- _createClass(SimilarityFinder, [{
- key: 'setSimilarityData',
- value: function setSimilarityData(similarityData) {
- var dataAsArray = Object.keys(similarityData).map(function (key) {
- return {
- data: similarityData[key],
- key: key
- };
- });
- dataAsArray.sort(function (a, b) {
- if (a.data.Tc < b.data.Tc) {
- return 1;
- } else if (a.data.Tc > b.data.Tc) {
- return -1;
- } else {
- return 0;
- }
- });
-
- var slicedData = dataAsArray.slice(0, 5);
-
- var container = document.createElement('table');
- container.setAttribute('class', 'similar-materials-panel-unfolded');
- container.style = 'width: 230px; padding-left: 5px;';
- this.foldingPanel.appendChild(container);
- var sim_table_header = document.createElement('tr');
- sim_table_header.style = "padding: 5px; ";
- sim_table_header.innerHTML = '<th style = "text-align: left;">Formula (space group)</th><th>:</th><th style = "text-align: left;">Tc</th>';
- container.appendChild(sim_table_header);
-
- slicedData.forEach(function (item) {
- var material_id = item.key.split(':')[0];
- var element = document.createElement('tr');
- element.style = "padding: 5px; font-family: 'Arimo', sans-serif; font-size: 10pt; ";
- var url = window.location.toString().replace(/#.*$/, "") + '#/material/' + material_id;
- element.innerHTML = '<td><a href="' + url + '" target="_' + material_id + '" style="color:#777; font-family: \'Arimo\', sans-serif; font-size: 10pt;">' + util.getSubscriptedFormula(item.data.formula) + ' (' + item.data.space_group_number + ')</a></td><td>:</td> <td>' + item.data.Tc.toPrecision(3) + '</td>';
- container.appendChild(element);
- });
- }
- }]);
-
- return SimilarityFinder;
- }(); // class DropDown
-
- module.exports = { SimilarityFinder: SimilarityFinder };
-
- /***/
-},
/* 24 */
/***/function (module, exports, __webpack_require__) {
->>>>>>> 6f076b65... Increased the blur delay on popups.
"use strict";
/**
@@ -4679,7 +4590,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var InfoSys = __webpack_require__(3);
var CalcSelectorBar = __webpack_require__(12);
var StatsViewer = __webpack_require__(13);
- var EquationOfStateViewer = __webpack_require__(24);
+ var EquationOfStateViewer = __webpack_require__(25);
var DataStore = __webpack_require__(1);
var LoadingPopup = __webpack_require__(4);
@@ -5252,7 +5163,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 24 */
+/* 25 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -5412,7 +5323,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 25 */
+/* 26 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -5449,7 +5360,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var InfoSys = __webpack_require__(3);
var CalcSelectorBar = __webpack_require__(12);
var StatsViewer = __webpack_require__(13);
- var BSDOSPlotter = __webpack_require__(26);
+ var BSDOSPlotter = __webpack_require__(27);
var PlotterBase = __webpack_require__(5);
var plotter = new PlotterBase();
var DataStore = __webpack_require__(1);
@@ -5854,7 +5765,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 26 */
+/* 27 */
/***/function (module, exports, __webpack_require__) {
/**
@@ -5977,7 +5888,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 27 */
+/* 28 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -6010,7 +5921,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var util = __webpack_require__(0);
var InfoSys = __webpack_require__(3);
var DataStore = __webpack_require__(1);
- var SortingButton = __webpack_require__(28);
+ var SortingButton = __webpack_require__(29);
var REPOSITORY_LINK = 'https://repository.nomad-coe.eu/NomadRepository-1.1/views/calculation.zul?pid=';
@@ -6124,7 +6035,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
_this39.dataTableWrapper = _this39.element.querySelector('.dataTableWrapper');
- _this39.dataTableWrapper.innerHTML += '\n <table id="methodology-data">\n <thead>\n <tr>\n <th style="width: 12%;">\n <span>Calculation ID</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 16%;">\n <span>Type</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 18%;">\n <span info-sys-data="functional-type">Density functional</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 12%;">\n <span info-sys-data="code-name">Code</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 16%;">\n <span info-sys-data="pseudopotential-type">Potential</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 11%;">\n <span info-sys-data="basis-set-type">Basis set</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 8%;">\n <span info-sys-data="basis-set-type">Link</span>\n\n </th>\n <th style="width: 8%;">\n <span info-sys-data="basis-set-type">RV</span>\n\n </th>\n </tr>\n </thead>\n <tbody>\n </tbody>\n </table>\n ';
+ _this39.dataTableWrapper.innerHTML += '\n <table id="methodology-data">\n <thead>\n <tr>\n <th style="width: 12%;">\n <span>Calculation ID</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 16%;">\n <span>Type</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 18%;">\n <span info-sys-data="functional-type">Density functional</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 12%;">\n <span info-sys-data="code-name">Code</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 16%;">\n <span info-sys-data="pseudopotential-type">Potential</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 11%;">\n <span info-sys-data="basis-set-type">Basis set</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 8%;">\n <span info-sys-data="basis-set-type">Link</span>\n\n </th>\n <!--<th style="width: 8%;">\n <span info-sys-data="basis-set-type">RV</span>\n\n </th>-->\n </tr>\n </thead>\n <tbody>\n </tbody>\n </table>\n ';
_this39.tbody = _this39.dataTableWrapper.querySelector("tbody");
_this39.moreInfoRow = document.createElement('tr'); //
@@ -6343,7 +6254,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var calcId = calc.id;
var vrLinkHtml = '<a href="https://labdev-nomad.esc.rzg.mpg.de/remotevis/cM/start/' + materialId + '+' + calcId + '" ' + 'target="blank"><img src="img/monitor_icon.png" height="20px" /> </a>';
- return '\n <tr data-calc-id="' + calc.id /*leafId*/ + '" class="data-row">\n <td>' + calc.id /*leafId*/ + '</td>\n <td>\n <span info-sys-data="calculation-type.value:' + calcType + '">\n ' + calcType + '</span>\n </td>\n <td>\n <span info-sys-data="functional-type.value:' + calc.functional_type + '">\n ' + calc.functional_type + '</span>\n ' + getOptValue(calc.functional_long_name) + '\n </td>\n <td>\n <span info-sys-data="code-name.value:' + calc.code_name + '">\n ' + calc.code_name + '</span>\n ' + getOptValue(calc.code_version) + '\n </td>\n\n <td>\n <span info-sys-data="core-electron-treatment.value:' + calc.core_electron_treatment + '">\n ' + getPotentialValue(calc.core_electron_treatment) + '</span>\n </td>\n <td>\n <span info-sys-data="basis-set-type.value:' + calc.basis_set_type + '">\n ' + calc.basis_set_type + '</span>\n ' + getOptValue(calc.basis_set_quality_quantifier) + '\n </td>\n\n <td style="padding-top: 8px;padding-bottom: 4px;">' + repositoryLinkHtml + '\n </td>\n \n <td style="padding-top: 8px;padding-bottom: 4px;">' + vrLinkHtml + '\n </td>\n\n </tr>';
+ return '\n <tr data-calc-id="' + calc.id /*leafId*/ + '" class="data-row">\n <td>' + calc.id /*leafId*/ + '</td>\n <td>\n <span info-sys-data="calculation-type.value:' + calcType + '">\n ' + calcType + '</span>\n </td>\n <td>\n <span info-sys-data="functional-type.value:' + calc.functional_type + '">\n ' + calc.functional_type + '</span>\n ' + getOptValue(calc.functional_long_name) + '\n </td>\n <td>\n <span info-sys-data="code-name.value:' + calc.code_name + '">\n ' + calc.code_name + '</span>\n ' + getOptValue(calc.code_version) + '\n </td>\n\n <td>\n <span info-sys-data="core-electron-treatment.value:' + calc.core_electron_treatment + '">\n ' + getPotentialValue(calc.core_electron_treatment) + '</span>\n </td>\n <td>\n <span info-sys-data="basis-set-type.value:' + calc.basis_set_type + '">\n ' + calc.basis_set_type + '</span>\n ' + getOptValue(calc.basis_set_quality_quantifier) + '\n </td>\n\n <td style="padding-top: 8px;padding-bottom: 4px;">' + repositoryLinkHtml + '\n </td>\n\n <!--<td style="padding-top: 8px;padding-bottom: 4px;">' + vrLinkHtml + '\n </td>-->\n\n </tr>';
}
function getOptValue(value) {
@@ -6373,7 +6284,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 28 */
+/* 29 */
/***/function (module, exports, __webpack_require__) {
/**
@@ -6443,7 +6354,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 29 */
+/* 30 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -6477,8 +6388,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var LoadingPopup = __webpack_require__(4);
var HeatCapPlotter = __webpack_require__(11);
- var HelmholtzPlotter = __webpack_require__(30);
- var PhononDispDOSPlotter = __webpack_require__(31);
+ var HelmholtzPlotter = __webpack_require__(31);
+ var PhononDispDOSPlotter = __webpack_require__(32);
var ThermalPropsDetails = function (_DetailsViewBase4) {
_inherits(ThermalPropsDetails, _DetailsViewBase4);
@@ -6607,7 +6518,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 30 */
+/* 31 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -6686,7 +6597,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 31 */
+/* 32 */
/***/function (module, exports, __webpack_require__) {
/**
@@ -6880,7 +6791,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 32 */
+/* 33 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -6970,7 +6881,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 33 */
+/* 34 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -7000,9 +6911,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var util = __webpack_require__(0);
var UserGuidance = __webpack_require__(14);
- var ElementTable = __webpack_require__(34);
- var MaterialList = __webpack_require__(35);
- var PropertiesBox = __webpack_require__(36);
+ var ElementTable = __webpack_require__(35);
+ var MaterialList = __webpack_require__(36);
+ var PropertiesBox = __webpack_require__(37);
// local utility functions
function getTagHtml(tag, isFormula) {
@@ -7392,7 +7303,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 34 */
+/* 35 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -7692,7 +7603,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 35 */
+/* 36 */
/***/function (module, exports, __webpack_require__) {
"use strict";
@@ -7931,7 +7842,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/***/
},
-/* 36 */
+/* 37 */
/***/function (module, exports, __webpack_require__) {
"use strict";
diff --git a/client/bundle.js b/client/bundle.js
index e814b32ccee23088f8ecf5726c5b75d873bd8799..d7a3f0dcdc6ca11e7a9748b7b6adc889a7c20634 100644
--- a/client/bundle.js
+++ b/client/bundle.js
@@ -6932,10 +6932,10 @@ class MethodologyDetails extends DetailsViewBase {
<span info-sys-data="basis-set-type">Link</span>
</th>
- <th style="width: 8%;">
+ <!--<th style="width: 8%;">
<span info-sys-data="basis-set-type">RV</span>
- </th>
+ </th>-->
</tr>
</thead>
<tbody>
@@ -7197,9 +7197,9 @@ class MethodologyDetails extends DetailsViewBase {
<td style="padding-top: 8px;padding-bottom: 4px;">${repositoryLinkHtml}
</td>
-
- <td style="padding-top: 8px;padding-bottom: 4px;">${vrLinkHtml}
- </td>
+
+ <!--<td style="padding-top: 8px;padding-bottom: 4px;">${vrLinkHtml}
+ </td>-->
</tr>`;
}
diff --git a/client/src/material-mod/MethodologyDetails.view.js b/client/src/material-mod/MethodologyDetails.view.js
index 18ba41d27487dc5189c1374a86e0513dbdfd595e..cea62669d801d9c4f0aaa9642b2270d6a4da4ffd 100644
--- a/client/src/material-mod/MethodologyDetails.view.js
+++ b/client/src/material-mod/MethodologyDetails.view.js
@@ -258,10 +258,10 @@ class MethodologyDetails extends DetailsViewBase {
<span info-sys-data="basis-set-type">Link</span>
</th>
- <th style="width: 8%;">
+ <!--<th style="width: 8%;">
<span info-sys-data="basis-set-type">RV</span>
- </th>
+ </th>-->
</tr>
</thead>
<tbody>
@@ -523,9 +523,9 @@ class MethodologyDetails extends DetailsViewBase {
<td style="padding-top: 8px;padding-bottom: 4px;">${repositoryLinkHtml}
</td>
-
- <td style="padding-top: 8px;padding-bottom: 4px;">${vrLinkHtml}
- </td>
+
+ <!--<td style="padding-top: 8px;padding-bottom: 4px;">${vrLinkHtml}
+ </td>-->
</tr>`;
}