Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
720ff4a9
Commit
720ff4a9
authored
3 years ago
by
Antony Le Courtes
Browse files
Options
Downloads
Patches
Plain Diff
Meilleure gestion code pays naissance pour le connecteur SIHAM
parent
7f8caf03
Branches
Branches containing commit
Tags
2.0.0
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
module/Application/view/application/pays/index.phtml
+6
-2
6 additions, 2 deletions
module/Application/view/application/pays/index.phtml
module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
+9
-1
9 additions, 1 deletion
module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
with
15 additions
and
3 deletions
module/Application/view/application/pays/index.phtml
+
6
−
2
View file @
720ff4a9
...
@@ -27,6 +27,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
...
@@ -27,6 +27,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
<tr>
<tr>
<th
style=
"text-align: center"
>
Libellé
</th>
<th
style=
"text-align: center"
>
Libellé
</th>
<th
style=
"text-align: center"
>
Code
</th>
<th
style=
"text-align: center"
>
Code
</th>
<th
style=
"text-align: center"
>
Code ISO
</th>
<th
style=
"text-align: center"
>
Source
</th>
<th
style=
"text-align: center"
>
Source
</th>
<?php
if
(
$canEdit
)
:
?>
<?php
if
(
$canEdit
)
:
?>
<th
style=
"text-align: center"
>
Actions
</th>
<th
style=
"text-align: center"
>
Actions
</th>
...
@@ -38,6 +39,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
...
@@ -38,6 +39,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
<tr
class=
"champ-triable"
data-id=
<?php
echo
$pays
->
getId
()
?>
>
<tr
class=
"champ-triable"
data-id=
<?php
echo
$pays
->
getId
()
?>
>
<td
>
<?=
$pays
->
getLibelle
();
?>
</td>
<td
>
<?=
$pays
->
getLibelle
();
?>
</td>
<td>
<?=
$pays
->
getCode
();
?>
</td>
<td>
<?=
$pays
->
getCode
();
?>
</td>
<td>
<?=
$pays
->
getCodeIso3
();
?>
</td>
<td
style=
"text-align: center"
>
<?=
$pays
->
getSource
()
->
getLibelle
();
?>
</td>
<td
style=
"text-align: center"
>
<?=
$pays
->
getSource
()
->
getLibelle
();
?>
</td>
<?php
if
(
$canEdit
)
:
?>
<?php
if
(
$canEdit
)
:
?>
<td
style=
"text-align: center"
>
<td
style=
"text-align: center"
>
...
@@ -45,7 +47,8 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
...
@@ -45,7 +47,8 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
<a
class=
"ajax-modal"
data-event=
"pays-edition"
<a
class=
"ajax-modal"
data-event=
"pays-edition"
href=
"
<?=
$this
->
url
(
'pays/saisie'
,
[
'pays'
=>
$pays
->
getId
()],
[
'query'
=>
[
'tab'
=>
'edition'
]])
?>
"
href=
"
<?=
$this
->
url
(
'pays/saisie'
,
[
'pays'
=>
$pays
->
getId
()],
[
'query'
=>
[
'tab'
=>
'edition'
]])
?>
"
title=
"Modifier le pays"
><i
class=
"fas fa-pen-to-square"
></i></a>
title=
"Modifier le pays"
><i
class=
"fas fa-pen-to-square"
></i></a>
<a
class=
"pop-ajax"
data-title=
"Suppression de l'établissement"
data-content=
"Êtes-vous sur de vouloir supprimer"
data-confirm=
"true"
<a
class=
"pop-ajax"
data-title=
"Suppression de l'établissement"
data-content=
"Êtes-vous sur de vouloir supprimer"
data-confirm=
"true"
data-submit-reload=
"true"
data-submit-reload=
"true"
href=
"
<?=
$this
->
url
(
'pays/supprimer'
,
[
'pays'
=>
$pays
->
getId
()])
?>
"
href=
"
<?=
$this
->
url
(
'pays/supprimer'
,
[
'pays'
=>
$pays
->
getId
()])
?>
"
title=
"Supprimer le pays"
><i
class=
"fas fa-trash-can"
></i></a>
title=
"Supprimer le pays"
><i
class=
"fas fa-trash-can"
></i></a>
...
@@ -60,7 +63,8 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
...
@@ -60,7 +63,8 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
</table>
</table>
<?php
if
(
$canEdit
)
:
?>
<?php
if
(
$canEdit
)
:
?>
<a
class=
"btn btn-primary ajax-modal"
data-event=
"pays-edition"
href=
"
<?=
$this
->
url
(
'pays/saisie'
);
?>
"
><i
class=
"fas fa-plus"
></i>
<a
class=
"btn btn-primary ajax-modal"
data-event=
"pays-edition"
href=
"
<?=
$this
->
url
(
'pays/saisie'
);
?>
"
><i
class=
"fas fa-plus"
></i>
Ajout d'un nouveau pays
</a>
Ajout d'un nouveau pays
</a>
<?php
endif
;
?>
<?php
endif
;
?>
...
...
This diff is collapsed.
Click to expand it.
module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php
+
9
−
1
View file @
720ff4a9
...
@@ -477,6 +477,14 @@ class SihamConnecteur implements ConnecteurRhInterface
...
@@ -477,6 +477,14 @@ class SihamConnecteur implements ConnecteurRhInterface
'temPrincipale'
=>
1
,
'temPrincipale'
=>
1
,
];
];
/*PAYS NAISSANCE*/
if
(
!
empty
(
$dossierIntervenant
->
getPaysNaissance
()
&&
!
empty
(
$dossierIntervenant
->
getPaysNaissance
()
->
getCodeIso3
())))
{
$paysNaissance
=
$dossierIntervenant
->
getPaysNaissance
()
->
getCodeIso3
();
}
elseif
(
!
empty
(
$dossierIntervenant
->
getDepartementNaissance
()))
{
$paysNaissance
=
'FRA'
;
}
else
{
$paysNaissance
=
''
;
}
$params
=
[
$params
=
[
'categorieEntree'
=>
'ACTIVE'
,
'categorieEntree'
=>
'ACTIVE'
,
...
@@ -485,7 +493,7 @@ class SihamConnecteur implements ConnecteurRhInterface
...
@@ -485,7 +493,7 @@ class SihamConnecteur implements ConnecteurRhInterface
'dateNaissance'
=>
$dossierIntervenant
->
getDateNaissance
()
->
format
(
'Y-m-d'
),
'dateNaissance'
=>
$dossierIntervenant
->
getDateNaissance
()
->
format
(
'Y-m-d'
),
'villeNaissance'
=>
$dossierIntervenant
->
getCommuneNaissance
(),
'villeNaissance'
=>
$dossierIntervenant
->
getCommuneNaissance
(),
'departementNaissance'
=>
(
!
empty
(
$dossierIntervenant
->
getDepartementNaissance
()))
?
substr
(
$dossierIntervenant
->
getDepartementNaissance
()
->
getCode
(),
1
,
2
)
:
''
,
'departementNaissance'
=>
(
!
empty
(
$dossierIntervenant
->
getDepartementNaissance
()))
?
substr
(
$dossierIntervenant
->
getDepartementNaissance
()
->
getCode
(),
1
,
2
)
:
''
,
'paysNaissance'
=>
(
!
empty
(
$dossierIntervenant
->
getPaysNaissance
()
&&
!
empty
(
$dossierIntervenant
->
getPaysNaissance
()
->
getCodeIso3
())))
?
$dossierIntervenant
->
getPaysNaissance
()
->
getCodeIso3
()
:
'FRA'
,
'paysNaissance'
=>
$paysNaissance
,
'emploi'
=>
$datas
[
'connecteurForm'
][
'emploi'
],
'emploi'
=>
$datas
[
'connecteurForm'
][
'emploi'
],
'listeCoordonneesPostales'
=>
$coordonneesPostales
,
'listeCoordonneesPostales'
=>
$coordonneesPostales
,
'listeCoordonneesBancaires'
=>
$coordonneesBancaires
,
'listeCoordonneesBancaires'
=>
$coordonneesBancaires
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment