person: add obele sign for dead persons

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-
+* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
 * [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
 * [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
 * [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -8,6 +8,7 @@
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
         buttonText: entity|chill_entity_render_string,
+        isDead: entity.deathdate is not null,
         parent: parent
     } %}
 {% endmacro %}

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue

@@ -5,6 +5,7 @@
         :action="context.action"
         :buttonText="options.buttonText"
         :displayBadge="options.displayBadge === 'true'"
+        :isDead="options.isDead"
         :parent="options.parent"
         @saveFormOnTheFly="saveFormOnTheFly">
     </on-the-fly>

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -2,14 +2,14 @@
 
     <a v-if="isDisplayBadge" @click="openModal">
         <span class="chill-entity" :class="badgeType">
-            {{ buttonText }}
+            {{ buttonText }}<span v-if="isDead"> (‡)</span>
         </span>
     </a>
     <a v-else class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
-      {{ buttonText }}
+      {{ buttonText }}<span v-if="isDead"> (‡)</span>
    </a>
 
    <teleport to="body">
@@ -90,7 +90,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js

@@ -22,6 +22,7 @@ containers.forEach((container) => {
                     options: {
                         buttonText: container.dataset.buttonText || null,
                         displayBadge: container.dataset.displayBadge || false,
+                        isDead: container.dataset.isDead || false,
                         parent: container.dataset.parent ? JSON.parse(container.dataset.parent) : null,
                     }
                 }

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

@@ -11,6 +11,7 @@
     * buttonText    string
     * displayBadge  boolean (default: false)  replace button by badge, need to define buttonText for content
     * parent        object  (optional)        pass parent context of the targetEntity (used for course resource comment)
+    * isDead        boolean (default: false)  is the person dead
 
 #}
 <span class="onthefly-container"
@@ -28,6 +29,10 @@
         data-button-text="{{ buttonText|e('html_attr') }}"
     {% endif %}
 
+    {% if isDead is defined and isDead == 1  %}
+        data-is-dead="true"
+    {% endif %}
+
     {% if displayBadge is defined and displayBadge == 1 %}
         data-display-badge="true"
     {% endif %}

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js

@@ -130,7 +130,7 @@ const store = createStore({
             person.group = person.type
             person._id = person.id
             person.id = `person_${person.id}`
-            person.label = `*${person.text}*\n_${getGender(person.gender)}${age}_${debug}`
+            person.label = `*${person.text}${person.deathdate ? ' (‡)' : ''}*\n_${getGender(person.gender)}${age}_${debug}`
             person.folded = false
             // folded is used for missing persons
             if (options.folded) {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue

@@ -127,6 +127,7 @@
         <i class="fa fa-stack-1x">T</i>
       </span>
       {{ person.text }}
+      <span v-if="person.deathdate" class="deathdate"> (‡)</span>
     </a>
     <span v-else>
        <span v-if="options.isHolder" class="fa-stack fa-holder" :title="$t('renderbox.holder')">
@@ -134,6 +135,7 @@
         <i class="fa fa-stack-1x">T</i>
       </span>
       {{ person.text }}
+      <span v-if="person.deathdate" class="deathdate"> (‡)</span>
     </span>
     <slot name="post-badge"></slot>
   </span>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_confirm_delete.html.twig

@@ -3,7 +3,8 @@
     {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
-        buttonText: entity|chill_entity_render_string
+        buttonText: entity|chill_entity_render_string,
+        isDead: entity.deathdate is not null
     } %}
 {% endmacro %}
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -9,6 +9,7 @@
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
         buttonText: entity|chill_entity_render_string,
+        isDead: entity.deathdate is not null,
         parent: parent
     } %}
 {% endmacro %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig

@@ -69,7 +69,8 @@
                                                     {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                                         action: 'show', displayBadge: true,
                                                         targetEntity: { name: 'person', id: p.id },
-                                                        buttonText: p|chill_entity_render_string
+                                                        buttonText: p|chill_entity_render_string,
+                                                        isDead: entity.deathdate is not null
                                                     } %}
                                                 </span>
                                             {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig

@@ -65,7 +65,8 @@
                                 {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                     action: 'show', displayBadge: true,
                                     targetEntity: { name: 'person', id: period.requestorPerson.id },
-                                    buttonText: period.requestorPerson|chill_entity_render_string
+                                    buttonText: period.requestorPerson|chill_entity_render_string,
+                                    isDead: period.requestorPerson.deathdate is not null
                                 } %}
                             </span>
                         {% endif %}
@@ -90,7 +91,8 @@
                                 {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                     action: 'show', displayBadge: true,
                                     targetEntity: { name: 'person', id: p.person.id },
-                                    buttonText: p.person|chill_entity_render_string
+                                    buttonText: p.person|chill_entity_render_string,
+                                    isDead: p.person.deathdate is not null
                                 } %}
                             </span>
                         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -59,7 +59,8 @@
                             {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                 action: 'show', displayBadge: true,
                                 targetEntity: { name: 'person', id: m.person.id },
-                                buttonText: m.person|chill_entity_render_string
+                                buttonText: m.person|chill_entity_render_string,
+                                isDead: m.person.deathdate is not null
                             } %}
                         {%- endfor -%}
                     {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -154,7 +154,8 @@
                                                         targetEntity: { name: 'person', id: part.person.id },
                                                         action: 'show',
                                                         displayBadge: true,
-                                                        buttonText: part.person|chill_entity_render_string
+                                                        buttonText: part.person|chill_entity_render_string,
+                                                        isDead: part.person.deathdate is not null
                                                     } %}
                                                 {% else %}
                                                     {% set participating = true %}
@@ -190,7 +191,8 @@
                                                             targetEntity: { name: 'person', id: acp.requestorPerson.id },
                                                             action: 'show',
                                                             displayBadge: true,
-                                                            buttonText: acp.requestorPerson|chill_entity_render_string
+                                                            buttonText: acp.requestorPerson|chill_entity_render_string,
+                                                            isDead: acp.requestorPerson.deathdate is not null
                                                         } %}
                                                     {% endif %}
                                                 </div>

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig

@@ -22,7 +22,8 @@
                                                     targetEntity: { name: 'person', id: task.person.id },
                                                     action: 'show',
                                                     displayBadge: true,
-                                                    buttonText: task.person|chill_entity_render_string
+                                                    buttonText: task.person|chill_entity_render_string,
+                                                    isDead: task.person.deathdate is not null
                                                 } %}
                                             </span>
                     {% elseif task.course is not null %}
@@ -36,7 +37,8 @@
                                 targetEntity: { name: 'person', id: part.person.id },
                                 action: 'show',
                                 displayBadge: true,
-                                buttonText: part.person|chill_entity_render_string
+                                buttonText: part.person|chill_entity_render_string,
+                                isDead: part.person.deathdate is not null
                             } %}
                         {% endfor %}