Merge branch 'dev' into 'main'

Add some reworks to Vision

See merge request gamexperience/vision!7

composer.json

@@ -19,33 +19,33 @@
         "sensio/framework-extra-bundle": "^6.1",
         "stof/doctrine-extensions-bundle": "^1.6",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "5.3.*",
+        "symfony/asset": "5.4.*",
-        "symfony/console": "5.3.*",
+        "symfony/console": "5.4.*",
-        "symfony/dotenv": "5.3.*",
+        "symfony/dotenv": "5.4.*",
-        "symfony/expression-language": "5.3.*",
+        "symfony/expression-language": "5.4.*",
         "symfony/flex": "^1.3.1",
-        "symfony/form": "5.3.*",
+        "symfony/form": "5.4.*",
-        "symfony/framework-bundle": "5.3.*",
+        "symfony/framework-bundle": "5.4.*",
-        "symfony/http-client": "5.3.*",
+        "symfony/http-client": "5.4.*",
-        "symfony/intl": "5.3.*",
+        "symfony/intl": "5.4.*",
-        "symfony/mailer": "5.3.*",
+        "symfony/mailer": "5.4.*",
-        "symfony/mime": "5.3.*",
+        "symfony/mime": "5.4.*",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/notifier": "5.3.*",
+        "symfony/notifier": "5.4.*",
-        "symfony/process": "5.3.*",
+        "symfony/process": "5.4.*",
-        "symfony/property-access": "5.3.*",
+        "symfony/property-access": "5.4.*",
-        "symfony/property-info": "5.3.*",
+        "symfony/property-info": "5.4.*",
-        "symfony/proxy-manager-bridge": "5.3.*",
+        "symfony/proxy-manager-bridge": "5.4.*",
-        "symfony/rate-limiter": "5.3.*",
+        "symfony/rate-limiter": "5.4.*",
-        "symfony/runtime": "5.3.*",
+        "symfony/runtime": "5.4.*",
-        "symfony/security-bundle": "5.3.*",
+        "symfony/security-bundle": "5.4.*",
-        "symfony/serializer": "5.3.*",
+        "symfony/serializer": "5.4.*",
-        "symfony/string": "5.3.*",
+        "symfony/string": "5.4.*",
-        "symfony/translation": "5.3.*",
+        "symfony/translation": "5.4.*",
-        "symfony/twig-bundle": "^5.3",
+        "symfony/twig-bundle": "^5.4",
-        "symfony/validator": "5.3.*",
+        "symfony/validator": "5.4.*",
-        "symfony/web-link": "5.3.*",
+        "symfony/web-link": "5.4.*",
-        "symfony/yaml": "5.3.*",
+        "symfony/yaml": "5.4.*",
         "symfonycasts/reset-password-bundle": "^1.9",
         "symfonycasts/verify-email-bundle": "^1.5",
         "twig/extra-bundle": "^2.12|^3.0",
@@ -59,14 +59,14 @@
         "phpstan/phpstan": "^1.2",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.6",
-        "symfony/browser-kit": "^5.3",
+        "symfony/browser-kit": "^5.4",
-        "symfony/css-selector": "^5.3",
+        "symfony/css-selector": "^5.4",
-        "symfony/debug-bundle": "5.3.*",
+        "symfony/debug-bundle": "5.4.*",
         "symfony/maker-bundle": "^1.0",
-        "symfony/phpunit-bridge": "^5.3",
+        "symfony/phpunit-bridge": "^5.4",
-        "symfony/stopwatch": "^5.3",
+        "symfony/stopwatch": "^5.4",
-        "symfony/var-dumper": "^5.3",
+        "symfony/var-dumper": "^5.4",
-        "symfony/web-profiler-bundle": "^5.3"
+        "symfony/web-profiler-bundle": "^5.4"
     },
     "config": {
         "optimize-autoloader": true,
@@ -108,7 +108,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "5.3.*"
+            "require": "5.4.*"
         }
     }
 }

migrations/Version20220327161253.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 Version20220327161253 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 criminal DROP article, DROP accessory_sentence');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE criminal ADD article VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, ADD accessory_sentence LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
+    }
+}

src/DataFixtures/Groups.php

@@ -100,13 +100,16 @@ class Groups extends Fixture
                 $NewGroup->addRank($newRank);
             }
 
-            foreach ($group['subgroups'] as $key => $subGroup) {
+            if (array_key_exists('subgroups', $group)) :
-                $newSubGroup = new SubGroup();
+                foreach ($group['subgroups'] as $key => $subGroup) {
-                $newSubGroup->setName($subGroup['name']);
+                    $newSubGroup = new SubGroup();
-                $newSubGroup->setShortName($subGroup['shortname']);
+                    $newSubGroup->setName($subGroup['name']);
-                $manager->persist($newSubGroup);
+                    $newSubGroup->setShortName($subGroup['shortname']);
-                $NewGroup->addSubGroup($newSubGroup);
+                    $manager->persist($newSubGroup);
-            }
+                    $NewGroup->addSubGroup($newSubGroup);
+                }
+            endif;
+
             $manager->persist($NewGroup);
         }
 

src/Entity/Criminal.php

@@ -18,12 +18,6 @@ class Criminal extends Document
      */
     private $directory;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     * @Gedmo\Versioned
-     */
-    private $article;
-
     /**
      * @ORM\Column(type="float", nullable=true)
      * @Gedmo\Versioned
@@ -42,12 +36,6 @@ class Criminal extends Document
      */
     private $content;
 
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     * @Gedmo\Versioned
-     */
-    private $accessorySentence;
-
     public function __construct(User $user)
     {
         parent::__construct($user);
@@ -66,18 +54,6 @@ class Criminal extends Document
         return $this;
     }
 
-    public function getArticle(): ?string
-    {
-        return $this->article;
-    }
-
-    public function setArticle(string $article): self
-    {
-        $this->article = $article;
-
-        return $this;
-    }
-
     public function getAmountMoney(): ?float
     {
         return $this->amountMoney;
@@ -113,16 +89,4 @@ class Criminal extends Document
 
         return $this;
     }
-
-    public function getAccessorySentence(): ?string
-    {
-        return $this->accessorySentence;
-    }
-
-    public function setAccessorySentence(?string $accessorySentence): self
-    {
-        $this->accessorySentence = $accessorySentence;
-
-        return $this;
-    }
 }

src/Form/CriminalType.php

@@ -17,19 +17,9 @@ class CriminalType extends DocumentType
 
         $builder
 
-            ->add('article', null, ['label' => 'form_label_article', 'help' => 'form_help_article'])
+            ->add('content', ContentType::class, ['label' => 'form_label_informations' ])
             ->add('amountMoney', null, ['label' => 'form_label_amount', 'help' => 'form_help_amount'])
             ->add('amountTime', null, ['label' => 'form_label_time', 'help' => 'form_help_time'])
-            ->add(
-                'accessorySentence',
-                ContentType::class,
-                ['label' => 'form_label_accessorySentence',
-                    'help' => 'form_help_accessorySentence',
-                    'required'   => false,
-                    'attr' => ['style' => 'height: 200px;']
-                    ]
-            )
-            ->add('content', ContentType::class, ['label' => 'form_label_informations', 'required'   => false ])
         ;
     }
 

src/Form/Type/FirstnameType.php

@@ -12,7 +12,6 @@ class FirstnameType extends AbstractType
     {
         $resolver->setDefaults([
             'attr' => ['placeholder' => 'form_placeholder_firstname'],
-            'help' => 'form_help_firstname',
             'label' => false
         ]);
     }

src/Form/Type/LastnameType.php

@@ -12,7 +12,6 @@ class LastnameType extends AbstractType
     {
         $resolver->setDefaults([
             'attr' => ['placeholder' => 'form_placeholder_lastname'],
-            'help' => 'form_help_lastname',
             'label' => false
         ]);
     }

src/Repository/CriminalRepository.php

@@ -17,6 +17,6 @@ class CriminalRepository extends DocumentRepositoriesExtension
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Criminal::class);
-        $this->fields = ['article', 'amountMoney', 'amountTime', 'content']; //with title, list fields we can search in
+        $this->fields = ['amountMoney', 'amountTime', 'content']; //with title, list fields we can search in
     }
 }

symfony.lock

@@ -393,9 +393,6 @@
             "config/packages/dev/debug.yaml"
         ]
     },
-    "symfony/debug-pack": {
-        "version": "v1.0.9"
-    },
     "symfony/dependency-injection": {
         "version": "v5.3.2"
     },
@@ -547,9 +544,6 @@
     "symfony/options-resolver": {
         "version": "v5.3.0"
     },
-    "symfony/orm-pack": {
-        "version": "v2.1.0"
-    },
     "symfony/password-hasher": {
         "version": "v5.3.2"
     },
@@ -595,9 +589,6 @@
     "symfony/process": {
         "version": "v5.3.2"
     },
-    "symfony/profiler-pack": {
-        "version": "v1.0.5"
-    },
     "symfony/property-access": {
         "version": "v5.3.0"
     },
@@ -653,9 +644,6 @@
     "symfony/serializer": {
         "version": "v5.3.2"
     },
-    "symfony/serializer-pack": {
-        "version": "v1.0.4"
-    },
     "symfony/service-contracts": {
         "version": "v2.4.0"
     },
@@ -665,9 +653,6 @@
     "symfony/string": {
         "version": "v5.3.2"
     },
