diff --git a/data/ddl/package/OSE_WORKFLOW/body.sql b/data/ddl/package/OSE_WORKFLOW/body.sql index 6aae7612c9c175107f39fd0c5847b64ad6a05a9b..9cbcb9ffeb61d1ab8e1d154aa82bdb8bbde92f14 100644 --- a/data/ddl/package/OSE_WORKFLOW/body.sql +++ b/data/ddl/package/OSE_WORKFLOW/body.sql @@ -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 diff --git a/module/Application/src/Application/Controller/ContratController.php b/module/Application/src/Application/Controller/ContratController.php index 018ca88e5e1fc50bc50818e5808258820c7311b6..9f88d97a3885c4d43e5dad880c936014de14221e 100755 --- a/module/Application/src/Application/Controller/ContratController.php +++ b/module/Application/src/Application/Controller/ContratController.php @@ -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 diff --git a/module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php b/module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php index 22055196713cce522445fb7cea07e389ffe15b11..426a88a041bb60d57420e49c95490b44a67b251a 100755 --- a/module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php +++ b/module/Application/src/Application/Processus/Intervenant/SuppressionProcessus.php @@ -112,7 +112,7 @@ class SuppressionProcessus foreach ($entities['Contrat'] as $v) { /** @var Contrat $avenant */ $avenant = $v->getEntity(); - if ($avenant->estUnAvenant()){ + if ($avenant->estUnAvenant()) { $this->getServiceContrat()->delete($v->getEntity(), false); } } @@ -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); } } diff --git a/module/Application/src/Application/Service/ModeleContratService.php b/module/Application/src/Application/Service/ModeleContratService.php index 59a38e5e593c13d75b2ff6fded3b9708d940df29..af74b94a332b73eb26978f6b62566a8bd43e7517 100755 --- a/module/Application/src/Application/Service/ModeleContratService.php +++ b/module/Application/src/Application/Service/ModeleContratService.php @@ -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"); }