Fix salesagility#10488 - Expand the number of filters in message queu…

…e views
SinergiaTIC · Aug 5, 2024 · ed451cb · ed451cb
1 parent 8735575
commit ed451cb
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 3 deletions.
diff --git a/modules/EmailMan/metadata/SearchFields.php b/modules/EmailMan/metadata/SearchFields.php
@@ -47,4 +47,52 @@
         'to_name'=> array('query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name','leads.first_name','leads.last_name','prospects.first_name','prospects.last_name')),
         'to_email'=> array('query_type'=>'default','db_field'=>array('contacts.email1','leads.email1','prospects.email1')),
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'message_name' => array( 'query_type'=>'default','db_field'=>array('email_marketing.name')),
+        'send_attempts' => array( 'query_type'=>'default','db_field'=>array('emailman.send_attempts')),
+        'in_queue' => array( 'query_type'=>'default','db_field'=>array('emailman.in_queue')),
+        'range_send_date_time' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'start_range_send_date_time' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'end_range_send_date_time' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),   
+        'range_date_entered' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'start_range_date_entered' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'end_range_date_entered' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),   
+        'range_date_modified' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'start_range_date_modified' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),
+        'end_range_date_modified' => array(
+            'query_type' => 'default',
+            'enable_range_search' => true,
+            'is_date_field' => true,
+        ),             
     );
diff --git a/modules/EmailMan/metadata/listviewdefs.php b/modules/EmailMan/metadata/listviewdefs.php
@@ -81,4 +81,20 @@
         'width' => '10',
         'label' => 'LBL_LIST_IN_QUEUE',
         'default' => true),
+    'DATE_ENTERED' => array(
+        'width' => '10',
+        'label' => 'LBL_DATE_ENTERED',
+        'default' => false),  
+    'DATE_MODIFIED' => array(
+        'width' => '10',
+        'label' => 'LBL_DATE_MODIFIED',
+        'default' => false),  
+    'MODIFIED_USER_ID' => array(
+        'width' => '10',
+        'label' => 'LBL_MODIFIED_USER',
+        'default' => false),                  
+    'USER_ID' => array(
+        'width' => '10',
+        'label' => 'LBL_USER_ID',
+        'default' => false),    
 );
diff --git a/modules/EmailMan/metadata/searchdefs.php b/modules/EmailMan/metadata/searchdefs.php
@@ -51,14 +51,28 @@
                            ),
                     'layout' => array(
                         'basic_search' => array(
-                            array('name'=>'campaign_name', 'label'=>'LBL_LIST_CAMPAIGN',),
-                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
+                            array('name'=>'campaign_name', 'label'=>'LBL_LIST_CAMPAIGN'),
+                            array('name'=>'to_name', 'label'=>'LBL_LIST_RECIPIENT_NAME'),
+                            array('name'=>'to_email', 'label'=>'LBL_LIST_RECIPIENT_EMAIL'),
+                            array('name'=>'message_name', 'label'=>'LBL_LIST_MESSAGE_NAME'),
+                            array('name'=>'send_date_time', 'label'=>'LBL_SEND_DATE_TIME'),                        
+                            array('name'=>'send_attempts', 'label'=>'LBL_SEND_ATTEMPTS'),
+                            array('name'=>'in_queue', 'label'=>'LBL_IN_QUEUE'),
                         ),
                         'advanced_search' => array(
-                            array('name'=>'campaign_name', 'label'=>'LBL_LIST_CAMPAIGN',),
+                            array('name'=>'campaign_name', 'label'=>'LBL_LIST_CAMPAIGN'),
                             array('name'=>'to_name', 'label'=>'LBL_LIST_RECIPIENT_NAME'),
                             array('name'=>'to_email', 'label'=>'LBL_LIST_RECIPIENT_EMAIL'),
+                            array('name'=>'message_name', 'label'=>'LBL_LIST_MESSAGE_NAME'),
+                            array('name'=>'send_date_time', 'label'=>'LBL_SEND_DATE_TIME'),
+                            array('name'=>'send_attempts', 'label'=>'LBL_SEND_ATTEMPTS'),
+                            array('name'=>'in_queue', 'label'=>'LBL_IN_QUEUE'),
                             array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
+
+                            array('name' => 'date_entered', 'label' => 'LBL_DATE_ENTERED' ),
+                            array('name' => 'date_modified', 'label' => 'LBL_DATE_MODIFIED' ),
+                            array('name' => 'modified_user_id', 'label' => 'LBL_MODIFIED_USER'),
+                            array('name' => 'user_id', 'label' => 'LBL_USER_ID' ),
                         ),
                     ),
                );
diff --git a/modules/EmailMan/vardefs.php b/modules/EmailMan/vardefs.php
@@ -48,19 +48,25 @@
         'vname' => 'LBL_DATE_ENTERED',
         'type' => 'datetime',
         'comment' => 'Date record created',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
     ),
     'date_modified' => array(
         'name' => 'date_modified',
         'vname' => 'LBL_DATE_MODIFIED',
         'type' => 'datetime',
         'comment' => 'Date record last modified',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
     ),
     'user_id' => array(
         'name' => 'user_id',
         'vname' => 'LBL_USER_ID',
         'type' => 'id','len' => '36',
         'reportable' =>false,
         'comment' => 'User ID representing assigned-to user',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',        
     ),
     'id' =>
     array(