DateColumn Fixes, DateTimeColumn Addition

Author: lrljoe

src/Views/Columns/DateColumn.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use DateTime;
+use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
@@ -36,10 +37,36 @@ public function getContents(Model $row): null|string|\BackedEnum|HtmlString|Data
                     return $dateTime->format($this->getOutputFormat());
                 } else {
                     // Check if format matches what is expected and return Carbon instance if so, otherwise emptyValue
-                    return Carbon::canBeCreatedFromFormat($dateTime, $this->getInputFormat()) ? Carbon::createFromFormat($this->getInputFormat(), $dateTime)->format($this->getOutputFormat()) : $this->getEmptyValue();
+                    if (Carbon::canBeCreatedFromFormat($dateTime, $this->getInputFormat()))
+                    {
+                        return Carbon::createFromFormat($this->getInputFormat(), $dateTime)->format($this->getOutputFormat());
+                    }
+                    else
+                    {
+                        try {
+                            if ($date = Carbon::parse($dateTime))
+                            {
+                                return $date->format($this->getOutputFormat());
+                            }    
+                        }
+                        catch (InvalidFormatException $e)
+                        {
+                            return $this->getEmptyValue();
+                        }
+                        catch (\Exception $e)
+                        {
+                            return $this->getEmptyValue();
+                        }
+                    }
+                    return $this->getEmptyValue();
                 }
             }
-        } catch (\Exception $exception) {
+        }
+        catch (InvalidFormatException $e)
+        {
+            return $this->getEmptyValue();
+        }
+        catch (\Exception $exception) {
             return $this->getEmptyValue();
         }
 

src/Views/Columns/DateTimeColumn.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns;
+
+use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration\DateColumnConfiguration;
+use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\{HasInputOutputFormat, IsColumn};
+use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers\DateColumnHelpers;
+
+class DateTimeColumn extends DateColumn
+{
+    use IsColumn,
+        HasInputOutputFormat,
+        DateColumnConfiguration,
+        DateColumnHelpers { DateColumnHelpers::getValue insteadof IsColumn; }
+
+    public string $inputFormat = 'Y-m-d H:i:s';
+
+    public string $outputFormat = 'Y-m-d H:i:s';
+
+    public string $emptyValue = '';
+
+    protected string $view = 'livewire-tables::includes.columns.date';
+
+}