diff --git a/migrations/Version20220407185812.php b/migrations/Version20220407185812.php new file mode 100644 index 0000000..6fcfb84 --- /dev/null +++ b/migrations/Version20220407185812.php @@ -0,0 +1,31 @@ +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'); + } +} diff --git a/migrations/Version20220407191942.php b/migrations/Version20220407191942.php new file mode 100644 index 0000000..dceced3 --- /dev/null +++ b/migrations/Version20220407191942.php @@ -0,0 +1,31 @@ +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'); + } +} diff --git a/package.json b/package.json index 717ab45..3c5c6ef 100644 --- a/package.json +++ b/package.json @@ -1,3 +1,3 @@ { - "version": "0.1.1" + "version": "0.1.2" } diff --git a/public/css/custom.css b/public/css/custom.css index e9b3b1f..6580115 100644 --- a/public/css/custom.css +++ b/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%; diff --git a/src/Controller/DirectoryController.php b/src/Controller/DirectoryController.php index c4ebef6..7f7d6c6 100644 --- a/src/Controller/DirectoryController.php +++ b/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() diff --git a/src/Entity/Directory.php b/src/Entity/Directory.php index 9539be7..710a95e 100644 --- a/src/Entity/Directory.php +++ b/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; + } } diff --git a/src/Form/DirectoryType.php b/src/Form/DirectoryType.php index 8e9e5d1..2cc1da1 100644 --- a/src/Form/DirectoryType.php +++ b/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']) ; diff --git a/src/Form/Type/GangListType.php b/src/Form/Type/GangListType.php index 194e530..3b62bb2 100644 --- a/src/Form/Type/GangListType.php +++ b/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 ]); } diff --git a/src/Repository/DirectoryRepository.php b/src/Repository/DirectoryRepository.php index a8d3624..dc74587 100644 --- a/src/Repository/DirectoryRepository.php +++ b/src/Repository/DirectoryRepository.php @@ -36,7 +36,8 @@ class DirectoryRepository extends ServiceEntityRepository 'medicalBloodGroup', 'medicalDrugs', 'medicalAlcohol', - 'medicalTreatment' + 'medicalTreatment', + 'gangInfo' ]; //list fields we can search in } diff --git a/templates/_cells/directoryCard.html.twig b/templates/_cells/directoryCard.html.twig index 6907e90..65a7234 100644 --- a/templates/_cells/directoryCard.html.twig +++ b/templates/_cells/directoryCard.html.twig @@ -7,46 +7,46 @@
{% set path_directories_uploads = 'uploads/directories' %} {% if directory.faceImageSize != 0 %}{% set faceImage = path_directories_uploads ~ '/' ~ directory.faceImageName %}{% else %}{% set faceImage = 'img/nophoto.jpg' %}{% endif %} -
- {{ directory.fullname}} +
+ {{ directory.fullname}}
{% if directory.backImageSize != 0 %}{% set backImage = path_directories_uploads ~ '/' ~ directory.backImageName %}{% else %}{% set backImage = 'img/nophoto.jpg' %}{% endif %} -
- {{ directory.fullname}} +
+ {{ directory.fullname}}
{% if directory.rightImageSize != 0 %}{% set rightImage = path_directories_uploads ~ '/' ~ directory.rightImageName %}{% else %}{% set rightImage = 'img/nophoto.jpg' %}{% endif %} -
- {{ directory.fullname}} +
+ {{ directory.fullname}}
{% if directory.leftImageSize != 0 %}{% set leftImage = path_directories_uploads ~ '/' ~ directory.leftImageName %}{% else %}{% set leftImage = 'img/nophoto.jpg' %}{% endif %} -
- {{ directory.fullname}} +
+ {{ directory.fullname}}
{% if directory.idCardImageSize != 0 %} -
- {% trans %}tooltip_id_card{% endtrans %} +
+ {% trans %}tooltip_id_card{% endtrans %}
{% endif %} {% if app.user.hasPermission('general_legal_view') %} {% if directory.carLicenceImageSize != 0 %} -
- {% trans %}tooltip_car_licence{% endtrans %} +
+ {% trans %}tooltip_car_licence{% endtrans %}
{% endif %} {% if directory.motorcycleLicenceImageSize != 0 %} -
- {% trans %}tooltip_motorcycle_licence{% endtrans %} +
+ {% trans %}tooltip_motorcycle_licence{% endtrans %}
{% endif %} {% if directory.truckLicenceImageSize != 0 %} -
- {% trans %}tooltip_truck_licence{% endtrans %} +
+ {% trans %}tooltip_truck_licence{% endtrans %}
{% endif %} {% if directory.boatLicenceImageSize != 0 %} -
- {% trans %}tooltip_boat_licence{% endtrans %} +
+ {% trans %}tooltip_boat_licence{% endtrans %}
{% endif %} {% endif %} @@ -58,9 +58,12 @@
  • {% trans %}title_gender{% endtrans %} : {{ directory.gender | default('value_no_value'|trans) }}
  • {% trans %}title_height{% endtrans %} : {{ directory.height | default('value_no_value'|trans) }}
  • {% trans %}title_weight{% endtrans %} : {{ directory.weight | default('value_no_value'|trans) }}
    • - {% if app.user.hasPermission('general_legal_view') %} -
  • Groupe associé : {% if directory.gang %} {{ directory.gang.title }} {% endif %}
    • - {% if directory.wanted %} + {% if app.user.hasPermission('general_legal_view') %} +
  • {% trans %}title_gang{% endtrans %} : {% if directory.gang %} {{ directory.gang.title }} {% endif %}{% if directory.gangInfo %}( {{ directory.gangInfo }} ){% endif %}
    • + {% if directory.hasnopapers %} +
  • {% trans %}title_hasnopapers{% endtrans %}
    • + {% endif %} + {% if directory.wanted %}
  • {% trans %}title_directory_wanted_light{% endtrans %} : {{ directory.wantedReason | default('value_no_value'|trans) }}
    • {% endif %} {% endif %} diff --git a/templates/_cells/directoryTable.html.twig b/templates/_cells/directoryTable.html.twig index d2aba11..c948b05 100644 --- a/templates/_cells/directoryTable.html.twig +++ b/templates/_cells/directoryTable.html.twig @@ -22,6 +22,7 @@ {% if nogender is not defined %}
  • {% trans %}title_gender{% endtrans %}: {{i.gender}}
    • {% endif %} {% if nophone is not defined %}
  • {% trans %}title_phone{% endtrans %}: {{i.phone}}
    • {% endif %} {% if nodate is not defined %}
  • {% trans %}title_created_at{% endtrans %}: {{i.createdAt |date('_datetime.format'|trans)}}
    • {% endif %} + {% if nopapers is not defined and i.hasNoPapers %}
  • {% trans %}title_hasnopapers{% endtrans %}
    • {% endif %} {% if noaction is not defined %} diff --git a/templates/_cells/documentTable.html.twig b/templates/_cells/documentTable.html.twig index 3297ba7..3cb9770 100644 --- a/templates/_cells/documentTable.html.twig +++ b/templates/_cells/documentTable.html.twig @@ -44,7 +44,7 @@ {% endif %} - `{{i.title | u.truncate(20, '...')}}` + `{{i.title | u.truncate(50, '...')}}` {% if notype is defined %}
    N°: #{{i.id}} {% endif %} diff --git a/templates/admin/user.html.twig b/templates/admin/user.html.twig index 9322dd7..6b55570 100644 --- a/templates/admin/user.html.twig +++ b/templates/admin/user.html.twig @@ -7,7 +7,7 @@
    {{form(searchForm)}}
    -
    +
    {% include '_cells/adminUserTable.html.twig' with {'users': pagination} %}
    diff --git a/templates/document/types/Gang.html.twig b/templates/document/types/Gang.html.twig index f980ba1..aaa907a 100644 --- a/templates/document/types/Gang.html.twig +++ b/templates/document/types/Gang.html.twig @@ -18,8 +18,15 @@

      + {% if i.wanted %} +
    • {% trans %}title_directory_wanted_light{% endtrans %} : {{ i.wantedReason | default('value_no_value'|trans) }}
      • + {% endif %} +
    • {% trans %}title_informations{% endtrans %}: {{i.gangInfo}}
    • {% trans %}title_gender{% endtrans %}: {{i.gender}}
    • {% trans %}title_phone{% endtrans %}: {{i.phone}}
      • + {% if i.hasnopapers %} +
    • {% trans %}title_hasnopapers{% endtrans %}
      • + {% endif %}

    diff --git a/translations/messages+intl-icu.en.yaml b/translations/messages+intl-icu.en.yaml index ec0fe04..8444540 100644 --- a/translations/messages+intl-icu.en.yaml +++ b/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 diff --git a/translations/messages+intl-icu.fr.yaml b/translations/messages+intl-icu.fr.yaml index 99aa411..3ea11ee 100644 --- a/translations/messages+intl-icu.fr.yaml +++ b/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