diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php index 6300b8f..6813228 100755 --- a/src/Controller/AdminController.php +++ b/src/Controller/AdminController.php @@ -2,36 +2,31 @@ namespace App\Controller; +use App\Entity\CheckIn; use App\Entity\Customer; +use App\Entity\ExportPeriod; use App\Entity\HalfDayAdjustment; +use App\Form\ExportPeriodType; use App\Form\HalfDayAdjustmentType; use App\Repository\HalfDayAdjustmentRepository; -use App\Form\CustomerSettingsAccountType; -use App\Form\CustomerSettingsPasswordType; -use App\Form\CustomerSettingsProfileType; use App\Repository\CheckInRepository; use App\Repository\OptionsRepository; use App\Repository\SubscriptionRepository; -use App\Service\Services; +use DateTime; use Doctrine\Common\Persistence\ObjectManager; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; -use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; -use Symfony\Component\Validator\Constraints\DateTime; use App\Form\HalfDayType; use App\Form\MonthType; use App\Form\PlaceType; use App\Form\PromoType; -use App\Form\CustomerType; use App\Form\CustomerSettingStatusType; use App\Form\TextHomeType; use App\Repository\CustomerRepository; use App\Repository\PromoRepository; -use phpDocumentor\Reflection\Types\Null_; class AdminController extends AbstractController { @@ -64,8 +59,9 @@ public function __construct( /** * @Route("/admin/home", name="admin_home") + * @return Response */ - public function adminHome() + public function adminHome(): Response { return $this->render('admin/home.html.twig'); } @@ -73,21 +69,71 @@ public function adminHome() /** * @Route("/admin/list", name="admin_list") + * @param Request $request + * @return Response */ - public function list() + public function list(Request $request): Response { - return $this->render( - 'admin/list.html.twig', - [ - 'customers' => $this->customerRepository->findAll() - ] - ); + $exportPeriod = new ExportPeriod(); + $form = $this->createForm(ExportPeriodType::class, $exportPeriod); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + if ($exportPeriod->getBeginDate() >= $exportPeriod->getEndDate()) { + $this->addFlash('error', 'La date de fin de la période ne peut être supérieur à la date de début'); + } + $users = $this->customerRepository->findAllWithCheckinWithinPeriod($exportPeriod->getBeginDate(), $exportPeriod->getEndDate()); + $rows = []; + $rows[] = "Id;E-mail;Pseudo;Prénom;Nom;Numéro de téléphone;Adresse;Ville;Code Postal;Pays;Rôle;Statut;Somme des checkins"; + + /** @var Customer $user */ + foreach ($users as $user) { + $diffSum = 0; + /** @var CheckIn $checkIn */ + foreach ($user->getCheckIns()->getValues() as $checkIn) { + $time = explode(':', $checkIn->getDiff()->format('H:i:s')); + $diffSum += ($time[0] * 60) + ($time[1]) + ($time[2] / 60); + } + $row = [ + $user->getId(), + $user->getMail(), + $user->getUsername(), + $user->getFirstname(), + $user->getLastname(), + $user->getPhone(), + $user->getAddress(), + $user->getCity(), + $user->getZip(), + $user->getCountry(), + $user->getRole(), + $user->getStatus(), + (new DateTime())->setTime(floor($diffSum / 60), $diffSum % 60)->format('H:i') + ]; + $rows[] = implode(';', $row); + } + $fileName = 'users_factures_' . + $exportPeriod->getBeginDate()->format('Y-m-d') . '_' . + $exportPeriod->getBeginDate()->format('Y-m-d') . '.csv'; + + return new Response(implode(PHP_EOL, $rows), 200, [ + 'Content-Type' => 'text/csv; charset=utf-8', + 'Content-Disposition' => 'attachment; filename=' . $fileName, + 'Pragma' => 'no-cache', + 'Expires' => '0' + ]); + } + + return $this->render('admin/list.html.twig', [ + 'customers' => $this->customerRepository->findAll(), + 'form' => $form->createView() + ]); } /** * @Route("/admin/present", name="admin_present") + * @return Response */ - public function present() + public function present(): Response { return $this->render( 'admin/present.html.twig', @@ -99,34 +145,25 @@ public function present() /** * @Route("/admin/activation", name="admin_activation") + * @return Response */ - public function activation() + public function activation(): Response { - return $this->render( - 'admin/activation.html.twig', - [ - 'subscriptions' => $this->subscriptionRepository->findBy(['active' => 0]) - ] - ); + return $this->render('admin/activation.html.twig', [ + 'subscriptions' => $this->subscriptionRepository->findBy(['active' => 0]) + ]); } /** * @param $id - * @return \Symfony\Component\HttpFoundation\RedirectResponse + * @return RedirectResponse * @Route("/admin/activate/{id}", name="admin_activate") + * @return Response */ - public function activate($id) + public function activate($id): Response { - $customer = $this->subscriptionRepository->findOneBy( - [ - 'customer' => $id - ] - ); - $promo = $this->promoRepository->findOneBy( - [ - 'customer' => $id - ] - ); + $customer = $this->subscriptionRepository->findOneBy(['customer' => $id]); + $promo = $this->promoRepository->findOneBy(['customer' => $id]); if ($customer->getActive() == 0) { $customer->setActive(1); $promo->setCounter($promo->getCounter() + 0); @@ -142,28 +179,15 @@ public function activate($id) /** * @param $id - * @return \Symfony\Component\HttpFoundation\Response + * @param Request $request + * @return Response * @Route("/admin/profile/{id}", name="admin_profile") */ - public function profile($id, Request $request) + public function profile($id, Request $request): Response { - $customer = $this->customerRepository->findOneBy( - [ - 'id' => $id - ] - ); - - $subscription = $this->subscriptionRepository->findOneBy( - [ - 'customer' => $id - ] - ); - - $promo = $this->promoRepository->findOneBy( - [ - 'customer' => $id - ] - ); + $customer = $this->customerRepository->findOneBy(['id' => $id]); + $subscription = $this->subscriptionRepository->findOneBy(['customer' => $id]); + $promo = $this->promoRepository->findOneBy(['customer' => $id]); $counter = $this->createForm(PromoType::class, $promo); $counter->handleRequest($request); @@ -171,7 +195,7 @@ public function profile($id, Request $request) if ($counter->isSubmitted() && $counter->isValid()) { $this->om->persist($promo); $this->om->flush(); - }; + } $status = $this->createForm(CustomerSettingStatusType::class, $customer); $status->handleRequest($request); @@ -194,32 +218,23 @@ public function profile($id, Request $request) /** * @Route("/admin/raz", name="admin_raz") + * @return Response */ - public function raz() + public function raz(): Response { - return $this->render('admin/raz.html.twig'); } /** * @Route("/admin/boom", name="admin_boom") + * @return Response */ - public function boom() + public function boom(): Response { - - $customers = $this->customerRepository->findBy( - [ - 'role' => 'ROLE_USER' - ] - ); - + $customers = $this->customerRepository->findBy(['role' => 'ROLE_USER']); foreach ($customers as $customer) { - $subscriptions = $this->subscriptionRepository->findOneBy( - [ - 'customer' => $customer->getId() - ] - ); + $subscriptions = $this->subscriptionRepository->findOneBy(['customer' => $customer->getId()]); $raz = $subscriptions->setActive(0); $this->om->persist($raz); $this->om->flush(); @@ -230,10 +245,10 @@ public function boom() /** * @param $id - * @return \Symfony\Component\HttpFoundation\Response + * @return Response * @Route("/admin/switchrole/{id}", name="admin_switchrole") */ - public function switch($id) + public function switch($id): Response { $customer = $this->customerRepository->find($id); if ($customer->getRole() == 'ROLE_USER') { @@ -249,7 +264,7 @@ public function switch($id) /** * @param Request $request - * @return \Symfony\Component\HttpFoundation\Response + * @return Response * @Route("/admin/text", name="admin_text") */ public function text(Request $request) @@ -341,7 +356,7 @@ public function text(Request $request) } /** - * @return \Symfony\Component\HttpFoundation\RedirectResponse + * @return RedirectResponse * @Route("/admin/textactive", name="admin_textactive") */ public function textActive() @@ -395,7 +410,6 @@ public function price(OptionsRepository $optionsRepository, Request $request) $days = []; $free= []; $customers = []; - $count_attendance = []; foreach ($checkins as $key => $checkin) { $customer = $this->customerRepository->findOneBy([ 'role' => 'ROLE_USER', @@ -419,8 +433,8 @@ public function price(OptionsRepository $optionsRepository, Request $request) if (!isset($days[$customer_id])) { $days[$customer_id] = 0; } - }; - + } + $days[$customer_id] -= $checkin->getFree(); if (isset($free[$customer_id])) { $free[$customer_id] += $checkin->getFree(); @@ -575,8 +589,8 @@ public function price(OptionsRepository $optionsRepository, Request $request) ['customer_id' => $customer->getId(), 'arrival_month' => $data], ['id' => 'DESC'] ); - }; - + } + return $this->render( 'admin/facturation.html.twig', [ diff --git a/src/Entity/CheckIn.php b/src/Entity/CheckIn.php index bebbdbc..b8bc951 100755 --- a/src/Entity/CheckIn.php +++ b/src/Entity/CheckIn.php @@ -2,6 +2,7 @@ namespace App\Entity; +use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; @@ -70,24 +71,24 @@ public function getId(): ?int return $this->id; } - public function getArrival(): ?\DateTimeInterface + public function getArrival(): ?DateTimeInterface { return $this->arrival; } - public function setArrival(\DateTimeInterface $arrival): self + public function setArrival(DateTimeInterface $arrival): self { $this->arrival = $arrival; return $this; } - public function getLeaving(): ?\DateTimeInterface + public function getLeaving(): ?DateTimeInterface { return $this->leaving; } - public function setLeaving(?\DateTimeInterface $leaving): self + public function setLeaving(?DateTimeInterface $leaving): self { $this->leaving = $leaving; @@ -106,12 +107,12 @@ public function setCustomer(?Customer $customer): self return $this; } - public function getDiff(): ?\DateTimeInterface + public function getDiff(): ?DateTimeInterface { return $this->diff; } - public function setDiff(?\DateTimeInterface $diff): self + public function setDiff(?DateTimeInterface $diff): self { $this->diff = $diff; diff --git a/src/Entity/ExportPeriod.php b/src/Entity/ExportPeriod.php new file mode 100644 index 0000000..3aa839e --- /dev/null +++ b/src/Entity/ExportPeriod.php @@ -0,0 +1,62 @@ +beginDate; + } + + /** + * @param DateTimeInterface $beginDate + * @return ExportPeriod + */ + public function setBeginDate(DateTimeInterface $beginDate): ExportPeriod + { + $this->beginDate = $beginDate; + return $this; + } + + /** + * @return DateTimeInterface|null + */ + public function getEndDate(): ?DateTimeInterface + { + return $this->endDate; + } + + /** + * @param DateTimeInterface $endDate + * @return ExportPeriod + */ + public function setEndDate(DateTimeInterface $endDate): ExportPeriod + { + $this->endDate = $endDate; + return $this; + } + +} \ No newline at end of file diff --git a/src/Form/ExportPeriodType.php b/src/Form/ExportPeriodType.php new file mode 100644 index 0000000..03c7f9b --- /dev/null +++ b/src/Form/ExportPeriodType.php @@ -0,0 +1,41 @@ +add('beginDate', DateType::class, [ + 'label' => 'Début de la période d\'export', + 'widget' => 'single_text', + 'html5' => false, + 'attr' => [ + 'class' => 'js-datepicker' + ] + ]) + ->add('endDate', DateType::class, [ + 'label' => 'Fin de la période d\'export', + 'widget' => 'single_text', + 'html5' => false, + 'attr' => [ + 'class' => 'js-datepicker' + ] + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => ExportPeriod::class, + ]); + } +} diff --git a/src/Repository/CustomerRepository.php b/src/Repository/CustomerRepository.php index 3e8e29b..eea26e8 100755 --- a/src/Repository/CustomerRepository.php +++ b/src/Repository/CustomerRepository.php @@ -3,8 +3,12 @@ namespace App\Repository; use App\Entity\Customer; +use DateTimeInterface; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\ORM\Query\Expr; use Symfony\Bridge\Doctrine\RegistryInterface; +use Symfony\Component\Security\Core\User\User; +use Symfony\Component\Validator\Constraints\Date; /** * @method Customer|null find($id, $lockMode = null, $lockVersion = null) @@ -18,4 +22,17 @@ public function __construct(RegistryInterface $registry) { parent::__construct($registry, Customer::class); } + + public function findAllWithCheckinWithinPeriod(DateTimeInterface $beginDate, DateTimeInterface $endDate): array { + return $this->createQueryBuilder('user') + ->leftJoin('user.checkIns', + 'checkIn', + Expr\Join::WITH, + 'checkIn.arrivalDate >= :beginDate AND checkIn.arrivalDate <= :endDate') + ->addSelect('checkIn') + ->setParameter('beginDate', $beginDate->format('Y-m-d')) + ->setParameter('endDate', $endDate->format('Y-m-d')) + ->getQuery() + ->getResult(); + } } diff --git a/templates/admin/list.html.twig b/templates/admin/list.html.twig index 9a826ba..0e0934b 100644 --- a/templates/admin/list.html.twig +++ b/templates/admin/list.html.twig @@ -4,10 +4,18 @@ {% block stylesheets %} + {% endblock %} {% block body %}
+ {% for messages in app.flashes('error') %} +
+ + {{ messages }} +
+ {% endfor %} +

Liste des personnes inscrites

Retour @@ -57,16 +65,51 @@ - Retour +
+ Retour + +
- + {% endblock %} {% block javascripts %} + + + {% endblock %}