Merge pull request #1262 from visual-framework/misc-updates

updates CH query to include primary position for people profiles
visual-framework · Aug 1, 2023 · d40e207 · d40e207
2 parents 94685c1 + b4a54cb
commit d40e207
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/wp-content/plugins/vf-group-header-block/template.php b/wp-content/plugins/vf-group-header-block/template.php
@@ -63,7 +63,9 @@
   'hide[team,mobile,phones]'  => 1,
   'sort-field-value[changed]' => 'DESC',
   'filter-ref-entity[field_person_positions][title]' => "",
-  'filter-field-value[field_person_positions.entity.field_position_membership]' => 'leader'
+  'filter-field-value[field_person_positions.entity.field_position_membership]' => 'leader',
+  'filter-ref-entity[field_person_positions][field_position_primary]' => 1
+
 );
 
 if ($is_minimal) {

diff --git a/wp-content/plugins/vf-members-block/template.php b/wp-content/plugins/vf-members-block/template.php
@@ -45,7 +45,8 @@
   'sort-field-value[field_person_full_name]' => 'ASC',
   'filter-fields-empty'       => 'field_person_visible_internally',
   'filter-ref-entity[field_person_positions][title]' => "",
-  'hide[team,' . $hide_fields . ']' => 1
+  'hide[team,' . $hide_fields . ']' => 1,
+  'filter-ref-entity[field_person_positions][field_position_primary]' => 1
 );
 
 if ($leader !== true) {
@@ -120,7 +121,7 @@
 
 $content = preg_replace(
   '#^(\s*<[^>]+?vf-content-hub-html)#',
-  '$1 vf-grid vf-grid__col-' . $columns,
+  '$1 vf-grid vf-grid__col-' . $columns . ' | vf-u-margin__bottom--800',
   $content
 );
 

diff --git a/wp-content/plugins/vf-members-block/vf-person/template.php b/wp-content/plugins/vf-members-block/vf-person/template.php
@@ -67,6 +67,8 @@
   'limit'               => 1,
   'filter-ref-entity[field_person_positions][title]' => "",
   'hide[' . $hide_fields . ']' => 1,
+  'filter-ref-entity[field_person_positions][field_position_primary]' => 1
+
 ), $url);
 
 // Add search field query var

diff --git a/wp-content/plugins/vf-members-internal/template.php b/wp-content/plugins/vf-members-internal/template.php
@@ -45,7 +45,9 @@
   'sort-field-value[field_person_name_last]' => 'DSC',
   'filter-fields-empty'       => 'field_person_visible_internally',
   'filter-ref-entity[field_person_positions][title]' => "",
-  'hide[team,' . $hide_fields . ']' => 1
+  'hide[team,' . $hide_fields . ']' => 1,
+  'filter-ref-entity[field_person_positions][field_position_primary]' => 1
+
 );
 
 if ($leader !== true) {

diff --git a/wp-content/plugins/vf-members-internal/vf-person-internal/template.php b/wp-content/plugins/vf-members-internal/vf-person-internal/template.php
@@ -67,6 +67,8 @@
   'limit'               => 1,
   'filter-ref-entity[field_person_positions][title]' => "",
   'hide[' . $hide_fields . ']' => 1,
+  'filter-ref-entity[field_person_positions][field_position_primary]' => 1
+
 ), $url);
 
 // Add search field query var

diff --git a/wp-content/themes/vf-wp-groups/template-trec-events.php b/wp-content/themes/vf-wp-groups/template-trec-events.php
@@ -57,20 +57,27 @@ class="vf-search__button | vf-button vf-button--tertiary vf-button--sm">
           'orderby' => 'meta_value_num',
           'meta_key' => 'vf_event_start_date',
           'meta_query' => array(
+            'relation' => 'OR',
             array(
                 'key' => 'vf_event_start_date',
                 'value' => $current_date,
                 'compare' => '>=',
                 'type' => 'numeric'
             ),
+            array(
+                'key' => 'vf_event_end_date',
+                'value' => $current_date,
+                'compare' => '>=',
+                'type' => 'numeric'
+            ),
             array(
               'key' => 'vf_event_start_date',
               'value' => date('Ymd', strtotime('now')),
               'type' => 'numeric',
               'compare' => '>=',
               ) 
             ) ));
-          $current_month = ""; ?>
+            $current_month = ""; ?>
           <?php while ($forthcomingLoop->have_posts()) : $forthcomingLoop->the_post();?>
           <?php
          include(locate_template('partials/vf-summary--trec-event.php', false, false)); ?>