Merge branch 'Xbird/Enhance' into 'main'

Enhance and fix some bugs

See merge request gamexperience/vision!19

migrations/Version20220407185812.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220407185812 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE directory ADD gang_info VARCHAR(255) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE directory DROP gang_info');
+    }
+}

migrations/Version20220407191942.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220407191942 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE directory ADD has_no_papers TINYINT(1) DEFAULT \'0\' NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE directory DROP has_no_papers');
+    }
+}

package.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.1"
+  "version": "0.1.2"
 }

public/css/custom.css

@@ -69,11 +69,6 @@ ul.timeline > li:before {
     background-color: #000;
 }
 
-.directory-picture-card {
-    max-width: 80px;
-    max-height: 80px;
-}
-
 .pulse {
     
     border-radius: 0%;

src/Controller/DirectoryController.php

@@ -34,7 +34,9 @@ class DirectoryController extends AbstractController
         $searchForm = $this->createForm(SearchBarType::class);
         $searchForm->handleRequest($request);
 
-        $req = $DirectoryRepository->list()
+        $req = $DirectoryRepository
+                        ->list()
+                        ->order(['createdAt' => 'DESC'])
                         ->search(
                             (
                                 $searchForm->isSubmitted()

src/Entity/Directory.php

@@ -457,6 +457,16 @@ class Directory
      */
     private $folders;
 
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $gangInfo;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default":"0"})
+     */
+    private $hasNoPapers = false;
+
 
     public function __construct()
     {
@@ -1438,4 +1448,28 @@ class Directory
 
         return $this;
     }
+
+    public function getGangInfo(): ?string
+    {
+        return $this->gangInfo;
+    }
+
+    public function setGangInfo(?string $gangInfo): self
+    {
+        $this->gangInfo = $gangInfo;
+
+        return $this;
+    }
+
+    public function getHasNoPapers(): ?bool
+    {
+        return $this->hasNoPapers;
+    }
+
+    public function setHasNoPapers(bool $hasNoPapers): self
+    {
+        $this->hasNoPapers = $hasNoPapers;
+
+        return $this;
+    }
 }

src/Form/DirectoryType.php

@@ -57,11 +57,14 @@ class DirectoryType extends AbstractType
             ->add('height', HeightType::class)
             ->add('weight', WeightType::class)
             ->add('address', AddressType::class, ['required' => false])
+            ->add('hasNoPapers', null, ['label' => 'form_label_hasnopapers'])
             ;
 
+
         if ($user->getAdminMode() || in_array('general_legal_view', $userPermissions)) {
             $builder
             ->add('gang', GangListType::class)
+            ->add('gangInfo', null, ['label' => 'form_label_gang_info'])
             ->add('wanted', null, ['label' => 'form_label_wanted'])
             ->add('wantedReason', null, ['label' => 'form_label_wantedReason', 'help' => 'form_help_wantedReason'])
             ;

src/Form/Type/GangListType.php

@@ -22,7 +22,7 @@ class GangListType extends AbstractType
             'choice_label' => 'title',
             'placeholder' => 'form_placeholder_gang',
             'help' => 'form_help_gang',
-            'label' => false,
+            'label' => 'form_label_gang',
             'required' => false
         ]);
     }

src/Repository/DirectoryRepository.php

@@ -36,7 +36,8 @@ class DirectoryRepository extends ServiceEntityRepository
             'medicalBloodGroup',
             'medicalDrugs',
             'medicalAlcohol',
-            'medicalTreatment'
+            'medicalTreatment',
+            'gangInfo'
         ]; //list fields we can search in
     }
 

templates/_cells/directoryCard.html.twig

@@ -7,46 +7,46 @@
         <div class="row">
             {% set path_directories_uploads  = 'uploads/directories' %}
             {% if directory.faceImageSize != 0 %}{% set faceImage = path_directories_uploads ~ '/' ~ directory.faceImageName %}{% else %}{% set faceImage = 'img/nophoto.jpg' %}{% endif %}
