From 5f381a244fb1c8f53caa358f37531de0944f5ab9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 14 Oct 2021 17:56:02 -0400 Subject: [PATCH] Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker. --- .../classic/includes/export_functions.php | 92 ++++++++----------- web/skins/classic/views/js/export.js | 33 ++++--- 2 files changed, 54 insertions(+), 71 deletions(-) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index 44eeb4ce5..0e348152f 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -225,15 +225,15 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {

Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.') ' : '' ) ?>

DefaultVideo() ) { + if ($event->DefaultVideo()) { // videojs zoomrotate only when direct recording $Zoom = 1; $Rotation = 0; $Monitor = $event->Monitor(); - if ( $Monitor->VideoWriter() == '2' ) { + if ($Monitor->VideoWriter() == '2') { # Passthrough $Rotation = $event->Orientation(); - if ( in_array($event->Orientation(), array('ROTATE_90','ROTATE_270')) ) + if (in_array($event->Orientation(), array('ROTATE_90','ROTATE_270'))) $Zoom = $event->Height()/$event->Width(); } # end if passthrough ?> @@ -242,7 +242,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) { width="Width() ?>" height="Height() ?>" data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": ""}}}'> - + Your browser does not support the video tag. @@ -250,7 +250,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) { - +
@@ -571,29 +571,23 @@ else if (document.layers) window.onload=start_slider; } # end function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) function eventlist_html($Event, $exportDetail, $exportFrames, $exportStructure) { - $html = '
-'; - if ( $Event->SaveJPEGs() ) { + $html = ''; + if ($Event->SaveJPEGs()) { $html .= ' '; if ( ZM_WEB_LIST_THUMBS ) { $html .= ''.$Event->Id().' '; - } else { - $html .= $Event->Id(); } $html .= '
'; } # end if has jpegs - if ( $Event->DefaultVideo() ) { - if ( ZM_WEB_LIST_THUMBS ) { - $html .= ''; - $html .= ''.$Event->Id().''; - $html .= '
- '; - } + if ($Event->DefaultVideo()) { + $html .= ''; + $html .= ''.$Event->Id().''; + $html .= '
'.PHP_EOL; } - if ( $exportDetail ) { + if ($exportDetail) { $html .= 'Detail '; } @@ -601,8 +595,8 @@ function eventlist_html($Event, $exportDetail, $exportFrames, $exportStructure) $html .= 'Frames '; } - $html .= '
-'; + if (!$html) $html = $Event->Id(); + $html = '
'.PHP_EOL.$html.PHP_EOL.'
'.PHP_EOL; return $html; } // end function eventlist_html @@ -615,7 +609,7 @@ function exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStr $eids)); - foreach ( $events as $event ) { + foreach ($events as $event) { //get monitor id and event id $eventMonitorId[$event->Id()] = $event->MonitorId(); $eventPath[$event->Id()] = $event->Relative_Path(); @@ -625,7 +619,7 @@ function exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStr $monitorNames = array(); //* - if ( !empty($monitors) ) { + if (!empty($monitors)) { $tmp = dbFetchAll('SELECT Id, Name FROM Monitors WHERE Id IN ('.implode(',', $monitors).') '); foreach ( $tmp as $row ) { $monitorNames[$row['Id']] = $row['Name']; } } @@ -641,23 +635,23 @@ function exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStr ?> - +

All

'; echo '

Monitor: '.$monitorNames[$monitor_id].'

'; - foreach ( $events as $event ) { - if ( $event->MonitorId() == $monitor_id ) { + foreach ($events as $event) { + if ($event->MonitorId() == $monitor_id) { echo eventlist_html($event, $exportDetail, $exportFrames, $exportStructure); } # end if its the right monitor } # end foreach event @@ -665,7 +659,7 @@ function exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStr } # end foreach monitor ?> -
+