Commit Graph

43 Commits

Author SHA1 Message Date
Isaac Connor 0ca10fe7cd Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:15 -04:00
Isaac Connor 50af7f25b8 Use less memory in event querying. More work to do here 2021-01-16 13:17:46 -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
Andrew Bauer f88d721ae3 fix issue with events view and ALL pagination 2020-11-14 10:27:33 -06:00
Andrew Bauer c0225a35aa use different variable assignment for clarity 2020-11-13 07:24:17 -06: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 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
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 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 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
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 0557d847f0 fix ajax archive/unarchive 2020-09-11 17:01:56 -05:00
Isaac Connor 98874cb6d1 provide error message when trying to delete Archived events. 2020-09-03 17:04:52 -04:00
Isaac Connor 73cdb510b2 Rough in an events ajax request for deleting events 2020-08-31 10:37:22 -04:00