Merge pull request #390 from crf-devs/improve-templates

Improve templates
crf-devs · May 7, 2020 · 6ba123d · 6ba123d
2 parents ddaf2c6 + 1713456
commit 6ba123d
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 10 deletions.
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -36,7 +36,7 @@ body {
 }
 
 footer {
-  margin-top: 10rem;
+  margin-top: 6rem;
   padding-top: 3rem;
   padding-bottom: 3rem;
   padding-left: 4rem;

diff --git a/assets/css/planning.scss b/assets/css/planning.scss
@@ -26,6 +26,7 @@ $tableBoxSize: 40px;
   .planning {
     margin-bottom: 40px;
     width: auto;
+    background-color: white;
 
     thead {
       th {

diff --git a/src/Form/Type/MissionType.php b/src/Form/Type/MissionType.php
@@ -12,6 +12,7 @@
 use App\Repository\CommissionableAssetRepository;
 use App\Repository\MissionTypeRepository;
 use App\Repository\UserRepository;
+use App\Twig\Extension\UserExtension;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
@@ -21,6 +22,13 @@
 
 class MissionType extends AbstractType
 {
+    private UserExtension $userExtension;
+
+    public function __construct(UserExtension $userExtension)
+    {
+        $this->userExtension = $userExtension;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $organization = $builder->getData()->organization ?? null;
@@ -65,6 +73,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'choice_label' => fn (User $user) => (string) $user,
                 'multiple' => true,
                 'required' => false,
+                'choice_attr' => function (User $user) {
+                    return [
+                        'data-content' => $user.' '.implode('', array_map(
+                            fn (string $skill) => $this->userExtension->formatBadge($skill),
+                            $this->userExtension->filterInludedSkills($user->skillSet)
+                        )),
+                    ];
+                },
                 'attr' => [
                     'class' => 'selectpicker',
                     'data-live-search' => 'true',
@@ -83,8 +99,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'selectpicker',
                     'data-live-search' => 'true',
                 ],
-            ])
-        ;
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void

diff --git a/src/Twig/Extension/TwigTextExtension.php b/src/Twig/Extension/TwigTextExtension.php
@@ -16,9 +16,23 @@ public function getFilters(): array
     {
         return [
             new TwigFilter('truncate', [$this, 'truncate']),
+            new TwigFilter('emptyIfSmaller', [$this, 'emptyIfSmaller']),
         ];
     }
 
+    public function emptyIfSmaller(?string $text, int $maxLen = 50, string $ellipsis = '...'): string
+    {
+        if (!\is_string($text)) {
+            return '';
+        }
+
+        if (\strlen($text) <= $maxLen - \strlen($ellipsis)) {
+            return '';
+        }
+
+        return $text;
+    }
+
     public function truncate(?string $text, int $maxLen = 50, string $ellipsis = '...'): string
     {
         if (!\is_string($text)) {
@@ -29,6 +43,6 @@ public function truncate(?string $text, int $maxLen = 50, string $ellipsis = '..
             return $text;
         }
 
-        return substr($text, 0, $maxLen - 3).$ellipsis;
+        return substr($text, 0, $maxLen - \strlen($ellipsis)).$ellipsis;
     }
 }
diff --git a/src/Twig/Extension/UserExtension.php b/src/Twig/Extension/UserExtension.php
@@ -26,9 +26,21 @@ public function getFilters(): array
         return [
             new TwigFilter('skillBadge', [$this, 'formatBadge'], ['is_safe' => ['html']]),
             new TwigFilter('sortBySkills', [$this, 'sortBySkills']),
+            new TwigFilter('filterSkillsToDisplay', [$this, 'filterSkillsToDisplay']),
+            new TwigFilter('filterInludedSkills', [$this, 'filterInludedSkills']),
         ];
     }
 
+    public function filterSkillsToDisplay(array $skills): array
+    {
+        return array_values(array_intersect($skills, $this->skillSetDomain->getSkillsToDisplay()));
+    }
+
+    public function filterInludedSkills(array $skills): array
+    {
+        return $this->skillSetDomain->filterIncludedSkills($skills);
+    }
+
     public function formatBadge(string $skill): string
     {
         $importantSkills = $this->skillSetDomain->getImportantSkills();

diff --git a/templates/organization/home.html.twig b/templates/organization/home.html.twig
@@ -40,8 +40,8 @@
         </p>
 
         <hr>
-        <p><a href="{{ path('app_organization_list') }}" class="btn btn-info">{{ 'organization.editAll' | trans }}</a></p>
-        <p><a href="{{ path('app_organization_mission_type_index') }}" class="btn btn-info">{{ 'organization.editMissionType' | trans }}</a></p>
-        <p><a href="{{ path('app_organization_assetType_list') }}" class="btn btn-info">{{ 'organization.editAssetType' | trans }}</a></p>
+        <p><a href="{{ path('app_organization_list') }}" class="btn btn-outline-info">{{ 'organization.editAll' | trans }}</a></p>
+        <p><a href="{{ path('app_organization_mission_type_index') }}" class="btn btn-outline-info">{{ 'organization.editMissionType' | trans }}</a></p>
+        <p><a href="{{ path('app_organization_assetType_list') }}" class="btn btn-outline-info">{{ 'organization.editAssetType' | trans }}</a></p>
     {% endif %}
 {% endblock %}
diff --git a/templates/organization/mission/_form.html.twig b/templates/organization/mission/_form.html.twig
@@ -4,7 +4,11 @@
     {{ form_row(form.organization) }}
 {% endif %}
 
+
 {{ form_row(form.type) }}
+<p class="text-right">
+    <a href="{{ path('app_organization_mission_type_new') }}">{{ 'organization.mission.newType' | trans }}</a>
+</p>
 
 {{ form_row(form.name) }}
 

diff --git a/templates/organization/planning/_availabilities_users.html.twig b/templates/organization/planning/_availabilities_users.html.twig
@@ -17,15 +17,15 @@
 
 {% block itemDataRowHeader %}
     {{ item.entity }}
-    {{ item.entity.skillSet | filter(skill => skill != type and skill in importantSkillsToDisplay) | map(skill => skill|skillBadge) | join | raw }}
+    {{ item.entity.skillSet | filterSkillsToDisplay | filterInludedSkills | map(skill => skill|skillBadge) | join | raw }}
 {% endblock itemDataRowHeader %}
 
 {% block itemDataDetails %}
     <td class="item-data">{{ item.entity.identificationNumber }}</td>
     <td class="item-data">{{ item.entity.phoneNumber|phone_number_format('NATIONAL') }}</td>
     <td class="item-data">{{ item.entity.emailAddress }}</td>
-    <td class="item-data">{{ item.entity.occupation | truncate(50) }}</td>
-    <td class="item-data">{{ item.entity.organizationOccupation | truncate(50) }}</td>
+    <td class="item-data" title="{{ item.entity.occupation | emptyIfSmaller(50) }}">{{ item.entity.occupation | truncate(50) }}</td>
+    <td class="item-data" title="{{ item.entity.occupation | emptyIfSmaller(50) }}">{{ item.entity.organizationOccupation | truncate(50) }}</td>
     <td class="item-data">
         {% for skill in getDisplayableSkillsInPlanning(item.entity) -%}
             {{ skill|skillBadge }}

diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml
@@ -122,6 +122,7 @@ organization:
     listFull: Equipages
     itemFull: Equipage
     listFullChooseDate: Choisissez une période pour afficher les équipages.
+    newType: Ajouter un nouveau type de mission (cela fermera la page courante)
   missionType:
     addNew: Ajouter un nouveau type de mission
     assetTypes: