LIMS-1463: Always display Mesh3D data collections as grid scans (#845)

ndg63276 · Mark Williams · web-flow · commit 44528722c8c3 · 2024-11-12T10:05:17.000Z
* LIMS-1463: Always display Mesh3d data collections as grid scans

* LIMS-1463: Combine if clauses

---------

Co-authored-by: Mark Williams &lt;mark.williams@diamond.ac.uk&gt;
diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php
@@ -993,9 +993,10 @@ function _data_collections($single = null)
                         $dc['DCT'] = 'Data Collection';
                 }
 
-                if ($dc['DCT'] == 'Mesh')
+                if ($dc['DCT'] == 'Mesh' || $dc['DCT'] == 'Mesh3D' ||
+                    ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1)
+                ) {
                     $dc['DCT'] = 'Grid Scan';
-                if ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1) {
                     $dc['TYPE'] = 'grid';
                 }
                 //$this->profile('dc');

Original file line number	Diff line number	Diff line change
`@@ -993,9 +993,10 @@ function _data_collections($single = null)`
`993`	`993`	`$dc['DCT'] = 'Data Collection';`
`994`	`994`	`}`
`995`	`995`
`996`		`- if ($dc['DCT'] == 'Mesh')`
	`996`	`+ if ($dc['DCT'] == 'Mesh' \|\| $dc['DCT'] == 'Mesh3D' \|\|`
	`997`	`+ ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1)`
	`998`	`+ ) {`
`997`	`999`	`$dc['DCT'] = 'Grid Scan';`
`998`		`- if ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1) {`
`999`	`1000`	`$dc['TYPE'] = 'grid';`
`1000`	`1001`	`}`
`1001`	`1002`	`//$this->profile('dc');`