From a261efe0a7ddda110dbb2c7fed62a35184b14ac2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 9 Mar 2020 12:04:40 -0400 Subject: [PATCH] return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0 --- web/api/app/Controller/EventsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php index 2a0f735eb..5188c18b4 100644 --- a/web/api/app/Controller/EventsController.php +++ b/web/api/app/Controller/EventsController.php @@ -151,8 +151,8 @@ class EventsController extends AppController { $event['Event']['PrevOfMonitor'] = $event_monitor_neighbors['prev']['Event']['Id']; $this->loadModel('Frame'); - $event['Event']['MaxScoreFrameId'] = $this->Frame->findByEventid($id,'Id','Score DESC')['Frame']['Id']; - $event['Event']['AlarmFrameId'] = $this->Frame->findByEventidAndType($id,'Alarm')['Frame']['Id']; + $event['Event']['MaxScoreFrameId'] = $this->Frame->findByEventid($id,'FrameId',array('Score'=>'desc','FrameId'=>'asc'))['Frame']['FrameId']; + $event['Event']['AlarmFrameId'] = $this->Frame->findByEventidAndType($id,'Alarm')['Frame']['FrameId']; $this->set(array( 'event' => $event,