Commit 0120a937 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE

parents d98106b6 1014bc80

data/ddl/package/OSE_WORKFLOW/body.sql

+1 −1
Changes for data/ddl/package/OSE_WORKFLOW/body.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS 
          1                                                         objectif,

          CASE

            WHEN e.code = ''DONNEES_PERSO_SAISIE'' THEN

              CASE WHEN d.dossier_id IS NULL THEN 0 ELSE 1 END

              (d.completude_statut + d.completude_identite + d.completude_identite_comp + d.completude_contact + d.completude_adresse + d.completude_insee + d.completude_iban + d.completude_employeur) / 8



            WHEN e.code = ''DONNEES_PERSO_VALIDATION'' THEN

              CASE WHEN d.validation_id IS NULL THEN 0 ELSE 1 END

module/Application/src/Application/Controller/ContratController.php

+2 −2
Changes for module/Application/src/Application/Controller/ContratController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class ContratController extends AbstractController 
        //Récupération email intervenant (Perso puis unicaen)

        $dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);

        $emailPerso         = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';

        $emailIntervenant   = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();

        $emailIntervenant   = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmailPro();



        /* Récupération des services par contrat et par structure (pour les non contractualisés) */

        $services = [
@@ -355,7 +355,7 @@ class ContratController extends AbstractController 
        $intervenant        = $contrat->getIntervenant();

        $dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);

        $emailDossierPerso  = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';

        $emailIntervenant   = (!empty($emailDossierPerso)) ? $emailDossierPerso : $intervenant->getEmail();

        $emailIntervenant   = (!empty($emailDossierPerso)) ? $emailDossierPerso : $intervenant->getEmailPro();

        if (!empty($emailIntervenant)) {

            try {

                //Utilisation ici du parametre email

module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php

+2 −2
Changes for module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ class SuppressionProcessus 
        }



        /* Dossier */

        if (isset($entities['Dossier'])) {

            foreach ($entities['Dossier'] as $v) {

        if (isset($entities['IntervenantDossier'])) {

            foreach ($entities['IntervenantDossier'] as $v) {

                $this->getServiceDossier()->delete($v->getEntity(), false);

            }

        }

module/Application/src/Application/Service/ModeleContratService.php

+1 −1
Changes for module/Application/src/Application/Service/ModeleContratService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class ModeleContratService extends AbstractEntityService 
        $intervenant        = $contrat->getIntervenant();

        $dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);

        $emailPerso         = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';

        $emailIntervenant   = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();

        $emailIntervenant   = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmailPro();

        if (empty($emailIntervenant)) {

            throw new \Exception("Aucun email disponible / Envoi du contrat impossible");

        }