From d376ba1c263c43911736d7b22d973bb322ff21cd Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 21 Apr 2021 00:58:28 +0200
Subject: [PATCH] Ajout partial-select-carac

---
 module/rdd-utility.js                 |  1 +
 styles/simple.css                     |  6 +++++
 templates/dialog-competence.html      | 11 +++------
 templates/dialog-roll-resolution.html | 32 ++++++---------------------
 templates/partial-select-carac.html   |  7 ++++++
 5 files changed, 24 insertions(+), 33 deletions(-)
 create mode 100644 templates/partial-select-carac.html

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index f384aef9..5d690f0c 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -163,6 +163,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html',
       // Calendrier
       'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html',
       'systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html',
diff --git a/styles/simple.css b/styles/simple.css
index e5e83279..254dd5b0 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -528,6 +528,12 @@ section.sheet-body:after {
   text-align: left;
   width: 50px;
 }
+.select-carac {
+  display: inline-block;
+  text-align: left;
+  width: 100%;
+  max-width: 90%;
+}
 
 #vie-plus, #vie-moins, #endurance-plus, #endurance-moins, #fatigue-plus, #fatigue-moins, #ptreve-actuel-plus, #ptreve-actuel-moins, .monnaie-plus, .monnaie-moins {
   display: inline-block;
diff --git a/templates/dialog-competence.html b/templates/dialog-competence.html
index 1ed86065..46d45fec 100644
--- a/templates/dialog-competence.html
+++ b/templates/dialog-competence.html
@@ -3,15 +3,10 @@
 
 <div class="grid grid-2col">
   <div class="flex-group-left">
+    <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
     <div class="flexrow">
-      <label>Caractéristique </label>
-      <select name="carac" id="carac" data-dtype="String">
-        {{#select carac}}
-        {{#each carac as |caracitem key|}}
-        <option value={{key}}>{{caracitem.label}}</option>
-        {{/each}}
-        {{/select}}
-      </select>
+      <label>Caractéristique</label>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
     </div>
     {{#if arme}}
     {{#if attackerRoll}}
diff --git a/templates/dialog-roll-resolution.html b/templates/dialog-roll-resolution.html
index bdaadae9..28573d76 100644
--- a/templates/dialog-roll-resolution.html
+++ b/templates/dialog-roll-resolution.html
@@ -1,29 +1,11 @@
 <form class="resolution-roll-dialog">
-<div class="flexrow flex-group-left">
-  <label>Caractéristique</label>
-  <select name="carac" id="carac" class="select-diff" data-dtype="String">
-      {{#select carac}}
-      {{#each carac as |caracitem key|}}
-      <option value={{key}}>{{caracitem.label}}</option>
-      {{/each}}
-      {{/select}}
-  </select>
-  <label>Difficulté libre</label>
-  <select name="diffLibre" id="diffLibre" class="select-diff" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-    {{/select}}
-  </select>
-  <label>&nbsp;&nbsp;Conditions</label>
-  <select name="diffConditions" id="diffConditions" class="select-diff" data-dtype="number">
-    {{#select diffConditions}}
-    {{#each ajustementsConditions as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-    {{/select}}
-  </select>
+<div class="grid grid-4col">
+  <div class="flexrow">
+    <label>Caractéristique</label>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
+  </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
   <button id="lancer" type="button">Lancer les dés</button>
 </div>
 <div id="tableResolution">  
diff --git a/templates/partial-select-carac.html b/templates/partial-select-carac.html
new file mode 100644
index 00000000..672a717d
--- /dev/null
+++ b/templates/partial-select-carac.html
@@ -0,0 +1,7 @@
+<select name="carac" id="carac" class="flex-grow select-carac" data-dtype="String">
+  {{#select carac}}
+  {{#each carac as |caracitem key|}}
+  <option value={{key}}>{{caracitem.label}}</option>
+  {{/each}}
+  {{/select}}
+</select>