Commit 782fcfcc authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents a1ada202 f9dc849e

module/Application/view/layout/layout.phtml

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ echo $this->doctype(); 
<script type="text/javascript" src="<?= $this->basePath('/vendor/bootstrap-5.0.2/dist/js/bootstrap.bundle.js') ?>"></script>

<script type="text/javascript" src="<?= $this->basePath('/vendor/jquery.form-3.51.js') ?>"></script>

<script type="text/javascript" src="<?= $this->basePath('/vendor/bootstrap-select-1.14.0/js/bootstrap-select.min.js') ?>"></script>

<script type="text/javascript" src="<?= $this->basePath('/vendor/bootstrap-select-1.14.0/js/i18n/defaults-fr_FR.js') ?>"></script>



<!-- Scripts de l'application -->

<script type="text/javascript" src="<?= $this->basePath('/js/datepicker-fr.js?v=' . $version) ?>"></script>

module/Enseignement/config/module.config.php

+3 −2
Original line number Diff line number Diff line
@@ -104,10 +104,11 @@ return [ 
                    ],

                ],

                'saisie-form-refresh-vh' => [

                    'route'       => 'saisie-form-refresh-vh[/:service]',

                    'route'       => '/saisie-form-refresh-vh[/:service]',

                    'action'      => 'saisie-form-refresh-vh',

                    'constraints' => [

                        'id'      => '[0-9]*',

                        'service' => '[0-9]*',

                    ],

                ],

                'suppression'            => [

module/Enseignement/src/View/Helper/EnseignementSaisieFormViewHelper.php

+6 −7
Original line number Diff line number Diff line
@@ -6,13 +6,12 @@ use Application\Entity\Db\Periode; 
use Enseignement\Entity\Db\Service;

use Enseignement\Form\EnseignementSaisieForm;

use Service\Entity\Db\TypeVolumeHoraire;

use Application\Form\Service\Saisie;

use Application\View\Helper\AbstractViewHelper;

use \Application\Service\Traits\ContextServiceAwareTrait;

use \Application\Service\Traits\PeriodeServiceAwareTrait;

use \Application\Service\Traits\TypeInterventionServiceAwareTrait;

use \Service\Service\TypeVolumeHoraireServiceAwareTrait;

use \Service\Service\EtatVolumeHoraireServiceAwareTrait;

use Application\Service\Traits\ContextServiceAwareTrait;

use Application\Service\Traits\PeriodeServiceAwareTrait;

use Application\Service\Traits\TypeInterventionServiceAwareTrait;

use Service\Service\TypeVolumeHoraireServiceAwareTrait;

use Service\Service\EtatVolumeHoraireServiceAwareTrait;





/**
@@ -126,7 +125,7 @@ class EnseignementSaisieFormViewHelper extends AbstractViewHelper 
            'enseignement/saisie-form-refresh-vh',

            [

                'service' => $this->form->get('service')->get('id')->getValue(),

            ]);

            ], ['query' => ['type-volume-horaire' => $this->form->getTypeVolumeHoraire()->getId()]]);



        return $url;

    }

module/Plafond/src/View/Helper/PlafondsViewHelper.php

+3 −3
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ class PlafondsViewHelper extends AbstractHtmlElement 
    {

        $t = $this->getView()->tag();



        $labAttrs = ['class' => ['label']];

        $labAttrs = ['class' => ['badge']];

        if ($plafond->isBloquant()) {

            $labAttrs['class'][] = 'label-danger';

            $labAttrs['class'][] = 'bg-danger';

            $labAttrs['title']   = 'Plafond bloquant';

        } else {

            $labAttrs['class'][] = 'label-info';

            $labAttrs['class'][] = 'bg-info';

            $labAttrs['title']   = 'Plafond informatif';

        }

public/css/app.css

+11 −2
Original line number Diff line number Diff line
@@ -28680,8 +28680,12 @@ form#service div#element-interne div.col-md-5 { 








form#service div.volume-horaire-saisie-multiple div {









  float: left;









  width: 10em;









  height: 5em;









  margin-right: 1em;









  margin-bottom: 1em;









}

















form#service div.volume-horaire-saisie-multiple label {









  font-weight: 600;









}

















form#service div.volume-horaire-saisie-multiple div input {










@@ -28834,6 +28838,11 @@ ul.privileges-form li label {







}

















/* Plafonds */









.plafonds .alert {









  padding-top: 0.5rem;









  padding-bottom: 0.5rem;









}

















.plafonds .plafond .progress {









  margin-bottom: 0px;









}