#44 - Gestion sur encombrement corrigée
This commit is contained in:
		@@ -179,18 +179,22 @@
 | 
			
		||||
      {{!-- Equipment Tab --}}
 | 
			
		||||
      <div class="tab items" data-group="primary" data-tab="items">
 | 
			
		||||
        <span cass=item-name>Encombrement total/max : {{numberFormat data.encombrementTotal decimals=1}} / {{data.attributs.encombrement.value}}</span>
 | 
			
		||||
        <hr>
 | 
			
		||||
        <span cass=item-name>Porté sur soi</span>      
 | 
			
		||||
          <ol 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}}"/>
 | 
			
		||||
                  <h4 class="item-name">{{item.name}}</h4>
 | 
			
		||||
                  {{#if item.data.quantite}}
 | 
			
		||||
                  <h4 class="item-quantite">{{item.data.quantite}}</h4>
 | 
			
		||||
                  {{/if}}
 | 
			
		||||
                  <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>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
  <li class="item flexrow list-item" data-item-id="{{item._id}}">
 | 
			
		||||
    <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
 | 
			
		||||
    <h4 class="item-name">{{item.name}}</h4>
 | 
			
		||||
    <h4 class="item-quantite">{{item.data.quantite}}</h4>
 | 
			
		||||
    <h4 class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</h4>
 | 
			
		||||
    <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-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>
 | 
			
		||||
 
 | 
			
		||||
@@ -554,17 +554,23 @@
 | 
			
		||||
 | 
			
		||||
      {{!-- Equipment Tab --}}
 | 
			
		||||
      <div class="tab items" data-group="primary" data-tab="items">
 | 
			
		||||
        <span cass=item-name>Encombrement total/max : {{numberFormat data.encombrementTotal decimals=1}} / {{data.attributs.encombrement.value}}</span>
 | 
			
		||||
        <span cass=item-name>Porté sur soi</span>      
 | 
			
		||||
        <span cass=item-name>Encombrement total/max : {{numberFormat data.encombrementTotal decimals=1}} / {{data.attributs.encombrement.value}} <b>{{data.surEncombrementMessage}}</b></span>
 | 
			
		||||
        <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}}"/>
 | 
			
		||||
              <h4 class="item-name">{{item.name}}</h4>
 | 
			
		||||
              <h4 class="item-quantite">{{item.data.quantite}}</h4>
 | 
			
		||||
              <h4 class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</h4>
 | 
			
		||||
              <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>
 | 
			
		||||
 
 | 
			
		||||
@@ -37,6 +37,7 @@
 | 
			
		||||
  <input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels"  {{#if coupsNonMortels}}checked{{/if}}/>
 | 
			
		||||
</div>
 | 
			
		||||
{{/if}}
 | 
			
		||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
 | 
			
		||||
<div class="form-group">
 | 
			
		||||
  <label for="categorie">Etat général</label><label>{{numberFormat etat decimals=0 sign=true}}</label>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,7 @@
 | 
			
		||||
      {{/select}}
 | 
			
		||||
  </select>
 | 
			
		||||
</div>
 | 
			
		||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
 | 
			
		||||
<div class="form-group">
 | 
			
		||||
  <label for="categorie">Etat général</label><label>{{numberFormat etat decimals=0 sign=true}}</label>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								templates/dialog-roll-surenc.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								templates/dialog-roll-surenc.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
{{#if surencMalusFlag}}
 | 
			
		||||
<div class="form-group">
 | 
			
		||||
  <label for="xp">Appliquer le malus de sur-encombrement ? </label>
 | 
			
		||||
  <input class="attribute-value" type="checkbox" id="surencMalusApply" name="surencMalusApply"  {{#if surencMalusApply}}checked{{/if}}/>
 | 
			
		||||
</div>
 | 
			
		||||
{{/if}}
 | 
			
		||||
		Reference in New Issue
	
	Block a user