Commit Graph

4061 Commits

Author SHA1 Message Date
Kyle Johnson b904cfde58 Remove events.css and event.css 2015-01-05 15:44:49 -05:00
Kyle Johnson 501b762b81 Remove event.js and event.js.php. Recreating in angular 2015-01-05 15:42:09 -05:00
Kyle Johnson a1d9f25c75 Remove bad vim swap file 2015-01-05 15:41:33 -05:00
Kyle Johnson afefef3cc2 Only build filter if named params are set 2015-01-05 14:21:19 -05:00
Kyle Johnson 648252cf50 Allow filtering of events in index view 2015-01-05 14:08:09 -05:00
Kyle Johnson 040094e984 Add initial API Filter component
The purpose of this is to turn ZoneMinder filter queries into usable
CakePHP find() conditions.
As example would be turning
api/events/index/MonitorId:7/MonitorId:8/StartTime >=:2015-01-05.json
into an array like this:
'conditions' => array(
	'MonitorId' => (7, 8),
	'StartTime >=' => '2015-01-05'
)
2015-01-05 14:02:42 -05:00
Kyle Johnson 9221675d2e Upgrade Angular from 1.3.2 to 1.3.8 2015-01-05 12:03:22 -05:00
Kyle Johnson c945b23dae Log which event a frame could not be found for 2015-01-01 11:33:12 -05:00
Kyle Johnson da495c65ac Add a link to replay each event in the Events list 2014-12-29 12:24:27 -05:00
Kyle Johnson 96551c98cf Use pagination directive in Events view
Pagination is now handled via the pagination directive with
asynchronous data.  The server returns a subset of the total events.
The directive looks at the 'limit' and 'count' fields to determine
how many pages to generate
2014-12-29 12:19:30 -05:00
Kyle Johnson 07e04ea9ff Load pagination directive into the angular app 2014-12-29 12:15:51 -05:00
Kyle Johnson 4b029fc2ae Remove page querystring from Events link in header 2014-12-29 12:13:13 -05:00
Kyle Johnson ad8bbea2bc Add pagination directive to angular frontend
Big thanks to @michaelbromley for his work on this.  Source can
be be found at https://github.com/michaelbromley/angularUtils/tree/master/src/directives/pagination
2014-12-29 12:11:53 -05:00
Kyle Johnson a2cd6e1434 Add pagination support to Events in the API
/api/events.json now accepts the ?page querystring, e.g.
/api/events.json?page=2 or /api/events.json
2014-12-29 12:10:05 -05:00
Kyle Johnson a7d32a2cd7 Default to Low bandwidth in API if not set 2014-12-25 23:47:44 -05:00
Kyle Johnson a71e291331 Add footer to events view 2014-12-23 22:43:42 -05:00
Kyle Johnson 0c38102951 First stab at Events view via angular and API 2014-12-23 22:38:54 -05:00
Kyle Johnson 930b94be40 Create a thumbnail for each event in index view 2014-12-23 22:11:24 -05:00
Kyle Johnson 1146e42c0f Add createThumbnail function to the API 2014-12-23 22:10:52 -05:00
Kyle Johnson 6718559be5 Set Frame model to not be recursive by default 2014-12-23 22:05:23 -05:00
Kyle Johnson 39501f4f52 Add angular function to show length of event 2014-12-23 22:04:23 -05:00
Kyle Johnson 5598cce260 Add getImageSrc function to the API via component 2014-12-23 17:42:44 -05:00
Kyle Johnson ef99e30a33 Add reScale and deScale components to API 2014-12-23 11:22:34 -05:00
Kyle Johnson e61b19b4d8 Fix bug where only Remote tab would display 2014-12-21 21:54:27 -05:00
Kyle Johnson 9e417730d2 Change Monitor input type from number to text
Angular seems to have a bug where when an input is type="number",
assiging a value to it via ng-model produces an error.
2014-12-21 21:47:04 -05:00
Kyle Johnson 0436b099d0 Use monitor save function from Factory, not controller 2014-12-21 21:45:44 -05:00
Kyle Johnson 1fadbff72d Add support for editing an existing monitor
Saving and editing of monitors now works.  Tested only with
Type = Remote.

There is a bug where when editing a monitor, Orientation is not
set properly.  Due to number vs. string and mysql enum.
0 != '0'
2014-12-21 21:44:18 -05:00
Kyle Johnson 44a44580b7 Add Angular factory to get and save Monitors 2014-12-21 21:42:54 -05:00
Kyle Johnson de221f4d57 Remove the old console.js file 2014-12-19 10:25:34 -05:00
Kyle Johnson 09ce6e01df Set monitor Method to simple by default 2014-12-19 10:17:25 -05:00
Kyle Johnson d79286e101 Fix bug where Remote tab was not displayed 2014-12-19 10:15:41 -05:00
Kyle Johnson 227f32a6a9 Fix bug where monitor source type was not set 2014-12-19 10:13:52 -05:00
Kyle Johnson 2e96b141e5 Major rehaul of Monitor view in Angular JS
You can now add monitors via angularjs, with the api as the
backend.
2014-12-17 16:08:35 -05:00
Kyle Johnson d5c8de6cb7 Set each input's ng-model for remote monitor type 2014-12-16 21:05:07 -05:00
Kyle Johnson 6d921a2a1a Moved curl, ffmpeg, vlc and file into their own files 2014-12-16 20:55:21 -05:00
Kyle Johnson de5106d90c Moved 'Remote' monitor type into its own file 2014-12-16 20:54:42 -05:00
Kyle Johnson 6764211ebd Add initial MonitorController 2014-12-16 17:11:28 -05:00
Kyle Johnson f770382268 Move FPS options to bottom of General tab 2014-12-16 17:11:02 -05:00
Kyle Johnson f9519d963c Fix ng-model names in General tab
As ng-model is namespaced into the MonitorController,
it is safe to name the variables 'Name' instead of
newMonitor[Name] as before
2014-12-16 17:10:02 -05:00
Kyle Johnson d662bf41e9 First pass at formatting Misc tab 2014-12-16 17:07:19 -05:00
Kyle Johnson 2f254eefef Split 'Local' and 'Remote' tabs into their own files 2014-12-16 17:06:54 -05:00
Kyle Johnson 00427c2e41 Fix indenting and missing </div> in monitor.php 2014-12-16 17:04:02 -05:00
Kyle Johnson 735c14ea2d Replace 'name' with 'ng-model' in General monitor tab 2014-12-16 14:18:54 -05:00
Kyle Johnson 21f29cfa29 Open the General monitor tab by default 2014-12-16 14:04:30 -05:00
Kyle Johnson d76e9e5f5d Initial work on cleaning up monitor view.
Starting by splitting each 'tab' out into their own php
file, and then including it.  Easier to manage.  Following up by
removing tables and replacing with a responsive form layout.
Also working on removing PHP dependencies and using the UI instead.
2014-12-13 23:15:31 -05:00
Kyle Johnson 030f6af057 Initial angular view for Logs 2014-12-01 16:16:30 +00:00
Kyle Johnson 904b946bfb Initial Logs controller 2014-12-01 16:15:42 +00:00
Kyle Johnson 87e1133506 Initial Log factory for returning log entires 2014-12-01 16:15:12 +00:00
Kyle Johnson f213657c0e Add cakephp route for logs 2014-12-01 16:14:23 +00:00
Kyle Johnson 9a041efbf0 Remove log.js 2014-12-01 16:14:02 +00:00