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

merging master

parents 41af47a1 f52d254a
Loading
Loading
Loading
Loading
+2 −1
Changes for module/Application/config/module.config.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ return [
            '050_bootstrap-theme' => '',
            '110_' => 'vendor/DataTables-1.10.18/datatables.min.css',
            '114_' => 'vendor/bootstrap-select-1.13.2/dist/css/bootstrap-select.min.css',
            '999_' => 'css/icon.css',
            '998_' => 'css/icon.css',
            '999_' => 'css/highlight.css',
        ],
        'images' => [
            '100_' => 'img/PrEECoG.svg',
+1 −1
Changes for module/Application/src/Application/Controller/ApplicationController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class ApplicationController extends AbstractActionController {
    {
        $groupeId = $this->params()->fromQuery('groupe');
        /**
         * @var Application[] $activites
         * @var Application[] $applications
         * @var ApplicationGroupe[] $groupes
         */

+11 −2
Changes for module/Application/src/Application/Controller/EntretienProfessionnelController.php: 11 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -92,7 +92,11 @@ class EntretienProfessionnelController extends AbstractActionController

        /** @var EntretienProfessionnelForm $form */
        $form = $this->getEntretienProfessionnelForm();
        if ($campagne !== null) {
            $form->setAttribute('action', $this->url()->fromRoute('entretien-professionnel/creer', ["campagne" => $campagne->getId()], ["query" => ["agent" => $agentId, "structure" => $structureId]], true));
        } else {
            $form->setAttribute('action', $this->url()->fromRoute('entretien-professionnel/creer', [], ["query" => ["agent" => $agentId, "structure" => $structureId]], true));
        }
        $form->bind($entretien);

        if ($structure !== null) {
@@ -107,8 +111,10 @@ class EntretienProfessionnelController extends AbstractActionController
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $instance = $this->getFormulaireInstanceService()->createInstance('ENTRETIEN_PROFESSIONNEL');
                $entretien->setFormulaireInstance($instance);
                $entretien_instance = $this->getFormulaireInstanceService()->createInstance('ENTRETIEN_PROFESSIONNEL');
                $formation_instance = $this->getFormulaireInstanceService()->createInstance('FORMATION');
                $entretien->setFormulaireInstance($entretien_instance);
                $entretien->setFormationInstance($formation_instance);
                $this->getEntretienProfessionnelService()->create($entretien);
                $this->getEntretienProfessionnelService()->recopiePrecedent($entretien);
                $this->getMailingService()->sendMailType("ENTRETIEN_CONVOCATION_AGENT", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'user' => $entretien->getAgent()->getUtilisateur()]);
@@ -296,6 +302,7 @@ class EntretienProfessionnelController extends AbstractActionController
                    case 'Responsable' :
                        $entretien->setValidationResponsable($validation);
                        $this->getMailingService()->sendMailType("ENTRETIEN_VALIDATION_RESPONSABLE", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'mailing' => 'zzz'.$entretien->getAgent()->getUtilisateur()->getEmail()]);
                        $this->getMailingService()->sendMailType("COMMUNICATION_AGENT_OBSERVATIONS", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'mailing' => 'zzz'.$entretien->getAgent()->getUtilisateur()->getEmail()]);
                        break;
                    case 'DRH' :
                        $entretien->setValidationDRH($validation);
@@ -314,6 +321,7 @@ class EntretienProfessionnelController extends AbstractActionController
                'title' => "Validation de l'entretien",
                'text' => "Validation de l'entretien",
                'action' => $this->url()->fromRoute('entretien-professionnel/valider-element', ["type" => $type, "entretien" => $entityId], [], true),
                'refus' => false,
            ]);
        }
        return $vm;
@@ -477,6 +485,7 @@ class EntretienProfessionnelController extends AbstractActionController
            $form->setData($data);
            if ($form->isValid()) {
                $this->getEntretienProfessionnelObservationService()->create($observation);
                $this->getMailingService()->sendMailType("NOTIFICATION_OBSERVATION_AGENT", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'mailing' => 'zzz'.$entretien->getResponsable()->getEmail()]);
            }
        }

+20 −0
Changes for module/Application/src/Application/Entity/Db/EntretienProfessionnel.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf
    private $dateEntretien;
    /** @var FormulaireInstance */
    private $formulaireInstance;
    /** @var FormulaireInstance */
    private $formationInstance;

    /** @var ArrayCollection (Observation) */
    private $observations;
@@ -151,6 +153,24 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf
        return $this;
    }

    /**
     * @return FormulaireInstance
     */
    public function getFormationInstance()
    {
        return $this->formationInstance;
    }

    /**
     * @param FormulaireInstance $formationInstance
     * @return EntretienProfessionnel
     */
    public function setFormationInstance($formationInstance)
    {
        $this->formationInstance = $formationInstance;
        return $this;
    }

    /** OBSERVATIONS **************************************************************************************************/

    /**
+3 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.EntretienProfessionnel.dcm.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@
        <many-to-one target-entity="Autoform\Entity\Db\FormulaireInstance"  field="formulaireInstance">
            <join-column name="formulaire_instance" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="Autoform\Entity\Db\FormulaireInstance"  field="formationInstance">
            <join-column name="formation_instance" referenced-column-name="id"/>
        </many-to-one>

        <field name="dateEntretien"     type="datetime"                 column="date_entretien"     nullable="false"/>

Loading