Réorganisation dans le haut-rêve

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

@@ -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,8 +508,61 @@
           </ul>
         </div>
         <hr>
+        {{!-- Queues, Souffles, Tetes, Ombre --}}
+        {{#if queues.length}}
+        <h3>Queues:</h3>
+        <ul class="flex-group-left">
+          {{#each queues as |queue key|}}
+          <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
+            <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.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|}}
+          <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
+            <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.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 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 options.isGM}}
+          {{#if (and options.isGM signesdraconiques.length)}}
             <h3>Signes draconiques</h3>
             <ul class="item-list alterne-list">
               {{#each signesdraconiques as |signe key|}}
@@ -524,34 +576,58 @@
               {{/each}}
             </ul>
           {{/if}}
-        <h3>Sorts:</h3>
+
-        <ul class="item-list alterne-list">
+          {{#if hautreve.rencontres.length}}
-          {{#each sorts as |sort key|}}
+            <h3>Rencontres présentes:</h3>
-          <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+            <ul class="item-list">
-            <span class="display-label flex-grow"> <a data-item-id="{{sort._id}}">{{sort.name}}</a></span> 
+              {{#each hautreve.rencontres as |rencontre key|}}
-            <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
+              <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 item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <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 flex-grow">{{reserve.sort.name}}</span> 
+                <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.data.ptreve_reel}}</span> 
-            <span class="flex-shrink">r{{reserve.sort.data.ptreve_reel}}</span> 
+                <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</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>
+          {{/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">
@@ -566,81 +642,20 @@
             {{/each}}
           </ul>
         <hr>
-        {{/if}}
+          {{#if hautreve.casesTmr}}
-        {{!-- Queues, Souffles, Tetes, Ombre --}}
-        <h3>Queues:</h3>
-        <ul class="flex-group-left">
-          {{#each queues as |queue key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.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>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>
-        <h3>Ombres de Thanatos:</h3>
-        <ul class="item-list">
-          {{#each ombres as |ombre key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.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 data.attributs.hautrevant.value}}
-        <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>
+                <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>