From 9b8f694ddafc3fd31c403242bdd4bced63cf882a Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 4 Jun 2022 23:47:38 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20dans=20le=20haut-r=C3=AAv?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajout de la force des rencontres en attente
Ajout des cases pour les sorts et cases spéciales

1. Têtes; souffles et queues
2. Effets temporaires: signes, rencontres, sorts en réserve
3. Apprentissages: sorts, méditations
4. cases spéciales
---
 templates/actor-sheet.html | 231 ++++++++++++++++++++-----------------
 1 file changed, 123 insertions(+), 108 deletions(-)

diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index d151bd16..88e76ad8 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -307,7 +307,6 @@
                   <a class="competence-label" name="{{esq.name}}">
                     <img class="sheet-competence-img" src="{{esq.img}}"/>
                     <span>{{esq.name}}</span>
-                    {{log esq}}
                   </a>
                 </span>
                 <span class="arme-initiative"></span>
@@ -509,65 +508,8 @@
           </ul>
         </div>
         <hr>
-        {{#if data.attributs.hautrevant.value}}
-        {{#if options.isGM}}
-        <h3>Signes draconiques</h3>
-        <ul class="item-list alterne-list">
-          {{#each signesdraconiques as |signe key|}}
-          <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
-            <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{signe.name}}</a></span> 
-            <span class="flex-shrink">{{signe.data.difficulte}}</span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        <h3>Sorts:</h3>
-        <ul class="item-list alterne-list">
-          {{#each sorts as |sort key|}}
-          <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-            <span class="display-label flex-grow"> <a data-item-id="{{sort._id}}">{{sort.name}}</a></span> 
-            <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        
-        <h3>Sorts en Réserve:</h3>
-        <ul class="item-list alterne-list">
-          {{#each hautreve.sortsReserve as |reserve key|}}
-          <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
-            <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
-            <span class="display-label flex-grow">{{reserve.sort.name}}</span> 
-            <span class="flex-shrink">r{{reserve.sort.data.ptreve_reel}}</span> 
-            <span class="flex-shrink">{{reserve.coord}}</span> 
-            <span>{{caseTmr-label reserve.coord}}</span> 
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        
-        <h3>Méditations:</h3>
-        <ul class="item-list">
-          {{#each meditations as |meditation key|}}
-          <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
-            <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
-            <div class="item-controls flex-shrink">
-              <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}}
-        </ul>
-        <hr>
-        {{/if}}
         {{!-- Queues, Souffles, Tetes, Ombre --}}
+        {{#if queues.length}}
         <h3>Queues:</h3>
         <ul class="flex-group-left">
           {{#each queues as |queue key|}}
@@ -579,28 +521,8 @@
           </li>
           {{/each}}
         </ul>
-        <h3>Souffles:</h3>
-        <ul class="item-list">
-          {{#each souffles as |souffle key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}                 
-        </ul>
-        <h3>Tetes:</h3>
-        <ul class="item-list">
-          {{#each tetes as |tete key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
+        {{/if}}
+        {{#if ombres.length}}
         <h3>Ombres de Thanatos:</h3>
         <ul class="item-list">
           {{#each ombres as |ombre key|}}
@@ -612,35 +534,128 @@
           </li>
           {{/each}}
         </ul>
+        {{/if}}
+        {{#if souffles.length}}
+        <h3>Souffles:</h3>
+        <ul class="item-list">
+          {{#each souffles as |souffle key|}}
+          <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
+            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
+            <div class="item-controls flex-shrink">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          </li>
+          {{/each}}
+        </ul>
+        {{/if}}
+        {{#if tetes.length}}
+        <h3>Tetes:</h3>
+        <ul class="item-list">
+          {{#each tetes as |tete key|}}
+          <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
+            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
+            <div class="item-controls flex-shrink">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          </li>
+          {{/each}}
+        </ul>
+        {{/if}}
         {{#if data.attributs.hautrevant.value}}
+          {{#if (and options.isGM signesdraconiques.length)}}
+            <h3>Signes draconiques</h3>
+            <ul class="item-list alterne-list">
+              {{#each signesdraconiques as |signe key|}}
+              <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
+                <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{signe.name}}</a></span> 
+                <span class="flex-shrink">{{signe.data.difficulte}}</span>
+                <div class="item-controls flex-shrink">
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          {{/if}}
+
+          {{#if hautreve.rencontres.length}}
+            <h3>Rencontres présentes:</h3>
+            <ul class="item-list">
+              {{#each hautreve.rencontres as |rencontre key|}}
+              <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
+                <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} r{{rencontre.force}}</a></span> 
+                <span class="flex-shrink">{{rencontre.coord}} - {{caseTmr-label rencontre.coord}}</span> 
+                {{#if rencontre.date}}
+                <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
+                {{/if}}
+                <div class="item-controls flex-shrink">
+                  <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          {{/if}}
+          {{#if hautreve.sortsReserve.length}}
+            <h3>Sorts en Réserve:</h3>
+            <ul class="item-list alterne-list">
+              {{#each hautreve.sortsReserve as |reserve key|}}
+              <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
+                <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
+                <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.data.ptreve_reel}}</span> 
+                <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
+                <div class="item-controls flex-shrink">
+                  <a class="item-control item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          {{/if}}
+
+          <hr>
+
+          <h3>Sorts:</h3>
+          <ul class="item-list alterne-list">
+            {{#each sorts as |sort key|}}
+            <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+              <span class="display-label flex-grow">
+                <a data-item-id="{{sort._id}}">{{sort.name}}
+                  - {{#if sort.data.caseTMRspeciale}}{{sort.data.caseTMRspeciale}}{{else}}{{upperFirst sort.data.caseTMR}}{{/if}}
+                </a>
+              </span> 
+              <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
+              <div class="item-controls flex-shrink">
+                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+
+          <h3>Méditations:</h3>
+          <ul class="item-list">
+            {{#each meditations as |meditation key|}}
+            <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
+              <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
+              <div class="item-controls flex-shrink">
+                <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}}
+          </ul>
         <hr>
-        <h3>Rencontres présentes:</h3>
-        <ul class="item-list">
-          {{#each hautreve.rencontres as |rencontre key|}}
-          <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
-            <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} - {{rencontre.coord}}</a></span> 
-            <span class="flex-shrink">{{caseTmr-label rencontre.coord}}</span> 
-            {{#if rencontre.date}}
-            <span>Le {{rencontre.date}} à {{rencontre.heure}}</span> 
-            {{/if}}
-            <div class="item-controls flex-shrink">
-              <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        <h3>Cases Spéciales:</h3>
-        <ul class="item-list">
-          {{#each hautreve.casesTmr as |casetmr key|}}
-          <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
-            <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span> 
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
+          {{#if hautreve.casesTmr}}
+            <h3>Cases Spéciales:</h3>
+            <ul class="item-list">
+              {{#each hautreve.casesTmr as |casetmr key|}}
+              <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
+                <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
+                <span>{{casetmr.data.coord}} - {{caseTmr-label casetmr.data.coord}}</span> 
+                <div class="item-controls flex-shrink">
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          {{/if}}
         <br><br>
         {{/if}}
       </div>