Merge remote-tracking branch 'origin/master' into homepage/rewrite

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

@@ -12,6 +12,7 @@
         display: block;
         top: calc(50% - 7px);
         right: 10px;
+        line-height: 11px;
     }
 }
 
@@ -62,14 +63,19 @@ ul.list-suggest {
             & span:hover {
                 color: $chill-l-gray;
             }
+            .person-text {
+                span {
+                    padding-left: 0px;
+                }
+            }
         }
     }
     &.remove-items {
         li {
             position: relative;
-            span {
+            & > span {
                 display: block;
-                padding-right: .75rem;
+                padding-right: 1.75rem;
                 @include remove_link;
             }
         }

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

@@ -22,6 +22,7 @@ $chill-theme-buttons: (
    "cancel":        $gray-300,
    "choose":        $gray-300,
    "notify":        $gray-300,
+   "search":        $gray-300,
    "unlink":        $chill-red,
    "tpchild":       $chill-pink,
 );
@@ -80,6 +81,7 @@ $chill-theme-buttons: (
    &.btn-notify::before,
    &.btn-tpchild::before,
    &.btn-download::before,
+   &.btn-search::before,
    &.btn-cancel::before {
       font: normal normal normal 14px/1 ForkAwesome;
       margin-right: 0.5em;
@@ -108,6 +110,7 @@ $chill-theme-buttons: (
    &.btn-notify::before    { content: "\f1d8"; } // fa-paper-plane
    &.btn-tpchild::before   { content: "\f007"; } // fa-user
    &.btn-download::before  { content: "\f019"; } // fa-download
+   &.btn-search::before    { content: "\f002"; } // fa-search
 }
 
 

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -19,6 +19,12 @@ function loadDynamicPicker(element) {
             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
             picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
 
+        if (!isMultiple) {
+            if (input.value === '[]'){
+                input.value = null;
+            }
+        }
+
         const app = createApp({
             template: '<pick-entity ' +
                 ':multiple="multiple" ' +

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

@@ -24,6 +24,11 @@
         {{ $t('user')}}
     </span>
 
+    <span v-if="entity.type === 'household'" class="badge rounded-pill bg-user">
+        {{ $t('household')}}
+    </span>
+
+
 </template>
 
 <script>
@@ -40,7 +45,8 @@ export default {
                     company: "Personne morale",
                     contact: "Personne physique",
                 },
-                user: 'TMS'
+                user: 'TMS',
+                household: 'Ménage',
             }
         }
     }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

@@ -61,14 +61,15 @@ const messages = {
             woman: "Née le"
          },
          deathdate: "Date de décès",
-         years_old: "ans",
          household_without_address: "Le ménage de l'usager est sans adresse",
          no_data: "Aucune information renseignée",
          type: {
             thirdparty: "Tiers",
             person: "Usager"
          },
-         holder: "Titulaire"
+         holder: "Titulaire",
+         years_old: "an | {n} an | {n} ans",
+
       }
    }
 };

src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig

@@ -42,6 +42,3 @@
     {% endif %}
 
 ></span>
-
-{{ encore_entry_script_tags('vue_onthefly') }}
-{{ encore_entry_link_tags('vue_onthefly') }}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -13,6 +13,7 @@
     {{ encore_entry_link_tags('mod_ckeditor5') }}
     {{ encore_entry_link_tags('chill') }}
     {{ encore_entry_link_tags('mod_blur') }}
+    {{ encore_entry_link_tags('vue_onthefly') }}
     {% block css %}<!-- nothing added to css -->{% endblock %}
 </head>
 
@@ -94,6 +95,7 @@
     {{ encore_entry_script_tags('mod_ckeditor5') }}
     {{ encore_entry_script_tags('mod_blur') }}
     {{ encore_entry_script_tags('chill') }}
+    {{ encore_entry_script_tags('vue_onthefly') }}
 
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function(e) {