Skip to content

Transforme le listing d'inscription en Controller Symfony #1776

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
Zarlokh wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Transforme le listing d'inscription en Controller Symfony #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49eb1c6
feature/move-inscription-page-to-sf : WIP
May 7, 2025
c202d23
feature/move-inscription-page-to-sf : Fait un peu de ménage dans le c…
May 8, 2025
6b8214d
feature/move-inscription-page-to-sf : Supprime l'ancien code et améli…
May 28, 2025
34845b1
feature/move-inscription-page-to-sf : Fix les tests en factorisant la…
May 30, 2025
5bcf6f2
#1776 : Fix review
Sep 2, 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
3 changes: 3 additions & 0 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ parameters:
forum_inscriptions:
nom: 'Inscriptions'
niveau: 'ROLE_FORUM'
url: '/admin/event/inscription'
extra_routes:
- admin_event_inscription_list
forum_pending_bankwires:
nom: 'Virements en attente'
niveau: 'ROLE_ADMIN'
Expand Down
4 changes: 4 additions & 0 deletions app/config/routing/admin_event.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,7 @@ admin_event_restore:
admin_event_votes:
path: /votes
defaults: {_controller: AppBundle\Controller\Admin\Event\VotesListeAction}

admin_event_inscription_list:
path: /inscription
defaults: { _controller: AppBundle\Controller\Admin\Event\Inscription\ListAction}
3 changes: 3 additions & 0 deletions db/seeds/Inscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public function run(): void
// Inscriptions
$data = [
[
'date' => time(),
'reference' => 'REF-TEST-001',
'type_inscription' => AFUP_FORUM_2_JOURNEES,
'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES],
Expand All @@ -26,6 +27,7 @@ public function run(): void
'etat' => AFUP_FORUM_ETAT_REGLE,
],
[
'date' => time(),
'reference' => 'REF-TEST-002',
'type_inscription' => AFUP_FORUM_2_JOURNEES,
'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES],
Expand All @@ -41,6 +43,7 @@ public function run(): void
'etat' => AFUP_FORUM_ETAT_REGLE,
],
[
'date' => time(),
'reference' => 'REF-TEST-003',
'type_inscription' => AFUP_FORUM_2_JOURNEES,
'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES],
Expand Down
66 changes: 6 additions & 60 deletions htdocs/pages/administration/forum_inscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

checkForumRedirection();

$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer','envoyer_convocation']);
$action = verifierAction(['ajouter', 'modifier', 'supprimer','envoyer_convocation']);
$tris_valides = ['i.date', 'i.nom', 'f.societe', 'i.etat'];
$sens_valides = [ 'desc','asc' ];
$smarty->assign('action', $action);
Expand Down Expand Up @@ -72,68 +72,14 @@ function updateGlobalsForTarif(
$forum_inscriptions = new Inscriptions($bdd);
$forum_facturation = new Facturation($bdd);

if ($action == 'lister') {
$list_champs = 'i.id, i.date, i.nom, i.prenom, i.email, f.societe, i.etat, i.coupon, i.type_inscription, f.type_reglement, i.presence_day1, i.presence_day2';
$list_ordre = 'date desc';
$list_sens = 'desc';
$list_associatif = false;
$list_filtre = false;

if (isset($_GET['tri']) && in_array($_GET['tri'], $tris_valides)
&& isset($_GET['sens']) && in_array($_GET['sens'], $sens_valides)) {
$list_ordre = $_GET['tri'] . ' ' . $_GET['sens'];
}
if (isset($_GET['filtre'])) {
$list_filtre = $_GET['filtre'];
}

chargerForumId();

if (!isset($_GET['id_forum']) || intval($_GET['id_forum']) == 0) {
$_GET['id_forum'] = $forum->obtenirDernier();
}
$forumData = $forum->obtenir($_GET['id_forum']);
$smarty->assign('id_forum', $_GET['id_forum']);
$memberTickets = [];

$retour = updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $_GET['id_forum'], $memberTickets);
$restantes = $retour['restantes'];

$smarty->assign('forum_tarifs_members', $memberTickets);
$smarty->assign('forum_tarifs_lib',$AFUP_Tarifs_Forum_Lib);
$smarty->assign('forum_tarifs_restantes', $restantes);
$smarty->assign('forum_tarifs',$AFUP_Tarifs_Forum);
$stats = $eventStatsRepository->getStats((int) $_GET['id_forum']);
$smarty->assign('statistiques', [
'premier_jour' => [
'inscrits' => $stats->firstDay->registered,
'confirmes' => $stats->firstDay->confirmed,
'en_attente_de_reglement' => $stats->firstDay->pending,
],
'second_jour' => [
'inscrits' => $stats->secondDay->registered,
'confirmes' => $stats->secondDay->confirmed,
'en_attente_de_reglement' => $stats->secondDay->pending,
],
'types_inscriptions' => [
'confirmes' => $stats->ticketType->confirmed,
'inscrits' => $stats->ticketType->registered,
'payants' => $stats->ticketType->paying,
],
]);

$smarty->assign('forums', $forum->obtenirListActive());
$smarty->assign('inscriptions', $forum_inscriptions->obtenirListe($_GET['id_forum'], $list_champs, $list_ordre, $list_associatif, $list_filtre));
$smarty->assign('finForum', (new \DateTime($forumData['date_fin']))->format('U'));
$smarty->assign('now', (new \DateTime())->format('U'));
} elseif ($action == 'supprimer') {
if ($action == 'supprimer') {
/** @var Invoice|null $invoice */
$invoice = $invoiceRepository->getByReference($_GET['id']);
if ($forum_inscriptions->supprimerInscription($_GET['id']) && (null === $invoice || $invoiceService->deleteInvoice($invoice))) {
Logs::log('Suppression de l\'inscription ' . $_GET['id']);
afficherMessage('L\'inscription a été supprimée', 'index.php?page=forum_inscriptions&action=lister');
afficherMessage('L\'inscription a été supprimée', '/admin/event/inscription');
} else {
afficherMessage('Une erreur est survenue lors de la suppression de l\'inscription', 'index.php?page=forum_inscriptions&action=lister', true);
afficherMessage('Une erreur est survenue lors de la suppression de l\'inscription', '/admin/event/inscription', true);
}
} else {
$pays = new Pays($bdd);
Expand All @@ -156,7 +102,7 @@ function updateGlobalsForTarif(
} else {
$champs = $forum_inscriptions->obtenir($_GET['id']);
if ($champs == false) {
afficherMessage('L\'inscription n\'existe plus', 'index.php?page=forum_inscriptions&action=lister');
afficherMessage('L\'inscription n\'existe plus', '/admin/event/inscription');
exit(0);
}
$champs2 = $forum_facturation->obtenir($champs['reference']);
Expand Down Expand Up @@ -409,7 +355,7 @@ function updateGlobalsForTarif(
} else {
Logs::log('Modification de l\'inscription de ' . $formulaire->exportValue('prenom') . ' ' . $formulaire->exportValue('nom') . ' (' . $_GET['id'] . ')');
}
afficherMessage('L\'inscription a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=forum_inscriptions&action=lister&id_forum=' . $valeurs['id_forum']);
afficherMessage('L\'inscription a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), '/admin/event/inscription?id=' . $valeurs['id_forum']);
} else {
$smarty->assign('erreur', 'Une erreur est survenue lors de ' . (($action == 'ajouter') ? "l'ajout" : 'la modification') . ' de l\'inscription');
}
Expand Down
Loading