return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0

This commit is contained in:
Pliable Pixels
2020-03-09 12:04:40 -04:00
parent 3611d147e6
commit a261efe0a7

View File

@@ -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,