Skip to content

Commit 0e2dc3d

Browse files
ndg63276Mark Williams
andauthored
LIMS-1718: Display cluster info on multiplex jobs (#937)
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
1 parent 08dfc93 commit 0e2dc3d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

api/src/Page/Processing.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ private function _autoprocessing_query_builder($where, $group, $order = '') {
978978
(SELECT COUNT(api1.autoprocintegrationid) FROM autoprocintegration api1 WHERE api1.autoprocprogramid = app.autoprocprogramid) as imagesweepcount,
979979
app.processingstatus,
980980
app.processingmessage,
981+
app.processingenvironment,
981982
count(distinct pjis.datacollectionid) as dccount,
982983
max(pjis.processingjobid) as processingjobid,
983984
(SELECT IFNULL(blsg.name, bls.name) FROM processingjobparameter pjp
@@ -1059,6 +1060,9 @@ private function _format_auto_processing_result($table_rows, $messages_result) {
10591060
if ($row['GROUPNAME']) {
10601061
$value .= ' ('.$row['GROUPNAME'].')';
10611062
}
1063+
if ($row['PROCESSINGENVIRONMENT'] && strpos($row['PROCESSINGENVIRONMENT'], 'cluster=') !== false) {
1064+
$value .= ' ('.$row['PROCESSINGENVIRONMENT'].')';
1065+
}
10621066
}
10631067

10641068

0 commit comments

Comments
 (0)