From b52028ecfdacb32056fac48ed96430f3f5fe7d61 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 2 Jul 2019 17:19:35 +0200
Subject: [PATCH] #2843

---
 src/app/Magic/Fields/Date.php     |  1 +
 src/app/Magic/Fields/Datetime.php |  2 +-
 src/app/Magic/Models/News.php     | 31 +++++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/app/Magic/Fields/Date.php b/src/app/Magic/Fields/Date.php
index ca59d88..0ee43a3 100644
--- a/src/app/Magic/Fields/Date.php
+++ b/src/app/Magic/Fields/Date.php
@@ -7,4 +7,5 @@ class Date extends Datetime
 {
     protected $_adminType = 'date_picker';
     protected $_databaseType = 'date';
+    protected $_cast = 'date';
 }
diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php
index 3495d1e..c9743f7 100644
--- a/src/app/Magic/Fields/Datetime.php
+++ b/src/app/Magic/Fields/Datetime.php
@@ -6,7 +6,7 @@ namespace Cubist\Backpack\app\Magic\Fields;
 class Datetime extends Field
 {
     protected $_adminType = 'datetime_picker';
-    protected $_cast = 'date';
+    protected $_cast = 'datetime';
     protected $pickerOptions = ['format' => 'DD/MM/YYYY HH:mm', 'language' => 'fr'];
     protected $_databaseType = 'datetime';
 
diff --git a/src/app/Magic/Models/News.php b/src/app/Magic/Models/News.php
index aeac834..e8667fc 100644
--- a/src/app/Magic/Models/News.php
+++ b/src/app/Magic/Models/News.php
@@ -26,15 +26,42 @@ class News extends CubistMagicModel
             'type' => 'Slug',
             'label' => 'Slug (URL)']);
 
+        $this->addField(['name' => 'type',
+            'type' => 'SelectFromArray',
+            'label' => 'Type',
+            'options' => ['news' => 'Actualité', 'event' => 'Evénement'],
+            'column' => true,
+        ]);
+
         $this->addField(['name' => 'date',
             'type' => 'Datetime',
             'label' => 'Date de publication',
             'column' => true]);
 
+        $this->addField(['name' => 'event_start',
+            'type' => 'Date',
+            'label' => 'Début de l\'évenement',
+            'when' => ['type' => ['event']],
+        ]);
+
+        $this->addField(['name' => 'event_end',
+            'type' => 'Date',
+            'label' => 'Fin de l\'évenement',
+            'when' => ['type' => ['event']],
+        ]);
+
+        $this->addField(['name' => 'event_place',
+            'type' => 'Text',
+            'label' => 'Lieu de l\'événement',
+            'when' => ['type' => ['event']],
+        ]);
+
         $this->addField(['name' => 'chapo',
             'type' => 'Textarea',
             'label' => 'Chapo',
-            'hint' => 'Texte court affiché sur le listing des actualités']);
+            'hint' => 'Texte court affiché sur le listing des actualités',
+            'when' => ['type' => ['news']]
+        ]);
 
         $this->addField(['name' => 'image',
             'type' => 'Images',
@@ -47,7 +74,7 @@ class News extends CubistMagicModel
 
         $this->addField(['name' => 'status',
             'type' => 'SelectFromArray',
-            'label'=>'Status',
+            'label' => 'Status',
             'options' => ['0' => 'Offline', '1' => 'Published'],
             'column' => true
         ]);
-- 
2.39.5