Skip to content

Feature: uniformisation de la gestion des dates #1888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vgreb wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: uniformisation de la gestion des dates #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37f601
divers correctifs
vgreb Jul 5, 2025
a9fb16f
refacto: Migration des selecteurs de date & temps par des éléments na…
vgreb Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions db/seeds/Facture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function run(): void
'nom' => 'Le kellen',
'prenom' => 'Yan',
'etat_paiement' => 1,
'date_paiement' => '2023-07-01',
'devise_facture' => 'EUR',
'ref_clt1' => 'Forum PHP 2023',
'service' => '',
Expand All @@ -49,6 +50,7 @@ public function run(): void
'nom' => 'Le kellen',
'prenom' => 'Yan',
'etat_paiement' => 1,
'date_paiement' => '2024-03-01',
'devise_facture' => 'EUR',
'ref_clt1' => 'Forum PHP 2024',
'service' => '',
Expand Down
16 changes: 9 additions & 7 deletions htdocs/pages/administration/compta_devis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,16 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id)
$formulaire->addElement('date' , 'date_devis' , 'Date devis', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y') - 3,
'maxYear' => date('Y')]);
'maxYear' => date('Y'),
'singleInput' => true,
]);
} else {
$formulaire->addElement('date' , 'date_devis' , 'Date devis', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y'),
'maxYear' => date('Y')]);
'maxYear' => date('Y'),
'singleInput' => true,
]);
}
$formulaire->addElement('header' , '' , 'Facturation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations concernent la personne ou la société qui sera facturée<br /><br />');
Expand Down Expand Up @@ -188,12 +192,10 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id)
if ($formulaire->validate()) {
$valeur = $formulaire->exportValues();

$date_devis = $valeur['date_devis']['Y'] . "-" . $valeur['date_devis']['F'] . "-" . $valeur['date_devis']['d'] ;

if ($action === 'ajouter') {
$bdd->executer('START TRANSACTION');
$ok = $comptaFact->ajouter(
$date_devis,
$valeur['date_devis'],
$valeur['societe'],
$valeur['service'],
$valeur['adresse'],
Expand All @@ -211,7 +213,7 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id)
$valeur['ref_clt3'],
0,
null,
$valeur['devise_facture'],
$valeur['devise_facture'] ?? 'EUR', // or make form field required
);

$id = $comptaFact->obtenirDernier();
Expand All @@ -231,7 +233,7 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id)
$bdd->executer('START TRANSACTION');
$ok = $comptaFact->modifier(
$_GET['id'],
$date_devis,
$valeur['date_devis'],
$valeur['societe'],
$valeur['service'],
$valeur['adresse'],
Expand Down
15 changes: 9 additions & 6 deletions htdocs/pages/administration/compta_facture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@

if ($action === 'modifier') {
$champsRecup = $comptaFact->obtenir($_GET['id']);

$factureId = $champsRecup['id'];

$champs['date_facture'] = $champsRecup['date_facture'];
Expand Down Expand Up @@ -119,12 +118,16 @@
$formulaire->addElement('date' , 'date_facture' , 'Date facture', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y') - 3,
'maxYear' => date('Y')]);
'maxYear' => date('Y'),
'singleInput' => true,
]);
} else {
$formulaire->addElement('date' , 'date_facture' , 'Date facture', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y'),
'maxYear' => date('Y')]);
'maxYear' => date('Y'),
'singleInput' => true,
]);
}
$formulaire->addElement('header' , '' , 'Facturation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations concernent la personne ou la société qui sera facturée<br /><br />');
Expand Down Expand Up @@ -172,7 +175,7 @@
$formulaire->addElement('select', 'devise_facture' , 'Monnaie de la facture', ['EUR' => 'Euro',
'DOL' => 'Dollar'], ['size' => 2]);
$formulaire->addElement('select', 'etat_paiement' , 'Etat paiement', ['En attente de paiement', 'Payé', 'Annulé'], ['size' => 3]);
$formulaire->addElement('date' , 'date_paiement' , 'Date paiement', ['language' => 'fr', 'format' => 'd F Y', 'minYear' => date('Y') - 5, 'maxYear' => date('Y')]);
$formulaire->addElement('date' , 'date_paiement' , 'Date paiement', ['language' => 'fr', 'format' => 'd F Y', 'minYear' => date('Y') - 5, 'maxYear' => date('Y'), 'singleInput' => true]);



Expand Down Expand Up @@ -214,8 +217,8 @@
if ($formulaire->validate()) {
$valeur = $formulaire->exportValues();

$date_ecriture = $valeur['date_facture']['Y'] . "-" . $valeur['date_facture']['F'] . "-" . $valeur['date_facture']['d'] ;
$date_paiement = $valeur['date_paiement']['Y'] . "-" . $valeur['date_paiement']['F'] . "-" . $valeur['date_paiement']['d'] ;
$date_ecriture = $valeur['date_facture'];
$date_paiement = $valeur['date_paiement'];
if ($action === 'ajouter') {
// il faut passser obligatoirement par un devis
} else {
Expand Down
20 changes: 10 additions & 10 deletions htdocs/pages/administration/compta_journal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@
$formulaire->addElement('date' , 'date_saisie' , 'Date saisie', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y') - 5,
'maxYear' => date('Y') + 1]);
'maxYear' => date('Y') + 1,
'singleInput' => true]);

$formulaire->addElement('select' , 'idcategorie', 'Type de compte', $compta->obtenirListCategories());
$formulaire->addElement('text', 'nom_frs', 'Nom fournisseurs' , ['size' => 30, 'maxlength' => 40]);
Expand Down Expand Up @@ -146,7 +147,9 @@
$formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y') - 5,
'maxYear' => date('Y') + 1]);
'maxYear' => date('Y') + 1,
'singleInput' => true,
]);
$formulaire->addElement('text', 'obs_regl', 'Info reglement' , ['size' => 30, 'maxlength' => 40]);


Expand Down Expand Up @@ -185,22 +188,19 @@
if ($formulaire->validate()) {
$valeur = $formulaire->exportValues();

$date_ecriture = $valeur['date_saisie']['Y'] . "-" . $valeur['date_saisie']['F'] . "-" . $valeur['date_saisie']['d'] ;
$date_regl = $valeur['date_reglement']['Y'] . "-" . $valeur['date_reglement']['F'] . "-" . $valeur['date_reglement']['d'] ;

if ($action === 'ajouter') {
$ok = $compta->ajouter(
$valeur['idoperation'],
$valeur['idcompte'],
$valeur['idcategorie'],
$date_ecriture,
$valeur['date_saisie'],
$valeur['nom_frs'],
$valeur['tva_intra'],
$valeur['montant'],
$valeur['description'],
$valeur['numero'],
$valeur['idmode_regl'],
$date_regl,
$valeur['date_reglement'],
$valeur['obs_regl'],
$valeur['idevenement'],
$valeur['comment'],
Expand All @@ -218,14 +218,14 @@
$valeur['idoperation'],
$valeur['idcompte'],
$valeur['idcategorie'],
$date_ecriture,
$valeur['date_saisie'],
$valeur['nom_frs'],
$valeur['tva_intra'],
$valeur['montant'],
$valeur['description'],
$valeur['numero'],
$valeur['idmode_regl'],
$date_regl,
$valeur['date_reglement'],
$valeur['obs_regl'],
$valeur['idevenement'],
$valeur['comment'],
Expand All @@ -248,7 +248,7 @@
if (isset($_POST['soumettrepasser']) && isset($passer)) {
$urlredirect = 'index.php?page=compta_journal&action=modifier&id=' . $passer;
} else {
$urlredirect = 'index.php?page=compta_journal&action=lister#L' . $valeur['id'];
$urlredirect = 'index.php?page=compta_journal&action=lister#L' . ($valeur['id'] ?? '') ;
}
afficherMessage('L\'écriture a été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), $urlredirect);
} else {
Expand Down
10 changes: 6 additions & 4 deletions htdocs/pages/administration/cotisations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@
$formulaire->addElement('date' , 'date_debut' , 'Date début', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => 2002,
'maxYear' => date('Y') + 5]);
'maxYear' => date('Y') + 5,
'singleInput' => true]);
$formulaire->addElement('date' , 'date_fin' , 'Date fin', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => 2002,
'maxYear' => date('Y') + 5]);
'maxYear' => date('Y') + 5,
'singleInput' => true]);
$formulaire->addElement('textarea', 'commentaires' , 'Commentaires', ['cols' => 42, 'rows' => 5]);

