Commit Graph

3407 Commits

Author SHA1 Message Date
Matthew Noorenberghe 46e69f8c27 Show correct enabled/disabled status in the function dialog
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
Isaac Connor 2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor e37c5ac385 Use FrameId instead of FramesId 2020-09-10 11:10:19 -04:00
Isaac Connor 4dc00ebe09 spacing, only add extra sort by Id column if we aren't already sorting by Id 2020-09-10 11:05:22 -04:00
Isaac Connor 1f837c1718 Hide eventId not FrameId 2020-09-10 11:04:18 -04:00
Matthew Noorenberghe f046b565c6 Fix saving function changes
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor b34c6dcfc2 correct log, code docs 2020-09-07 13:29:36 -04:00
Isaac Connor 74dc8af76f add global 2020-09-07 13:29:21 -04:00
Isaac Connor fc06b440ad remove debug 2020-09-07 13:28:55 -04:00
Isaac Connor 1659bb2116 Add id to scale dropdown 2020-09-06 12:12:26 -04:00
Isaac Connor 034bee9bb2 fix errors due to selects no longer having an id by default 2020-09-05 17:33:17 -04:00
Isaac Connor 23505159da put scale code together with itself. Get rid of unneeded generateConnKey 2020-09-05 12:23:00 -04:00
Isaac Connor d1dc3d6864 remove Error debug 2020-09-05 09:45:44 -04:00
Isaac Connor b3b6445d60 Fix application of scales to montage streams 2020-09-05 09:15:33 -04:00
Isaac Connor bf895f8f12 Make Zones a link to view/edit all zones 2020-09-05 09:15:09 -04:00
Isaac Connor 778fdb9ab0 fix lack of id's on width,height,scale dropdowns making their selection break 2020-09-05 08:56:00 -04:00
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Matthew Noorenberghe bd829f8aa1 Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033 2020-09-04 10:25:05 -04:00
Matthew Noorenberghe 77cca7efac eslint --fix 2020-09-04 10:02:43 -04:00
Isaac Connor 46790bf401 Add monitor json data 2020-09-03 18:25:00 -04:00
Isaac Connor 1f810c8947 Populate the function modal from the javascript monitors array before viewing. 2020-09-03 18:24:45 -04:00
Isaac Connor 1e4d80ee7b Make the function modal monitor-agnostic . It will get populated before being made visisble 2020-09-03 18:24:09 -04:00
Isaac Connor ea5d19412c Only include the function modal once at the end as it will get populated with data before being made visible 2020-09-03 18:23:26 -04:00
Isaac Connor d4d0a971d1 get rid of errant fo 2020-09-03 10:19:59 -04:00
Isaac Connor dd5e342196 use xhtmlFooter 2020-09-02 18:17:12 -04:00
Isaac Connor b0eacba0ee use xhtmlFooter 2020-09-02 18:14:45 -04:00
Isaac Connor 22a40edd71 spacing 2020-09-02 18:12:35 -04:00
Isaac Connor 6abad06db2 increase width of frames view 2020-09-02 18:12:26 -04:00
Isaac Connor 18671b7c19 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:57:32 -04:00
Isaac Connor 69bee20ef5 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:56:30 -04:00
Isaac Connor 5b53289fee fix html structure 2020-09-02 17:55:34 -04:00
Isaac Connor 7623733840 use xhtmlFooter and fix spacing 2020-09-02 17:55:23 -04:00
Isaac Connor aa4e9600eb Update to use MonitorStream 2020-09-02 17:36:01 -04:00
Isaac Connor e25708ce99 use getBodyTopHTML and xhtmlFooter 2020-09-02 17:35:46 -04:00
Isaac Connor fa780c5020 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:35:24 -04:00
Isaac Connor f38692795e use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:35:13 -04:00
Isaac Connor cf1f408e96 Don't need pauseString and playStream anymore 2020-09-02 17:34:09 -04:00
Isaac Connor c6bc6704b3 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:33:56 -04:00
Isaac Connor bc710bc826 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:33:09 -04:00
Isaac Connor a6ad57b393 fix html validation errors 2020-09-02 17:32:24 -04:00
Isaac Connor c2760ef768 add needed js stuff for streaming 2020-09-02 17:28:08 -04:00
Isaac Connor d243d798ff add needed js stuff for streaming 2020-09-02 17:27:59 -04:00
Isaac Connor 5b0123e710 Not necessary to specify type=text/css 2020-09-02 17:27:31 -04:00
Isaac Connor 0d07f93cd7 fix layout of svg 2020-09-02 16:37:39 -04:00
Isaac Connor 0cd35518c3 Fix id on nav 2020-09-02 14:47:07 -04:00
Isaac Connor ab116a1a6f use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:47:00 -04:00
Isaac Connor 84bed1b16a include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming 2020-09-02 14:46:45 -04:00
Isaac Connor 7b4569392c use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:46:08 -04:00
Isaac Connor 3d3966b1ea use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:45:40 -04:00
Isaac Connor 5aef5e2312 populate monitorData for MonitorStream use 2020-09-02 14:45:10 -04:00