Merge branch 'main' of https://github.com/Z3d0X/filament-logger into …

…patch-1
AmirAghaee · Sep 27, 2022 · a788e34 · a788e34
2 parents 7d5c8d0 + e609c91
commit a788e34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -37,6 +37,9 @@ This is the contents of the published config file:
 ```php
 <?php
 return [
+    'datetime_format' => 'd/m/Y H:i:s',
+    'date_format' => 'd/m/Y',
+
     'activity_resource' => \Z3d0X\FilamentLogger\Resources\ActivityResource::class,
 
     'resources' => [
@@ -78,7 +81,7 @@ return [
         //     'log_name' => 'Custom',
         //     'color' => 'primary',
         // ]
-    ]
+    ],
 ];
 ```
 ## Future Scope

diff --git a/config/filament-logger.php b/config/filament-logger.php
@@ -1,5 +1,8 @@
 <?php
 return [
+    'datetime_format' => 'd/m/Y H:i:s',
+    'date_format' => 'd/m/Y',
+
     'activity_resource' => \Z3d0X\FilamentLogger\Resources\ActivityResource::class,
 
     'resources' => [

diff --git a/src/Resources/ActivityResource.php b/src/Resources/ActivityResource.php
@@ -80,7 +80,7 @@ public static function form(Form $form): Form
                             ->label(__('filament-logger::filament-logger.resource.label.event'))
                             ->content(function (?Model $record): string {
                                 /** @var Activity $record */
-                                return $record->created_at ? "{$record->created_at->format('d/m/Y H:i')}" : '-';
+                                return $record->created_at ? "{$record->created_at->format(config('filament-logger.datetime_format', 'd/m/Y H:i:s'))}" : '-';
                             }),
                     ])
                 ]),
@@ -138,7 +138,7 @@ public static function table(Table $table): Table
 
                 TextColumn::make('created_at')
                     ->label(__('filament-logger::filament-logger.resource.label.logged_at'))
-                    ->dateTime('d/m/Y H:i:s')
+                    ->dateTime(config('filament-logger.datetime_format', 'd/m/Y H:i:s'))
                     ->sortable(),
             ])
             ->defaultSort('created_at', 'desc')
@@ -192,7 +192,7 @@ public static function table(Table $table): Table
                     ->form([
                         DatePicker::make('logged_at')
                             ->label(__('filament-logger::filament-logger.resource.label.logged_at'))
-                            ->displayFormat('d/m/Y'),
+                            ->displayFormat(config('filament-logger.date_format', 'd/m/Y')),
                     ])
                     ->query(function (Builder $query, array $data): Builder {
                         return $query