Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mes-formations
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
mes-formations
Commits
fc68e80c
Commit
fc68e80c
authored
6 months ago
by
Jean-Philippe Metivier
Browse files
Options
Downloads
Patches
Plain Diff
Ne plus lister en frais non renseignées les formations sans demande externe
parent
d9b89fe0
Branches
master
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
module/Formation/src/Formation/Service/InscriptionFrais/InscriptionFraisService.php
+9
-2
9 additions, 2 deletions
...tion/Service/InscriptionFrais/InscriptionFraisService.php
with
9 additions
and
2 deletions
module/Formation/src/Formation/Service/InscriptionFrais/InscriptionFraisService.php
+
9
−
2
View file @
fc68e80c
...
...
@@ -69,8 +69,15 @@ class InscriptionFraisService
return
$frais
;
}
/**
* Nota Bene :
* seules les formations rattachées à une demande externe (hors plan de formation) doivent avoir le faire de nécessairement remplis ;
* ils peuvent toujours être remplis.
*/
public
function
getFraisManquants
(
?Session
$session
):
array
{
if
(
empty
(
$session
->
getDemandesExternes
()))
return
[];
$sql
=
<<<EOS
select frais.id, coalesce(concat(agent.prenom, ' ', coalesce(agent.nom_usage, agent.nom_famille)), concat(stagiaire.prenom, ' ', stagiaire.nom)) AS personne , frais_hebergement, frais_repas, frais_transport
from formation_instance session
...
...
@@ -79,9 +86,9 @@ from formation_instance session
left join formation_stagiaire_externe stagiaire on inscription.stagiaire_id = stagiaire.id
left join formation_inscription_frais frais on inscription.id = frais.inscription_id
where true
-- pas histo
--
-- pas histo
AND inscription.histo_destruction IS NULL
-- selection
--
-- selection
AND session.id=:session_id
AND inscription.liste = 'principale'
AND (frais_repas IS NULL OR frais_transport IS NULL OR frais_hebergement IS NULL)
...
...
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