Merge pull request #4754 from chloealee/date-fields

creates convertDate helper function and adds field_mobile_app_date to…

Author: chloealee

lib/modules/dosomething/dosomething_api/includes/Transformer.php

@@ -227,6 +227,7 @@ protected function transformCollection($items, $method = 'transform') {
    *   - timing: (array)
    *   - services: (array)
    *   - reportback_info: (array)
+   *   - mobile_app: (array)
    * @return array
    */
   protected function transformCampaign($data) {
@@ -281,6 +282,8 @@ protected function transformCampaign($data) {
         $output['timing']['low_season'] = $data->timing['low_season'];
 
         $output['services'] = $data->services;
+
+        $output['mobile_app']['dates'] = $data->mobile_app['dates'];
       }
 
       $output['reportback_info'] = $data->reportback_info;

lib/modules/dosomething/dosomething_campaign/includes/Campaign.php

@@ -26,7 +26,7 @@ class Campaign {
   public $timing;
   public $reportback_info;
   public $services;
-
+  public $mobile_app;
 
   /**
    * Convenience method to retrieve a single campaign from supplied id.
@@ -144,6 +144,8 @@ private function build($data, $display = 'teaser') {
         $this->timing = $timing;
 
         $this->services = $this->getServices();
+
+        $this->mobile_app = $this->getMobileAppDate();
       }
 
       $this->reportback_info = $this->getReportbackInfo();
@@ -363,6 +365,25 @@ protected function getMobileCommonsData() {
   }
 
 
+   /**
+   * Get the start and end dates for when campaign will be displayed on the mobile app if available.
+   * Dates formatted as ISO-8601 datetime.
+   *
+   * @return array
+   */
+
+    protected function getMobileAppDate() {
+      $timing = [];
+      $timing['dates'] = (dosomething_helpers_extract_field_data($this->node->field_mobile_app_date));
+
+      foreach ($timing['dates'] as $key => $date) {
+        $timing['dates'][$key] = dosomething_helpers_convert_date($date);
+      }
+
+      return $timing;
+  }
+
+
   /**
    * Get Reportback content info used in the campaign.
    *
@@ -525,17 +546,14 @@ protected function getTimeCommitment() {
    * @return array
    */
   protected function getTiming() {
-    $timezone = new DateTimeZone('UTC');
-
     $timing = [];
     $timing['high_season'] = dosomething_helpers_extract_field_data($this->node->field_high_season);
     $timing['low_season'] = dosomething_helpers_extract_field_data($this->node->field_low_season);
 
     foreach ($timing as $season => $dates) {
       if ($timing[$season]) {
         foreach ($timing[$season] as $key => $date) {
-          $date = new DateTime($date, $timezone);
-          $timing[$season][$key] = $date->format(DateTime::ISO8601);
+          $timing[$season][$key] = dosomething_helpers_convert_date($date);
         }
       }
     }

lib/modules/dosomething/dosomething_helpers/dosomething_helpers.module

@@ -49,6 +49,18 @@ function dosomething_helpers_menu() {
   return $items;
 }
 
+/**
+ * Utility function to convert dates, defaults to ISO-8601 datetime.
+ */
+function dosomething_helpers_convert_date($date, $format = 'ISO-8601') {
+  $timezone = new DateTimeZone('UTC');
+  $datetime = new DateTime($date, $timezone);
+
+  if ($format === 'ISO-8601') {
+    return $datetime->format(DateTime::ISO8601);
+  }
+}
+
 /**
  * Utility function to delete automated test data.
  */