Commit 86eed977 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

erge

parents 2e0f5a9c d93972fa
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ $modules = [
    'Fichier',
    'Indicateur',
    'Formation',
    'EntretienProfessionnel',
    'Application',
//    'Document',
    'ZendDeveloperTools',
+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ use Application\Provider\Privilege\ApplicationPrivileges;
use Application\Provider\Privilege\CompetencePrivileges;
use Application\Provider\Privilege\ConfigurationPrivileges;
use Application\Provider\Privilege\CorpsPrivileges;
use Application\Provider\Privilege\EntretienproPrivileges;
use Application\Provider\Privilege\FicheMetierPrivileges;
use Application\Provider\Privilege\FichePostePrivileges;
use Formation\Provider\Privilege\FormationPrivileges;
use Application\Provider\Privilege\MetierPrivileges;
use Application\Provider\Privilege\MissionspecifiquePrivileges;
use Application\Provider\Privilege\PostePrivileges;
@@ -30,6 +28,8 @@ use Application\View\Helper\SynchorniserIconViewHelper;
use Autoform\Provider\Privilege\IndexPrivileges;
use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use EntretienProfessionnel\Provider\Privilege\EntretienproPrivileges;
use Formation\Provider\Privilege\FormationPrivileges;
use Mailing\Provider\Privilege\MailingPrivileges;
use UnicaenPrivilege\Guard\PrivilegeController;
use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
+1 −1
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ use Application\Service\Agent\AgentServiceAwareTrait;
use Application\Service\ApplicationElement\ApplicationElementServiceAwareTrait;
use Application\Service\Categorie\CategorieServiceAwareTrait;
use Application\Service\CompetenceElement\CompetenceElementServiceAwareTrait;
use Application\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;
use Application\Service\HasApplicationCollection\HasApplicationCollectionServiceAwareTrait;
use Application\Service\HasCompetenceCollection\HasCompetenceCollectionServiceAwareTrait;
use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
use Application\Service\Structure\StructureServiceAwareTrait;
use Doctrine\ORM\ORMException;
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;
use Fichier\Entity\Db\Fichier;
use Fichier\Form\Upload\UploadFormAwareTrait;
use Fichier\Service\Fichier\FichierServiceAwareTrait;
+1 −1
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ use Application\Service\Agent\AgentService;
use Application\Service\ApplicationElement\ApplicationElementService;
use Application\Service\Categorie\CategorieService;
use Application\Service\CompetenceElement\CompetenceElementService;
use Application\Service\EntretienProfessionnel\EntretienProfessionnelService;
use Application\Service\HasApplicationCollection\HasApplicationCollectionService;
use Application\Service\HasCompetenceCollection\HasCompetenceCollectionService;
use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
use Application\Service\Structure\StructureService;
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelService;
use Fichier\Form\Upload\UploadForm;
use Fichier\Service\Fichier\FichierService;
use Fichier\Service\Nature\NatureService;
+5 −5
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ use Application\Form\AjouterGestionnaire\AjouterGestionnaireFormAwareTrait;
use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;
use Application\Form\Structure\StructureFormAwareTrait;
use Application\Service\Agent\AgentServiceAwareTrait;
use Application\Service\EntretienProfessionnel\EntretienProfessionnelCampagneServiceAwareTrait;
use Application\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;
use Application\Service\FichePoste\FichePosteServiceAwareTrait;
use Application\Service\FicheProfil\FicheProfilServiceAwareTrait;
use Application\Service\MissionSpecifique\MissionSpecifiqueAffectationServiceAwareTrait;
@@ -20,6 +18,8 @@ use Application\Service\Poste\PosteServiceAwareTrait;
use Application\Service\Structure\StructureServiceAwareTrait;
use Application\Service\StructureAgentForce\StructureAgentForceServiceAwareTrait;
use DateTime;
use EntretienProfessionnel\Service\Campagne\CampagneServiceAwareTrait;
use EntretienProfessionnel\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;
use UnicaenApp\Form\Element\SearchAndSelect;
use UnicaenApp\View\Model\CsvModel;
use UnicaenUtilisateur\Entity\Db\User;
@@ -42,7 +42,7 @@ class StructureController extends AbstractActionController {
    use UserServiceAwareTrait;

    use EntretienProfessionnelServiceAwareTrait;
    use EntretienProfessionnelCampagneServiceAwareTrait;
    use CampagneServiceAwareTrait;

    use AgentMissionSpecifiqueFormAwareTrait;
    use AjouterGestionnaireFormAwareTrait;
@@ -113,8 +113,8 @@ class StructureController extends AbstractActionController {
        $postes = $this->getPosteService()->getPostesByStructures($structures);

        /** Campagne */
        $last = $this->getEntretienProfessionnelCampagneService()->getLastCampagne();
        $campagnes = $this->getEntretienProfessionnelCampagneService()->getCampagnesActives();
        $last = $this->getCampagneService()->getLastCampagne();
        $campagnes = $this->getCampagneService()->getCampagnesActives();
        $entretiens = [];

        return new ViewModel([
Loading