Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
open-source
OSE
Commits
95666bd3
Commit
95666bd3
authored
Feb 05, 2019
by
Laurent Lécluse
Browse files
Correction de bug de sélection de structure si on est composante
parent
77025748
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
95666bd3
...
...
@@ -8,6 +8,7 @@ author: Laurent Lécluse - DSI - Unicaen
## Corrections de bugs
* Dans l'onglet Services, le filtre par intervenant fonctionne à nouveau
* Dans la page des mises en paiement (menu gestion), si on a un rôle de périmètre composante, le bug n'affichant plus la structure est résolu
#OSE 8.0.1
...
...
data/Déploiement/Changements.pdf
View file @
95666bd3
No preview for this file type
data/Déploiement/Procédure d'installation.pdf
View file @
95666bd3
No preview for this file type
data/Déploiement/Procédure de mise à jour.pdf
View file @
95666bd3
No preview for this file type
module/Application/src/Application/Controller/PaiementController.php
View file @
95666bd3
...
...
@@ -323,17 +323,23 @@ class PaiementController extends AbstractController
$rechercheForm
=
$this
->
getFormPaiementMiseEnPaiementRecherche
();
$rechercheForm
->
bind
(
$recherche
);
$recherche
->
setStructure
(
$role
->
getStructure
());
if
(
!
$recherche
->
getStructure
())
{
if
(
$role
->
getStructure
()){
$structures
=
[
$role
->
getStructure
()
->
getId
()
=>
$role
->
getStructure
()];
}
else
{
$qb
=
$this
->
getServiceStructure
()
->
finderByMiseEnPaiement
();
$this
->
getServiceStructure
()
->
finderByRole
(
$role
,
$qb
);
$this
->
getServiceMiseEnPaiement
()
->
finderByTypeIntervenant
(
$recherche
->
getTypeIntervenant
(),
$qb
);
$this
->
getServiceMiseEnPaiement
()
->
finderByEtat
(
$recherche
->
getEtat
(),
$qb
);
$structures
=
$this
->
getServiceStructure
()
->
getList
(
$qb
);
$rechercheForm
->
populateStructures
(
$structures
);
}
$rechercheForm
->
populateStructures
(
$structures
);
if
(
!
$recherche
->
getStructure
())
{
if
(
count
(
$structures
)
==
1
)
{
$recherche
->
setStructure
(
current
(
$structures
));
$rechercheForm
->
get
(
'structure'
)
->
setValue
(
$recherche
->
getStructure
()
->
getId
());
$structure
=
current
(
$structures
);
$recherche
->
setStructure
(
$structure
);
$rechercheForm
->
get
(
'structure'
)
->
setValue
(
$structure
->
getId
());
$noData
=
false
;
}
elseif
(
count
(
$structures
)
==
0
)
{
$noData
=
true
;
...
...
@@ -350,7 +356,6 @@ class PaiementController extends AbstractController
$this
->
getServiceMiseEnPaiement
()
->
finderByEtat
(
$recherche
->
getEtat
(),
$qb
);
$periodes
=
$this
->
getServicePeriode
()
->
getList
(
$qb
);
$rechercheForm
->
populatePeriodes
(
$periodes
);
if
(
count
(
$periodes
)
==
1
)
{
$recherche
->
setPeriode
(
current
(
$periodes
));
$rechercheForm
->
get
(
'periode'
)
->
setValue
(
$recherche
->
getPeriode
()
->
getId
());
...
...
@@ -362,7 +367,9 @@ class PaiementController extends AbstractController
$this
->
getServiceIntervenant
()
->
finderByAnnee
(
$recherche
->
getAnnee
(),
$qb
);
$this
->
getServiceMiseEnPaiement
()
->
finderByTypeIntervenant
(
$recherche
->
getTypeIntervenant
(),
$qb
);
$this
->
getServiceMiseEnPaiement
()
->
finderByEtat
(
$recherche
->
getEtat
(),
$qb
);
$rechercheForm
->
populateIntervenants
(
$this
->
getServiceIntervenant
()
->
getList
(
$qb
));
$intervenants
=
$this
->
getServiceIntervenant
()
->
getList
(
$qb
);
$rechercheForm
->
populateIntervenants
(
$intervenants
);
$noData
=
count
(
$intervenants
)
==
0
;
}
$request
=
$this
->
getRequest
();
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment