Merge branch 'develop' of github.com:OS2web/os2web8 into develop

Author: Simon L. Lange

web/themes/custom/subsites/fds_ringsted_theme/fds_ringsted_theme.theme

@@ -242,6 +242,40 @@ function fds_ringsted_theme_preprocess_node(&$variables) {
     $body = preg_replace("/<((?:style)).*>.*<\/style>/im","",$body);
     $variables['content']['body'][0]['#text'] = $body;
   }
+
+
+  if ($node->getType() == 'os2web_event' && $variables['view_mode'] == 'full') {
+    $variables['content']['start_datetime'] = null;
+    $variables['content']['end_datetime'] = null;
+    $variables['content']['timezone'] = 'UTC';
+    if (date_default_timezone_get() != 'UTC') date_default_timezone_set('UTC');
+    if (
+      $node->hasField('field_os2web_event_start_date') ||
+      $node->hasField('field_os2web_event_end_date')
+    ) {
+      $tz = \Drupal::config('system.date')->get('timezone')['default'];
+      $variables['content']['timezone'] = $tz;
+
+      if ($node->hasField('field_os2web_event_start_date')) {
+        $sdt = $node->get('field_os2web_event_start_date')->getString();
+        if (strlen($sdt) > 0) {
+          $dt = new \Drupal\Core\Datetime\DrupalDateTime($sdt);
+          $dt->setTimezone(new \DateTimeZone($tz));
+          $variables['content']['start_datetime'] = $dt->format('Y-m-d H:i:s');
+        }
+      }
+
+      if ($node->hasField('field_os2web_event_end_date')) {
+        $edt = $node->get('field_os2web_event_end_date')->getString();
+        if (strlen($edt) > 0) {
+          $dt = new \Drupal\Core\Datetime\DrupalDateTime($edt);
+          $dt->setTimezone(new \DateTimeZone($tz));
+          $variables['content']['end_datetime'] = $dt->format('Y-m-d H:i:s');
+        }
+      }
+    }
+  }
+
 }
 
 /**

web/themes/custom/subsites/fds_ringsted_theme/templates/field/field--node--os2web-event.html.twig

@@ -100,31 +100,61 @@
 
   <div{{ content_attributes.addClass('node__content') }}>
 
-{#    {{ content }}#}
-
     <div{{ attributes.addClass(classes) }}>
       {{ content.field_os2web_evnet_image }}
       <div{{ title_attributes.addClass(title_classes) }}>
-        {% set startdate = node.field_os2web_event_start_date.value|date('Ymd') %}
-        {% set starttime = node.field_os2web_event_start_date.value|date("Hi") %}
-        {% set enddate = node.field_os2web_event_end_date.value|date('Ymd') %}
-        {% set starttime = node.field_os2web_event_start_date.value|date("Hi") %}
 
-        <div>
-          {{ node.field_os2web_event_start_date.value|date('D')|trans }}
-          {{ node.field_os2web_event_start_date.value|date('d/m/Y') }}</div>
-        {% if startdate != enddate %}
-          <div>{{ node.field_os2web_event_end_date.value|render }}</div>
+        {% set startdate = false %}
+        {% set starttime = false %}
+        {% if content.start_datetime %}
+            {% set startdate = content.start_datetime|date('Ymd') %}
+            {% set starttime = content.start_datetime|date("Hi") %}
+            {{ content.start_datetime|date('D')|trans }}
+            {{ content.start_datetime|date('d/m/Y') }}
+            {% if starttime != '0000' %}
+              , {{ content.start_datetime|date("H:i") }}
+            {% endif %}
+        {% endif %}
+        {% if content.end_datetime %}
+            {% set enddate = content.end_datetime|date('Ymd') %}
+            {% set endtime = content.end_datetime|date("Hi") %}
+            {#  if no start date #}
+            {% if not startdate %}
+              {{ "until "|trans }}
+              {{ content.end_datetime|date('D')|trans }}
+              {{ content.end_datetime|date('d/m/Y') }}
+              {% if endtime != '0000' %}
+                , {{ content.end_datetime|date("H:i") }}
+              {% endif %}
+            {% endif %}
+            {#  if startdate and startdate is not enddate #}
+            {% if startdate and startdate != enddate %}
+              <br>
+              {{ content.end_datetime|date('D')|trans }}
+              {{ content.end_datetime|date('d/m/Y') }}
+              {% if endtime != '0000' %}
+                , {{ content.end_datetime|date("H:i") }}
+              {% endif %}
+            {% endif %}
+            {# if startdate and enddate is alike #}
+            {% if startdate and startdate == enddate %}
+              {% if starttime != '0000' and starttime != endtime %}
+                {% if endtime != '0000' %}
+                  - {{ content.end_datetime|date("H:i") }}
+                {% endif %}
+              {% endif %}
+              {% if starttime == '0000' and starttime != endtime %}
+                {% if endtime != '0000' %}
+                  , - {{ content.end_datetime|date("H:i") }}
+                {% endif %}
+              {% endif %}
+            {% endif %}
         {% endif %}
 
-        {{ content.body|raw }}
-
+        <div>
+          {{ content.body|raw }}
+        </div>
       </div>
-
-
-
-    </div>
-
   </div>
-
+  </div>
 </article>