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
6c929bc1
Commit
6c929bc1
authored
Nov 10, 2021
by
Laurent Lécluse
Browse files
Affichage distinct des enseignements dans la fiche de service
parent
a9f83ef1
Changes
2
Hide whitespace changes
Inline
Side-by-side
module/Application/src/Application/Controller/IntervenantController.php
View file @
6c929bc1
...
...
@@ -160,6 +160,7 @@ class IntervenantController extends AbstractController
$this
->
em
()
->
getFilters
()
->
enable
(
'historique'
)
->
init
([
\
Application\Entity\Db\Service
::
class
,
\
Application\Entity\Db\VolumeHoraire
::
class
,
\
Application\Entity\Db\CheminPedagogique
::
class
,
\
Application\Entity\Db\ServiceReferentiel
::
class
,
\
Application\Entity\Db\VolumeHoraireReferentiel
::
class
,
\
Application\Entity\Db\Validation
::
class
,
...
...
@@ -191,7 +192,7 @@ class IntervenantController extends AbstractController
$campagneSaisie
=
$this
->
getServiceCampagneSaisie
()
->
getBy
(
$intervenant
->
getStatut
()
->
getTypeIntervenant
(),
$typeVolumeHoraire
);
if
(
!
$campagneSaisie
->
estOuverte
())
{
$role
=
$this
->
getServiceContext
()
->
getSelectedIdentityRole
();
if
(
$role
->
getIntervenant
())
{
...
...
module/Application/src/Application/View/Helper/Service/Ligne.php
View file @
6c929bc1
...
...
@@ -120,7 +120,11 @@ class Ligne extends AbstractViewHelper
$out
.
=
'<td>'
.
$this
->
renderStructure
(
$element
?
$element
->
getStructure
()
:
null
)
.
"</td>
\n
"
;
}
if
(
$liste
->
getColumnVisibility
(
'formation'
))
{
$out
.
=
'<td>'
.
$this
->
renderEtape
(
$element
?
$element
->
getEtape
()
:
null
)
.
"</td>
\n
"
;
$out
.
=
'<td>'
;
if
(
$element
&&
$element
->
getCheminPedagogique
()
->
count
()
>
1
)
{
$out
.
=
'<small class="badge" style="font-size:8pt" title="Enseignement mutualisé entre plusieures formations. Seule la formation principale est présentée ci-dessous">Enseignement mutualisé</small><br />'
;
}
$out
.
=
$this
->
renderEtape
(
$element
?
$element
->
getEtape
()
:
null
)
.
"</td>
\n
"
;
}
if
(
$liste
->
getColumnVisibility
(
'periode'
))
{
$out
.
=
'<td style="text-align:center">'
.
$this
->
renderPeriode
(
$element
?
$element
->
getPeriode
()
:
null
)
.
"</td>
\n
"
;
...
...
Laurent Lécluse
@lecluse
mentioned in commit
0022a5e5
·
Nov 22, 2021
mentioned in commit
0022a5e5
mentioned in commit 0022a5e5f8c1a5b0f3f79bca43b77995008273a0
Toggle commit list
Laurent Lécluse
@lecluse
mentioned in merge request
!95 (merged)
·
Nov 22, 2021
mentioned in merge request
!95 (merged)
mentioned in merge request !95
Toggle commit list
Laurent Lécluse
@lecluse
mentioned in commit
c76eb450
·
Nov 22, 2021
mentioned in commit
c76eb450
mentioned in commit c76eb450341db9f0f55d0e19f1118d8dbfb3c822
Toggle commit list
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