Commit 34ce7d10 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Nettoyage

parent b480efcd
Loading
Loading
Loading
Loading
+15 −0
Changes for module/Application/src/View/Helper/Intervenant/IntervenantViewHelper.php: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -46,6 +46,21 @@ class IntervenantViewHelper extends AbstractHtmlElement



    public function getCurrentIntervenant(): ?Intervenant
    {
        if ($this->intervenant) {
            return $this->intervenant;
        }

        if ($intervenant = $this->getServiceContext()->getSelectedIdentityRole()->getIntervenant()) {
            return $intervenant;
        }

        return null;
    }



    /**
     *
     *
+1 −1
Changes for module/Referentiel/view/referentiel/validation.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ foreach ($wells as $well => $title) {
        echo '<div class="well"><h2>' . $title . '</h2>';
        foreach ($services[$well] as $validationId => $srvs) {
            $validation = $validations[$validationId];
            echo $this->partial('application/service-referentiel/partial/validation-referentiel', [
            echo $this->partial('referentiel/partial/validation-referentiel', [
                'validation'        => $validation,
                'structure'         => $validation->getStructure(),
                'services'          => $srvs,
+8 −7
Changes for module/Service/view/service/intervenant/saisie.phtml: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -21,19 +21,17 @@ if ($typeVolumeHoraire->isPrevu()) {
    $title     = 'Constatation des services réalisés';
}

$menuUrl = $this->url(null, ['intervenant' => $intervenant->getId()], ['query' => ['menu' => 1]]);
$menuUrl = (string)$this->url(null, ['intervenant' => $intervenant->getId()], ['query' => ['menu' => 1]]);

$btnNextUrl = $this->url('workflow/feuille-de-route-btn-next', ['intervenant' => $intervenant->getId(), 'wfEtapeCode' => $nextEtape]);

// campagnes de saisie...
$this->intervenant($intervenant)->renderTitle($title);

echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
echo $this->plafonds($intervenant, $typeVolumeHoraire);

if ($cloture && ($enseignements || $referentiels)) {
    $bottom = false;
if ($cloture) echo $this->partial('service/partial/cloture', compact('cloture', 'bottom'));

    echo $this->partial('service/partial/cloture', compact('cloture', 'bottom'));
}

if ($enseignements !== false) {
    echo '<h2>Enseignement</h2>';
@@ -49,12 +47,15 @@ if ($referentiels !== false) {
    echo $ref;
}

if ($cloture && ($enseignements || $referentiels)) {
    $bottom = true;
if ($cloture) echo $this->partial('service/partial/cloture', compact('cloture', 'bottom'));
    echo $this->partial('service/partial/cloture', compact('cloture', 'bottom'));
}


echo $formuleTotauxHetd;


echo $this->feuilleDeRoute($intervenant)->renderNav($nextEtape);

if ($enseignements !== false || $referentiels !== false): ?>
+0 −155
Changes for module/Service/view/service/intervenant/services.phtml: 0 added lines, 155 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Entity\Db\WfEtape;
use Application\Provider\Privilege\Privileges;

/**
 * @var $this                \Application\View\Renderer\PhpRenderer
 * @var $intervenant         \Application\Entity\Db\Intervenant
 * @var $typeVolumeHoraire   \Service\Entity\Db\TypeVolumeHoraire
 * @var $cloture             \Application\Entity\Db\Validation|null
 * @var $role                \Application\Acl\Role
 * @var $services            \Enseignement\Entity\Db\Service[]
 * @var $servicesReferentiel \Referentiel\Entity\Db\ServiceReferentiel[]
 */

$service = new \Enseignement\Entity\Db\Service();
$service->setIntervenant($intervenant);
$service->setTypeVolumeHoraire($typeVolumeHoraire);
$canAddService = $this->isAllowed($service, $typeVolumeHoraire->getPrivilegeEnseignementEdition());

$serviceReferentiel = new \Referentiel\Entity\Db\ServiceReferentiel();
$serviceReferentiel->setIntervenant($intervenant);
$serviceReferentiel->setTypeVolumeHoraire($typeVolumeHoraire);
$serviceReferentiel->setStructure($role->getStructure());
$canAddServiceReferentiel = $this->isAllowed($serviceReferentiel, $typeVolumeHoraire->getPrivilegeReferentielEdition());

if ($typeVolumeHoraire->isPrevu()) {
    $nextEtape = WfEtape::CODE_SERVICE_SAISIE;
    $title     = 'Enseignements';
} else {
    $nextEtape = WfEtape::CODE_SERVICE_SAISIE_REALISE;
    $title     = 'Constatation des enseignements réalisés';
}

