Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
potage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mathieu
potage
Commits
91f48f55
Commit
91f48f55
authored
Sep 17, 2018
by
Mat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
un premier formulaire de commande, basique, qui fonctionne
parent
05db4da1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
68 additions
and
8 deletions
+68
-8
src/PotageBundle/Controller/MembreController.php
src/PotageBundle/Controller/MembreController.php
+18
-1
src/PotageBundle/Entity/Commande.php
src/PotageBundle/Entity/Commande.php
+7
-3
src/PotageBundle/Entity/CommandeLegumes.php
src/PotageBundle/Entity/CommandeLegumes.php
+1
-1
src/PotageBundle/Form/Membre/CommandeType.php
src/PotageBundle/Form/Membre/CommandeType.php
+37
-0
src/PotageBundle/Resources/config/routing.yml
src/PotageBundle/Resources/config/routing.yml
+2
-2
src/PotageBundle/Resources/views/Membre/detailCommande.html.twig
...ageBundle/Resources/views/Membre/detailCommande.html.twig
+3
-1
No files found.
src/PotageBundle/Controller/MembreController.php
View file @
91f48f55
...
...
@@ -2,12 +2,14 @@
namespace
PotageBundle\Controller
;
use
PotageBundle\Entity\Commande
;
use
PotageBundle\Entity\Groupe
;
use
PotageBundle\Entity\Lettre
;
use
PotageBundle\Entity\Offre
;
use
PotageBundle\Entity\OffreLegumes
;
use
PotageBundle\Entity\User
;
use
PotageBundle\Entity\Utilisateur
;
use
PotageBundle\Form\Membre\CommandeType
;
use
PotageBundle\Services\LettreToken
;
use
Symfony\Component\HttpFoundation\Request
;
...
...
@@ -64,11 +66,12 @@ class MembreController extends MasterController
/**
* Lorsqu'on pointe explicitement la référence de l'offre
*
* @param Request $request
* @param string $offre_ref
* @return \Symfony\Component\HttpFoundation\Response
* @throws \Doctrine\ORM\NonUniqueResultException
*/
public
function
todayOneAction
(
$offre_ref
)
public
function
todayOneAction
(
Request
$request
,
$offre_ref
)
{
$user
=
$this
->
getUser
();
...
...
@@ -77,6 +80,7 @@ class MembreController extends MasterController
$groupes
=
$this
->
getGroupesDepotLettresAndOffreLegumes
(
$user
);
$currentOffre
=
$this
->
getCurrentOffre
(
$offre_ref
);
$offre
=
$currentOffre
[
'offreOne'
];
/**
* il faut que l'offre soit en cours, et qu'on aie le droit d'y accéder
...
...
@@ -85,6 +89,18 @@ class MembreController extends MasterController
{
return
$this
->
redirectToRoute
(
'potage_today'
);
}
$commande
=
new
Commande
(
$offre
,
$user
);
$form
=
$this
->
createForm
(
CommandeType
::
class
,
$commande
);
$form
->
handleRequest
(
$request
);
if
(
$form
->
isSubmitted
()
&&
$form
->
isValid
())
{
$em
=
$this
->
getDoctrine
()
->
getManager
();
$em
->
persist
(
$commande
);
$em
->
flush
();
}
return
$this
->
render
(
'@Potage/Membre/today.html.twig'
,
array
(
'user'
=>
$user
,
...
...
@@ -94,6 +110,7 @@ class MembreController extends MasterController
'offreOne'
=>
$currentOffre
[
'offreOne'
],
'legumesSorted'
=>
$currentOffre
[
'legumesSorted'
],
'groupeOne'
=>
$currentOffre
[
'groupeOne'
],
'formCommande'
=>
$form
->
createView
(),
));
}
...
...
src/PotageBundle/Entity/Commande.php
View file @
91f48f55
...
...
@@ -58,7 +58,7 @@ class Commande
/**
* @var \DateTime
*
* @ORM\Column(name="updatedAt", type="datetime")
* @ORM\Column(name="updatedAt", type="datetime"
, nullable=true
)
*/
private
$updatedAt
;
...
...
@@ -83,10 +83,14 @@ class Commande
/**
* Commande constructor.
*
* @param Offre $offre
* @param User $user
*/
public
function
__construct
()
public
function
__construct
(
$offre
,
$user
)
{
$this
->
offre
=
$offre
;
$this
->
user
=
$user
;
}
/**
...
...
src/PotageBundle/Entity/CommandeLegumes.php
View file @
91f48f55
...
...
@@ -67,7 +67,7 @@ class CommandeLegumes
/**
* @var \DateTime
*
* @ORM\Column(name="updatedAt", type="datetime")
* @ORM\Column(name="updatedAt", type="datetime"
, nullable=true
)
*/
private
$updatedAt
;
...
...
src/PotageBundle/Form/Membre/CommandeType.php
0 → 100644
View file @
91f48f55
<?php
namespace
PotageBundle\Form\Membre
;
use
PotageBundle\Entity\Commande
;
use
Symfony\Component\Form\AbstractType
;
use
Symfony\Component\Form\Extension\Core\Type\SubmitType
;
use
Symfony\Component\Form\FormBuilderInterface
;
use
Symfony\Component\OptionsResolver\OptionsResolver
;
class
CommandeType
extends
AbstractType
{
public
function
buildForm
(
FormBuilderInterface
$builder
,
array
$options
)
{
$builder
->
add
(
'prixTotal'
)
->
add
(
'sauver'
,
SubmitType
::
class
,
array
(
'label'
=>
'Enregistrer'
,
'attr'
=>
array
(
'class'
=>
'btn btn-dark mb-2'
)
))
;
}
public
function
configureOptions
(
OptionsResolver
$resolver
)
{
parent
::
configureOptions
(
$resolver
);
$resolver
->
setDefault
(
'data_class'
,
Commande
::
class
);
$resolver
->
setDefault
(
'attr'
,
array
(
'class'
=>
'formulaire formulaire_commande'
,
));
}
public
function
getBlockPrefix
()
{
return
'commande'
;
}
}
src/PotageBundle/Resources/config/routing.yml
View file @
91f48f55
...
...
@@ -10,7 +10,7 @@ potage_today:
path
:
/member/today
defaults
:
_controller
:
PotageBundle:Membre:today
methods
:
[
GET
]
methods
:
[
GET
,
POST
]
potage_today_one
:
path
:
/member/today/{offre_ref}
...
...
@@ -18,7 +18,7 @@ potage_today_one:
offre_ref
:
\w+
defaults
:
_controller
:
PotageBundle:Membre:todayOne
methods
:
[
GET
]
methods
:
[
GET
,
POST
]
### ADMIN
...
...
src/PotageBundle/Resources/views/Membre/detailCommande.html.twig
View file @
91f48f55
...
...
@@ -29,4 +29,6 @@
</tbody>
</table>
<button
type=
"button"
class=
"btn btn-lg btn-block btn-primary float-right"
>
Envoyer la commande
</button>
\ No newline at end of file
<button
type=
"button"
class=
"btn btn-lg btn-block btn-primary float-right"
>
Envoyer la commande
</button>
{{
form
(
formCommande
)
}}
\ No newline at end of file
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