-    "symfony/test-pack": {
-        "version": "v1.0.8"
-    },
     "symfony/translation": {
         "version": "5.3",
         "recipe": {

templates/_cells/documentTable.html.twig

@@ -72,10 +72,6 @@
                 <br /><small>{% trans %}title_user{% endtrans %}:</small>
                 <small><a href="{{ path('user_view', {'id': i.user.id}) }}" >{{ i.user.firstname  | u.truncate(2, '.')}} {{ i.user.lastname }}</a></small>
               {% endif %}              
-              {% if i.article is defined %}            
-                <br /><small>{% trans %}title_article{% endtrans %}:</small>
-                <small data-bs-toggle="tooltip" data-placement="top"  title="{{ i.article }}">{{ i.article| u.truncate(10, '...') }}</small>
-              {% endif %}
               {% if i.amountMoney is defined %}            
                 <br /><small>{% trans %}title_amount{% endtrans %}:</small>
                 <small>{{ i.amountMoney ? i.amountMoney ~ ' ' ~'currency_symbol'|trans :'value_no_value'|trans }}</small>

templates/document/types/Criminal.html.twig

@@ -1,17 +1,10 @@
-<h3>{{ document.article }}</h3>
+
-<ul>
-    <li>{% trans %}title_amount{% endtrans %} : {{ document.amountMoney }} {{'currency_symbol'|trans}}</li>
-    <li>{% trans %}title_hours{% endtrans %} : {{ document.amountTime }} {{ 'title_hours'| trans }}</li>
-</ul>
-{% if document.accessorySentence %}
-<div class="p-2">
-    <h4>{% trans %}title_accessorySentence{% endtrans %}</h4>
-    {{ document.accessorySentence | raw }}
-</div>
-{% endif %}
-{% if document.content %}
 <div class="p-2">
     <h4>{% trans %}title_informations{% endtrans %}</h4>
     {{ document.content | raw }}
 </div>
-{% endif %}
+<hr>
+<ul>
+    <li>{% trans %}title_amount{% endtrans %} : {{ document.amountMoney }} {{'currency_symbol'|trans}}</li>
+    <li>{% trans %}title_hours{% endtrans %} : {{ document.amountTime }} {{ 'title_hours'| trans }}</li>
+</ul>

translations/messages+intl-icu.en.yaml

@@ -240,7 +240,6 @@ form_help_allowedgroups: Check the groups allowed to access this
 form_help_allowedsubgroups: This document will be only available for those subgroups
 form_help_amount: Enter a monetary value
 form_help_arrested_at: Enter the date of arrest
-form_help_article: Enter a law article number / name
 form_help_cant_edit_firstname: You cannot edit your first name
 form_help_cant_edit_lastname: You cannot edit your first last name
 form_help_checkbox_adminmode: Check the box to switch the user to admin mode
@@ -274,9 +273,8 @@ form_label_address: Residence address
 form_label_allowedgroups: Authorized groups
 form_label_allowedsubgroups: Allowed subgroups
 form_label_allowShare: Check this box to allow public sharing
-form_label_amount: Amount
+form_label_amount: Total Amount
 form_label_arrested_at: Arrest
-form_label_article: Article
 form_label_asked_for_lawyer: Request for a lawyer
 form_label_asked_for_medic: Request for a doctor
 form_label_birthday: Birthday
@@ -326,7 +324,7 @@ form_label_shortname: Short name
 form_label_shortName: Short Name
 form_label_status: Status
 form_label_subgroups: Speciality
-form_label_time: Duration
+form_label_time: Total Duration
 form_label_title: Title
 form_label_until: until
 form_label_upload_backpicture: Back picture
@@ -463,6 +461,8 @@ 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
@@ -609,7 +609,6 @@ title_announces: Announces
 title_archived: Archived
 title_archives: Archives
 title_arrested_at: Arrested at
-title_article: Article
 title_ask_for_lawyer: Ask for lawyer
 title_ask_for_medic: Ask for doctor
 title_author: Author

translations/messages+intl-icu.fr.yaml

@@ -240,7 +240,6 @@ form_help_allowedgroups: Cochez les groupes autorisés à accéder à ceci
 form_help_allowedsubgroups: Ce document sera uniquement accessible aux specialitées cochées
 form_help_amount: Entrez une valeur monétaire
 form_help_arrested_at: Entrez la date d'arrestation
-form_help_article: Entrez un numéro / nom d'article de loi
 form_help_cant_edit_firstname: Vous ne pouvez pas éditer votre prénom
 form_help_cant_edit_lastname: Vous ne pouvez pas éditer votre nom
 form_help_checkbox_adminmode: Cochez la case pour passer l'utilisateur en mode admin
@@ -274,9 +273,8 @@ form_label_address: Adresse de résidence
 form_label_allowedgroups: Groupes autorisés
 form_label_allowedsubgroups: Specialitées autorisées en acces
 form_label_allowShare: Cochez cette case pour autoriser le partage public
-form_label_amount: Montant
+form_label_amount: Montant total
 form_label_arrested_at: Arrestation
-form_label_article: Article
 form_label_asked_for_lawyer: Demande d'un avocat
 form_label_asked_for_medic: Demande d'un médecin
 form_label_birthday: Date de naissance
@@ -326,7 +324,7 @@ form_label_shortname: Nom court
 form_label_shortName: Nom court
 form_label_status: Statut
 form_label_subgroups: Spécialités
-form_label_time: Durée
+form_label_time: Durée totale
 form_label_title: Titre
 form_label_until: Jusqu'à
 form_label_upload_backpicture: Photo de Dos
@@ -462,6 +460,8 @@ 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
@@ -608,7 +608,6 @@ title_announces: Annonces
 title_archived: Archivé
 title_archives: Archives
 title_arrested_at: Arrêté à
-title_article: Article
 title_ask_for_lawyer: Demande d'avocat
 title_ask_for_medic: Demande de médecin
 title_author: Auteur