Merge pull request #4253 from Simpler1/no_tag_filter

feat(tags): Filter option for No Tag

Author: connortechnology

db/zm_update-1.37.44.sql

@@ -18,7 +18,7 @@ SET @s = (SELECT IF(
     `LastAssignedDate` dateTime,
     PRIMARY KEY (`Id`),
     UNIQUE(`Name`)
-  ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci"
+  ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci"
 ));
 
 PREPARE stmt FROM @s;

scripts/ZoneMinder/lib/ZoneMinder/Filter.pm

@@ -260,6 +260,7 @@ sub Sql {
             } elsif ( $term->{attr} eq 'Name'
               || $term->{attr} eq 'Cause'
               || $term->{attr} eq 'Notes'
+              || $term->{attr} eq 'Tags'
             ) {
               if ( $term->{op} eq 'LIKE'
                 || $term->{op} eq 'NOT LIKE'
@@ -339,6 +340,8 @@ sub Sql {
               $self->{Sql} .= ' LIKE '.$value;
             } elsif ( $term->{op} eq 'NOT LIKE' ) {
               $self->{Sql} .= ' NOT LIKE '.$value;
+            } elsif ( $term->{attr} eq 'Tags' and ($term->{op} eq 'LIKE' or $term->{op} eq 'IS') and $term->{val} eq "'0'") {
+              $self->{Sql} .= 'NOT EXISTS (SELECT NULL FROM `Events_Tags` AS ET WHERE ET.EventId = E.Id)';
             } else {
               $self->{Sql} .= ' '.$term->{op}.' '.$value;
             }

web/includes/Filter.php

@@ -957,7 +957,7 @@ public function widget() {
         }
       }
     }
-    // $availableTags = array();
+    $availableTags = array(translate('NoTag'));
     foreach ( dbFetchAll('SELECT Id, Name FROM Tags ORDER BY LastAssignedDate DESC') AS $tag ) {
       $availableTags[$tag['Id']] = validHtmlStr($tag['Name']);
     }
@@ -1093,7 +1093,7 @@ public function simple_widget() {
     for ( $i = 0; $i < 7; $i++ ) {
       $weekdays[$i] = date('D', mktime(12, 0, 0, 1, $i+1, 2001));
     }
-    $availableTags = array();
+    $availableTags = array(translate('NoTag'));
     foreach ( dbFetchAll('SELECT Id, Name FROM Tags ORDER BY LastAssignedDate DESC') AS $tag ) {
       $availableTags[$tag['Id']] = validHtmlStr($tag['Name']);
     }

web/includes/FilterTerm.php

@@ -312,6 +312,7 @@ public function sql() {
     }
 
     $sql = '';
+    $where_null = '';
     if ( isset($this->cnj) ) {
       $sql .= ' '.$this->cnj;
     }
@@ -332,6 +333,8 @@ public function sql() {
         $subterms[] = $subterm;
       }
       $sql .= '('.implode(' OR ', $subterms).')';
+    } elseif (($this->attr === 'Tags') && ($values[0] === "'0'")) {
+      $where_null = 'NOT EXISTS (SELECT NULL FROM Events_Tags AS ET WHERE ET.EventId = E.Id)';
     } else {
       $sql .= $this->sql_attr();
       if ($this->collate) $sql .= ' COLLATE '.$this->collate;
@@ -343,7 +346,7 @@ public function sql() {
         $sql .= $values[0];
       }
     }
-
+    $sql .= $where_null;
     if ( isset($this->cbr) ) {
       $sql .= ' '.str_repeat(')', $this->cbr);
     }

web/lang/en_gb.php

@@ -75,6 +75,7 @@
     'AlarmPx'               => 'Alarm Px',
     'AlarmRefImageBlendPct' => 'Alarm Reference Image Blend %ge',
     'AlarmRGBUnset'         => 'You must set an alarm RGB colour',
+    'All'                   => 'All',
     'AllTokensRevoked'      => 'All Tokens Revoked',
     'AnalysisFPS'           => 'Analysis FPS',
     'AnalysisUpdateDelay'   => 'Analysis Update Delay',
@@ -442,10 +443,12 @@
     'NoneAvailable'         => 'None available',
     'NoSavedFilters'        => 'No Saved Filters',
     'NoStatisticsRecorded'  => 'There are no statistics recorded for this event/frame',
+    'NoTag'                 => 'No Tag',
     'NumPresets'            => 'Num Presets',
     'OnvifProbe'            => 'ONVIF',
     'OnvifProbeIntro'       => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'OnvifCredentialsIntro' => 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>',
+    'OpBlank'               => 'is blank',
     'OpEq'                  => 'equal to',
     'OpGtEq'                => 'greater than or equal to',
     'OpGt'                  => 'greater than',

web/skins/classic/views/filter.php

@@ -132,7 +132,7 @@
   }
 }
 
-$availableTags = array();
+$availableTags = array(translate('NoTag'));
 foreach ( dbFetchAll('SELECT Id, Name FROM Tags ORDER BY LastAssignedDate DESC') AS $tag ) {
   $availableTags[$tag['Id']] = validHtmlStr($tag['Name']);
 }