Skip to content

Commit 256bf39

Browse files
author
wuruchi
committed
Added ASYPD to Job Information Panel
1 parent 933412a commit 256bf39

File tree

9 files changed

+24
-16
lines changed

9 files changed

+24
-16
lines changed

Diff for: build/asset-manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"files": {
33
"main.css": "/autosubmitapp/static/css/main.3206b6c4.chunk.css",
4-
"main.js": "/autosubmitapp/static/js/main.4a2889c5.chunk.js",
5-
"main.js.map": "/autosubmitapp/static/js/main.4a2889c5.chunk.js.map",
4+
"main.js": "/autosubmitapp/static/js/main.f2d23f19.chunk.js",
5+
"main.js.map": "/autosubmitapp/static/js/main.f2d23f19.chunk.js.map",
66
"runtime-main.js": "/autosubmitapp/static/js/runtime-main.aff45655.js",
77
"runtime-main.js.map": "/autosubmitapp/static/js/runtime-main.aff45655.js.map",
88
"static/js/2.78dc1ab9.chunk.js": "/autosubmitapp/static/js/2.78dc1ab9.chunk.js",
@@ -17,6 +17,6 @@
1717
"static/js/runtime-main.aff45655.js",
1818
"static/js/2.78dc1ab9.chunk.js",
1919
"static/css/main.3206b6c4.chunk.css",
20-
"static/js/main.4a2889c5.chunk.js"
20+
"static/js/main.f2d23f19.chunk.js"
2121
]
2222
}

