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
034c2b2d
Commit
034c2b2d
authored
3 months ago
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
bug mep
parent
8d85cd23
Branches
freeradius_3_0_21_config_updates
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
module/Paiement/src/Tbl/Process/PaiementDebugger.php
+6
-1
6 additions, 1 deletion
module/Paiement/src/Tbl/Process/PaiementDebugger.php
module/Paiement/src/Tbl/Process/PaiementProcess.php
+11
-6
11 additions, 6 deletions
module/Paiement/src/Tbl/Process/PaiementProcess.php
with
17 additions
and
7 deletions
module/Paiement/src/Tbl/Process/PaiementDebugger.php
+
6
−
1
View file @
034c2b2d
...
...
@@ -19,6 +19,8 @@ use Paiement\Entity\Db\TauxRemu;
use
Paiement\Tbl\Process\Sub\ServiceAPayer
;
use
Referentiel\Entity\Db\ServiceReferentiel
;
use
Referentiel\Entity\Db\VolumeHoraireReferentiel
;
use
Service\Entity\Db\EtatVolumeHoraire
;
use
Service\Entity\Db\TypeVolumeHoraire
;
use
UnicaenApp\Entity\HistoriqueAwareInterface
;
/**
...
...
@@ -365,10 +367,13 @@ class PaiementDebugger
'Dernière modification par ' || u.display_name || ' le ' || to_char(vhr.histo_modification,'dd/mm/YYYY') histo
FROM
formule_resultat_volume_horaire frvh
JOIN formule_resultat_intervenant fri ON fri.id = frvh.formule_resultat_intervenant_id
JOIN type_volume_horaire tvh ON tvh.id = fri.type_volume_horaire_id AND tvh.code = '"
.
TypeVolumeHoraire
::
CODE_REALISE
.
"'
JOIN etat_volume_horaire evh ON evh.id = fri.etat_volume_horaire_id AND evh.code = '"
.
EtatVolumeHoraire
::
CODE_VALIDE
.
"'
JOIN volume_horaire_ref vhr ON vhr.id = frvh.volume_horaire_ref_id
JOIN utilisateur u ON u.id = vhr.histo_modificateur_id
WHERE
frvh.id = :frsr
frvh.
service_referentiel_
id = :frsr
ORDER BY
frvh.id
"
;
...
...
This diff is collapsed.
Click to expand it.
module/Paiement/src/Tbl/Process/PaiementProcess.php
+
11
−
6
View file @
034c2b2d
...
...
@@ -195,14 +195,19 @@ class PaiementProcess implements ProcessInterface
$this
->
services
[
$key
]
=
$sap
;
}
if
(
!
array_key_exists
(
$lapKey
,
$this
->
services
[
$key
]
->
lignesAPayer
))
{
$lap
=
new
LigneAPayer
();
$tauxRemu
=
(
int
)
$data
[
'TAUX_REMU_ID'
];
$horaireDebut
=
(
string
)
$data
[
'HORAIRE_DEBUT'
];
$lap
->
tauxValeur
=
$this
->
getServiceTauxRemu
()
->
tauxValeur
(
$tauxRemu
,
$horaireDebut
);
$lap
->
pourcAA
=
$this
->
repartiteur
->
fromBdd
(
$data
);
$lap
->
fromBdd
(
$data
);
if
(
!
array_key_exists
(
$lapKey
,
$this
->
services
[
$key
]
->
lignesAPayer
))
{
$this
->
services
[
$key
]
->
lignesAPayer
[
$lapKey
]
=
$lap
;
}
else
{
$olap
=
&
$this
->
services
[
$key
]
->
lignesAPayer
[
$lapKey
];
$olap
->
heuresAA
+=
$lap
->
heuresAA
;
$olap
->
heuresAC
+=
$lap
->
heuresAC
;
}
if
(
$mepKey
>
0
&&
!
array_key_exists
(
$mepKey
,
$this
->
services
[
$key
]
->
misesEnPaiement
))
{
...
...
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