Merge pull request #26211 from larssandergreen/export-dates-from-SK-i…

…n-ISO-format dev/core#4031 Export dates from SearchKit to spreadsheet in SQL format
civicrm · May 18, 2023 · c7dd67b · c7dd67b
2 parents f8185a2 + 46ae5f2
commit c7dd67b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -207,7 +207,8 @@ private function formatColumn($column, $data) {
           $out['val'] = $this->rewrite($column, $data);
         }
         else {
-          $out['val'] = $this->formatViewValue($column['key'], $rawValue, $data);
+          $dataType = $this->getSelectExpression($column['key'])['dataType'] ?? NULL;
+          $out['val'] = $this->formatViewValue($column['key'], $rawValue, $data, $dataType);
         }
         if ($this->hasValue($column['label']) && (!empty($column['forceLabel']) || $this->hasValue($out['val']))) {
           $out['label'] = $this->replaceTokens($column['label'], $data, 'view');
@@ -736,7 +737,8 @@ private function replaceTokens($tokenExpr, $data, $format, $index = NULL) {
       foreach ($this->getTokens($tokenExpr) as $token) {
         $val = $data[$token] ?? NULL;
         if (isset($val) && $format === 'view') {
-          $val = $this->formatViewValue($token, $val, $data);
+          $dataType = $this->getSelectExpression($token)['dataType'] ?? NULL;
+          $val = $this->formatViewValue($token, $val, $data, $dataType);
         }
         if (!(is_null($index))) {
           $replacement = is_array($val) ? $val[$index] ?? '' : $val;
@@ -759,17 +761,16 @@ private function replaceTokens($tokenExpr, $data, $format, $index = NULL) {
    * @param string $key
    * @param mixed $rawValue
    * @param array $data
+   * @param string $dataType
    * @return array|string
    */
-  protected function formatViewValue($key, $rawValue, $data) {
+  protected function formatViewValue($key, $rawValue, $data, $dataType) {
     if (is_array($rawValue)) {
-      return array_map(function($val) use ($key, $data) {
-        return $this->formatViewValue($key, $val, $data);
+      return array_map(function($val) use ($key, $data, $dataType) {
+        return $this->formatViewValue($key, $val, $data, $dataType);
       }, $rawValue);
     }
 
-    $dataType = $this->getSelectExpression($key)['dataType'] ?? NULL;
-
     $formatted = $rawValue;
 
     switch ($dataType) {

diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
@@ -116,6 +116,23 @@ protected function processResult(\Civi\Api4\Result\SearchDisplayRunResult $resul
     \CRM_Utils_System::civiExit();
   }
 
+  /**
+   * Return raw value if it is a single date, otherwise return parent
+   * {@inheritDoc}
+   */
+  protected function formatViewValue($key, $rawValue, $data, $dataType) {
+    if (is_array($rawValue)) {
+      return parent::formatViewValue($key, $rawValue, $data, $dataType);
+    }
+
+    if (($dataType === 'Date' || $dataType === 'Timestamp') && in_array($this->format, ['csv', 'xlsx', 'ods'])) {
+      return $rawValue;
+    }
+    else {
+      return parent::formatViewValue($key, $rawValue, $data, $dataType);
+    }
+  }
+
   /**
    * Outputs headers and CSV directly to browser for download
    * @param array $rows