$formulaire->addElement('header', 'boutons' , '');
Expand All @@ -104,9 +106,9 @@
if ($formulaire->validate()) {
$nom = ($_GET['type_personne'] == AFUP_PERSONNES_PHYSIQUES) ? $personne['prenom'] . ' ' . $personne['nom'] : $personne['raison_sociale'];
$date_debut = $formulaire->exportValue('date_debut');
$date_debut = mktime(0, 0, 0, (int) $date_debut['F'], (int) $date_debut['d'],(int) $date_debut['Y']);
$date_debut = (new \DateTime($date_debut))->getTimestamp();
$date_fin = $formulaire->exportValue('date_fin');
$date_fin = mktime(0, 0, 0, (int) $date_fin['F'], (int) $date_fin['d'], (int) $date_fin['Y']);
$date_fin = (new \DateTime($date_fin))->getTimestamp();

if ($action == 'ajouter') {
if ($cotisations->ajouter(
Expand Down
11 changes: 6 additions & 5 deletions htdocs/pages/administration/forum_inscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function updateGlobalsForTarif(


$current = $forum->obtenir($_GET['id_forum']);
$formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr', 'minYear' => $current['forum_annee'] - 2, 'maxYear' => $current['forum_annee'] + 2]);
$formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr', 'minYear' => $current['forum_annee'] - 2, 'maxYear' => $current['forum_annee'] + 2, 'singleInput' => true]);


$formulaire->addElement('header' , '' , 'Facturation');
Expand Down Expand Up @@ -307,10 +307,11 @@ function updateGlobalsForTarif(
$valeurs = $formulaire->exportValues();

// Date de réglement au 01/01 => non defini
if ($valeurs['date_reglement']['d'] == 1 && $valeurs['date_reglement']['M'] == 1) {
$dateReglement = new DateTime($valeurs['date_reglement']);
if ($dateReglement->format('j') == 1 && $dateReglement->format('n') == 1) {
$valeurs['date_reglement'] = null;
} else {
$valeurs['date_reglement'] = mktime(0,0,0, (int) $valeurs['date_reglement']['M'], (int) $valeurs['date_reglement']['d'], (int) $valeurs['date_reglement']['Y']);
$valeurs['date_reglement'] = $dateReglement->getTimestamp();
}

if ($action == 'ajouter') {
Expand All @@ -333,8 +334,8 @@ function updateGlobalsForTarif(
$ticket->setEmail($valeurs['email']);
$ticket->setPhoneNumber($valeurs['telephone']);
$ticket->setVoucher($valeurs['coupon']);
$ticket->setCompanyCitation($valeurs['citer_societe']);
$ticket->setNewsletter($valeurs['newsletter_afup']);
$ticket->setCompanyCitation((bool) $valeurs['citer_societe']);
$ticket->setNewsletter((bool) $valeurs['newsletter_afup']);
$ticket->setOptin((bool) $valeurs['mail_partenaire']);
$ticket->setComments($valeurs['commentaires']);
$ticket->setStatus($valeurs['etat']);
Expand Down
13 changes: 6 additions & 7 deletions htdocs/pages/administration/forum_planning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
$champs['debut'] = $forum_donnees['date_debut'];
$champs['fin'] = $forum_donnees['date_debut'];
}

$formulaire->setDefaults($champs);
$id = $_GET['id'] ?? 0;

Expand All @@ -87,8 +86,8 @@
}

$formulaire->addElement('header', null, 'Plannification');
$formulaire->addElement('date' , 'debut' , 'Début', ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'minHour' => 8, 'maxHour' => 18, 'optionIncrement' => ['i' => 5]]);
$formulaire->addElement('date' , 'fin' , 'Fin' , ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'optionIncrement' => ['i' => 5], 'minHour' => 8, 'maxHour' => 18]);
$formulaire->addElement('date' , 'debut' , 'Début', ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'minHour' => 8, 'maxHour' => 18, 'optionIncrement' => ['i' => 5], 'singleInput' => true]);
$formulaire->addElement('date' , 'fin' , 'Fin' , ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'optionIncrement' => ['i' => 5], 'minHour' => 8, 'maxHour' => 18, 'singleInput' => true]);
$formulaire->addElement('select' , 'id_salle', 'Salle', [null => '' ] + $forum_appel->obtenirListeSalles($champs['id_forum'], true));
$formulaire->addElement('text' , 'joindin' , 'Id de la conférence chez joind.in' , ['size' => 40, 'maxlength' => 10]);

Expand All @@ -105,8 +104,8 @@
if ($id == 0 || 0 === strlen(trim((string) $id))) {
$planning_id = $forum_appel->ajouterSessionDansPlanning($valeurs['id_forum'],
$valeurs['id_session'],
mktime((int) $valeurs['debut']['H'], (int) $valeurs['debut']['i'], 0, (int) $valeurs['debut']['M'], (int) $valeurs['debut']['d'], (int) $valeurs['debut']['Y']),
mktime((int) $valeurs['fin']['H'], (int) $valeurs['fin']['i'], 0, (int) $valeurs['fin']['M'], (int) $valeurs['fin']['d'], (int) $valeurs['fin']['Y']),
(new DateTime($valeurs['debut']))->getTimestamp(),
(new DateTime($valeurs['fin']))->getTimestamp(),
$valeurs['id_salle']);

$ok = (bool) $planning_id;
Expand All @@ -115,8 +114,8 @@
$ok = $forum_appel->modifierSessionDuPlanning($planning_id,
$valeurs['id_forum'],
$valeurs['id_session'],
mktime((int) $valeurs['debut']['H'], (int) $valeurs['debut']['i'], 0, (int) $valeurs['debut']['M'], (int) $valeurs['debut']['d'], (int) $valeurs['debut']['Y']),
mktime((int) $valeurs['fin']['H'],(int) $valeurs['fin']['i'], 0,(int) $valeurs['fin']['M'],(int) $valeurs['fin']['d'], (int) $valeurs['fin']['Y']),
(new DateTime($valeurs['debut']))->getTimestamp(),
(new DateTime($valeurs['fin']))->getTimestamp(),
$valeurs['id_salle']);
$forum_appel->modifierJoindinSession($valeurs['id_session'], $valeurs['joindin']);
}
Expand Down
18 changes: 7 additions & 11 deletions htdocs/pages/administration/forum_sessions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use AppBundle\Controller\LegacyController;
use AppBundle\Event\Model\Talk;
use Assert\Assertion;
use Symfony\Component\PropertyAccess\PropertyAccess;

/** @var LegacyController $this */
if (!defined('PAGE_LOADED_USING_INDEX')) {
Expand Down Expand Up @@ -131,7 +130,7 @@

$formulaire->addElement('header', null, 'Présentation');

$formulaire->addElement('date' , 'date_soumission', 'Soumission', ['language' => 'fr', 'minYear' => date('Y') - 5, 'maxYear' => date('Y') + 5]);
$formulaire->addElement('date' , 'date_soumission', 'Soumission', ['language' => 'fr', 'minYear' => date('Y') - 5, 'maxYear' => date('Y') + 5, 'singleInput' => true]);
$formulaire->addElement('text' , 'titre' , 'Titre' , ['size' => 40, 'maxlength' => 150]);

$abstractClass = 'simplemde';
Expand Down Expand Up @@ -182,12 +181,9 @@
$formulaire->addElement('checkbox' , 'video_has_fr_subtitles' , "Sous titres FR présents");
$formulaire->addElement('checkbox' , 'video_has_en_subtitles' , "Sous titres EN présents");

$dateElement = $formulaire->addElement('date' , 'date_publication' , 'Date de publication' , ['language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => date('Y') - 5, 'maxYear' => date('Y') + 5]);

/** @var HTML_QuickForm_select $dateElementSelect */
$dateElementSelect = PropertyAccess::createPropertyAccessor()->getValue($dateElement, '_elements[2]');
if (!isset($dateElementSelect->getSelected()[0])) {
$dateElementSelect->setSelected([date('Y')]);
$dateElement = $formulaire->addElement('date' , 'date_publication' , 'Date de publication' , ['language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => date('Y') - 5, 'maxYear' => date('Y') + 5, 'singleInput' => true]);
if (empty($dateElement->getValue())) {
$dateElement->setValue(date('Y') . '-01-01 00:00:00');
}

$formulaire->addElement('textarea' , 'tweets' , "Tweets", ['style' => "width:100%;min-height:100px"]);
Expand Down Expand Up @@ -249,7 +245,7 @@
if ($action == 'ajouter') {
$session_id = $forum_appel->ajouterSession(
$valeurs['id_forum'],
$valeurs['date_soumission']['Y'] . '-' . $valeurs['date_soumission']['M'] . '-' . $valeurs['date_soumission']['d'],
$valeurs['date_soumission'],
$valeurs['titre'],
$valeurs['abstract'],
(int) $valeurs['genre'],
Expand All @@ -263,7 +259,7 @@
$session_id = (int) $_GET['id'];
$ok = $forum_appel->modifierSession($session_id,
$valeurs['id_forum'],
$valeurs['date_soumission']['Y'] . '-' . $valeurs['date_soumission']['M'] . '-' . $valeurs['date_soumission']['d'],
$valeurs['date_soumission'],
$valeurs['titre'],
$valeurs['abstract'],
(int) $valeurs['genre'],
Expand All @@ -280,7 +276,7 @@
$valeurs['use_markdown'],
$valeurs['video_has_fr_subtitles'],
$valeurs['video_has_en_subtitles'],
$valeurs['date_publication']['Y'] . '-' . $valeurs['date_publication']['M'] . '-' . $valeurs['date_publication']['d'] . ' ' . $valeurs['date_publication']['H'] . ':' . $valeurs['date_publication']['i'] . ':' . $valeurs['date_publication']['s'],
$valeurs['date_publication'],
$valeurs['tweets'],
$valeurs['transcript'],
$valeurs['verbatim'],
Expand Down
Loading