Merge branch 'add_monitor_status_to_api' into storageareas

web/api/app/Model/Monitor.php

@@ -116,8 +116,15 @@ class Monitor extends AppModel {
       'OutputCodec'     => array('h264','mjpeg','mpeg1','mpeg2'),
       'OutputContainer' => array('auto','mp4','mkv'),
       'DefaultView'     => array('Events','Control'),
-      'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
+      #'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
     )
   );
 
+  public $hasOne = array(
+    'Monitor_Status' => array(
+      'className' => 'Monitor_Status',
+      'foreignKey' => 'MonitorId',
+      'joinTable' =>  'Monitor_Status',
+    )
+  );
 }

web/api/app/Model/Monitor_Status.php

@@ -0,0 +1,59 @@
+<?php
+App::uses('AppModel', 'Model');
+/**
+ * Monitor_Status Model
+ *
+ * @property Event $Event
+ * @property Zone $Zone
+ */
+class Monitor_Status extends AppModel {
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'Monitor_Status';
+
+/**
+ * Primary key field
+ *
+ * @var string
+ */
+	public $primaryKey = 'MonitorId';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'Status';
+
+	public $recursive = -1;
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public $validate = array(
+		'MonitorId' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+  public $actsAs = array(
+    'CakePHP-Enum-Behavior.Enum' => array(
+      'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
+    )
+  );
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+}