From 0a9e8e0ac67b54f859b2e6a81dc1913cbe0dfb70 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 27 Apr 2021 00:30:46 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20pr=C3=A9sentation=20blessur?=
 =?UTF-8?q?es=20#173?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/rdd-utility.js                        |   2 +
 styles/simple.css                            |  18 +++
 templates/actor-blessure-partial.html        |  24 ++++
 templates/actor-creature-sheet.html          | 130 ++++++-------------
 templates/actor-liste-blessures-partial.html |  23 ++++
 templates/actor-sheet.html                   | 103 +--------------
 6 files changed, 107 insertions(+), 193 deletions(-)
 create mode 100644 templates/actor-blessure-partial.html
 create mode 100644 templates/actor-liste-blessures-partial.html

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index e6d5c403..be7eb64b 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -101,6 +101,8 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competencecreature-sheet.html',
diff --git a/styles/simple.css b/styles/simple.css
index c76e8e8a..c62b90e0 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -627,6 +627,24 @@ ul, li {
   padding: 0.125rem;
   flex: 1 1 5rem;
 }
+
+.table-row {
+  margin: 0.125rem;
+  border-radius: 0;
+  padding: 0.125rem;
+  flex: 1 1 5rem;
+}
+
+.alterne-row > .row-item:hover {
+  background: rgba(100, 100, 50, 0.25);
+}
+.alterne-row > .row-item:nth-child(even) {
+  background: rgba(80, 60, 0, 0.10);
+}
+.alterne-row > .row-item:nth-child(odd) {
+  background: rgb(160, 130, 100, 0.05);
+}
+
 .item-display-show {
   display: block;
 }
