From 1426e89aff5f3a9a100df306908363153eccc5a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 10 Jan 2023 12:10:45 -0500
Subject: [PATCH 1/3] Remove debugging

---
 web/skins/classic/views/js/event.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index b31004d44..3331f4718 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -117,7 +117,6 @@ function renderAlarmCues(containerEl) {
   const span_count = 10;
   const span_seconds = parseInt(event_length / span_count);
   const span_width = parseInt(containerEl.width() / span_count);
-  console.log('span_width', span_width, 'container width', containerEl.width(), 'span count', span_count);
   const date = new Date(eventData.StartDateTime);
   for (let i=0; i < span_count; i += 1) {
     html += '<span style="left:'+(i*span_width)+'px; width: '+span_width+'px;">'+date.toLocaleTimeString()+'</span>';
@@ -160,7 +159,7 @@ function renderAlarmCues(containerEl) {
 
       alarmHtml += '<span class="noneCue" style="left: '+left+'px; width: ' + pix + 'px;"></span>';
       left = parseInt((frame.Delta / event_length) * containerEl.width());
-      console.log(left, frame.Delta, event_length, containerEl.width());
+      //console.log(left, frame.Delta, event_length, containerEl.width());
       spanTimeStart = spanTimeEnd;
     } else if ( (frame.Type !== 'Alarm') && (alarmed == 1) ) { //from alarm to nothing.  End alarm and start nothing.
       futNone = 0;

From 9789e02f2a421ca4720a77eea58dd02d43b10f64 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 20 Jan 2023 17:26:40 -0500
Subject: [PATCH 2/3] create archiveTypes static function. Use it.  Add
 has_term function

---
 web/includes/Filter.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index ecdc8a0f0..1378afe53 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -8,6 +8,7 @@ class Filter extends ZM_Object {
   protected static $table = 'Filters';
   protected static $attrTypes = null;
   protected static $opTypes = null;
+  protected static $archiveTypes = null;
 
   protected $defaults = array(
     'Id'              =>  null,
@@ -795,9 +796,21 @@ class Filter extends ZM_Object {
     return self::$opTypes;
   }
 
+  public static function archiveTypes() {
+    if (!self::$archiveTypes) {
+      self::$archiveTypes = array(
+        '' => translate('All'),
+        '0' => translate('ArchUnarchived'),
+        '1' => translate('ArchArchived')
+      );
+    }
+    return self::$archiveTypes;
+  }
+
   public function widget() {
     $html = '<table id="fieldsTable" class="filterTable"><tbody>';
     $opTypes = $this->opTypes();
+    $archiveTypes = $this->archiveTypes();
 
     $terms = $this->terms();
     $obracketTypes = array();
@@ -814,10 +827,6 @@ class Filter extends ZM_Object {
       'IS NOT'  => translate('OpIsNot'),
     );
 
-    $archiveTypes = array(
-      '0' => translate('ArchUnarchived'),
-      '1' => translate('ArchArchived')
-    );
 
     $booleanValues = array(
       'false' => translate('False'),
@@ -942,10 +951,7 @@ class Filter extends ZM_Object {
     $terms = $this->terms();
     $attrTypes = $this->attrTypes();
     $opTypes = $this->opTypes();
-    $archiveTypes = array(
-      '0' => translate('ArchUnarchived'),
-      '1' => translate('ArchArchived')
-    );
+    $archiveTypes = $this->archiveTypes();
 
     for ($i=0; $i < count($terms); $i++) {
       $term = $terms[$i];
@@ -1033,5 +1039,12 @@ class Filter extends ZM_Object {
     return $html;
   }  # end function widget()
 
+  public function has_term($attr) {
+    foreach ($this->terms() as $term) {
+      if ($term['attr'] == $attr) return true;
+    }
+    return false;
+  }
+
 } # end class Filter
 ?>

From 5e71a8fb72c9b66356ec209c49d732fddb4820f0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 21 Jan 2023 18:36:32 -0500
Subject: [PATCH 3/3] Add operator filtering to has_term

---
 web/includes/Filter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 1378afe53..bdc421380 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -1039,9 +1039,9 @@ class Filter extends ZM_Object {
     return $html;
   }  # end function widget()
 
-  public function has_term($attr) {
+  public function has_term($attr, $op=null) {
     foreach ($this->terms() as $term) {
-      if ($term['attr'] == $attr) return true;
+      if (($term['attr'] == $attr) and ((!$op) or ($term['op']==$op)) ) return true;
     }
     return false;
   }