diff --git a/public/css/Index/index.css b/public/css/Index/index.css index c081efb..7b2c784 100644 --- a/public/css/Index/index.css +++ b/public/css/Index/index.css @@ -43,7 +43,7 @@ ul { } li { - padding-bottom: 30px; + padding-bottom: 20px; } .btn-custom { diff --git a/src/Form/ClientsType.php b/src/Form/ClientsType.php index cd01f5a..4444b85 100644 --- a/src/Form/ClientsType.php +++ b/src/Form/ClientsType.php @@ -23,12 +23,9 @@ class ClientsType extends AbstractType 'class' => Tables::class, 'choice_label' => 'id', 'multiple' => true, + 'expanded' => true, ]) - ->add('Commandes', EntityType::class, [ - 'class' => Commandes::class, - 'choice_label' => 'id', - 'multiple' => true, - ]) + ; } diff --git a/templates/base.html.twig b/templates/base.html.twig index 619a007..baf9c01 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -63,6 +63,12 @@ Gérer Utilisateur +
  • + + {{ ux_icon('icon-park-outline:people') }} + Gestion Client + +
  • {{ ux_icon('ic:outline-table-bar') }} @@ -82,22 +88,22 @@
  • -
    + {{ ux_icon('fluent-emoji-high-contrast:ten-oclock') }} Voir tendances -
    +
  • -
    + {{ ux_icon('icon-park-outline:view-list') }} Commandes -
    +
  • -
    + {{ ux_icon('fluent-mdl2:reservation-orders') }} Réservation -
    +
    • @@ -144,7 +150,7 @@ {% block container_modal %}
    - +
    {% endblock %} diff --git a/templates/clients/edit.html.twig b/templates/clients/edit.html.twig index bea3e03..1a6a7f1 100644 --- a/templates/clients/edit.html.twig +++ b/templates/clients/edit.html.twig @@ -2,7 +2,25 @@ {% block title %}Modifier Client{% endblock %} -{% block body %} +{% block head %} + + + + + +{% endblock %} + +{% block stylesheets %} + + + + + +{% endblock %} + +{% block container_modal %} + +

    Modifier Client

    {{ include('clients/_form.html.twig', {'button_label': 'Mettre à jour'}) }} @@ -10,4 +28,5 @@ Retour à la liste {{ include('clients/_delete_form.html.twig') }} +
    {% endblock %} diff --git a/templates/clients/index.html.twig b/templates/clients/index.html.twig index 9eeb216..e78988b 100644 --- a/templates/clients/index.html.twig +++ b/templates/clients/index.html.twig @@ -1,11 +1,24 @@ {% extends 'base.html.twig' %} -{% block title %}Clients index{% endblock %} +{% block title %}Client index{% endblock %} + +{% block head %} + + + + + +{% endblock %} + {% block stylesheets %} - + + + {% endblock %} -{% block body %} + +{% block container_modal %} +

    Clients index

    @@ -44,4 +57,5 @@
    Créer un nouveau client +
    {% endblock %} diff --git a/templates/clients/new.html.twig b/templates/clients/new.html.twig index 16b0079..cd1332f 100644 --- a/templates/clients/new.html.twig +++ b/templates/clients/new.html.twig @@ -1,14 +1,29 @@ {% extends 'base.html.twig' %} -{% block title %}Nouveau client{% endblock %} -{% block stylesheets %} - +{% block title %}Tables index{% endblock %} +{% block head %} + + + + + {% endblock %} -{% block body %} + +{% block stylesheets %} + + + + +{% endblock %} + +{% block container_modal %} + +

    Créer un client

    {{ include('clients/_form.html.twig') }} Retour à la liste +
    {% endblock %} diff --git a/templates/commandes/edit.html.twig b/templates/commandes/edit.html.twig index 104ce92..df76840 100644 --- a/templates/commandes/edit.html.twig +++ b/templates/commandes/edit.html.twig @@ -1,13 +1,30 @@ {% extends 'base.html.twig' %} -{% block title %}Modifier Commande{% endblock %} +{% block title %}Tables index{% endblock %} -{% block body %} +{% block head %} + + + + + +{% endblock %} + +{% block stylesheets %} + + + + + +{% endblock %} + +{% block container_modal %} + +

    Modifier Commande

    {{ include('commandes/_form.html.twig', {'button_label': 'Mettre à jour'}) }} Retour à la liste - - +
    {% endblock %} diff --git a/templates/commandes/index.html.twig b/templates/commandes/index.html.twig index 38ce9b9..f3ffffa 100644 --- a/templates/commandes/index.html.twig +++ b/templates/commandes/index.html.twig @@ -1,46 +1,60 @@ {% extends 'base.html.twig' %} {% block title %}Commandes index{% endblock %} + +{% block head %} + + + + + +{% endblock %} + {% block stylesheets %} - + + + {% endblock %} -{% block body %} -

    Commandes index

    - - - - - - - - - - - - {% for commande in commandes %} - - - - - - - - {% else %} - - - - {% endfor %} - -
    IdDateHeureStatutTotalactions
    {{ commande.id }}{{ commande.DateHeure ? commande.DateHeure|date('Y-m-d H:i:s') : '' }}{{ commande.Statut ? 'Yes' : 'No' }}{{ commande.Total }} -
    - - {{ include('commandes/_delete_form.html.twig') }} -
    +{% block container_modal %} +
    +

    Commandes index

    - Modifier -
    pas de commande crée
    + + + + + + + + + + + + {% for commande in commandes %} + + + + + + + + {% else %} + + + + {% endfor %} + +
    IdDateHeureStatutTotalactions
    {{ commande.id }}{{ commande.DateHeure ? commande.DateHeure|date('Y-m-d H:i:s') : '' }}{{ commande.Statut ? 'Yes' : 'No' }}{{ commande.Total }} +
    + + {{ include('commandes/_delete_form.html.twig') }} +
    - Créer une nouvelle commande + Modifier +
    pas de commande crée
    + + Créer une nouvelle commande + {% endblock %} diff --git a/templates/commandes/new.html.twig b/templates/commandes/new.html.twig index fb9b259..0104be5 100644 --- a/templates/commandes/new.html.twig +++ b/templates/commandes/new.html.twig @@ -1,15 +1,29 @@ {% extends 'base.html.twig' %} -{% block title %}Nouvelle commande{% endblock %} -{% block stylesheets %} - +{% block title %}Tables index{% endblock %} +{% block head %} + + + + + {% endblock %} -{% block body %} +{% block stylesheets %} + + + + +{% endblock %} + +{% block container_modal %} + +

    Créer une commande

    {{ include('commandes/_form.html.twig') }} Retour à la liste +
    {% endblock %} diff --git a/templates/reservations/edit.html.twig b/templates/reservations/edit.html.twig index 320a151..1483f13 100644 --- a/templates/reservations/edit.html.twig +++ b/templates/reservations/edit.html.twig @@ -1,12 +1,25 @@ {% extends 'base.html.twig' %} -{% block title %}Modifier Réservation{% endblock %} +{% block title %}Tables index{% endblock %} -{% block stylesheets %} - +{% block head %} + + + + + {% endblock %} -{% block body %} +{% block stylesheets %} + + + + + +{% endblock %} + +{% block container_modal %} +

    Modifier Réservation

    @@ -18,4 +31,5 @@ {{ include('reservations/_delete_form.html.twig') }}
    +
    {% endblock %} diff --git a/templates/reservations/index.html.twig b/templates/reservations/index.html.twig index c2be21a..b0ac723 100644 --- a/templates/reservations/index.html.twig +++ b/templates/reservations/index.html.twig @@ -1,11 +1,24 @@ {% extends 'base.html.twig' %} {% block title %}Reservations index{% endblock %} + +{% block head %} + + + + + +{% endblock %} + {% block stylesheets %} - + + + {% endblock %} -{% block body %} + +{% block container_modal %} +

    Reservations index

    @@ -40,4 +53,5 @@
    Créer une réservation +
    {% endblock %} diff --git a/templates/reservations/new.html.twig b/templates/reservations/new.html.twig index f33c62a..3a8a5b7 100644 --- a/templates/reservations/new.html.twig +++ b/templates/reservations/new.html.twig @@ -1,14 +1,29 @@ {% extends 'base.html.twig' %} -{% block title %}New Reservations{% endblock %} -{% block stylesheets %} - +{% block title %}Tables index{% endblock %} +{% block head %} + + + + + {% endblock %} -{% block body %} + +{% block stylesheets %} + + + + + +{% endblock %} + +{% block container_modal %} +

    Créer une reservation

    {{ include('reservations/_form.html.twig') }} Retour à la liste +
    {% endblock %}