Commit 1532717a authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Hotfix VR links, added vr link to methodology.

parent aaad5e23
This diff is collapsed.
......@@ -83,11 +83,11 @@ if (document.location.href.indexOf('nomad-coe.eu') > 0){//
path = 'api/v1.0/';
}
// Case 3: testing-staging environment and local installations (docker containers) of full Encyclopedia stack
else if (document.location.href.indexOf('gui') > 0){
API_HOST= '/'; // USER_COOKIE_DOMAIN = 'localhost' and path = 'v1.0/';
if (document.location.href.indexOf('staging') > 0) // testing-staging server
USER_COOKIE_DOMAIN = '.mpg.de';
}
// else if (document.location.href.indexOf('gui') > 0){
// API_HOST= '/'; // USER_COOKIE_DOMAIN = 'localhost' and path = 'v1.0/';
// if (document.location.href.indexOf('staging') > 0) // testing-staging server
// USER_COOKIE_DOMAIN = '.mpg.de';
// }
let API_BASE_URL = API_HOST + path;
//console.log('API host: ',API_HOST,' USER_COOKIE_DOMAIN: ',USER_COOKIE_DOMAIN);
......
......@@ -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