Commit Graph

220 Commits

Author SHA1 Message Date
Isaac Connor 21218491f7 Add EventStartCommand and EventEndCommand to monitors ui 2021-11-26 19:22:07 -05:00
Isaac Connor 98e29e7ef6 implement UrlToZMS in Monitor 2021-11-12 15:11:48 -05:00
Isaac Connor 7ca7d40b6f Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them 2021-09-25 10:32:04 -04:00
Isaac Connor 227e5794fa Merge branch 'master' into add_manufacturer_model_to_monitors 2021-09-08 18:32:46 -04:00
Isaac Connor b2415643f6 Add missing Importance member 2021-09-08 13:57:46 -04:00
Isaac Connor eb1124c406 Spacing and quotes 2021-08-18 10:53:59 -04:00
Isaac Connor 301d8fa5fa Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 2021-08-18 10:53:59 -04:00
Isaac Connor 3bb2b804b3 Include Model and Manufacturer to includes in Monitor.php 2021-07-07 09:46:36 -04:00
Isaac Connor 096581b7f1 add getMonitorStatuses function to return string values for status numbers 2021-05-28 12:29:30 -04:00
Isaac Connor 9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor 3335976cba implement remote api Trigger support. 2021-04-12 15:59:31 -04:00
Isaac Connor 1b50314f9e Add DisableAlarms function 2021-04-12 15:59:31 -04:00
Isaac Connor 3dcb71933e Add event summary fields to Monitor Object 2021-04-09 19:46:25 -04:00
Isaac Connor 7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53:57 -04:00
Isaac Connor beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor 8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
Isaac Connor c347261e19 Change default of ImageBufferCount to 3 2021-03-22 12:05:36 -04:00
Isaac Connor 6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00
Isaac Connor ce4e133c94 Add loading SecondPath in monitor 2021-03-03 09:56:33 -05:00
Isaac Connor bb747bfc6d Add RTSPStreamName fields 2021-03-01 16:46:48 -05:00
Isaac Connor c8af90fd24 Add RTSP Server checkbox 2021-02-02 23:19:52 -05:00
Isaac Connor 105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor da7d9c3756 Add default for Monitor Name 2021-02-01 16:43:24 -05:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Isaac Connor 381cc30e5d Set default value for DefaultScale to 0 which is ScaleToFit 2020-12-18 10:54:08 -05:00
Isaac Connor 0702b64cc4 Merge branch 'master' into zma_to_thread 2020-12-15 10:51:40 -05:00
Isaac Connor ced396e437 Add DecodingEnabled to Monitors 2020-12-10 14:06:26 -05:00
Isaac Connor df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 59403dc11b Move event stat totals to Monitor_Status. 2020-11-06 14:00:18 -05:00
Isaac Connor 2eda49333f Merge branch 'master' into zma_to_thread 2020-10-20 16:20:29 -04:00
Isaac Connor 57a1a383ad Merge branch 'release-1.34' 2020-10-14 11:32:50 -04:00
Isaac Connor e9fb150880 Improve error message when a row doesn't exist in the Monitor_Status table 2020-10-14 11:32:33 -04: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 24d8b99eea test for property_exists to quiet errors 2020-09-29 16:47:49 -04:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Isaac Connor 624bcdcde0 Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them 2020-09-24 09:01:30 -04:00
Isaac Connor 3e3af0bca5 Fix zmcontrol.pl command line to not use = to match with usage elsewhere 2020-09-21 11:24:17 -04:00
Isaac Connor 42dc4e46b1 add canEdit method to Monitor object 2020-09-17 20:56:04 -04:00
Isaac Connor 6f5acece66 FIx Record Entry 2020-09-03 18:20:51 -04:00
Isaac Connor fb9129a4d3 Add missing Mocord option 2020-09-03 10:40:10 -04:00
Isaac Connor c0b54ee790 introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet. 2020-09-02 13:56:55 -04:00
Isaac Connor 762bea0761 Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot. 2020-08-31 18:30:05 -04:00
Isaac Connor 11f165a99f remove width and height from zms url. zms doesn't support them and having them in the url is confusing 2020-08-27 10:29:50 -04:00
Isaac Connor 3c1651d98f in getStreamSrc if scale isn't set figure it out from width and height if passed 2020-08-24 14:35:59 -04:00
Isaac Connor 63da7f0074 Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 14:02:25 -04:00
Isaac Connor 81b55589db Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 13:59:47 -04:00
Isaac Connor 869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
Isaac Connor d716d1d686 Merge branch 'release-1.34' 2020-07-20 16:25:41 -04:00
Isaac Connor 4e2633d22b Update code to make calls to api on remote servers 2020-07-20 16:25:29 -04:00