Merge pull request 'sayliR' (#107) from sayliR into main

Reviewed-on: Nikhil.Kadam/vib360#107
This commit is contained in:
2025-04-28 14:08:52 +00:00
2 changed files with 2 additions and 4 deletions

View File

@@ -40,7 +40,6 @@ class AlarmControllerCommon extends Controller
'propagateToTenant' => true,
'originator' => $request->originator ?? 1,
// 'assigneeId' => $request->assigneeId ?? 1,
'acknowledged' => false,
];
@@ -203,7 +202,7 @@ class AlarmControllerCommon extends Controller
]);
}
return jsonResponseWithErrorMessage('Failed to clear alarm: ' . $clearResponse->body(), $clearResponse->status());
} catch (\Exception $e) {
Log::error('Error clearing alarm: ' . $e->getMessage());

View File

@@ -386,7 +386,7 @@ class AlarmService
$payload = [
'type' => $data['type'] ?? null,
'severity' => $data['severity'] ?? null,
'acknowledged' => $data['acknowledged'] ?? null,
'acknowledged' => false,
'cleared' => $data['cleared'] ?? Carbon::now()->timestamp,
'startTs' => $data['startTs'] ?? Carbon::now()->timestamp,
'endTs' => $data['endTs'] ?? Carbon::now()->timestamp,
@@ -400,7 +400,6 @@ class AlarmService
// ],
'details' => $data['details'] ?? [],
'propagate' => $data['propagate'] ?? false,
'acknowledged' => false,
'propagateToOwner' => $data['propagateToOwner'] ?? false,
];