-            <div class="col-2">
-                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(faceImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(faceImage) }}" alt="{{ directory.fullname}}"></a>             
+            <div class="col-2  col-xs-4">
+                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(faceImage) }}"><img class="img-fluid m-1" src="{{ asset(faceImage) }}" alt="{{ directory.fullname}}"></a>             
             </div>
             {% if directory.backImageSize != 0 %}{% set backImage = path_directories_uploads ~ '/' ~ directory.backImageName %}{% else %}{% set backImage = 'img/nophoto.jpg' %}{% endif %}
-            <div class="col-2">
-                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(backImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(backImage) }}" alt="{{ directory.fullname}}"></a>                  
+            <div class="col-2  col-xs-4">
+                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(backImage) }}"><img class="img-fluid m-1" src="{{ asset(backImage) }}" alt="{{ directory.fullname}}"></a>                  
             </div>
             {% if directory.rightImageSize != 0 %}{% set rightImage = path_directories_uploads ~ '/' ~ directory.rightImageName %}{% else %}{% set rightImage = 'img/nophoto.jpg' %}{% endif %}
-            <div class="col-2">
-                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(rightImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(rightImage) }}" alt="{{ directory.fullname}}"></a>                  
+            <div class="col-2  col-xs-4">
+                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(rightImage) }}"><img class="img-fluid m-1" src="{{ asset(rightImage) }}" alt="{{ directory.fullname}}"></a>                  
             </div>
             {% if directory.leftImageSize != 0 %}{% set leftImage = path_directories_uploads ~ '/' ~ directory.leftImageName %}{% else %}{% set leftImage = 'img/nophoto.jpg' %}{% endif %}
-            <div class="col-2">
-                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>                  
+            <div class="col-2  col-xs-4">
+                <a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>                  
             </div>
         
             {% if directory.idCardImageSize != 0 %}
-            <div class="col-2">
-                <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
+            <div class="col-2  col-xs-4">
+                <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
             </div>
             {% endif %}
             {% if app.user.hasPermission('general_legal_view') %}
                 {% if directory.carLicenceImageSize != 0 %}
-                <div class="col-2">
-                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
+                <div class="col-2  col-xs-4">
+                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
                 </div>
                 {% endif %}
                 {% if directory.motorcycleLicenceImageSize != 0 %}
-                <div class="col-2">
-                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
+                <div class="col-2  col-xs-4">
+                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
                 </div>
                 {% endif %}
                 {% if directory.truckLicenceImageSize != 0 %}
-                <div class="col-2">
-                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
+                <div class="col-2  col-xs-4">
+                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
                 </div>
                 {% endif %}
                 {% if directory.boatLicenceImageSize != 0 %}
-                <div class="col-2">
-                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
+                <div class="col-2  col-xs-4">
+                    <a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
                 </div>
                 {% endif %}
             {% endif %}
@@ -58,9 +58,12 @@
             <li class="list-group-item"><span class="fa-li"><i class="fas fa-transgender-alt"></i></span>{% trans %}title_gender{% endtrans %} : {{ directory.gender | default('value_no_value'|trans) }}</li>
             <li class="list-group-item"><span class="fa-li"><i class="fas fa-arrows-alt-v"></i></span>{% trans %}title_height{% endtrans %} : {{ directory.height | default('value_no_value'|trans) }}</li>
             <li class="list-group-item"><span class="fa-li"><i class="fas fa-weight"></i></span>{% trans %}title_weight{% endtrans %} : {{ directory.weight | default('value_no_value'|trans) }}</li>
-            {% if app.user.hasPermission('general_legal_view') %}
-            <li class="list-group-item"><span class="fa-li"><i class="fas fa-wheelchair"></i></span>Groupe associé :  {% if directory.gang %} <a href="{{ path('document_view', {id: directory.gang.id}) }}">{{ directory.gang.title }}</a> {% endif %}</li>
-            {% if directory.wanted %}
+            {% if app.user.hasPermission('general_legal_view') %}            
+            <li class="list-group-item"><span class="fa-li"><i class="fas fa-wheelchair"></i></span>{% trans %}title_gang{% endtrans %} :  {% if directory.gang %} <a href="{{ path('document_view', {id: directory.gang.id}) }}">{{ directory.gang.title }}</a> {% endif %}{% if directory.gangInfo %}( {{ directory.gangInfo }} ){% endif %}</li>
+                {% if directory.hasnopapers %}
+                    <li class="list-group-item"><span class="fa-li"><i class="fas fa-scroll"></i></span>{% trans %}title_hasnopapers{% endtrans %}</li>
+                {% endif %}
+                {% if directory.wanted %}
                     <li class="list-group-item text-danger"><span class="fa-li"><i class="far fa-id-badge"></i></span>{% trans %}title_directory_wanted_light{% endtrans %} : {{ directory.wantedReason | default('value_no_value'|trans) }}</li>
                 {% endif %}
             {% endif %}

templates/_cells/directoryTable.html.twig

@@ -22,6 +22,7 @@
                         {% if nogender is not defined %}<li>{% trans %}title_gender{% endtrans %}: {{i.gender}}</li>{% endif %}
                         {% if nophone is not defined %}<li>{% trans %}title_phone{% endtrans %}: {{i.phone}}</li>{% endif %}
                         {% if nodate is not defined %}<li>{% trans %}title_created_at{% endtrans %}: {{i.createdAt |date('_datetime.format'|trans)}}</li>{% endif %}
+                        {% if nopapers is not defined and i.hasNoPapers %}<li>{% trans %}title_hasnopapers{% endtrans %}</li>{% endif %}
                       </ul>
                     </td>
                     {% if noaction is not defined %}

templates/_cells/documentTable.html.twig

@@ -44,7 +44,7 @@
             {% endif %}
 
             <td>              
-              <a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >`{{i.title | u.truncate(20, '...')}}`</a>
+              <a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top"  title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >`{{i.title | u.truncate(50, '...')}}`</a>
               {% if notype is defined %}
                 <br /><small>N°: #{{i.id}}</small>
               {% endif %}

templates/admin/user.html.twig

@@ -7,7 +7,7 @@
   <div class="col-5">{{form(searchForm)}}</div>
 </div>
 <div class="row">
-  <div class="col-8">
+  <div class="col-12">
     {% include '_cells/adminUserTable.html.twig' with {'users': pagination} %}
   </div>
 </div>

templates/document/types/Gang.html.twig

@@ -18,8 +18,15 @@
                     <div class="card-body">                  
                     <p class="card-text">
                         <ul>
+                            {% if i.wanted %}
+                                <li class="text-danger">{% trans %}title_directory_wanted_light{% endtrans %} : {{ i.wantedReason | default('value_no_value'|trans) }}</li>
+                            {% endif %}
+                            <li>{% trans %}title_informations{% endtrans %}: {{i.gangInfo}}</li>
                             <li>{% trans %}title_gender{% endtrans %}: {{i.gender}}</li>
                             <li>{% trans %}title_phone{% endtrans %}: {{i.phone}}</li>
+                            {% if i.hasnopapers %}
+                                <li>{% trans %}title_hasnopapers{% endtrans %}</li>
+                            {% endif %}
                         </ul>
                     </p>                  
                     </div>

translations/messages+intl-icu.en.yaml

@@ -246,7 +246,7 @@ form_help_checkbox_adminmode: Check the box to switch the user to admin mode
 form_help_checkbox_isdesactivated: Check the box to prevent the user from using their account, without deleting it
 form_help_checkbox_isverified: This box is automatically checked when the user validates his email address.
 form_help_firstname: First name
-form_help_gang: Gang Associated
+form_help_gang: Select an associated group
 form_help_gender: Indicate the person's gender
 form_help_group: Choose a group to join
 form_help_height: Indicate the size
@@ -289,10 +289,13 @@ form_label_download_image: Download picture
 form_label_email: Email Adress
 form_label_firstname: Firstname
 form_label_folder_name: Folder name
-form_label_gang_logo: Gang Logo
+form_label_gang_info: Informations about Group member
+form_label_gang_logo: Group Logo
 form_label_gang_name: Name of the Associate Group
+form_label_gang: Group Associated
 form_label_group_and_rank: Group and Rank
 form_label_group_logo: Group Logo
+form_label_hasnopapers: Has no id card ?
 form_label_imageName: Image Name
 form_label_informations: Informations
 form_label_isDesactivated: Desactivated
@@ -453,6 +456,8 @@ permission_create_certificate: Can create a certificate
 permission_create_complaint: Can create a complaint
 permission_create_criminal: Can create an criminal entry
 permission_create_directory: Can create a directory
