Commit 34b80f9b authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merged VR hotfix and new VR methodology links.

parents 55d0fbab 1532717a
Pipeline #39384 passed with stages
in 5 seconds
......@@ -2376,9 +2376,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
});
this.element.addEventListener('blur', function (e) {
_this7.folded = true;
_this7.foldBtn.src = util.IMAGE_DIR + 'folded.png';
_this7.foldingPanel.style.display = 'none';
setTimeout(function () {
_this7.folded = true;
_this7.foldBtn.src = util.IMAGE_DIR + 'folded.png';
_this7.foldingPanel.style.display = 'none';
}, 100);
});
//this.cellViewer.toggleLatticeParameters(false);
......@@ -6025,7 +6027,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: 13%;">\n <span>Calculation ID</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 17%;">\n <span>Type</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 19%;">\n <span info-sys-data="functional-type">Density functional</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 13%;">\n <span info-sys-data="code-name">Code</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 17%;">\n <span info-sys-data="pseudopotential-type">Potential</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 12%;">\n <span info-sys-data="basis-set-type">Basis set</span>\n <span class="sorting-button"></span>\n </th>\n <th style="width: 9%;">\n <span info-sys-data="basis-set-type">Link</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">VR</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'); //
......@@ -6240,7 +6242,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var repositoryLinkHtml = '';
if (calc.calculation_pid !== null && calc.calculation_pid !== undefined) repositoryLinkHtml = '<a href="' + REPOSITORY_LINK + calc.calculation_pid + '" target="blank"> ' + '<img src="img/download.svg" 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 </tr>';
var materialId = DataStore.getMaterialData().id;
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>';
}
function getOptValue(value) {
......
......@@ -2469,9 +2469,11 @@ class DropDown{
});
this.element.addEventListener('blur' , e => {
this.folded = true;
this.foldBtn.src = util.IMAGE_DIR+'folded.png';
this.foldingPanel.style.display = 'none';
setTimeout(() => {
this.folded = true;
this.foldBtn.src = util.IMAGE_DIR+'folded.png';
this.foldingPanel.style.display = 'none';
}, 100);
});
//this.cellViewer.toggleLatticeParameters(false);
......@@ -6889,34 +6891,38 @@ class MethodologyDetails extends DetailsViewBase {
<table id="methodology-data">
<thead>
<tr>
<th style="width: 13%;">
<th style="width: 12%;">
<span>Calculation ID</span>
<span class="sorting-button"></span>
</th>
<th style="width: 17%;">
<th style="width: 16%;">
<span>Type</span>
<span class="sorting-button"></span>
</th>
<th style="width: 19%;">
<th style="width: 18%;">
<span info-sys-data="functional-type">Density functional</span>
<span class="sorting-button"></span>
</th>
<th style="width: 13%;">
<th style="width: 12%;">
<span info-sys-data="code-name">Code</span>
<span class="sorting-button"></span>
</th>
<th style="width: 17%;">
<th style="width: 16%;">
<span info-sys-data="pseudopotential-type">Potential</span>
<span class="sorting-button"></span>
</th>
<th style="width: 12%;">
<th style="width: 11%;">
<span info-sys-data="basis-set-type">Basis set</span>
<span class="sorting-button"></span>
</th>
<th style="width: 9%;">
<th style="width: 8%;">
<span info-sys-data="basis-set-type">Link</span>
</th>
<th style="width: 8%;">
<span info-sys-data="basis-set-type">VR</span>
</th>
</tr>
</thead>
<tbody>
......@@ -7143,6 +7149,11 @@ class MethodologyDetails extends DetailsViewBase {
'<a href="'+REPOSITORY_LINK+calc.calculation_pid+'" target="blank"> '
+'<img src="img/download.svg" height="20px" /> </a>';
let materialId = DataStore.getMaterialData().id;
let calcId = calc.id;
let 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 `
<tr data-calc-id="${calc.id/*leafId*/}" class="data-row">
<td>${calc.id/*leafId*/}</td>
......@@ -7173,6 +7184,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>
</tr>`;
}
......
......@@ -438,9 +438,11 @@ class DropDown{
});
this.element.addEventListener('blur' , e => {
this.folded = true;
this.foldBtn.src = util.IMAGE_DIR+'folded.png';
this.foldingPanel.style.display = 'none';
setTimeout(() => {
this.folded = true;
this.foldBtn.src = util.IMAGE_DIR+'folded.png';
this.foldingPanel.style.display = 'none';
}, 100);
});
//this.cellViewer.toggleLatticeParameters(false);
......
......@@ -230,34 +230,38 @@ class MethodologyDetails extends DetailsViewBase {
<table id="methodology-data">
<thead>
<tr>
<th style="width: 13%;">
<th style="width: 12%;">
<span>Calculation ID</span>
<span class="sorting-button"></span>
</th>
<th style="width: 17%;">
<th style="width: 16%;">
<span>Type</span>
<span class="sorting-button"></span>
</th>
<th style="width: 19%;">
<th style="width: 18%;">
<span info-sys-data="functional-type">Density functional</span>
<span class="sorting-button"></span>
</th>
<th style="width: 13%;">
<th style="width: 12%;">
<span info-sys-data="code-name">Code</span>
<span class="sorting-button"></span>
</th>
<th style="width: 17%;">
<th style="width: 16%;">
<span info-sys-data="pseudopotential-type">Potential</span>
<span class="sorting-button"></span>
</th>
<th style="width: 12%;">
<th style="width: 11%;">
<span info-sys-data="basis-set-type">Basis set</span>
<span class="sorting-button"></span>
</th>
<th style="width: 9%;">
<th style="width: 8%;">
<span info-sys-data="basis-set-type">Link</span>
</th>
<th style="width: 8%;">
<span info-sys-data="basis-set-type">VR</span>
</th>
</tr>
</thead>
<tbody>
......@@ -484,6 +488,11 @@ class MethodologyDetails extends DetailsViewBase {
'<a href="'+REPOSITORY_LINK+calc.calculation_pid+'" target="blank"> '
+'<img src="img/download.svg" height="20px" /> </a>';
let materialId = DataStore.getMaterialData().id;
let calcId = calc.id;
let 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 `
<tr data-calc-id="${calc.id/*leafId*/}" class="data-row">
<td>${calc.id/*leafId*/}</td>
......@@ -514,6 +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>
</tr>`;
}
......
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