Skip to content

Commit 3ce62f3

Browse files
committed
show osparcCredits
1 parent 6304d4d commit 3ce62f3

File tree

3 files changed

+27
-10
lines changed

3 files changed

+27
-10
lines changed

services/static-webserver/client/source/class/osparc/data/SubJob.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ qx.Class.define("osparc.data.SubJob", {
3030
startedAt: subJobData["startedAt"] ? new Date(subJobData["startedAt"]) : null,
3131
endedAt: subJobData["endedAt"] ? new Date(subJobData["endedAt"]) : null,
3232
osparcCredits: subJobData["osparcCredits"] || null,
33-
logDownloadLink: subJobData["logDownloadLink"] || null,
3433
image: subJobData["image"] || {},
34+
logDownloadLink: subJobData["logDownloadLink"] || null,
3535
});
3636
},
3737

@@ -84,17 +84,17 @@ qx.Class.define("osparc.data.SubJob", {
8484
init: null,
8585
},
8686

87-
logDownloadLink: {
88-
check: "String",
89-
nullable: true,
90-
init: null,
91-
},
92-
9387
image: {
9488
check: "Object",
9589
nullable: false,
9690
init: null,
9791
},
92+
93+
logDownloadLink: {
94+
check: "String",
95+
nullable: true,
96+
init: null,
97+
},
9898
},
9999

100100
members: {

services/static-webserver/client/source/class/osparc/jobs/SubRunsTable.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
3939

4040
const iconPathInfo = "osparc/circle-info-text.svg";
4141
const fontButtonRendererInfo = new osparc.ui.table.cellrenderer.ImageButtonRenderer("info", iconPathInfo);
42-
columnModel.setDataCellRenderer(this.self().COLS.IMAGE.column, fontButtonRendererInfo);
42+
columnModel.setDataCellRenderer(this.self().COLS.INFO.column, fontButtonRendererInfo);
43+
44+
const iconPathLogs = "osparc/circle-info-text.svg";
45+
const fontButtonRendererLogs = new osparc.ui.table.cellrenderer.ImageButtonRenderer("logs", iconPathLogs);
46+
columnModel.setDataCellRenderer(this.self().COLS.LOGS.column, fontButtonRendererLogs);
4347

4448
this.__attachHandlers();
4549
},
@@ -100,12 +104,24 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
100104
label: qx.locale.Manager.tr("Duration"),
101105
width: 70
102106
},
103-
IMAGE: {
104-
id: "image",
107+
CREDITS: {
108+
id: "credits",
105109
column: 9,
110+
label: qx.locale.Manager.tr("Credits"),
111+
width: 70
112+
},
113+
INFO: {
114+
id: "info",
115+
column: 10,
106116
label: qx.locale.Manager.tr("Info"),
107117
width: 40
108118
},
119+
LOGS: {
120+
id: "logs",
121+
column: 11,
122+
label: qx.locale.Manager.tr("Logs"),
123+
width: 40
124+
},
109125
}
110126
},
111127

services/static-webserver/client/source/class/osparc/jobs/SubRunsTableModel.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ qx.Class.define("osparc.jobs.SubRunsTableModel", {
9595
[subJobsCols.START.id]: startedAt ? osparc.utils.Utils.formatDateAndTime(startedAt) : "-",
9696
[subJobsCols.END.id]: endedAt ? osparc.utils.Utils.formatDateAndTime(endedAt) : "-",
9797
[subJobsCols.DURATION.id]: duration,
98+
[subJobsCols.CREDITS.id]: subJob.getOsparcCredits() === null ? "-" : subJob.getOsparcCredits(),
9899
});
99100
});
100101
return data;

0 commit comments

Comments
 (0)