Merge branch 'dev_1.1' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon into dev_1.1

module/actor-sheet.js

@@ -34,7 +34,7 @@ export class RdDActorSheet extends ActorSheet {
     data.data.lockUnlockText = (this.options.editCaracComp) ? "Bloquer" : "Débloquer";
     // Gestion de l'affichage total/partiel des compétences
     data.data.cacherCompetencesNiveauBase  = this.options.cacherCompetencesNiveauBase;
-    data.data.showHideCompetenceText = (this.options.cacherCompetencesNiveauBase) ? "Cacher Comp." : "Montrer Comp." ;
+    data.data.showHideCompetenceText = (this.options.cacherCompetencesNiveauBase) ? "Montrer tout" : "Filtrer" ;
     
     let compCategorieNiveau = RdDUtility.getLevelCategory(); // recup catégorie
     data.itemsByType = RdDUtility.buildItemsClassification(data.items);

module/item-sort.js

@@ -32,8 +32,11 @@ export class RdDItemSort extends Item {
 
   /* -------------------------------------------- */
   static buildBonusCaseList( caseBonusString, newCase ) {
+      if (caseBonusString == undefined) {
+        return [];
+      }
       let bonusCaseList = [];
-      let bonusCaseArray = caseBonusString.split(',');
+      let bonusCaseArray = caseBonusString == undefined ? [] : caseBonusString.split(',');
       for( let bonusCase of bonusCaseArray) {
         let bonusSplit = bonusCase.split(':');
         bonusCaseList.push( { case: bonusSplit[0], bonus: bonusSplit[1] } );
@@ -49,14 +52,12 @@ export class RdDItemSort extends Item {
   * @param {} item 
   */
   static getBonusCaseList( data, newCase = false ) {
-          
-      let bonusCaseList = [];
-      // Gestion spéciale case bonus
-      if ( data.item.type == 'sort') {
-        bonusCaseList = this.buildBonusCaseList(data.data.bonuscase, newCase );
-      }
-      return bonusCaseList;
+    // Gestion spéciale case bonus
+    if ( data.item.type == 'sort') {
+      return this.buildBonusCaseList(data.data.bonuscase, newCase );
     }
+    return undefined;
+  }
     
     /* -------------------------------------------- */
     /** Met à jour les données de formulaire 

templates/actor-sheet.html

@@ -52,10 +52,6 @@
                 <a id="ptreve-actuel-plus">+</a>
               </label>
             </li>
-            <li>
-              <label><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></label>
-              <label><a class="show-hide-competences">{{data.showHideCompetenceText}}</a></label>
-            </li>
           </ul>
           <div class="flex-group-center  flex-actions-bar">
             <div>
@@ -66,16 +62,18 @@
               <span id="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
               <span id="monte-tmr-rapide"><a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
               <span id="visu-tmr"><a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a></span>
-              </div>
+            </div>
             <div class="flexrow">
               <span class="tooltip">Malus de fatigue : {{data.fatigue.malus}}
                 <span class="tooltiptext">{{{data.fatigue.html}}}</span>
               </span>
               <span>{{data.blessures.resume}}</span>
-              <span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span>
             </div>
             <div class="flexrow">
-              <span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span>
+              <span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span><span></span>
+            </div>
+            <div class="flexrow">
+              <span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span><span></span>
             </div>
           </div>
         </div>
@@ -100,6 +98,7 @@
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
+              <span><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></span>
               <ul class="carac-list alterne-list">
                 {{#each data.carac as |carac key|}}
                     <li class="competence flexrow list-item" data-attribute="{{key}}">
@@ -162,6 +161,10 @@
         
         {{!-- Compétences Tab --}}
         <div class="tab competences" data-group="primary" data-tab="competences">
+          <div class="flexrow">
+            <span><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></span>
+            <span><a class="show-hide-competences">{{data.showHideCompetenceText}}</a></span> 
+          </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
               <header class="competence-header flexrow">

templates/item-sort-sheet.html

@@ -56,6 +56,7 @@
         <label for="xp">XP </label>
         <input class="attribute-value" type="text" name="data.xp" value="{{data.xp}}" data-dtype="Number"/>
       </div>
+      {{#if owner}}
       {{#each bonusCaseList as |bcData key|}}
       <div class="form-group">
         <label for="bonuscase">Case/Bonus :</label>
@@ -63,6 +64,7 @@
         <input class="attribute-value" type="text" name="bonusValue" value="{{bcData.bonus}}" data-dtype="Number"/>
       </div>
       {{/each}}
+      {{/if}}
       <div class="flexcol">
         <span><label>Description : </label></span>
         <div class="form-group editor">