Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
encyclopedia-gui
Commits
1c1a52b6
Commit
1c1a52b6
authored
Nov 15, 2018
by
Markus Scheidgen
Browse files
Changed VR to RV.
parent
34b80f9b
Pipeline
#39385
passed with stages
in 5 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
client/bundle-es5.js
View file @
1c1a52b6
...
...
@@ -171,11 +171,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
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
'
;
}
var
API_BASE_URL
=
API_HOST
+
path
;
//console.log('API host: ',API_HOST,' USER_COOKIE_DOMAIN: ',USER_COOKIE_DOMAIN);
...
...
@@ -6027,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: 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">
V
R</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">R
V
</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
'
);
//
...
...
client/bundle.js
View file @
1c1a52b6
...
...
@@ -153,11 +153,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);
...
...
@@ -6920,7 +6920,7 @@ class MethodologyDetails extends DetailsViewBase {
</th>
<th style="width: 8%;">
<span info-sys-data="basis-set-type">
V
R</span>
<span info-sys-data="basis-set-type">R
V
</span>
</th>
</tr>
...
...
client/src/material-mod/MethodologyDetails.view.js
View file @
1c1a52b6
...
...
@@ -259,7 +259,7 @@ class MethodologyDetails extends DetailsViewBase {
</th>
<th style="width: 8%;">
<span info-sys-data="basis-set-type">
V
R</span>
<span info-sys-data="basis-set-type">R
V
</span>
</th>
</tr>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment