Commit Graph

57 Commits

Author SHA1 Message Date
Isaac Connor
b7d5b53d67 Add handling of StartDateTime,EndDateTime,MonitorId as specific filters 2022-12-07 12:36:05 -05:00
Isaac Connor
d583c10fa6 Return events when limit is > the # of events returned 2022-11-03 17:48:39 -04:00
Isaac Connor
e1581b6be6 db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions. 2022-07-29 13:59:01 -04:00
Isaac Connor
baebdb277e Only return error messages, not a bunch of empty arrays 2022-06-06 13:09:41 -04:00
Isaac Connor
d3b1ede73a Use dateTimeFOrmatter to format the date/time on events 2022-06-01 15:46:18 -04:00
Isaac Connor
da0483f3e7 Use global dateFormatter to format time in ajax events response. Don't format Length as it loses precision. Let javascript side do it. Turn off error_reporting in the output as it breaks the json 2022-06-01 13:32:32 -04:00
Isaac Connor
01ab1c2535 Fix errors when sorting by EndDateTime. 2022-04-13 17:18:59 -04:00
Ben Dailey
ce267c7e3c Most programmatic images are lazy. 2022-02-22 08:31:02 -05:00
Isaac Connor
31eff49a46 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:49:05 -05:00
Isaac Connor
6511dc8a4f Allow empty sort field. 2021-12-13 15:00:35 -05:00
Isaac Connor
9036728bdc Report error if sql fails. Add check for access to specific event. 2021-11-12 15:11:48 -05:00
Isaac Connor
3208059040 Fix event listing when not paginated. 2021-11-02 17:24:05 -04:00
SzymekCRX
2bcad7bf5e Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
2021-10-28 07:43:44 +02:00
Isaac Connor
8afed25d18 Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override. 2021-10-25 12:34:28 -04:00
Isaac Connor
29fb2d3885 Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:33 -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