From c87d170972604ff7b825a38001fcb86b32f379fe Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 11:23:22 -0500 Subject: [PATCH 01/34] Pass montagereview filter --- web/skins/classic/views/montagereview.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php index cbb1e59b7..8476ce426 100644 --- a/web/skins/classic/views/montagereview.php +++ b/web/skins/classic/views/montagereview.php @@ -87,6 +87,7 @@ if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && count($display $_SESSION['montageReviewFilter'] = $filter; session_write_close(); } +$filterQuery = $filter['query']; // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame // if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large) From ee5552d9f9f96af3689b8eaee8a343e3ef9af590 Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 11:23:50 -0500 Subject: [PATCH 02/34] Redirect Events when post Fixes broken back due to form resubmit --- web/skins/classic/views/events.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 3d426191b..0ec975d53 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -88,6 +88,11 @@ $pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQue $focusWindow = true; +if ($_POST) { + header("Location: " . $_SERVER['REQUEST_URI'].htmlspecialchars_decode($filterQuery).htmlspecialchars_decode($sortQuery).'&limit='.$limit.'&page='.$page); + exit(); +} + xhtmlHeaders(__FILE__, translate('Events') ); ?> From 9eb03a881d6a596fddcc68ff12204bed27b50b52 Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 22:13:17 -0500 Subject: [PATCH 03/34] Always have a full line on filter page. This allows javascript to copy easily --- web/skins/classic/views/filter.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index a180fd242..4f0e8c0a9 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -54,7 +54,12 @@ $conjunctionTypes = array( $obracketTypes = array(); $cbracketTypes = array(); -$terms = $filter->terms(); +if (count($filter->terms()) > 0) { + $terms = $filter->terms(); +} else { + $terms[] = array(); +} + if ( count($terms) ) { for ( $i = 0; $i <= count($terms)-2; $i++ ) { $obracketTypes[$i] = str_repeat( '(', $i ); @@ -293,13 +298,6 @@ for ( $i=0; $i < count($terms); $i++ ) { ?> - - -
| - + @@ -272,13 +272,13 @@ for ( $i=0; $i < count($terms); $i++ ) { } else { ?> | - | + | - | + | From fe6a6bec7ce9cee28c7a4338bcdf4eec565ef89f Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 22:16:52 -0500 Subject: [PATCH 05/34] Use disabled button rather than remove Reduces page jumping --- web/skins/classic/views/filter.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index b545b0e1c..ebaa173be 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -284,14 +284,9 @@ for ( $i=0; $i < count($terms); $i++ ) { ?> | 2 ) { echo htmlSelect( "filter[Query][terms][$i][cbr]", $cbracketTypes, $term['cbr'] ); } else { ?> | - - 1 ) { -?> - - | + + /> + Date: Sat, 9 Dec 2017 22:17:54 -0500 Subject: [PATCH 06/34] Change reset to not reload form --- web/skins/classic/views/filter.php | 2 +- web/skins/classic/views/js/filter.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index ebaa173be..01775134e 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -413,7 +413,7 @@ if ( canEdit( 'Events' ) ) { } } ?> - + diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 31746c0f9..6902159cc 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -46,6 +46,11 @@ function submitToFilter( element ) { form.submit(); } +function resetFilter( element ) { + element.form.reset(); + $j('#contentForm')[0].reset(); +} + function submitToEvents( element ) { var form = element.form; if ( validateForm( form ) ) { From d5ec45eed77decb8178f2a88c2db81737fb18049 Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 22:19:01 -0500 Subject: [PATCH 07/34] Include all DateTime possibilities --- web/skins/classic/views/filter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index 01775134e..be4fa0a2a 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -205,7 +205,7 @@ for ( $i=0; $i < count($terms); $i++ ) {From 51b4ddb0e4ed4dc50bed7ac84f98dab2f8bcbc4d Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Sat, 9 Dec 2017 22:20:35 -0500 Subject: [PATCH 08/34] Add js for filter handling --- web/skins/classic/views/filter.php | 2 +- web/skins/classic/views/js/filter.js | 103 +++++++++++++++++++++------ 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index be4fa0a2a..9816ac6b8 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -197,7 +197,7 @@ for ( $i=0; $i < count($terms); $i++ ) { } ?> | 2 ) { echo htmlSelect( "filter[Query][terms][$i][obr]", $obracketTypes, $term['obr'] ); } else { ?> | -+ | 0 && i > 0 && inputs[0].children.length == 0) { //add and/or to 1+ if doesn't exist + $j(inputs[0]).html(''); + } + let brackets = rows.length - 2; + if (brackets > 0) { //add bracket td to all rows + let obr = ''; + let obrVal = $j(inputs[1]).children().val(); //Save currently selected bracket option + let cbrVal = $j(inputs[5]).children().val(); + $j(inputs[1]).html(obr).children().val(obrVal); //Set bracket contents and assign saved value + $j(inputs[5]).html(cbr).children().val(cbrVal); + } else { + $j(inputs[1]).html(' '); + $j(inputs[5]).html(' '); + } + if ($j(inputs[2]).children().val() == "Archived") { //Archived filter is very different. Handles html changes. + $j(inputs[3]).html('equal to'); + $j(inputs[4]).html(' |