Merge branch 'master' into TMS-1059

devgeniem · Nov 24, 2024 · c0f7032 · c0f7032
2 parents cb95245 + ae3febd
commit c0f7032
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 35 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Add "Sign up"- & "Purchase tickets"-links
     - Add translation to homepage link
     - Fix regex pattern for short description
+- TMS-1087: Event-page main image style change
+- TMS-1083: Change event short description to be used from API
+
+## [1.59.2] - 2024-11-19
+
+- TMS-1088: Add fields to redipress schema
 
 ## [1.59.1] - 2024-10-28
 

diff --git a/assets/styles/views/_page-event.scss b/assets/styles/views/_page-event.scss
@@ -5,15 +5,9 @@
 .page-template-page-event {
     .entry {
         &__hero-image {
-            height: 18.25rem;
-
-            @include from($tablet) {
-                height: 22rem;
-            }
-
-            @include from($desktop) {
-                height: 31.25rem;
-            }
+            height: auto;
+            aspect-ratio: 16 / 9;
+            background-size: contain;
         }
 
         &__hero-info {

diff --git a/lib/Eventz.php b/lib/Eventz.php
@@ -141,7 +141,7 @@ public static function normalize_event( $event ) : array {
 
         return [
             'name'                 => $event->name ?? null,
-            'short_description'    => static::get_short_description( $event ) ?? null,
+            'short_description'    => nl2br( $event->descriptionShort ) ?? null,
             'description'          => nl2br( $event->description ) ?? null,
             'date_title'           => __( 'Dates', 'tms-theme-base' ),
             'date'                 => static::get_event_date( $event ),
@@ -199,7 +199,7 @@ public static function normalize_event_title( $event ) : array {
      */
     public static function normalize_event_description( $event ) : array {
         return [
-            'short_description' => static::get_short_description( $event ) ?? null,
+            'short_description' => nl2br( $event->descriptionShort ) ?? null,
         ];
     }
 
@@ -642,27 +642,4 @@ public static function compare_dates( $start, $end ) {
             $end_time->format( 'H.i' )
         );
     }
-
-    /**
-     * Generate short description.
-     *
-     * @param object $event Event object.
-     *
-     * @return string|null
-     */
-    public static function get_short_description( $event ) {
-
-        if ( empty( $event->description ) ) {
-            return null;
-        }
-
-        // Define a regular expression pattern to match the first two sentences
-        // This also takes &nbsp; and closing html-tags after the dot into consideration
-        $pattern = '/^(.*?[.!?](?:\s|&nbsp;|<\/[^>]+>)+)(.*?[.!?](?:\s|&nbsp;|<\/[^>]+>)+)/';
-
-        // Use preg_match() to find the first two sentences
-        if ( preg_match( $pattern, $event->description, $matches ) ) {
-            return $matches[1] . ' ' . $matches[2];
-        }
-    }
 }
diff --git a/models/search.php b/models/search.php
@@ -191,6 +191,17 @@ public static function set_fields_weight( array $fields ) : array {
         $post_excerpt                    = array_search( 'post_excerpt', array_column( $fields, 'name' ), true );
         $fields[ $post_excerpt ]->weight = 5;
 
+        // Include fields
+        $fields[] = new \Geniem\RediPress\Entity\NumericField( [
+            'name'     => 'is_active',
+        ] );
+        $fields[] = new \Geniem\RediPress\Entity\NumericField( [
+            'name'     => 'apply_start',
+        ] );
+        $fields[] = new \Geniem\RediPress\Entity\NumericField( [
+            'name'     => 'apply_end',
+        ] );
+
         return $fields;
     }
 

diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Base
  * Description: Tampere Multisite Base Theme
  * Domain Path: /lang
- * Version:     1.59.1
+ * Version:     1.59.2
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-base