diff --git a/templates/actor-blessure-partial.html b/templates/actor-blessure-partial.html
new file mode 100644
index 00000000..b08f50f7
--- /dev/null
+++ b/templates/actor-blessure-partial.html
@@ -0,0 +1,24 @@
+<tr class="table-row alterne-row item" data-blessure-type="{{gravite}}" data-attribute={{key}} data-blessure-index="{{key}}" >
+  <td class="flex-row first" >
+    {{title}}
+  </td>
+  <td class="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
+    {{#if bless.active}}
+    <i class="fas fa-circle"></i>
+    {{else}}
+    <i class="fas fa-genderless"></i>
+    {{/if}}
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
+  </td>
+</tr>
diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html
index 339e7c61..a96bf07f 100644
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -139,101 +139,47 @@
       
     {{!-- blessures Tab --}}
     <div class="tab blessures" data-group="primary" data-tab="blessures" style="height:200px">
-        <span class="blessures-title">Blessures Légeres :</span>
-        <div class="blessure-data alterne-list">
-          {{#each data.blessures.legeres.liste as |bless key|}}
-          <li class="item flexrow blessure-data list-item" data-blessure-type="legere" data-attribute={{key}}
-            data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Légère"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number"
-              value="{{this.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number"
-              value="{{this.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{this.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name='localisation' data-dtype="String"
-              value="{{this.loc}}" />
-          </li>
-          {{/each}}
-        </div>
-        <span class="blessures-title">Blessures Graves :</span>
-        <div class="blessure-data alterne-list">
-          {{#each data.blessures.graves.liste as |bless key|}}
-          <li class="item flexrow list-item" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Grave"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number"
-              value="{{bless.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number"
-              value="{{bless.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String"
-              value="{{bless.loc}}" />
-          </li>
-          {{/each}}
-        </div>
-        <span class="blessures-title">Blessure Critique :</span>
-        <div class="blessure-data alterne-list">
-          {{#each data.blessures.critiques.liste as |bless key|}}
-          <li class="item flexrow list-item" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Critique"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number"
-              value="{{bless.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number"
-              value="{{bless.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String"
-              value="{{bless.loc}}" />
-          </li>
-          </li>
-          {{/each}}
-        </div>
-      </div>
+      {{!-- Liste de blessures --}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
+    </div>
 
-      {{!-- Equipment Tab --}}
-      <div class="tab items" data-group="primary" data-tab="items">
-        <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
-        <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
-        {{#if options.isGM}}
-        <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
-        {{/if}}
-        <ul class="item-list alterne-list">
-          <li class="competence-header flexrow">
-            <span class="competence-title competence-label">Nom</span>
-            <span class="competence-title competence-label">Q.</span>
-            <span class="competence-title competence-value">Enc.</span>
-            <span class="competence-title competence-value">Equiper</span>
-            <span class="competence-title competence-value">Editer/Suppr.</span>
+    {{!-- Equipment Tab --}}
+    <div class="tab items" data-group="primary" data-tab="items">
+      <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
+      <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
+      {{#if options.isGM}}
+      <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
+      {{/if}}
+      <ul class="item-list alterne-list">
+        <li class="competence-header flexrow">
+          <span class="competence-title competence-label">Nom</span>
+          <span class="competence-title competence-label">Q.</span>
+          <span class="competence-title competence-value">Enc.</span>
+          <span class="competence-title competence-value">Equiper</span>
+          <span class="competence-title competence-value">Editer/Suppr.</span>
+        </li>
+        {{#each data.objets as |item id|}}
+          {{#unless item.estContenu}}
+          {{#if (ne item.type 'conteneur')}}
+          <li class="item flexrow list-item" data-item-id="{{item._id}}">
+              <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+              <span class="item-name">{{item.name}}</span>
+              <span class="item-quantite">{{item.data.quantite}}</span>
+              <span class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</span>
+              <div class="item-controls">
+                  <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                  <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+              </div>
           </li>
-          {{#each data.objets as |item id|}}
-            {{#unless item.estContenu}}
-            {{#if (ne item.type 'conteneur')}}
-            <li class="item flexrow list-item" data-item-id="{{item._id}}">
-                <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-                <span class="item-name">{{item.name}}</span>
-                <span class="item-quantite">{{item.data.quantite}}</span>
-                <span class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</span>
-                <div class="item-controls">
-                    <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                    <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-            </li>
-            {{/if}}
-            {{/unless}}
+          {{/if}}
+          {{/unless}}
+        {{/each}}
+          {{#each data.conteneurs as |conteneur id|}}
+          {{buildConteneur this}}
           {{/each}}
-            {{#each data.conteneurs as |conteneur id|}}
-            {{buildConteneur this}}
-            {{/each}}
-          </ul>
-        </div>
+        </ul>
+      </div>
 
       {{!-- Biography Tab --}}
       <div class="tab description" data-group="primary" data-tab="description">
diff --git a/templates/actor-liste-blessures-partial.html b/templates/actor-liste-blessures-partial.html
new file mode 100644
index 00000000..ea58f23b
--- /dev/null
+++ b/templates/actor-liste-blessures-partial.html
@@ -0,0 +1,23 @@
+<h3>Blessures:</h3>
+<table class="table-container" role="table">
+  <thead>
+    <tr class="competence-header competence-title competence-label" >
+      <th class="first" colspan="2">Gravité</th>
+      <th>Localisation</th>
+      <th>Premiers soins</th>
+      <th>Soins complets</th>
+      <th>Age (jours)</th>   
+    </tr>
+  </thead>
+  <tbody>
+    {{#each data.blessures.legeres.liste as |bless key|}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Légère"}}
+    {{/each}}
+    {{#each data.blessures.graves.liste as |bless key|}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="grave" title="Grave"}}
+    {{/each}}
+    {{#each data.blessures.critiques.liste as |bless key|}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Critique"}}
+    {{/each}}
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index f3cb0920..346778d3 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -365,108 +365,9 @@
           </li>
         </ul>
         <hr>
-
         {{!-- Liste de blessures --}}
-        <h3 class="blessures-title">Blessures:</h3>
-        <div class="flex-group-left flexcol competence-column">
-          <h4 class="blessures-title">Légères:</h4>
-          <ul class="blessure-data flexrow alterne-list blessures-list">
-            {{#each data.blessures.legeres.liste as |bless key|}}
-            <li class="item flexrow blessure-data list-item" data-blessure-type="legere" data-attribute={{key}} data-blessure-index="{{key}}">
-              <ul>
-                <li class="item-control blessure-control" title="Blessure Légère" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-          <h4 class="blessures-title">Graves :</h4>
-          <ul class="flexrow alterne-list blessures-list">
-            {{#each data.blessures.graves.liste as |bless key|}}
-            <li class="item flexrow list-item" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}" >
-              <ul>
-                <li class="item-control blessure-control" title="Blessure Grave" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-          <h4 class="blessures-title">Critique :</h4>
-          <ul class="flexrow alterne-list blessures-list">
-            {{#each data.blessures.critiques.liste as |bless key|}}
-            <li class="item list-item flexrow" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}" >
-              <ul>
-                <li class="flex-group-center item-control blessure-control" title="Blessure Critique" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-        </div>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
+      </div>
 
       {{!-- Connaissances Tab --}}
       <div class="tab connaissances" data-group="primary" data-tab="connaissances">