Commit Graph

12 Commits

Author SHA1 Message Date
Kyle Johnson f385db2d80 Moved the scaling of streams from JS to PHP
The Monitor model is now smart enough to change the stream's scale.
It also has the option of not scaling at all (in the case of the
single monitor view).
2013-09-24 12:54:37 -04:00
Kyle Johnson 2fa0d3a284 Rewrote the way that monitor streams are created.
No longer need LiveStreamHelper, and the logic of which image to
display (live or placeholder) has been moved to the Moniors model.
This way should be much easier to understand and support.  This also
fixes my 'ugly hack' in commit eed6c81287
2013-09-24 08:56:04 -04:00
Kyle Johnson eed6c81287 An ugly hack to make the liveStreams display in both index and view views. 2013-09-23 21:51:02 -04:00
Kyle Johnson 05c8ddf153 Reworked to allow displaying of monitors from many views with less code.
* Moved getStreamSrc from Monitors Controller to Monitors Model
 * Minor indenting of code
 * Removed some old code
 * Changed how I lookup ZM_MPEG_LIVE_FORMAT from within getStreamSrc
 * Changed Monitors View view to use divs instead of tables
2013-05-24 20:13:14 -04:00
Kyle Johnson 1307ba41c8 Changed the event count lookups to use find() instead of custom functions 2013-05-08 09:37:56 -04:00
Kyle Johnson 5f7e4a3471 Overriding the primaryKey for the Events and Monitors models 2013-05-06 10:36:47 -04:00
Kyle Johnson d4b0d05366 Added number of archived events per monitor to Monitors index view 2013-05-04 22:45:59 -04:00
Kyle Johnson 3af0600917 Limited the number of fields returned when searching for associated events and zones 2013-05-04 22:41:27 -04:00
Kyle Johnson d681654e56 Moved events queries from the Monitors controller to the Monitors model 2013-05-04 19:42:37 -04:00
Kyle Johnson b7d993839b Added Zone model, as well as Monitor and Zone model association 2013-05-02 09:01:27 -04:00
Kyle Johnson e782fbe38d Defined associations between the Monitor and Event models 2013-05-02 08:55:59 -04:00
Kyle Johnson 055d8f8d0b Initial commit of MVC for Monitors 2013-05-01 18:41:59 -04:00