Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
open-source
OSE
Commits
f7462ca7
Commit
f7462ca7
authored
Sep 21, 2021
by
Antony Le Courtes
Browse files
Mise en place date d'export au niveau de l'intervenant pour permettre la gestion d'un indicateur.
parent
a8ed4a55
Changes
5
Hide whitespace changes
Inline
Side-by-side
composer.lock
View file @
f7462ca7
...
@@ -2896,7 +2896,7 @@
...
@@ -2896,7 +2896,7 @@
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/siham.git",
"url": "https://git.unicaen.fr/lib/unicaen/siham.git",
"reference": "
cf1929786d816d6cfb7f0646741b9a829637104
0"
"reference": "
af707552271432f46eb16fe86b0718501d8b298
0"
},
},
"require": {
"require": {
"zendframework/zend-mail": "^2.10",
"zendframework/zend-mail": "^2.10",
...
@@ -2921,7 +2921,7 @@
...
@@ -2921,7 +2921,7 @@
}
}
],
],
"description": "PHP library for SIHAM webservices",
"description": "PHP library for SIHAM webservices",
"time": "2021-09-1
6
T12:3
3
:4
9
+00:00"
"time": "2021-09-
2
1T12:3
8
:4
6
+00:00"
},
},
{
{
"name": "unicaen/tbl",
"name": "unicaen/tbl",
...
@@ -6579,16 +6579,16 @@
...
@@ -6579,16 +6579,16 @@
},
},
{
{
"name": "phpdocumentor/type-resolver",
"name": "phpdocumentor/type-resolver",
"version": "1.
4
.0",
"version": "1.
5
.0",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "
6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0
"
"reference": "
30f38bffc6f24293dadd1823936372dfa9e86e2f
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/
6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0
",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/
30f38bffc6f24293dadd1823936372dfa9e86e2f
",
"reference": "
6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0
",
"reference": "
30f38bffc6f24293dadd1823936372dfa9e86e2f
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -6596,7 +6596,8 @@
...
@@ -6596,7 +6596,8 @@
"phpdocumentor/reflection-common": "^2.0"
"phpdocumentor/reflection-common": "^2.0"
},
},
"require-dev": {
"require-dev": {
"ext-tokenizer": "*"
"ext-tokenizer": "*",
"psalm/phar": "^4.8"
},
},
"type": "library",
"type": "library",
"extra": {
"extra": {
...
@@ -6620,7 +6621,7 @@
...
@@ -6620,7 +6621,7 @@
}
}
],
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "202
0
-09-17T1
8:55:26
+00:00"
"time": "202
1
-09-17T1
5:28:14
+00:00"
},
},
{
{
"name": "phpspec/prophecy",
"name": "phpspec/prophecy",
...
...
data/ddl/table/INTERVENANT.php
View file @
f7462ca7
...
@@ -705,6 +705,18 @@ return [
...
@@ -705,6 +705,18 @@ return [
'position'
=>
58
,
'position'
=>
58
,
'commentaire'
=>
NULL
,
'commentaire'
=>
NULL
,
],
],
'EXPORT_DATE'
=>
[
'name'
=>
'EXPORT_DATE'
,
'type'
=>
'date'
,
'bdd-type'
=>
'DATE'
,
'length'
=>
0
,
'scale'
=>
NULL
,
'precision'
=>
NULL
,
'nullable'
=>
TRUE
,
'default'
=>
NULL
,
'position'
=>
59
,
'commentaire'
=>
'Date du dernier export vers le SIRH'
,
],
],
],
'columns-order'
=>
'ID,ANNEE_ID,CODE,UTILISATEUR_CODE,STRUCTURE_ID,STATUT_ID,GRADE_ID,DISCIPLINE_ID,CIVILITE_ID,NOM_USUEL,PRENOM,DATE_NAISSANCE,NOM_PATRONYMIQUE,COMMUNE_NAISSANCE,PAYS_NAISSANCE_ID,DEPARTEMENT_NAISSANCE_ID,PAYS_NATIONALITE_ID,TEL_PRO,TEL_PERSO,EMAIL_PRO,EMAIL_PERSO,ADDR_PRECISIONS,ADDR_NUMERO,ADDR_NUMERO_COMPL_ID,ADDR_VOIRIE_ID,ADDR_VOIE,ADDR_LIEU_DIT,ADDR_CODE_POSTAL,ADDR_COMMUNE,ADDR_PAYS_ID,NUMERO_INSEE,NUMERO_INSEE_PROVISOIRE,IBAN,BIC,RIB_HORS_SEPA,AUTRE_1,AUTRE_2,AUTRE_3,AUTRE_4,AUTRE_5,EMPLOYEUR_ID,MONTANT_INDEMNITE_FC,CRITERE_RECHERCHE,SOURCE_ID,SOURCE_CODE,SYNC_STATUT,SYNC_STRUCTURE,HISTO_CREATION,HISTO_CREATEUR_ID,HISTO_MODIFICATION,HISTO_MODIFICATEUR_ID,HISTO_DESTRUCTION,HISTO_DESTRUCTEUR_ID'
,
'columns-order'
=>
'ID,ANNEE_ID,CODE,UTILISATEUR_CODE,STRUCTURE_ID,STATUT_ID,GRADE_ID,DISCIPLINE_ID,CIVILITE_ID,NOM_USUEL,PRENOM,DATE_NAISSANCE,NOM_PATRONYMIQUE,COMMUNE_NAISSANCE,PAYS_NAISSANCE_ID,DEPARTEMENT_NAISSANCE_ID,PAYS_NATIONALITE_ID,TEL_PRO,TEL_PERSO,EMAIL_PRO,EMAIL_PERSO,ADDR_PRECISIONS,ADDR_NUMERO,ADDR_NUMERO_COMPL_ID,ADDR_VOIRIE_ID,ADDR_VOIE,ADDR_LIEU_DIT,ADDR_CODE_POSTAL,ADDR_COMMUNE,ADDR_PAYS_ID,NUMERO_INSEE,NUMERO_INSEE_PROVISOIRE,IBAN,BIC,RIB_HORS_SEPA,AUTRE_1,AUTRE_2,AUTRE_3,AUTRE_4,AUTRE_5,EMPLOYEUR_ID,MONTANT_INDEMNITE_FC,CRITERE_RECHERCHE,SOURCE_ID,SOURCE_CODE,SYNC_STATUT,SYNC_STRUCTURE,HISTO_CREATION,HISTO_CREATEUR_ID,HISTO_MODIFICATION,HISTO_MODIFICATEUR_ID,HISTO_DESTRUCTION,HISTO_DESTRUCTEUR_ID'
,
];
];
...
...
module/Application/src/Application/Entity/Db/Intervenant.php
View file @
f7462ca7
...
@@ -275,6 +275,11 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
...
@@ -275,6 +275,11 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
*/
*/
protected
$hasMiseEnPaiement
=
null
;
protected
$hasMiseEnPaiement
=
null
;
/**
* @var \DateTime
*/
protected
$exportDate
;
/**
/**
...
@@ -1216,6 +1221,30 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
...
@@ -1216,6 +1221,30 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
/**
* @return \DateTime
*/
public
function
getExportDate
():
?
\
DateTime
{
return
$this
->
exportDate
;
}
/**
* @param \DateTime $exportDate
*
* @return Intervenant
*/
public
function
setExportDate
(
?
\
DateTime
$exportDate
)
:
Intervenant
{
$this
->
exportDate
=
$exportDate
;
return
$this
;
}
public
function
getValidite
():
string
public
function
getValidite
():
string
{
{
if
(
!
$this
->
validiteDebut
&&
!
$this
->
validiteFin
)
{
if
(
!
$this
->
validiteDebut
&&
!
$this
->
validiteFin
)
{
...
...
module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml
View file @
f7462ca7
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
<field
name=
"validiteDebut"
type=
"datetime"
column=
"VALIDITE_DEBUT"
nullable=
"true"
/>
<field
name=
"validiteDebut"
type=
"datetime"
column=
"VALIDITE_DEBUT"
nullable=
"true"
/>
<field
name=
"validiteFin"
type=
"datetime"
column=
"VALIDITE_FIN"
nullable=
"true"
/>
<field
name=
"validiteFin"
type=
"datetime"
column=
"VALIDITE_FIN"
nullable=
"true"
/>
<field
name=
"exportDate"
type=
"datetime"
column=
"EXPORT_DATE"
nullable=
"true"
/>
<many-to-one
field=
"source"
target-entity=
"UnicaenImport\Entity\Db\Source"
>
<many-to-one
field=
"source"
target-entity=
"UnicaenImport\Entity\Db\Source"
>
<join-column
name=
"SOURCE_ID"
referenced-column-name=
"ID"
/>
<join-column
name=
"SOURCE_ID"
referenced-column-name=
"ID"
/>
...
...
module/Application/src/Application/Service/IntervenantService.php
View file @
f7462ca7
...
@@ -580,4 +580,16 @@ class IntervenantService extends AbstractEntityService
...
@@ -580,4 +580,16 @@ class IntervenantService extends AbstractEntityService
return
$intervenant
;
return
$intervenant
;
}
}
public
function
updateExportDate
(
Intervenant
$intervenant
):
Intervenant
{
$date
=
new
\
DateTime
();
$intervenant
->
setExportDate
(
$date
);
$this
->
getEntityManager
()
->
persist
(
$intervenant
);
$this
->
getEntityManager
()
->
flush
();
return
$intervenant
;
}
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment