Merge branch 'fronkdev' into 'master'

Added FileType if available in Rimoapi:getWorkorderAhaReport

See merge request fronk/thetool!2056
This commit is contained in:
Frank Schubert
2026-01-27 15:09:06 +00:00

View File

@@ -395,12 +395,18 @@ class Rimoapi {
return false; return false;
} }
$filename = false;
$filetype = false;
foreach($items->item as $item) { foreach($items->item as $item) {
if(!$item->name) continue; if(!$item->name) continue;
if(!preg_match('/_AHA.pdf$/i', $item->name)) continue; if(!preg_match('/_AHA.pdf$/i', $item->name)) continue;
$filename = $item->name; $filename = $item->name;
if(property_exists($item, "fileType") && is_object($item->fileType) && property_exists($item->fileType, "name")) {
$filetype = $item->fileType->name;
}
} }
if(!$filename) { if(!$filename) {
@@ -413,6 +419,9 @@ class Rimoapi {
$params['apiKey'] = $apikey; $params['apiKey'] = $apikey;
$params['objectId'] = $rimo_id; $params['objectId'] = $rimo_id;
$params['fileNames'] = $filename; $params['fileNames'] = $filename;
if($filetype) {
$params["fileTypeNames"] = $filetype;
}
$ctx_opts = [ $ctx_opts = [
'http' => [ 'http' => [