Merge remote-tracking branch 'origin/master' into issue332_location_activity

src/Bundle/ChillMainBundle/Entity/Civility.php

@@ -47,6 +47,11 @@ class Civility
      */
     private array $name = [];
 
+    /**
+     * @ORM\Column(type="float", name="ordering", nullable=true, options={"default": 0.0})
+     */
+    private float $order = 0;
+
     public function getAbbreviation(): array
     {
         return $this->abbreviation;
@@ -67,6 +72,11 @@ class Civility
         return $this->name;
     }
 
+    public function getOrder(): ?float
+    {
+        return $this->order;
+    }
+
     /**
      * @return Civility
      */
@@ -90,4 +100,11 @@ class Civility
 
         return $this;
     }
+
+    public function setOrder(float $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
 }

src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss

@@ -197,7 +197,7 @@ div.wrap-list {
         div.wl-col.list {
             background-color: cyan;
 
-            p.wl-item {
+            .wl-item {
                 background-color: orange;
             }
         }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue

@@ -1,13 +1,12 @@
 <template>
 
     <span v-if="entity.type === 'person'" class="badge rounded-pill bg-person">
-        {{ $t('renderbox.person') }}
+        {{ $t('person') }}
     </span>
 
     <span v-if="entity.type === 'thirdparty'" class="badge rounded-pill bg-thirdparty">
-
         <template v-if="options.displayLong !== true">
-            {{ $t('renderbox.type.thirdparty')}}
+            {{ $t('thirdparty.thirdparty')}}
         </template>
 
         <i class="fa fa-fw fa-user" v-if="entity.kind === 'child'"></i>
@@ -15,12 +14,16 @@
         <i class="fa fa-fw fa-user-md" v-else></i>
 
         <template v-if="options.displayLong === true">
-            <span v-if="entity.kind === 'child'">{{ $t('tparty.child')}}</span>
-            <span v-else-if="entity.kind === 'company'">{{ $t('tparty.company')}}</span>
-            <span v-else>{{ $t('tparty.contact')}}</span>
+            <span v-if="entity.kind === 'child'">{{ $t('thirdparty.child')}}</span>
+            <span v-else-if="entity.kind === 'company'">{{ $t('thirdparty.company')}}</span>
+            <span v-else>{{ $t('thirdparty.contact')}}</span>
         </template>
     </span>
 
+    <span v-if="entity.type === 'user'" class="badge rounded-pill bg-user">
+        {{ $t('user')}}
+    </span>
+
 </template>
 
 <script>
@@ -30,11 +33,14 @@ export default {
     i18n: {
         messages: {
             fr: {
-                tparty: {
+                person: "Usager",
+                thirdparty: {
+                    thirdparty: "Tiers",
                     child: "Personne de contact",
                     company: "Personne morale",
                     contact: "Personne physique",
-                }
+                },
+                user: 'TMS'
             }
         }
     }

src/Bundle/ChillMainBundle/migrations/Version20211213112628.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add order to civility.
+ */
+final class Version20211213112628 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_civility DROP "ordering"');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add order to civility';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_civility ADD "ordering" FLOAT DEFAULT 0.0');
+    }
+}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -56,6 +56,7 @@ centers: centres
 Centers: Centres
 comment: commentaire
 Comment: Commentaire
+Pinned comment: Commentaire épinglé
 Any comment: Aucun commentaire
 
 # comment embeddable