Commit 9de3feb3 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Netoyage structure requete

parent 6be957ab

module/Structure/src/Structure/Controller/StructureController.php

+9 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use Application\Entity\Db\Interfaces\HasSourceInterface; 
use Application\Form\AgentMissionSpecifique\AgentMissionSpecifiqueFormAwareTrait;

use Application\Form\HasDescription\HasDescriptionFormAwareTrait;

use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;

use Application\Provider\Etat\FichePosteEtats;

use Application\Service\Agent\AgentServiceAwareTrait;

use Application\Service\AgentMissionSpecifique\AgentMissionSpecifiqueServiceAwareTrait;

use Application\Service\FichePoste\FichePosteServiceAwareTrait;
@@ -20,6 +21,11 @@ use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnel 
use Formation\Entity\Db\Formation;

use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;

use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;

use Laminas\Http\Request;

use Laminas\Http\Response;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\JsonModel;

use Laminas\View\Model\ViewModel;

use Structure\Entity\Db\StructureAgentForce;

use Structure\Entity\Db\StructureGestionnaire;

use Structure\Entity\Db\StructureResponsable;
@@ -33,18 +39,15 @@ use UnicaenApp\Exception\RuntimeException; 
use UnicaenApp\View\Model\CsvModel;

use UnicaenDbImport\Entity\Db\Service\Source\SourceServiceAwareTrait;

use UnicaenDbImport\Entity\Db\Source;

use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;

use UnicaenPdf\Exporter\PdfExporter;

use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;

use Laminas\Http\Request;

use Laminas\Http\Response;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\JsonModel;

use Laminas\View\Model\ViewModel;



class StructureController extends AbstractActionController {

    use AgentServiceAwareTrait;

    use AgentMissionSpecifiqueServiceAwareTrait;

    use DemandeExterneServiceAwareTrait;

    use EtatServiceAwareTrait;

    use FichePosteServiceAwareTrait;

    use FicheProfilServiceAwareTrait;