+permission_create_folder: Can create a folder
+permission_create_gang: Can create a gang
 permission_create_infringement: Can create an infringement
 permission_create_jail: Can create a jail entry
 permission_create_licencewithdrawal: Can create a licence withdrawal
@@ -461,8 +466,6 @@ permission_create_report: Can create a report
 permission_create_sanction: Can create a sanction
 permission_create_stolenvehicle: Can create a stolen vehicle
 permission_create_template: Can create a template
-permission_create_gang: Can create a gang
-permission_create_folder: Can create a folder
 permission_delete_directory: Can delete a directory
 permission_delete_other_group_announce: Can delete an announce created by another group
 permission_delete_other_group_bracelet: Can delete an electronic bracelet created by another group
@@ -705,6 +708,7 @@ title_group_view_documents: Group's documents
 title_group_view: View group
 title_group: group
 title_groups: groups
+title_hasnopapers: without papers
 title_height: Height
 title_history: History
 title_home: Home

translations/messages+intl-icu.fr.yaml

@@ -246,7 +246,7 @@ form_help_checkbox_adminmode: Cochez la case pour passer l'utilisateur en mode a
 form_help_checkbox_isdesactivated: Cochez la case pour empêcher l'utilisateur d'utiliser son compte, sans l'effacer
 form_help_checkbox_isverified: Cette case est cochée automatiquement lorsque l'utilisateur valide son adresse email
 form_help_firstname: Prénom
-form_help_gang: Gang Associé
+form_help_gang: Séléctionnez un groupe associé a cette personne
 form_help_gender: Indiquez le genre de la personne
 form_help_group: Choisir un groupe à rejoindre
 form_help_height: Indiquez la taille
@@ -289,10 +289,13 @@ form_label_download_image: Télécharger l'image
 form_label_email: Adresse Email
 form_label_firstname: Prénom
 form_label_folder_name: Nom du dossier
-form_label_gang_logo: Logo du gang
+form_label_gang_info: Informations du membre dans le Groupe associé
+form_label_gang_logo: Logo du Group
 form_label_gang_name: Nom du Groupe Associé
+form_label_gang: Groupe associé
 form_label_group_and_rank: Groupe et rang
 form_label_group_logo: Logo du groupe
+form_label_hasnopapers: Est sans papier ?
 form_label_imageName: nom de l'image
 form_label_informations: Informations
 form_label_isDesactivated: Désactivé
@@ -452,6 +455,8 @@ permission_create_certificate: Peut créer un certificat
 permission_create_complaint: Peut créer une plainte
 permission_create_criminal: Peut créer une entrée au casier
 permission_create_directory: Peut créer une fiche
+permission_create_folder: Peut créer un dossier
+permission_create_gang: Peut créer un gang
 permission_create_infringement: Peut créer une infraction
 permission_create_jail: Peut créer un PV de GAV
 permission_create_licencewithdrawal: Peut créer un retrait de permis
@@ -460,8 +465,6 @@ permission_create_report: Peut créer un rapport
 permission_create_sanction: Peut créer une sanction
 permission_create_stolenvehicle: Peut créer une déclaration de vol de véhicule
 permission_create_template: Peut créer un modèle
-permission_create_gang: Peut créer un gang
-permission_create_folder: Peut créer un dossier
 permission_delete_directory: Peut effacer une fiche
 permission_delete_other_group_announce: Peut effacer une annonce faite par un autre groupe
 permission_delete_other_group_bracelet: Peut effacer un bracelet électronique fait par un autre groupe
@@ -684,8 +687,8 @@ title_folder_view: Voir un dossier
 title_folders: Dossiers
 title_form_id_merge_into: Fusionner dans la fiche numéro
 title_full_name: Nom Complet
-title_gang: Gang
-title_gangs: Gangs
+title_gang: Groupe
+title_gangs: Groupes
 title_gender: Genre
 title_general: Général
 title_group_administration: Gestion du groupe
@@ -791,6 +794,7 @@ title_wanted_directory: Personnes recherchées
 title_wanted: Personne Recherchée
 title_wanteds: Recherchés
 title_watchdog: Watchdog
+title_hasnopapers: Sans papier
 title_weight: Poids
 tooltip_add_to_folder: Ajouter au dossier
 tooltip_archive: Archiver