From a74ab041f9e71552f19c3ca48664b5c3189da681 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 4 May 2021 11:38:23 +0200
Subject: [PATCH] Utilisation templates partial

---
 module/rdd-utility.js                         |   2 +
 ...r-sheet-categorie-competences-partial.html |   8 ++
 templates/actor-sheet-oeuvre-partial.html     |  11 ++
 templates/actor-sheet.html                    | 116 +++---------------
 4 files changed, 35 insertions(+), 102 deletions(-)
 create mode 100644 templates/actor-sheet-categorie-competences-partial.html
 create mode 100644 templates/actor-sheet-oeuvre-partial.html

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index c6123b52..6ebb0d6f 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -108,6 +108,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-sheet-categorie-competences-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
       //Items
diff --git a/templates/actor-sheet-categorie-competences-partial.html b/templates/actor-sheet-categorie-competences-partial.html
new file mode 100644
index 00000000..a3fa8da9
--- /dev/null
+++ b/templates/actor-sheet-categorie-competences-partial.html
@@ -0,0 +1,8 @@
+<header class="competence-header flexrow">
+  <span class="competence-title">{{categorie}}</span>
+</header>
+<ul class="item-list alterne-list">
+  {{#each competences as |comp key|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
+  {{/each}}
+</ul>
diff --git a/templates/actor-sheet-oeuvre-partial.html b/templates/actor-sheet-oeuvre-partial.html
new file mode 100644
index 00000000..4492568d
--- /dev/null
+++ b/templates/actor-sheet-oeuvre-partial.html
@@ -0,0 +1,11 @@
+<li class="item flexrow list-item" data-item-id="{{oeuvre._id}}">
+  <span>{{upperFirst typeOeuvre}}</span>
+  <span class="competence-title {{classOeuvre}}">
+    <a>{{oeuvre.name}} (niveau {{oeuvre.data.niveau}})</a>
+  </span>
+  <div class="item-controls">
+    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+  </div>
+</li>
+
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index b4270533..5b96d32f 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -233,81 +233,18 @@
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
-              
-              <header class="competence-header flexrow">
-                <span class="competence-title">Compétences générales</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.generale as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-
-              <header class="competence-header flexrow">
-                  <span class="competence-title">Compétences Particulières</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.particuliere as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-
-              <header class="competence-header flexrow">
-                <span class="competence-title">Compétences Spécialisées</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.specialisee as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.generale categorie="Compétences générales"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.particuliere categorie="Compétences Particulières"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.specialisee categorie="Compétences Spécialisées"}}
             </div>
-            
+
             <div class="flex-group-left flexcol competence-column">
-              <header class="competence-header flexrow">
-                <span class="competence-title">Compétences de Mêlée</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.melee as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-              
-              <header class="competence-header flexrow">
-                <span class="competence-title">Compétences de Tir</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.tir as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-              
-              <header class="competence-header flexrow">
-                <span class="competence-title">Compétences de Lancer</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.lancer as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-
-              <header class="competence-header flexrow">
-                  <span class="competence-title">Connaissances</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.connaissance as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
-
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.melee categorie="Compétences de Mêlée"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.tir categorie="Compétences de Tir"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.lancer categorie="Compétences de Lancer"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.connaissance categorie="Connaissances"}}
               {{#if data.attributs.hautrevant.value}}
-              <header class="competence-header flexrow">
-                <span class="competence-title">Draconic</span>
-              </header>
-              <ul class="item-list alterne-list">
-                {{#each competenceByCategory.draconic as |comp key|}}
-                {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
-                {{/each}}
-              </ul>
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.draconic categorie="Draconic"}}
               {{/if}}
 
               <div>
@@ -384,44 +321,19 @@
         <h3>Oeuvres diverses :</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
         <ul class="item-list alterne-list">
           {{#each chants as |chant id|}}
-          <li class="item flexrow list-item" data-item-id="{{chant._id}}"><span>Chant</span><span class="competence-title chant-label"><a>{{chant.name}} (niveau {{chant.data.niveau}})</a></span>
-            <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
           {{/each}}
           {{#each musiques as |musique id|}}
-          <li class="item flexrow list-item" data-item-id="{{musique._id}}"><span>Musique</span><span class="competence-title musique-label"><a>{{musique.name}} (niveau {{musique.data.niveau}})</a></span>
-            <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
           {{/each}}
           {{#each danses as |danse id|}}
-          <li class="item flexrow list-item" data-item-id="{{danse._id}}"><span>Danse</span><span class="competence-title danse-label"><a>{{danse.name}} (niveau {{danse.data.niveau}})</a></span>
-            <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
           {{/each}}
           {{#each oeuvres as |oeuvre id|}}
-          <li class="item flexrow list-item" data-item-id="{{oeuvre._id}}"><span>{{upperFirst oeuvre.data.competence}}</span><span class="competence-title oeuvre-label"><a>{{oeuvre.name}} (niveau {{oeuvre.data.niveau}})</a></span>
-            <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.data.competence classOeuvre="oeuvre-label"}}
           {{/each}}
           {{#each recettescuisine as |recette id|}}
-          <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span>Recette de cuisine</span><span class="competence-title recettecuisine-label"><a>{{recette.name}} (niveau {{recette.data.niveau}})</a></span>
-            <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
           {{/each}}
         </ul>
         <h3>Jeux :</h3>