From 61cf384c724918d532333ca95dd1cf2622f802f8 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Thu, 29 Aug 2024 18:00:55 +0200 Subject: [PATCH] =?UTF-8?q?Agenda=20format=20d'heure=20sans=20flatpicker?= =?UTF-8?q?=20Fonction=20removedir=20=20renomm=C3=A9e=20en=20deleteDir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agenda/agenda.php | 16 ++++++---------- agenda/view/creation/creation.php | 4 ++-- agenda/view/edition/edition.php | 5 +++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/agenda/agenda.php b/agenda/agenda.php index c0cbd5b..484976e 100644 --- a/agenda/agenda.php +++ b/agenda/agenda.php @@ -124,13 +124,13 @@ class agenda extends common { //Si mise à jour depuis une version <4.5 if( is_dir('site/data/agenda/data')){ $this->custom_copy( 'site/data/agenda/data', 'site/data/agenda/module/data'); - $this->removeDir('site/data/agenda/data'); + $this->deleteDir('site/data/agenda/data'); $this->custom_copy( 'site/data/agenda/adresses', 'site/data/agenda/module/adresses'); - $this->removeDir('site/data/agenda/adresses'); + $this->deleteDir('site/data/agenda/adresses'); $this->custom_copy( 'site/data/agenda/ics', 'site/data/agenda/module/ics'); - $this->removeDir('site/data/agenda/ics'); + $this->deleteDir('site/data/agenda/ics'); $this->custom_copy( 'site/data/agenda/categories', 'site/data/agenda/module/categories'); - $this->removeDir('site/data/agenda/categories'); + $this->deleteDir('site/data/agenda/categories'); } $this->setData(['module', $this->getUrl(0), 'config', 'versionData','4.5']); } @@ -656,9 +656,6 @@ class agenda extends common { $this->addOutput([ 'showBarEditButton' => true, 'showPageContent' => false, - 'vendor' => [ - 'flatpickr' - ], 'view' => 'creation' ]); } @@ -668,6 +665,8 @@ class agenda extends common { * Edition, modification, suppression */ public function edition($lid) { + var_dump($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')); + die(); //Préparation avant l'édition de l'évènement self::$evenement['id'] = $lid; @@ -761,9 +760,6 @@ class agenda extends common { $this->addOutput([ 'showBarEditButton' => true, 'showPageContent' => false, - 'vendor' => [ - 'flatpickr' - ], 'view' => 'edition' ]); } diff --git a/agenda/view/creation/creation.php b/agenda/view/creation/creation.php index b6b341e..ea7fde1 100644 --- a/agenda/view/creation/creation.php +++ b/agenda/view/creation/creation.php @@ -44,7 +44,7 @@ 'help' => 'Choix de la date et de l\'heure de début de l\'évènement', 'label' => 'Date de début', 'value' => $module::$time_unix_deb, - 'vendor' => 'flatpickr' + 'type' => 'datetime-local', ]); ?> @@ -53,7 +53,7 @@ 'help' => 'Choix de la date et de l\'heure de fin de l\'évènement', 'label' => 'Date de fin', 'value' => $module::$time_unix_fin, - 'vendor' => 'flatpickr' + 'type' => 'datetime-local', ]); ?> diff --git a/agenda/view/edition/edition.php b/agenda/view/edition/edition.php index 0c19e60..873f2f7 100644 --- a/agenda/view/edition/edition.php +++ b/agenda/view/edition/edition.php @@ -70,9 +70,10 @@ 'Date de début', 'label' => 'Date de début', + 'type' => 'datetime-local', 'disabled' => $readonly, 'value' => $module::$evenement['datedebut'], - 'vendor' => 'flatpickr' + ]); ?> @@ -80,9 +81,9 @@ 'Date de fin', 'label' => 'Date de fin', + 'type' => 'datetime-local', 'disabled' => $readonly, 'value' => $module::$evenement['datefin'], - 'vendor' => 'flatpickr' ]); ?>