Merge pull request #12 from cmoa/feature/time-display-override

Adds custom time display.

cmoa-event.php

@@ -302,55 +302,65 @@ public function formatted_instances() {
   }
 
   /*
-  *  display_dates
+  *  custom_date
   *
-  *  This function will conditionally render an html template based on event conditions
+  *  This function will return a custom date format field
   *
   *  @type	function
-  *  @date	11/09/16
-  *  @since	1.1.0
+  *  @date	07/17/20
+  *  @since	4.2.2
   *
-  *  @return html template string
+  *  @return string
   */
 
+  public function custom_date() {
+    return function_exists('get_field') ? get_field('date_display', $this->details->get('post_id')) : false;
+  }
+
   /*
-  *  custom_formatting
+  *  custom_date
   *
-  *  This function will return a custom format field
+  *  This function will return a custom date format field
   *
   *  @type	function
-  *  @date	11/12/19
-  *  @since	4.2.0
+  *  @date	07/17/20
+  *  @since	4.2.2
   *
   *  @return string
   */
 
-  public function custom_formatting() {
-    return function_exists('get_field') ? get_field('date_display', $this->details->get('post_id')) : false;
+  public function custom_time() {
+    return function_exists('get_field') ? get_field('time_display', $this->details->get('post_id')) : false;
   }
 
+  /*
+  *  display_dates
+  *
+  *  This function will conditionally render an html template based on event conditions
+  *
+  *  @type	function
+  *  @date	11/09/16
+  *  @since	1.1.0
+  *
+  *  @return html template string
+  */
+
   public function display_dates() {
-    if($this->custom_formatting()) {
+    if($this->custom_date()):
       $template = 'custom';
-    }
-    elseif($this->has_end_date() && $this->recurrence() === 'CUSTOM') {
+    elseif($this->has_end_date() && $this->recurrence() === 'CUSTOM'):
       $template = 'date_range';
-    }
-    elseif($this->recurrence() !== false && $this->recurrence() !== 'CUSTOM') {
+    elseif($this->recurrence() !== false && $this->recurrence() !== 'CUSTOM'):
       $template = 'recurring';
-    }
-    elseif($this->details->get('recurrence_rules')) {
+    elseif($this->details->get('recurrence_rules')):
       $template = 'multi';
-    }
-    elseif ($this->all_day() || $this->has_no_end_time()) {
+    elseif ($this->all_day() || $this->has_no_end_time()):
       $template = 'start_date';
-    }
-    elseif ($this->details->get('start')->format('Ymd') != $this->details->get('end')->format('Ymd')) {
+    elseif ($this->details->get('start')->format('Ymd') != $this->details->get('end')->format('Ymd')):
       $template = 'mixed_range';
-    }
-    else {
+    else:
       $template = 'single';
-    }
+    endif;
 
     return $this->mustache->render("$template.html", $this);
   }

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "cmoa/wp-museum-calendar",
   "description": "Bridge to WordPress calendar data",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "keywords": ["wordpress", "plugin", "carneyplusco", "all-in-one-event-calendar"],
   "homepage": "https://carney.co",
   "license": "MIT",

plugin.php

@@ -4,7 +4,7 @@
  * Description: Bridge to WordPress calendar data
  * Author: Carney+Co.
  * Author URI: https://carney.co
- * Version: 4.2.1
+ * Version: 4.2.2
  */
 
 /**

templates/custom.html

@@ -1,4 +1,9 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
-  <strong>{{{custom_formatting}}}</strong>
-  <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  <strong>{{{custom_date}}}</strong>
+  {{^ custom_time}}
+    <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  {{/ custom_time}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
 </time>

templates/date_range.html

@@ -1,4 +1,9 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
   <strong>{{start_date}}</strong>{{^in_same_year}}, {{start_year}}{{/in_same_year}}&ndash;<strong>{{end_date}}</strong>, {{end_year}}
-  <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  {{^ custom_time}}
+    <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  {{/ custom_time}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
 </time>

templates/mixed_range.html

@@ -1,3 +1,6 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
   <strong>{{start_date}}</strong>, {{start_year}}, {{start_time}}&ndash;<strong>{{end_date}}</strong>, {{end_year}}, {{end_time}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
 </time>

templates/multi.html

@@ -3,10 +3,15 @@
     {{#formatted_instances}}
       <span class="event__day">{{day}}</span>,
       <span class="event__year">{{year}}</span>
-      {{^all_day}}
-        <span class="times">{{start_time}}{{^has_no_end_time}}&ndash;{{end_time}}{{/has_no_end_time}}</span>
-      {{/all_day}}
+      {{^ custom_time}}
+        {{^ all_day}}
+          <span class="times">{{start_time}}{{^has_no_end_time}}&ndash;{{end_time}}{{/has_no_end_time}}</span>
+        {{/ all_day}}
+      {{/ custom_time}}
       <br />
     {{/formatted_instances}}
+    {{# custom_time}}
+      <span class="times">{{{custom_time}}}</span>
+    {{/ custom_time}}
   </p>
 </time>

templates/recurring.html

@@ -1,6 +1,11 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
   <strong>{{recurrence}}</strong>, <strong>{{start_date}}</strong>{{^in_same_year}}, {{start_year}}{{/in_same_year}}&ndash;<strong>{{end_date}}</strong>, {{end_year}}
-  {{^ all_day}}
-    <span class="times">{{start_time}}&ndash;{{end_time}}</span>
-  {{/ all_day}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
+  {{^ custom_time}}
+    {{^ all_day}}
+      <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+    {{/ all_day}}
+  {{/ custom_time}}
 </time>

templates/single.html

@@ -1,4 +1,9 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
   <strong>{{start_date}}</strong>, {{start_year}}
-  <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  {{^ custom_time}}
+    <span class="times">{{start_time}}&ndash;{{end_time}}</span>
+  {{/ custom_time}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
 </time>

templates/start_date.html

@@ -1,6 +1,11 @@
 <time itemprop="startDate" content="{{start_date_iso}}">
   <strong>{{start_date}}</strong>, {{start_year}}
-  {{^all_day}}
-  <span class="times">{{start_time}}{{^has_no_end_time}}&ndash;{{end_time}}{{/has_no_end_time}}</span>
-  {{/all_day}}
+  {{# custom_time}}
+    <span class="times">{{{custom_time}}}</span>
+  {{/ custom_time}}
+  {{^ custom_time}}
+    {{^ all_day}}
+      <span class="times">{{start_time}}{{^has_no_end_time}}&ndash;{{end_time}}{{/has_no_end_time}}</span>
+    {{/ all_day}}
+  {{/ custom_time}}
 </time>