$menuUrl = $this->url(null, ['intervenant' => $intervenant->getId()], ['query' => ['menu' => 1]]);

$btnNextUrl = $this->url('workflow/feuille-de-route-btn-next', ['intervenant' => $intervenant->getId(), 'wfEtapeCode' => $nextEtape]);

$this->intervenant($intervenant)->renderTitle($title);

echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
echo $this->plafonds($intervenant, $typeVolumeHoraire);

$bottom = false;
if ($cloture) echo $this->partial('application/intervenant/partial/cloture', compact('cloture', 'role', 'bottom'));

/* Services et horodatage */
if ($services !== false) {
    $serviceListe = $this->enseignements($services);
    $serviceListe->setIntervenant($intervenant);
    $serviceListe->setTypeVolumeHoraire($typeVolumeHoraire)->setAddButtonVisibility($canAddService);
    if ($canAddService && $typeVolumeHoraire->isPrevu()) {
        $serviceListe->showPrevuToPrevu($intervenant);
    }
    echo $serviceListe->render();

    echo $this->partial('application/intervenant/partial/horodatage', [
        'intervenant'       => $intervenant,
        'typeVolumeHoraire' => $typeVolumeHoraire,
        'referentiel'       => false,
    ]);
}

/* Référentiel et horodatage */
if ($servicesReferentiel !== false) {
    $serviceReferentielListe = $this->serviceReferentielListe($servicesReferentiel);
    $serviceReferentielListe->setTypeVolumeHoraire($typeVolumeHoraire)->setAddButtonVisibility($canAddServiceReferentiel);
    if ($canAddServiceReferentiel && $typeVolumeHoraire->isPrevu()) {
        $serviceReferentielListe->showPrevuToPrevu($intervenant);
    }
    echo '<h1>Référentiel</h1><hr />';
    echo $serviceReferentielListe->render();

    echo $this->partial('application/intervenant/partial/horodatage', [
        'intervenant'       => $intervenant,
        'typeVolumeHoraire' => $typeVolumeHoraire,
        'referentiel'       => true,
    ]);
}

$bottom = true;
if ($cloture) echo $this->partial('application/intervenant/partial/cloture', compact('cloture', 'role', 'bottom'));


echo $formuleTotauxHetd;

?>

    <hr/>
    <div id="feuille-de-route-btn-next" data-url="<?= $btnNextUrl ?>">
        <?= $this->feuilleDeRoute($intervenant)->renderNav($nextEtape); ?>
    </div>

<?php if ($services !== false || $servicesReferentiel !== false): ?>
    <script>

        $(function ()
        {
            WidgetInitializer.includeJs(Url('js/service.js'));
            WidgetInitializer.includeJs(Url('js/service-referentiel.js'));
            WidgetInitializer.includeCss(Url('css/service.css'));

            <?php if ($services !== false): ?>$('.service-liste').serviceListe({
                'heures-change-exists': function ()
                {

                },
                'heures-change': function ()
                {
                    // on met à jour le résultat de la formule
                    $("#formule-totaux-hetd").refresh(); // HETD rafraichis

                    // on met à jour l'horodatage des services !!
                    $("#s-horodatage").refresh();

                    // Mise à jour des plafonds
                    $(".plafonds").refresh();

                    // chargement du menu pour faire apparaître ou disparaitre les liens de validation
                    $('#sidebar').load('<?= $menuUrl; ?>');

                    // rafraichissement du bouton de la feuille de route pour pointer vers la prochaine bonne étape
                    $('#feuille-de-route-btn-next').refresh();
                }
            });<?php endif; ?>


            <?php if ($servicesReferentiel !== false): ?>$('.referentiels').referentiels({
                'heures-change-exists': function ()
                {

                },
                'heures-change': function ()
                {
                    // on met à jour le résultat de la formule
                    $("#formule-totaux-hetd").refresh(); // HETD rafraichis

                    // on met à jour l'horodatage des services !!
                    $("#sr-horodatage").refresh();

                    // Mise à jour des plafonds
                    $(".plafonds").refresh();

                    // chargement du menu pour faire apparaître ou disparaitre les liens de validation
                    $('#sidebar').load('<?= $menuUrl; ?>');

                    // rafraichissement du bouton de la feuille de route pour pointer vers la prochaine bonne étape
                    $('#feuille-de-route-btn-next').refresh();
                }
            });<?php endif; ?>

        });

    </script>
<?php endif; ?>
 No newline at end of file