File tree Expand file tree Collapse file tree 4 files changed +33
-9
lines changed
services/static-webserver/client/source/class/osparc Expand file tree Collapse file tree 4 files changed +33
-9
lines changed Original file line number Diff line number Diff line change @@ -81,6 +81,20 @@ qx.Class.define("osparc.data.Job", {
8181 } ,
8282 } ,
8383
84+ statics : {
85+ STATUS_LABELS : {
86+ "NOT_STARTED" : "Not Started" ,
87+ "PUBLISHED" : "Published" ,
88+ "PENDING" : "Pending" ,
89+ "RUNNING" : "Running" ,
90+ "SUCCESS" : "Success" ,
91+ "FAILED" : "Failed" ,
92+ "ABORTED" : "Aborted" ,
93+ "WAITING_FOR_RESOURCES" : "Waiting for Resources" ,
94+ "WAITING_FOR_CLUSTER" : "Waiting for Cluster" ,
95+ } ,
96+ } ,
97+
8498 members : {
8599 __subJobs : null ,
86100
Original file line number Diff line number Diff line change @@ -40,6 +40,10 @@ qx.Class.define("osparc.jobs.RunsTable", {
4040 const fontButtonRendererStop = new osparc . ui . table . cellrenderer . ImageButtonRenderer ( "cancel" , iconPathStop ) ;
4141 columnModel . setDataCellRenderer ( this . self ( ) . COLS . ACTION_CANCEL . column , fontButtonRendererStop ) ;
4242
43+ const iconPathInfo = "osparc/icons/circle-info-text.svg" ;
44+ const fontButtonRendererInfo = new osparc . ui . table . cellrenderer . ImageButtonRenderer ( "info" , iconPathInfo ) ;
45+ columnModel . setDataCellRenderer ( this . self ( ) . COLS . ACTION_INFO . column , fontButtonRendererInfo ) ;
46+
4347 this . __attachHandlers ( ) ;
4448 } ,
4549
@@ -53,20 +57,20 @@ qx.Class.define("osparc.jobs.RunsTable", {
5357 id : "projectUuid" ,
5458 column : 0 ,
5559 label : qx . locale . Manager . tr ( "Project Id" ) ,
56- width : 170
60+ width : 200
5761 } ,
5862 PROJECT_NAME : {
5963 id : "projectName" ,
6064 column : 1 ,
6165 label : qx . locale . Manager . tr ( "Project" ) ,
62- width : 170 ,
66+ width : 150 ,
6367 sortable : true
6468 } ,
6569 STATE : {
6670 id : "state" ,
6771 column : 2 ,
6872 label : qx . locale . Manager . tr ( "Status" ) ,
69- width : 170
73+ width : 150
7074 } ,
7175 SUBMIT : {
7276 id : "submit" ,
@@ -92,8 +96,14 @@ qx.Class.define("osparc.jobs.RunsTable", {
9296 ACTION_CANCEL : {
9397 id : "action_cancel" ,
9498 column : 6 ,
95- label : "" ,
96- width : 40
99+ label : qx . locale . Manager . tr ( "Cancel" ) ,
100+ width : 50
101+ } ,
102+ ACTION_INFO : {
103+ id : "action_info" ,
104+ column : 7 ,
105+ label : qx . locale . Manager . tr ( "Info" ) ,
106+ width : 50
97107 } ,
98108 }
99109 } ,
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
8484 data . push ( {
8585 [ jobsCols . PROJECT_UUID . id ] : job . getProjectUuid ( ) ,
8686 [ jobsCols . PROJECT_NAME . id ] : job . getProjectName ( ) ,
87- [ jobsCols . STATE . id ] : job . getState ( ) ,
87+ [ jobsCols . STATE . id ] : osparc . data . Job . STATUS_LABELS [ job . getState ( ) ] || job . getState ( ) ,
8888 [ jobsCols . SUBMIT . id ] : job . getSubmittedAt ( ) ? osparc . utils . Utils . formatDateAndTime ( job . getSubmittedAt ( ) ) : "-" ,
8989 [ jobsCols . START . id ] : job . getStartedAt ( ) ? osparc . utils . Utils . formatDateAndTime ( job . getStartedAt ( ) ) : "-" ,
9090 [ jobsCols . END . id ] : job . getEndedAt ( ) ? osparc . utils . Utils . formatDateAndTime ( job . getEndedAt ( ) ) : "-" ,
Original file line number Diff line number Diff line change @@ -54,19 +54,19 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
5454 id : "projectUuid" ,
5555 column : 0 ,
5656 label : qx . locale . Manager . tr ( "Project Id" ) ,
57- width : 170
57+ width : 200
5858 } ,
5959 NODE_ID : {
6060 id : "nodeId" ,
6161 column : 1 ,
6262 label : qx . locale . Manager . tr ( "Node Id" ) ,
63- width : 170
63+ width : 200
6464 } ,
6565 NODE_NAME : {
6666 id : "nodeName" ,
6767 column : 2 ,
6868 label : qx . locale . Manager . tr ( "Node" ) ,
69- width : 170
69+ width : 150
7070 } ,
7171 APP : {
7272 id : "app" ,
You can’t perform that action at this time.
0 commit comments