Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
mathieu
potage
Commits
e6b8094f
Commit
e6b8094f
authored
Sep 04, 2018
by
Mat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vérifie le statut 'en cours' des offres affichées sur la page today
parent
fb07ea87
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
4 deletions
+13
-4
src/PotageBundle/Controller/DefaultController.php
src/PotageBundle/Controller/DefaultController.php
+1
-1
src/PotageBundle/Controller/MembreController.php
src/PotageBundle/Controller/MembreController.php
+4
-0
src/PotageBundle/Repository/LettreRepository.php
src/PotageBundle/Repository/LettreRepository.php
+1
-2
src/PotageBundle/Repository/OffreRepository.php
src/PotageBundle/Repository/OffreRepository.php
+5
-1
src/PotageBundle/Resources/views/Membre/today.html.twig
src/PotageBundle/Resources/views/Membre/today.html.twig
+2
-0
No files found.
src/PotageBundle/Controller/DefaultController.php
View file @
e6b8094f
...
...
@@ -41,7 +41,7 @@ class DefaultController extends MasterController
*/
$lettre
=
$this
->
get
(
'doctrine'
)
->
getManager
()
->
getRepository
(
'PotageBundle:Lettre'
)
->
findOneForSend
(
5
);
->
findOneForSend
(
7
);
$header
=
array
(
'id'
=>
$lettre
->
getId
(),
...
...
src/PotageBundle/Controller/MembreController.php
View file @
e6b8094f
...
...
@@ -113,6 +113,10 @@ class MembreController extends MasterController
$offre
=
$this
->
getDoctrine
()
->
getManager
()
->
getRepository
(
'PotageBundle:Offre'
)
->
findOneByReference
(
$offre_ref
);
if
(
$offre
===
null
)
{
return
$this
->
redirectToRoute
(
'potage_today'
);
}
return
$this
->
render
(
'@Potage/Membre/today.html.twig'
,
array
(
'user'
=>
$user
,
...
...
src/PotageBundle/Repository/LettreRepository.php
View file @
e6b8094f
...
...
@@ -218,9 +218,8 @@ class LettreRepository extends \Doctrine\ORM\EntityRepository
$qb
=
$this
->
createQueryBuilder
(
'l'
)
->
select
(
'l.id'
,
'l.subject'
,
'l.reference'
,
'l.startedAt'
,
'l.endedAt'
,
'l.status'
)
->
innerJoin
(
'l.groupe'
,
'g'
)
->
innerJoin
(
'l.offre'
,
'o'
)
->
addSelect
(
'o.id offre_id'
,
'o.reference offre_ref'
)
->
addSelect
(
'o.id offre_id'
,
'o.reference offre_ref'
,
'o.status offre_status'
)
->
where
(
'g.id = :id'
)
->
andWhere
(
'l.status = :status'
)
->
setParameters
(
array
(
...
...
src/PotageBundle/Repository/OffreRepository.php
View file @
e6b8094f
...
...
@@ -163,7 +163,11 @@ class OffreRepository extends \Doctrine\ORM\EntityRepository
{
$qb
=
$this
->
createQueryBuilder
(
'o'
)
->
where
(
'o.reference = :reference'
)
->
setParameter
(
':reference'
,
$reference
)
->
andWhere
(
'o.status = :status'
)
->
setParameters
(
array
(
':reference'
=>
$reference
,
':status'
=>
"current"
))
;
return
$qb
->
getQuery
()
->
getOneOrNullResult
();
...
...
src/PotageBundle/Resources/views/Membre/today.html.twig
View file @
e6b8094f
...
...
@@ -32,6 +32,7 @@
<ul>
{%
if
groupe.lettres
%}
{%
for
lettre
in
groupe.lettres
%}
{%
if
lettre.offre_status
==
'current'
%}
<li>
<a
href=
"
{{
path
(
'potage_today_one'
,
{
'offre_ref'
:
lettre.offre_ref
}
)
}}
"
>
Offre
{{
lettre.offre_ref
}}
</a><br>
Infolettre
{{
lettre.reference
}}
→ Période du
{{
lettre.startedAt
|
date
(
'd/m/Y'
)
}}
au
{{
lettre.endedAt
|
date
(
'd/m/Y'
)
}}
<br>
...
...
@@ -39,6 +40,7 @@
{{
groupe.nom
}}
:
{{
groupe.adresseDepot
}}
</li>
{%
endif
%}
{%
endfor
%}
{%
endif
%}
</ul>
...
...
Write
Preview
Markdown
is supported
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