Add field securiteSociale for Membre

n7consulting · Mar 2, 2017 · f35b158 · f35b158
1 parent 3acf89a
commit f35b158
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/Mgate/PersonneBundle/Entity/Membre.php b/src/Mgate/PersonneBundle/Entity/Membre.php
@@ -122,6 +122,11 @@ class Membre
      */
     private $filiere;
 
+    /**
+     * @ORM\Column(name="securiteSociale", type="string", length=25, nullable=true)
+     */
+    private $securiteSociale;
+
     /**
      * @ORM\ManyToMany(targetEntity="N7consulting\RhBundle\Entity\Competence", mappedBy="membres", cascade={"persist"})
      * @ORM\JoinColumn(nullable=true)
@@ -577,4 +582,22 @@ public function getCompetences()
     {
         return $this->competences;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getSecuriteSociale()
+    {
+        return $this->securiteSociale;
+    }
+
+    /**
+     * @param mixed $securiteSociale
+     */
+    public function setSecuriteSociale($securiteSociale)
+    {
+        $this->securiteSociale = $securiteSociale;
+    }
+
+
 }
diff --git a/src/Mgate/PersonneBundle/Form/Type/MembreType.php b/src/Mgate/PersonneBundle/Form/Type/MembreType.php
@@ -57,7 +57,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ->add('filiere', EntityType::class,
                     array('label' => 'Filiere',
                         'class' => 'Mgate\\PersonneBundle\\Entity\\Filiere',
-                        'required' => true, ));
+                        'required' => true, ))
+                ->add('securiteSociale', TextType::class, array('required' => false, 'label' => 'Numéro de sécurité sociale'));
     }
 
     public function getBlockPrefix()

diff --git a/src/Mgate/PersonneBundle/Resources/views/Membre/TabVoir/fiche.html.twig b/src/Mgate/PersonneBundle/Resources/views/Membre/TabVoir/fiche.html.twig
@@ -69,6 +69,7 @@
                     <tr>
                         <td>Format Paiement : {{ membre.formatPaiement }}</td>
                         <td>Filière : {{ membre.filiere.nom }}</td>
+                        <td>Securite Sociale : {{ membre.securiteSociale }}</td>
                     </tr>
                 </table>
             </div>

diff --git a/src/Mgate/PersonneBundle/Resources/views/Membre/modifier.html.twig b/src/Mgate/PersonneBundle/Resources/views/Membre/modifier.html.twig
@@ -19,7 +19,7 @@
         </thead>
         <tbody>
         <tr>
-            <td rowspan="7" style="text-align: center;"><img class="img-thumbnail" style="height: 200px"
+            <td rowspan="6" style="text-align: center;"><img class="img-thumbnail" style="height: 200px"
                                                              src="{{ asset(photoURI) }}"/><br><br>{{ form_widget(form.photo) }}
             </td>
         </tr>
@@ -88,11 +88,13 @@
             <th colspan="7">Informations Intervenant</th>
         </tr>
         <tr>
-            <td colspan="4">{{ form_label(form.dateConventionEleve) }}</td>
-            <td colspan="3">{{ form_widget(form.dateConventionEleve) }} {{ form_errors(form.dateConventionEleve) }}</td>
+            <td colspan="1">{{ form_label(form.dateConventionEleve) }}</td>
+            <td colspan="2">{{ form_widget(form.dateConventionEleve) }} {{ form_errors(form.dateConventionEleve) }}</td>
+            <td colspan="1">{{ form_label(form.securiteSociale) }}</td>
+            <td colspan="3">{{ form_widget(form.securiteSociale, {'attr': {'style': 'width: 100%' }}) }} {{ form_errors(form.securiteSociale) }}</td>
         </tr>
         <tr>
-            <td colspan="6">
+            <td colspan="7">
                 <button class="btn" type="submit" value="Ajouter mandat" name="add"><i
                             class="fa fa-plus"></i></button>
                 <h4 style="display: inline;">Postes occupés</h4></td>