Commit Graph

493 Commits

Author SHA1 Message Date
Isaac Connor 4667e21636 Add DecodingEnabled to Function modal 2020-12-10 14:06:40 -05:00
Isaac Connor 37d4b3472f Add useful help for function modal describing each mode and the purpose of the Enabled checkbox 2020-12-10 13:43:28 -05:00
Isaac Connor 28a3868069 report both capture_fps and analysis_fps 2020-12-09 15:03:33 -05:00
Isaac Connor 84c7a117f5 Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters 2020-12-08 11:26:43 -05:00
Isaac Connor c156731f0b Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit 2020-12-08 10:33:25 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Andrew Bauer 347c64eb7d remove warning 2020-12-01 13:30:57 -06:00
Andrew Bauer 6da826d79c fix typo 2020-12-01 13:29:43 -06:00
Andrew Bauer 23fcd1f2c5 modernize the event playback view 2020-12-01 09:07:42 -06:00
Isaac Connor 80c4e2fa57 Fix table not being 100%. Use appropriate bootstrap style labels for radios 2020-11-27 13:29:57 -05:00
Andrew Bauer a2b5271835 fix copy/paste typo 2020-11-14 17:34:59 -06:00
Andrew Bauer 0ffb5e153c modify FilterTerm to support Frames view searches 2020-11-14 17:33:18 -06:00
Andrew Bauer f3756def08 deploy server side pagination for frames view 2020-11-14 14:45:22 -06:00
Andrew Bauer 9aa6fea6a3 frames view server pagination WIP 2020-11-14 14:19:28 -06:00
Andrew Bauer f88d721ae3 fix issue with events view and ALL pagination 2020-11-14 10:27:33 -06:00
Isaac Connor f32d10a1ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 17:16:13 -05:00
Isaac Connor 66f7cc55dc Spacing code comments, quotes 2020-11-13 17:05:23 -05:00
Andrew Bauer 52e747791d rough in frames server pagination backend 2020-11-13 12:34:01 -06:00
Andrew Bauer c0225a35aa use different variable assignment for clarity 2020-11-13 07:24:17 -06:00
Andrew Bauer a15c8ea7d8
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
2020-11-13 07:10:08 -06:00
Isaac Connor df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 52c7cc5869 reorganize code. Remove Server caching as it is done in Object.php. 2020-11-11 11:49:44 -05:00
Isaac Connor 7b8ee6af9f Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load. 2020-11-05 12:20:49 -05:00
Isaac Connor ee89eb45e6 Fix EndTime to EndDateTime 2020-11-04 18:39:02 -05:00
Isaac Connor e085e08caa Fix missed StartTime to StartDateTime 2020-11-04 18:27:51 -05:00
Isaac Connor 130588eb8f fix typos 2020-11-04 18:22:50 -05:00
Isaac Connor b17fa8f9c1 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:58:03 -05:00
Andrew Bauer 736c2e4cf5
Merge pull request #3068 from ZoneMinder/fix_endtime
Test for EndTime value before using strftime on it.
2020-11-02 15:21:43 -06:00
Isaac Connor 0f74e24bfc Join Monitors as M as well in total and totalNotFiltered queries 2020-11-02 15:50:38 -05:00
Isaac Connor bd1d4f954b Test for EndTime value before using strftime on it. 2020-11-02 15:45:05 -05:00
Andrew Bauer 96a9a73320 roll back events.php 2020-11-02 14:33:40 -06:00
Isaac Connor 787953559d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-01 16:11:10 -05:00
Isaac Connor 30e0e49ee7 Fix total rows when using search 2020-10-31 14:09:47 -04:00
Andrew Bauer 5047c28157 attempt to fix totalnotfiltered 2020-10-31 11:26:29 -05:00
Isaac Connor 41e88fad6e translate \n to <br/>. Fixes #3064 2020-10-29 15:08:14 -04:00
Isaac Connor 638a05b207 Fix totalrows in pagination. Still figuring this out. 2020-10-29 09:39:48 -04:00
Isaac Connor df788f2810 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-28 12:40:00 -04:00
Isaac Connor 1690bcbd38 update auth_relay when we update auth_hash 2020-10-26 18:49:14 -04:00
Andrew Bauer 7b106e2522 don't use wildcards in advanced search 2020-10-26 12:20:26 -05:00
Isaac Connor 5ed168bccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 13:07:18 -04:00
Isaac Connor da87b5b475 Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .= 2020-10-26 13:06:05 -04:00
Andrew Bauer 97573122bc fix EndTime 2020-10-26 09:33:11 -05:00
Andrew Bauer 27b39a0258
comment out warning used for debug 2020-10-26 09:19:08 -05:00
Isaac Connor 4abfa61bbc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 10:03:12 -04:00
Isaac Connor 4c791b390f fix warning due to undefined vars being used 2020-10-26 09:59:15 -04:00
Isaac Connor 706bf085f4 Add pre and post sql conditions and pre-populate the return 2020-10-26 09:58:47 -04:00
Andrew Bauer 8cf899efc5 remove commented line 2020-10-25 10:58:27 -05:00
Andrew Bauer e9b71b4ce1 events view server pagination - fix sorting name & monitor 2020-10-25 10:40:29 -05:00
Andrew Bauer cb073950b9 events view server pagination WIP 2020-10-25 10:28:22 -05:00
Andrew Bauer f87be2d289 specify the table name when we sort in events view 2020-10-25 08:24:56 -05:00
Isaac Connor 760e20bc0f Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet 2020-10-24 08:50:59 -04:00
Isaac Connor 2ebd686d19 Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data. 2020-10-23 17:55:43 -04:00
Isaac Connor da080d44c1 rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter 2020-10-23 16:44:50 -04:00
Andrew Bauer d425d1006e push newevents.php to master 2020-10-23 10:21:32 -05:00
Andrew Bauer 235dd2a2fb don't use wildcards in event view advanced search fields 2020-10-22 15:06:06 -05:00
Andrew Bauer 29819d8044 fix copy/paste error with events.php 2020-10-22 13:27:47 -05:00
Andrew Bauer d117e993ad add create task to ajax/log.php 2020-10-22 10:17:34 -05:00
Isaac Connor 4a0ada5335 improve logging of invalid task in ajax/log 2020-10-22 08:52:54 -04:00
Isaac Connor e6f08959fa Fix use of result instead of NearEvents 2020-10-21 10:40:26 -04:00
Isaac Connor 34ce3a1498 Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm 2020-10-21 10:36:40 -04:00
Isaac Connor 2eda49333f Merge branch 'master' into zma_to_thread 2020-10-20 16:20:29 -04:00
Andrew Bauer b5aa215e31 WIP events view server pagination 2020-10-20 12:59:30 -05:00
Andrew Bauer 6357c02ec9 WIP events view server pagination 2020-10-20 12:13:12 -05:00
Isaac Connor 41ed267b71 move view to the form action so that it is part of get request instead of post 2020-10-20 12:31:38 -04:00
Andrew Bauer bfa45b0c43 continue work on event view server pagination 2020-10-20 08:10:43 -05:00
Andrew Bauer 4e391708f1 event view server pagination WIP 2020-10-19 14:18:21 -05:00
Andrew Bauer 89f298771f server pagination backend improvements 2020-10-19 12:25:13 -05:00
Andrew Bauer 6f45de04f8 partial roughin ajax event view server side pagination 2020-10-19 07:50:11 -05:00
Andrew Bauer 97d05c2f88 move newlog ajax request to log 2020-10-18 07:20:59 -05:00
Andrew Bauer e69b3800c7 set return status for cancel and restart commands 2020-10-14 12:22:21 -05:00
Andrew Bauer bea95bca68 use ZM\Debug 2020-10-14 10:33:40 -05:00
Andrew Bauer c3a98c1f44 replace shutdown form submit with ajax 2020-10-14 10:03:33 -05:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Isaac Connor cd2e96eaec Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 08:42:28 -04:00
Andrew Bauer 89c76ec140 no need to clare $view as global 2020-10-12 14:52:57 -05:00
Andrew Bauer c4ea27db8d fix buttons in shutdown modal 2020-10-12 14:51:33 -05:00
Andrew Bauer ed5f6b2625 convert shutdown popup to modal 2020-10-12 12:16:52 -05:00
Isaac Connor 66a8d3876d add caching of users by username to improve performance 2020-10-12 11:25:20 -04:00
Isaac Connor 9e6db17e68 Fix getting next event due to case of asc 2020-10-10 11:09:39 -04:00
Isaac Connor 9cc7f0d360 Merge branch 'release-1.34' 2020-10-08 09:28:25 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor d7429014b6 Convert progress to a double instead of int. 2020-10-06 16:36:56 -04:00
Isaac Connor 0e89d28c26 Send SEEK as two integers representing a float 2020-10-06 16:34:06 -04:00
Isaac Connor 2faedc6248 Sort sessions by access time so that we list active users first 2020-10-05 10:34:52 -04:00
Isaac Connor 1cf181372f Only load users for logged in sessions 2020-10-05 10:30:57 -04:00
Isaac Connor fa641a0345 Convert progress to a double instead of int. 2020-10-05 10:30:38 -04:00
Isaac Connor 6d1e5330e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-05 09:30:49 -04:00
Isaac Connor 93021f5806 Update getNearEvents to handle when event doesn't exist 2020-10-05 09:30:33 -04:00
Andrew Bauer b4d2fa5e75 replace inline onchange event 2020-10-03 21:14:24 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Isaac Connor 311ba4ef69 use bootstrap styles on logged in user table. Include ip address 2020-10-02 16:04:56 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor d97f8af215 Finish showing logged in users 2020-10-02 15:56:39 -04:00
Isaac Connor 23f2c1468f rough in a table of the logged in users 2020-10-02 15:21:58 -04:00
Andrew Bauer 6c0f61ebbd rework devices view, remove inline onclick 2020-10-02 12:39:05 -05:00
Andrew Bauer 186b8ac947 convert x10 device view to a modal 2020-10-01 15:52:33 -05:00
Andrew Bauer 2d30d7aafa convert download view to modal 2020-09-30 09:12:54 -05:00