Separation difficulte libre/conditions

* ajout de diffConditions pour gérer l'ajustement de conditions
* renommage de bmValue en diffLibre
* calcul de l'ajustement (etat+conditions+difficulté libre)
* présentation des 2 champs

fix:
* utiliser .change() au lieu de .click() permet de supporter aussi
les changements au clavier

templates/dialog-roll-sort.html

@@ -13,6 +13,14 @@
       {{/each}}
       {{/select}}
   </select>
+  <label for="categorie">conditions</label>
+  <select name="diffConditions" id="diffConditions" data-dtype="number">
+      {{#select diffConditions}}
+      {{#each ajustementsConditions as |key|}}
+      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      {{/each}}
+      {{/select}}
+  </select>
 </div>
 
 <div class="form-group">
@@ -20,7 +28,8 @@
   <select name="sort" id="sort" data-dtype="String">
       {{#select sort}}
       {{#each sortList as |sort key|}}
-      <option value={{key}}>{{sort.name}} : {{sort.data.difficulte}} / {{sort.data.ptreve}} / {{sort.data.caseTMR}}</option>
+      <option value={{key}}>{{this.name}} - {{#if this.data.caseTMRspeciale}} {{this.data.caseTMRspeciale}} {{else}}{{this.data.caseTMR}}{{/if}} / R{{this.data.difficulte}} r {{sort.data.ptreve}}</option>
+
       {{/each}}
       {{/select}}
   </select>
@@ -28,12 +37,12 @@
 
 <div class="form-group" id="div-sort-difficulte">
   <label for="categorie">Difficulté </label>
-  <select name="bonusmalus" id="bonusmalus" data-dtype="number">
-    {{#select bonusmalus}}
-    {{#each bonusmalusTable as |bmvalue key|}}
-    <option value={{bmvalue}}>{{numberFormat bmvalue decimals=0 sign=true}}</option>
+  <select name="diffLibre" id="diffLibre" data-dtype="number">
+    {{#select diffLibre}}
+    {{#each difficultesLibres  as |key|}}
+    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
     {{/each}}
-    {{/select}}
+  {{/select}}
   </select>
 </div>