Skip to content
Snippets Groups Projects
Commit 4246e3c1 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'refs/heads/b23' into b23_FJ_Pegase

parents bc5a787d 0bb8416c
Branches
Tags 23.6
No related merge requests found
......@@ -16,7 +16,7 @@
"laminas/laminas-file" : "^2.8",
"unicaen/code" : "6.1.0",
"unicaen/import" : "6.0.1",
"unicaen/tbl" : "6.2.0",
"unicaen/tbl" : "6.2.1",
"unicaen/open-document" : "6.0.2",
"unicaen/siham" : "6.1.4",
"unicaen/mail" : "6.1.1",
......
This diff is collapsed.
......@@ -238,7 +238,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- AH15=SUM([.AG$1:.AG$1048576])
-- AH15=SUM([.AG:.AG])
WHEN 'AH15' THEN
RETURN calcFnc('somme','AG');
......@@ -302,7 +302,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- AN15=SUM([.AM$1:.AM$1048576])
-- AN15=SUM([.AM:.AM])
WHEN 'AN15' THEN
RETURN calcFnc('somme','AM');
......@@ -366,7 +366,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- AT15=SUM([.AS$1:.AS$1048576])
-- AT15=SUM([.AS:.AS])
WHEN 'AT15' THEN
RETURN calcFnc('somme','AS');
......@@ -430,7 +430,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- AZ15=SUM([.AY$1:.AY$1048576])
-- AZ15=SUM([.AY:.AY])
WHEN 'AZ15' THEN
RETURN calcFnc('somme','AY');
......@@ -494,7 +494,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- BF15=SUM([.BE$1:.BE$1048576])
-- BF15=SUM([.BE:.BE])
WHEN 'BF15' THEN
RETURN calcFnc('somme','BE');
......@@ -558,7 +558,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- BL15=SUM([.BK$1:.BK$1048576])
-- BL15=SUM([.BK:.BK])
WHEN 'BL15' THEN
RETURN calcFnc('somme','BK');
......@@ -612,9 +612,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- BQ=IF(AND([.$D20]="Oui";[.$H20]<>"Référentiel");[.$M20]*[.$AE20];0)
-- BQ=IF([.$D20]="Oui";[.$M20]*[.$AE20];0)
WHEN 'BQ' THEN
IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NULL THEN
IF vh.service_statutaire THEN
RETURN vh.heures * cell('AE',l);
ELSE
RETURN 0;
......@@ -638,9 +638,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PARIS8 AS
-- BS=IF([.$BS$15]<i_service_du;0;IF(OR(MID([.$A20];1;25)="20595";MID([.$A20];1;25)="40");[.$M20]*[.$AE20];0))
-- BS=IF([.$BS$15]<=i_service_du;0;IF(OR(MID([.$A20];1;25)="20595";MID([.$A20];1;25)="40");[.$M20]*[.$AE20];0))
WHEN 'BS' THEN
IF cell('BS15') < i.service_du THEN
IF cell('BS15') <= i.service_du THEN
RETURN 0;
ELSE
IF COALESCE(SUBSTR(vh.structure_code, 1, 25),' ') = '20595' OR COALESCE(SUBSTR(vh.structure_code, 1, 25),' ') = '40' THEN
......
......@@ -4,6 +4,7 @@ namespace Dossier\Form;
use Dossier\Entity\Db\Employeur;
use Application\Form\AbstractForm;
use Dossier\Hydrator\EmployeurHydrator;
use Laminas\Form\FormInterface;
use UnicaenImport\Service\Traits\SchemaServiceAwareTrait;
......@@ -15,6 +16,7 @@ class EmployeurSaisieForm extends AbstractForm
{
$ignore = ["identifiantAssociation", "sourceCode", "source", "critereRecherche"];
$this->spec(Employeur::class, $ignore);
$this->setHydrator(new EmployeurHydrator());
$this->build();
$this->get('raisonSociale')->setLabel('Raison sociale');
$this->get('nomCommercial')->setLabel('Nom commercial');
......
<?php
namespace Dossier\Hydrator;
use Dossier\Entity\Db\Employeur;
use Laminas\Hydrator\HydratorInterface;
class EmployeurHydrator implements HydratorInterface
{
/**
* Hydrate $object with the provided $data.
*
* @param array $data
* @param Employeur $object
*
* @return object
*/
public function hydrate(array $data, $object)
{
$siret = preg_replace('/\D/', '', $data['siret']);
$siren = preg_replace('/\D/', '', $data['siren']);
$object->setSiret($siret);
$object->setSiren($siren);
$object->setRaisonSociale($data['raisonSociale']);
$object->setNomCommercial($data['nomCommercial']);
return $object;
}
/**
* Extract values from an object
*
* @param Employeur $object
*
* @return array
*/
public function extract($object): array
{
$data = [
'siret' => $object->getSiret(),
'siren' => $object->getSiren(),
'raisonSociale' => $object->getRaisonSociale(),
'nomCommercial' => $object->getNomCommercial(),
];
return $data;
}
}
\ No newline at end of file
......@@ -3,6 +3,7 @@
namespace Plafond\Processus;
use Application\Processus\AbstractProcessus;
use Doctrine\DBAL\ConnectionException;
use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use Plafond\Interfaces\PlafondDataInterface;
use Plafond\Service\PlafondServiceAwareTrait;
......@@ -64,8 +65,12 @@ class PlafondProcessus extends AbstractProcessus
}
if ($passed) {
try {
$this->getEntityManager()->commit();
$this->getServicePlafond()->calculerDepuisEntite($entity); // on met à jour les TBLs
}catch(ConnectionException $e){
$this->getEntityManager()->rollback();
}
} else {
$this->getEntityManager()->rollback();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment