Merge pull request 'sayliR' (#106) from sayliR into main
Reviewed-on: Nikhil.Kadam/vib360#106
This commit is contained in:
@@ -40,6 +40,7 @@ class AlarmControllerCommon extends Controller
|
||||
'propagateToTenant' => true,
|
||||
'originator' => $request->originator ?? 1,
|
||||
// 'assigneeId' => $request->assigneeId ?? 1,
|
||||
'acknowledged' => false,
|
||||
|
||||
|
||||
];
|
||||
|
||||
@@ -320,8 +320,7 @@ class AlarmService
|
||||
|
||||
if (!empty($data['deviceId'])) {
|
||||
$deviceId = $data['deviceId'];
|
||||
}
|
||||
elseif (!empty($data['assetId'])) {
|
||||
} elseif (!empty($data['assetId'])) {
|
||||
$deviceId = Device::where('asset_id', $data['assetId'])->value('id');
|
||||
}
|
||||
|
||||
@@ -401,6 +400,7 @@ class AlarmService
|
||||
// ],
|
||||
'details' => $data['details'] ?? [],
|
||||
'propagate' => $data['propagate'] ?? false,
|
||||
'acknowledged' => false,
|
||||
'propagateToOwner' => $data['propagateToOwner'] ?? false,
|
||||
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user