    use FormationInstanceInscritServiceAwareTrait;
@@ -155,6 +158,7 @@ class StructureController extends AbstractActionController { 
            'missions' => $missionsSpecifiques,

            'fichespostes' => $this->getFichePosteService()->getFichesPostesbyAgents($allAgents),

            'fichespostes_pdf' => $fichespostes_pdf,

            'fichePosteEtats' => $this->getEtatService()->getEtatsByTypeCode(FichePosteEtats::TYPE),

//            'fichesRecrutements' => $fichesRecrutements,

//            'profils' => $profils,

            'agents' => $agents,

module/Structure/src/Structure/Controller/StructureControllerFactory.php

+4 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ use Application\Service\Agent\AgentService; 
use Application\Service\AgentMissionSpecifique\AgentMissionSpecifiqueService;

use Application\Service\FichePoste\FichePosteService;

use Application\Service\FicheProfil\FicheProfilService;

use Application\Service\Poste\PosteService;

use Application\Service\SpecificitePoste\SpecificitePosteService;

use EntretienProfessionnel\Service\Campagne\CampagneService;

use EntretienProfessionnel\Service\Delegue\DelegueService;
@@ -25,6 +24,7 @@ use Structure\Form\AjouterResponsable\AjouterResponsableForm; 
use Structure\Service\Structure\StructureService;

use Structure\Service\StructureAgentForce\StructureAgentForceService;

use UnicaenDbImport\Entity\Db\Service\Source\SourceService;

use UnicaenEtat\Service\Etat\EtatService;

use UnicaenUtilisateur\Service\User\UserService;



class StructureControllerFactory {
@@ -42,6 +42,7 @@ class StructureControllerFactory { 
         * @var AgentMissionSpecifiqueService $agentMissionSpecifiqueService

         * @var EntretienProfessionnelService $entretienService

         * @var CampagneService $campagneService

         * @var EtatService $etatService

         * @var DelegueService $delegueService

         * @var DemandeExterneService $demandeService

         * @var FichePosteService $fichePosteService
@@ -58,6 +59,7 @@ class StructureControllerFactory { 
        $agentMissionSpecifiqueService = $container->get(AgentMissionSpecifiqueService::class);

        $entretienService = $container->get(EntretienProfessionnelService::class);

        $campagneService = $container->get(CampagneService::class);

        $etatService = $container->get(EtatService::class);

        $demandeService = $container->get(DemandeExterneService::class);

        $delegueService = $container->get(DelegueService::class);

        $fichePosteService = $container->get(FichePosteService::class);
@@ -92,6 +94,7 @@ class StructureControllerFactory { 
        $controller->setAgentMissionSpecifiqueService($agentMissionSpecifiqueService);

        $controller->setEntretienProfessionnelService($entretienService);

        $controller->setCampagneService($campagneService);

        $controller->setEtatService($etatService);

        $controller->setDelegueService($delegueService);

        $controller->setDemandeExterneService($demandeService);

        $controller->setFichePosteService($fichePosteService);

module/Structure/view/structure/structure/afficher.phtml

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * @var FichePoste[] $fichespostes_pdf

 * @var FichePoste[] $fichesCompletes

 * @var FichePoste[] $fichesIncompletes

 * @var EtatType[] $fichePosteEtats

// * @var FichePoste[] $fichesRecrutements

 * @var Agent[] $agents

 * @var Agent[] $agentsForces
@@ -47,6 +48,7 @@ use Structure\Entity\Db\Structure; 
use Structure\Entity\Db\StructureGestionnaire;

use Structure\Entity\Db\StructureResponsable;

use Structure\Provider\Privilege\StructurePrivileges;

use UnicaenEtat\Entity\Db\EtatType;



$this->headTitle($structure->getLibelleLong());
@@ -195,7 +197,7 @@ $canAfficherStructure = $this->isAllowed($structure, StructurePrivileges::STRU 


                <!-- Informations ------------------------------------------------------------------------------------->

                <div id="informations" class="tab-pane">

                    <?php echo $this->partial('partial/fiches-postes', ['agents' => $agentsAll, 'structure' => $structure, 'fichespostes' => $fichespostes, 'fichespostes_pdf' => $fichespostes_pdf]); ?>

                    <?php echo $this->partial('partial/fiches-postes', ['agents' => $agentsAll, 'structure' => $structure, 'fichespostes' => $fichespostes, 'fichespostes_pdf' => $fichespostes_pdf, 'etats' => $fichePosteEtats]); ?>

                </div>



                <!-- Missions spécifique ------------------------------------------------------------------------------------->

module/Structure/view/structure/structure/partial/campagne.phtml

+18 −16
Original line number Diff line number Diff line
@@ -77,23 +77,25 @@ foreach ($encours as $epro) { 


<h2> Informations sur la campagne </h2>





<div class="row">

    <div class="col-md-6">

            <dl class="dl-horizontal">

        <dt> Année </dt>

        <dd> <?php echo $campagne->getAnnee(); ?> </dd>

        <dt> Début de la campagne </dt>

        <dd> <?php echo $campagne->getDateDebut()->format('d/m/Y'); ?></dd>

        <dt> Fin de la campagne </dt>

        <dd> <?php echo $campagne->getDateFin()->format('d/m/Y'); ?></dd>

        <dt> En cours </dt>

        <dd>

            <?php if ($enCours) : ?>

        <dl class="row">

            <dt class="col-md-3"> Année </dt>

            <dd class="col-md-3"> <?php echo $campagne->getAnnee(); ?> </dd>

            <dt class="col-md-3"> En cours </dt>

            <dd class="col-md-3">

                <?php if ($campagne->estEnCours()) : ?>

                    <span style="color:darkgreen;"><span class="icon icon-checked"></span>Oui</span>

                <?php else : ?>

                    <span style="color:darkred;"><span class="icon icon-retirer"></span>Non</span>

                <?php endif; ?>

            </dd>

            <dt class="col-md-6"> Début de la campagne </dt>

            <dd class="col-md-6"> <?php echo $campagne->getDateDebut()->format('d/m/Y'); ?></dd>

            <dt class="col-md-6"> Fin de la campagne </dt>

            <dd  class="col-md-6"> <?php echo $campagne->getDateFin()->format('d/m/Y'); ?></dd>



        </dl>



        <h3>Délégué&middot;e&middot;s pour la campagne

module/Structure/view/structure/structure/partial/fiches-postes.phtml

+3 −2
Original line number Diff line number Diff line
@@ -5,15 +5,16 @@ 
 * @var Agent[] $agents

 * @var Structure $structure

 * @var array $fichespostes_pdf

 * @var EtatType[] $etats

 */



use Application\Entity\Db\Agent;

use Application\Entity\Db\FichePoste;

use Application\Provider\Etat\FichePosteEtats;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\FichePostePrivileges;

use Fichier\Entity\Db\Fichier;

use Structure\Entity\Db\Structure;

use UnicaenEtat\Entity\Db\EtatType;



$canVoirFichePoste          = $this->isAllowed(FichePostePrivileges::getResourceId(FichePostePrivileges::FICHEPOSTE_AFFICHER));

$canExporterFichePoste      = $canVoirFichePoste;
@@ -145,7 +146,7 @@ $date = new DateTime(); 
                                    <?php if ($fin === null AND $ficheposte['etat_code'] !== FichePosteEtats::ETAT_CODE_SIGNEE)  echo "<span class='icon sursis' style='color:cadetblue;' title='Fiche en cours de redaction ou fiche ayant pas été validée'></span>"; ?>

                                </td>

                                <td class="etat">

                                    <?php echo $this->etatbadge($ficheposte['etat_code']); ?>

                                    <?php echo $this->etatbadge($etats[$ficheposte['etat_code']]); ?>

                                </td>

                                <td class="action">

                                    <?php if ($canVoirFichePoste) : ?>