From fbd365b7b7582fc6ec25c1bd3ab6ef76d70e6b32 Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Tue, 28 Sep 2021 15:22:13 +0200
Subject: [PATCH] Temoin validite
---
composer.json | 2 +-
composer.lock | 9 +++---
.../src/Connecteur/Siham/SihamConnecteur.php | 30 ++++++++++++++-----
.../src/Hydrator/ExportRhHydrator.php | 3 ++
4 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/composer.json b/composer.json
index 76403c43b5..d0bf53582a 100755
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"unicaen/tbl" : "4.1",
"unicaen/open-document" : "3.0.2",
"ocramius/proxy-manager" : "2.2.3",
- "unicaen/siham" : "dev-master"
+ "unicaen/siham" : "^1.0"
},
"require-dev" : {
"zendframework/zend-test" : "3.3.0",
diff --git a/composer.lock b/composer.lock
index 2068aa7187..342f4e397d 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ac9cf1ab6b4d0db5255a5e0697cc6626",
+ "content-hash": "25f3bf165aca197f0744a83c93336d5c",
"packages": [
{
"name": "beberlei/assert",
@@ -2894,11 +2894,11 @@
},
{
"name": "unicaen/siham",
- "version": "dev-master",
+ "version": "1.0",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/siham.git",
- "reference": "cbc2a7482dd157f96029e8438da63cf0c76ca4d9"
+ "reference": "9ae9c8034e32c5ed082b1b9548fbc93e592f124a"
},
"require": {
"zendframework/zend-mail": "^2.10",
@@ -2923,7 +2923,7 @@
}
],
"description": "PHP library for SIHAM webservices",
- "time": "2021-09-27T10:14:03+00:00"
+ "time": "2021-09-27T10:25:02+00:00"
},
{
"name": "unicaen/tbl",
@@ -8149,7 +8149,6 @@
],
"minimum-stability": "stable",
"stability-flags": {
- "unicaen/siham": 20,
"unicaen/php-compat": 20
},
"prefer-stable": false,
diff --git a/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php b/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
index 17c5dd6533..70e21dcbdd 100644
--- a/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
+++ b/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
@@ -369,17 +369,23 @@ class SihamConnecteur implements ConnecteurRhInterface
['dateEffetPosition' => $dateEffet,
'dateFinPrevue' => $dateFin,
'dateFinReelle' => $dateFin,
- 'position' => $datas['connecteurForm']['position']];
+ 'position' => $datas['connecteurForm']['position'],
+ 'temoinValidite' => 1,
+ ];
/*STATUT*/
$statut[] =
['dateEffetStatut' => $dateEffet,
- 'statut' => $datas['connecteurForm']['statut']];
+ 'statut' => $datas['connecteurForm']['statut'],
+ 'temoinValidite' => 1,
+ ];
/*MODALITE SERVICE*/
$service[] =
['dateEffetModalite' => $dateEffet,
- 'modalite' => $datas['connecteurForm']['modaliteService']];
+ 'modalite' => $datas['connecteurForm']['modaliteService'],
+ 'temoinValidite' => 1,
+ ];
/*COORDONNEES POSTALES*/
$adresse = '';
@@ -470,7 +476,7 @@ class SihamConnecteur implements ConnecteurRhInterface
'numeroInseeProvisoire' => ($dossierIntervenant->getNumeroInseeProvisoire()) ? $dossierIntervenant->getNumeroInsee() : '',
'prenom' => $dossierIntervenant->getPrenom(),
'sexe' => ($dossierIntervenant->getCivilite() == 'M.') ? '1' : '2',
- 'temoinValidite' => '1',
+ 'temoinValidite' => 1,
'UO' => $datas['connecteurForm']['affectation'],
];
@@ -520,17 +526,25 @@ class SihamConnecteur implements ConnecteurRhInterface
['dateEffetPosition' => $dateEffet,
'dateFinPrevue' => $dateFin,
'dateFinReelle' => $dateFin,
- 'position' => $datas['connecteurForm']['position']];
+ 'position' => $datas['connecteurForm']['position'],
+ 'temoinValidite' => 1,
+ ];
+
/*STATUT*/
$statut[] =
['dateEffetStatut' => $dateEffet,
- 'statut' => $datas['connecteurForm']['statut']];
+ 'statut' => $datas['connecteurForm']['statut'],
+ 'temoinValidite' => 1,
+ ];
/*MODALITE SERVICE*/
$service[] =
['dateEffetModalite' => $dateEffet,
- 'modalite' => $datas['connecteurForm']['modaliteService']];
+ 'modalite' => $datas['connecteurForm']['modaliteService'],
+ 'temoinValidite' => 1,
+
+ ];
/*CARRIERE*/
$carriere = [
@@ -561,7 +575,7 @@ class SihamConnecteur implements ConnecteurRhInterface
'listePositions' => $position,
'motifEntree' => 'REN',
'matricule' => $matricule,
- 'temoinValidite' => '1',
+ 'temoinValidite' => 1,
'UO' => $datas['connecteurForm']['affectation'],
];
diff --git a/module/ExportRh/src/Hydrator/ExportRhHydrator.php b/module/ExportRh/src/Hydrator/ExportRhHydrator.php
index a59feeac96..1a4df3588a 100644
--- a/module/ExportRh/src/Hydrator/ExportRhHydrator.php
+++ b/module/ExportRh/src/Hydrator/ExportRhHydrator.php
@@ -45,6 +45,9 @@ class ExportRhHydrator implements HydratorInterface
case 'ETUD_UCBN':
$statutRh = 'C2041';
break;
+ case 'PAMSU':
+ $statutRh = 'C1210';
+ break;
}
$data['connecteurForm'] = [
--
GitLab