Merge pull request #230 from M-GaTE/jeh

Default JEH set to 340
n7consulting · Jan 19, 2018 · cc6dc64 · cc6dc64
2 parents a8b2686 + 5799640
commit cc6dc64
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/Mgate/SuiviBundle/Controller/AvMissionController.php b/src/Mgate/SuiviBundle/Controller/AvMissionController.php
@@ -13,7 +13,6 @@
 
 use Mgate\SuiviBundle\Entity\AvMission;
 use Mgate\SuiviBundle\Entity\Etude;
-use Mgate\SuiviBundle\Form\Type\AvMissionHandler;
 use Mgate\SuiviBundle\Form\Type\AvMissionType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -27,6 +26,7 @@ class AvMissionController extends Controller
 {
     /**
      * @Security("has_role('ROLE_SUIVEUR')")
+     *
      * @param Request $request
      * @param Etude   $etude
      *
@@ -105,7 +105,7 @@ public function modifierAction(Request $request, AvMission $avmission)
      * @Security("has_role('ROLE_SUIVEUR')")
      *
      * @param AvMission $av
-     * @param Request       $request
+     * @param Request   $request
      *
      * @return RedirectResponse
      */
@@ -127,7 +127,7 @@ public function deleteAction(AvMission $av, Request $request)
             $this->addFlash('success', 'Avenant au RM supprimé');
         }
 
-        return $this->redirectToRoute('MgateSuivi_etude_voir',['nom' => $av->getEtude()->getNom()]);
+        return $this->redirectToRoute('MgateSuivi_etude_voir', ['nom' => $av->getEtude()->getNom()]);
     }
 
     private function createDeleteForm(AvMission $contact)

diff --git a/src/Mgate/SuiviBundle/Controller/ClientContactController.php b/src/Mgate/SuiviBundle/Controller/ClientContactController.php
@@ -172,7 +172,7 @@ public function deleteAction(ClientContact $contact, Request $request)
             $this->addFlash('success', 'Contact client supprimé');
         }
 
-        return $this->redirectToRoute('MgateSuivi_etude_voir',['nom' => $contact->getEtude()->getNom()]);
+        return $this->redirectToRoute('MgateSuivi_etude_voir', ['nom' => $contact->getEtude()->getNom()]);
     }
 
     private function createDeleteForm(ClientContact $contact)

diff --git a/src/Mgate/SuiviBundle/Controller/GroupePhasesController.php b/src/Mgate/SuiviBundle/Controller/GroupePhasesController.php
@@ -25,6 +25,7 @@ class GroupePhasesController extends Controller
 {
     /**
      * @Security("has_role('ROLE_SUIVEUR')")
+     *
      * @param Request $request
      * @param Etude   $etude
      *
@@ -55,12 +56,12 @@ public function modifierAction(Request $request, Etude $etude)
 
                 $em->persist($etude); // persist $etude / $form->getData()
                 $em->flush();
-                $this->addFlash('success',isset($message) ? $message: 'Groupes modifiés');
+                $this->addFlash('success', isset($message) ? $message : 'Groupes modifiés');
+
                 return $this->redirectToRoute('MgateSuivi_groupes_modifier', ['id' => $etude->getId()]);
             }
 
             $this->addFlash('danger', 'Le formulaire contient des erreurs.');
-
         }
 
         return $this->render('MgateSuiviBundle:GroupePhases:modifier.html.twig', [

diff --git a/src/Mgate/SuiviBundle/Entity/Phase.php b/src/Mgate/SuiviBundle/Entity/Phase.php
@@ -143,7 +143,7 @@ public function __construct()
     {
         $this->voteCount = 0;
         $this->createdAt = new \DateTime('now');
-        $this->prixJEH = 320;
+        $this->prixJEH = 340;
         $this->avenantStatut = 0;
     }
 

diff --git a/src/Mgate/SuiviBundle/Manager/EtudeExtension.php b/src/Mgate/SuiviBundle/Manager/EtudeExtension.php
@@ -2,7 +2,6 @@
 
 namespace Mgate\SuiviBundle\Manager;
 
-
 use Mgate\PersonneBundle\Entity\Membre;
 use Mgate\SuiviBundle\Entity\DocType;
 use Mgate\SuiviBundle\Entity\Etude;
@@ -43,6 +42,7 @@ public function getFilters()
             'string' => new \Twig_Filter_Method($this, 'toString'),
         ];
     }
+
     public function toString($int)
     {
         return (string) $int;
@@ -68,7 +68,6 @@ public function confidentielRefusTwig(Etude $etude, User $user, $isGranted)
         return false;
     }
 
-
     public function getErrors(Etude $etude)
     {
         $errors = [];
@@ -120,7 +119,8 @@ public function getErrors(Etude $etude)
         }
 
         //ordre PVI
-        /** @var ProcesVerbal $pvi
+        /**
+         * @var ProcesVerbal
          * @var ProcesVerbal $pviAnterieur
          */
         foreach ($etude->getPvis() as $pvi) {

diff --git a/src/Mgate/SuiviBundle/Manager/EtudeManager.php b/src/Mgate/SuiviBundle/Manager/EtudeManager.php
@@ -91,7 +91,6 @@ public function confidentielRefus(Etude $etude, User $user)
         return false;
     }
 
-
     /**
      * Get référence du document
      * Params : Etude $etude, mixed $doc, string $type (the type of doc).