Diff for: build/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/autosubmitapp/favicon.ico"/><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"/><script type="text/javascript" src="https://unpkg.com/vis-network@latest/dist/vis-network.min.js"></script><link href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis-network.min.css" rel="stylesheet"/><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"/><script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script><script>$(document).ready((function(){$("body").tooltip({selector:"[data-toggle=tooltip]"})}))</script><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/autosubmitapp/manifest.json"/><title>Autosubmit GUI</title><link href="/autosubmitapp/static/css/main.3206b6c4.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,i,a=t[0],l=t[1],p=t[2],c=0,s=[];c<a.length;c++)i=a[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(f&&f(t);s.length;)s.shift()();return u.push.apply(u,p||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,a=1;a<r.length;a++){var l=r[a];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/autosubmitapp/";var a=this.webpackJsonpautosubmitgui=this.webpackJsonpautosubmitgui||[],l=a.push.bind(a);a.push=t,a=a.slice();for(var p=0;p<a.length;p++)t(a[p]);var f=l;r()}([])</script><script src="/autosubmitapp/static/js/2.78dc1ab9.chunk.js"></script><script src="/autosubmitapp/static/js/main.4a2889c5.chunk.js"></script></body><script type="text/javascript">function showTreeTab(){$('#myTab a[href="#treeview"]').tab("show")}function showGraphTab(){$('#myTab a[href="#graph"]').tab("show")}function showLogTab(){$('#myTab a[href="#log"]').tab("show")}function showStatsTab(){$('#myTab a[href="#stats"]').tab("show")}function copyToClip(o){var e=document.getElementById(o);e?(e.select(),e.setSelectionRange(0,99999),document.execCommand("copy")):console.log("No selection")}function fallbackCopyTextToClipboard(o){var e=document.createElement("textarea");e.value=o,e.style.top="0",e.style.left="0",e.style.position="fixed",document.body.appendChild(e),e.focus(),e.select();try{var t=document.execCommand("copy")?"successful":"unsuccessful";console.log("Fallback: Copying text command was "+t)}catch(o){console.error("Fallback: Oops, unable to copy",o)}document.body.removeChild(e)}function copyTextToClipboard(o){navigator.clipboard?navigator.clipboard.writeText(o).then((function(){console.log("Async: Copying to clipboard was successful!")}),(function(o){console.error("Async: Could not copy text: ",o)})):fallbackCopyTextToClipboard(o)}function scrollToBottom(){var o=document.getElementById("log_scroll");o&&(o.scrollTop=o.scrollHeight-o.clientHeight)}</script><link href="//cdn.jsdelivr.net/npm/[email protected]/dist/skin-win8/ui.fancytree.min.css" rel="stylesheet"/></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/autosubmitapp/favicon.ico"/><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"/><script type="text/javascript" src="https://unpkg.com/vis-network@latest/dist/vis-network.min.js"></script><link href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis-network.min.css" rel="stylesheet"/><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"/><script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script><script>$(document).ready((function(){$("body").tooltip({selector:"[data-toggle=tooltip]"})}))</script><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/autosubmitapp/manifest.json"/><title>Autosubmit GUI</title><link href="/autosubmitapp/static/css/main.3206b6c4.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,i,a=t[0],l=t[1],p=t[2],c=0,s=[];c<a.length;c++)i=a[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(f&&f(t);s.length;)s.shift()();return u.push.apply(u,p||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,a=1;a<r.length;a++){var l=r[a];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/autosubmitapp/";var a=this.webpackJsonpautosubmitgui=this.webpackJsonpautosubmitgui||[],l=a.push.bind(a);a.push=t,a=a.slice();for(var p=0;p<a.length;p++)t(a[p]);var f=l;r()}([])</script><script src="/autosubmitapp/static/js/2.78dc1ab9.chunk.js"></script><script src="/autosubmitapp/static/js/main.f2d23f19.chunk.js"></script></body><script type="text/javascript">function showTreeTab(){$('#myTab a[href="#treeview"]').tab("show")}function showGraphTab(){$('#myTab a[href="#graph"]').tab("show")}function showLogTab(){$('#myTab a[href="#log"]').tab("show")}function showStatsTab(){$('#myTab a[href="#stats"]').tab("show")}function copyToClip(o){var e=document.getElementById(o);e?(e.select(),e.setSelectionRange(0,99999),document.execCommand("copy")):console.log("No selection")}function fallbackCopyTextToClipboard(o){var e=document.createElement("textarea");e.value=o,e.style.top="0",e.style.left="0",e.style.position="fixed",document.body.appendChild(e),e.focus(),e.select();try{var t=document.execCommand("copy")?"successful":"unsuccessful";console.log("Fallback: Copying text command was "+t)}catch(o){console.error("Fallback: Oops, unable to copy",o)}document.body.removeChild(e)}function copyTextToClipboard(o){navigator.clipboard?navigator.clipboard.writeText(o).then((function(){console.log("Async: Copying to clipboard was successful!")}),(function(o){console.error("Async: Could not copy text: ",o)})):fallbackCopyTextToClipboard(o)}function scrollToBottom(){var o=document.getElementById("log_scroll");o&&(o.scrollTop=o.scrollHeight-o.clientHeight)}</script><link href="//cdn.jsdelivr.net/npm/[email protected]/dist/skin-win8/ui.fancytree.min.css" rel="stylesheet"/></html>

Diff for: build/static/js/main.4a2889c5.chunk.js.map

-1
This file was deleted.

Diff for: build/static/js/main.4a2889c5.chunk.js renamed to build/static/js/main.f2d23f19.chunk.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: build/static/js/main.f2d23f19.chunk.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/components/context/vars.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const AUTOSUBMIT_API_SOURCE = "https://earth.bsc.es/autosubmitapi/";
2-
// export const AUTOSUBMIT_API_SOURCE = "http://84.88.185.94:8081";
2+
//export const AUTOSUBMIT_API_SOURCE = "http://84.88.185.94:8081";
33
export const DEBUG = false;
44
export const NOAPI = false;
55
export const ERROR_MESSAGE = "Autosubmit API couldn't retrieve the requested information on time. It might be due to a network error or heavy traffic on the shared folders that Autosubmit uses to store experiment information (/esarchive/autosubmit/)."

Diff for: src/components/experiment/FAQ.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/components/experiment/Selection.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,14 @@ const Selection = () => {
354354
</tbody>
355355
</table>
356356
</div>
357-
{selectedNode.SYPD !== undefined && selectedNode.SYPD !== null && selectedNode.SYPD > 0 && (
358-
<div className="col-md-4">
359-
<span className="badge badge-info" data-toggle='tooltip' data-placement='bottom' title="Generalization of Simulated Years per Day.">SYPD: {selectedNode.SYPD}</span>
360-
</div>
357+
<div className="col-md-4">
358+
{selectedNode.SYPD !== undefined && selectedNode.SYPD !== null && selectedNode.SYPD > 0 && (
359+
<span className="badge badge-info" data-toggle='tooltip' data-placement='bottom' title="Generalization of Simulated Years per Day.">SYPD: {selectedNode.SYPD}</span>
360+
)}
361+
{selectedNode.ASYPD !== undefined && selectedNode.ASYPD !== null && selectedNode.ASYPD > 0 && (
362+
<span className="badge badge-info" data-toggle='tooltip' data-placement='bottom' title="Generalization of Actual SYPD.">ASYPD: {selectedNode.ASYPD}</span>
361363
)}
364+
</div>
362365
</div>
363366
</div>
364367
</div>

Diff for: src/components/experiment/SelectionTreeNode.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,14 @@ const SelectionTreeNode = () => {
347347
</tbody>
348348
</table>
349349
</div>
350-
{selectedNode.SYPD !== undefined && selectedNode.SYPD !== null && selectedNode.SYPD > 0 && (
351-
<div className="col-md-4">
350+
<div className="col-md-4">
351+
{selectedNode.SYPD !== undefined && selectedNode.SYPD !== null && selectedNode.SYPD > 0 && (
352352
<span className="badge badge-info" data-toggle='tooltip' data-placement='bottom' title="Generalization of Simulated Years per Day.">SYPD: {selectedNode.SYPD}</span>
353-
</div>
354353
)}
355-
354+
{selectedNode.ASYPD !== undefined && selectedNode.ASYPD !== null && selectedNode.ASYPD > 0 && (
355+
<span className="badge badge-info" data-toggle='tooltip' data-placement='bottom' title="Generalization of Actual SYPD.">ASYPD: {selectedNode.ASYPD}</span>
356+
)}
357+
</div>
356358
</div>
357359
{selectedNode.wrapper !== null &&
358360
selectedNode.wrapper.length > 0 && (

0 commit comments

Comments
 (0)