Fix: Fenêtre d'édition du calendrier

Ajout d'un helper Handlebars pour accéder à l'objet RDD_CONFIG
sans avoir besoin de l'ajouter dans les données pour rendu du template

changelog.md

@@ -1,4 +1,7 @@
 # 12.0
+## 12.0.5 - Les mauvais jours d'Astrobazzarh
+- Fix: on peut de nouveau ouvrir l'édition de calendrier
+
 ## 12.0.4 - La plaie d'Astrobazzarh
 - **Support V12**
   - Fix: les boutons d'encaissement dans le tchat fonctionnent de nouveau

module/actor.js

@@ -1146,8 +1146,7 @@ export class RdDActor extends RdDBaseActorSang {
       diffNbDoses: -Number(this.system.compteurs.ethylisme.nb_doses || 0),
       finalLevel: 0,
       diffConditions: 0,
-      ajustementsForce: CONFIG.RDD.difficultesLibres,
+      ajustementsForce: CONFIG.RDD.difficultesLibres
-      config: game.system.rdd.config
     }
     let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ethylisme.html', rollData);
     new RdDRollDialogEthylisme(html, rollData, this, r => this.saouler(r.forceAlcool)).render(true);

module/actor/base-actor-sheet.js

@@ -38,8 +38,7 @@ export class RdDBaseActorSheet extends ActorSheet {
       description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
       notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
       options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable),
-      effects: this.actor.effects,
+      effects: this.actor.effects
-      config: game.system.rdd.config
     }
 
     RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);

module/dialog-chronologie.js

@@ -25,7 +25,6 @@ export class DialogChronologie extends Dialog {
       journalId: game.settings.get(SYSTEM_RDD, LATEST_USED_JOURNAL_ID),
       journaux: game.journal.filter(it => it.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)),
       timestamp: game.system.rdd.calendrier.timestamp,
-      config: game.system.rdd.config,
       dateReel: game.system.rdd.calendrier.dateReel()
     };
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-chronologie.html", dialogData);

module/item-sheet.js

@@ -99,7 +99,6 @@ export class RdDItemSheet extends ItemSheet {
       descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
       isComestible: this.item.getUtilisationCuisine(),
       options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
-      config: game.system.rdd.config
     }
     if (this.item.type == TYPES.competencecreature) {
       formData.isparade = RdDItemCompetenceCreature.isParade(this.item)

module/rdd-main.js

@@ -71,15 +71,16 @@ import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
  * Software License: GNU GPLv3
  */
 export class SystemReveDeDragon {
-
+  
   static start() {
     const system = new SystemReveDeDragon()
     Hooks.once('init', async () => await system.onInit())
     Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d))
     Hooks.once('ready', () => system.onReady())
   }
-
+  
   constructor() {
+    this.config = RDD_CONFIG; 
     this.RdDUtility = RdDUtility;
     this.RdDHotbar = RdDHotbar;
     this.itemClasses = {
@@ -108,7 +109,6 @@ export class SystemReveDeDragon {
   /* -------------------------------------------- */
   async onInit() {
     game.system.rdd = this;
-    game.system.rdd.config = RDD_CONFIG; 
     this.AppAstrologie = AppAstrologie;    
 
 

module/rdd-utility.js

@@ -19,6 +19,7 @@ import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { ExperienceLog } from "./actor/experience-log.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
 import { APP_ASTROLOGIE_REFRESH } from "./sommeil/app-astrologie.js";
+import { RDD_CONFIG } from "./constants.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -262,8 +263,6 @@ export class RdDUtility {
     ];
 
     Handlebars.registerHelper('either', (a, b) => a ?? b);
-    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
-    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
     Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null'));
     Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null'));
     Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? '');
@@ -272,6 +271,10 @@ export class RdDUtility {
     Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
     Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
     Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
+
+    Handlebars.registerHelper('RDD_CONFIG', path => RDD_CONFIG[path])
+    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
+    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
     Handlebars.registerHelper('buildLigneInventaire', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildLigneInventaire(item, options)); });
     Handlebars.registerHelper('buildInventaireConteneur', (actorId, itemId, options) => { return new Handlebars.SafeString(RdDUtility.buildInventaireConteneur(actorId, itemId, options)); });
     Handlebars.registerHelper('buildContenuConteneur', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildContenuConteneur(item, options)); });

module/time/rdd-calendrier.js

@@ -123,9 +123,9 @@ export class RdDCalendrier extends Application {
   /* -------------------------------------------- */
   fillCalendrierData(formData = {}) {
     foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
-    formData.isGM = game.user.isGM;
+    formData.isGM = game.user.isGM
     formData.heures = RdDTimestamp.definitions()
-    formData.horlogeAnalogique = this.horlogeAnalogique;
+    formData.horlogeAnalogique = this.horlogeAnalogique
     formData.autoDarkness = AutoAdjustDarkness.isAuto()
     return formData;
   }
@@ -372,7 +372,7 @@ export class RdDCalendrier extends Application {
       game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_app_astrologie_refresh", data: {} })
     }
   }
-  
+
   async addNbAstralJoueur(actor, date, nbAstral, isValid) {
     const nombresAstraux = this.getNombresAstraux()
     const astralData = nombresAstraux.find(it => it.index == date)

templates/actor/carac-derivee.html

@@ -55,7 +55,7 @@
   <li class="caracteristique flexrow list-item"  data-tooltip="Niveau d'éthylisme">
     <label class="derivee-label" for="system.compteurs.ethylisme.value">{{system.compteurs.ethylisme.label}}</label>
     <select class="derivee-value" name="system.compteurs.ethylisme.value" data-dtype="Number">
-      {{selectOptions @root.config.niveauEthylisme selected=system.compteurs.ethylisme.value valueAttr="value" nameAttr="value" labelAttr="label"}} 
+      {{selectOptions (RDD_CONFIG 'niveauEthylisme')  selected=system.compteurs.ethylisme.value valueAttr="value" nameAttr="value" labelAttr="label"}} 
     </select>  
   </li>  
 

templates/actor/carac-entitee.html

@@ -2,13 +2,13 @@
   <li class="caracteristique flexrow list-item">
     <span class="carac-label" name="catEntite">Catégorie : </span>
     <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{selectOptions @root.config.categorieEntite selected=system.definition.categorieentite}}
+      {{selectOptions (RDD_CONFIG 'categorieEntite') selected=system.definition.categorieentite}}
     </select>
   </li>
   <li class="caracteristique flexrow list-item">
     <span class="carac-label" name="typeEntite">Type d'entité : </span>
     <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{selectOptions @root.config.typeEntite selected=system.definition.typeentite}}
+      {{selectOptions (RDD_CONFIG 'typeEntite') selected=system.definition.typeentite}}
     </select>
   </li>
   {{#each system.attributs as |attr key|}}

templates/common/timestamp.hbs

@@ -6,7 +6,7 @@
         type="number" data-dtype="Number" min="1" max="28"
         name="{{path}}.jourDuMois" value="{{jourDuMois}}" />
     <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.mois" class="calendar-signe-heure" data-dtype="String">
-    {{selectOptions @root.config.heuresRdD selected=mois.key labelAttr="label" nameAttr="value" valueAttr="value"}}
+    {{selectOptions (RDD_CONFIG 'heuresRdD') selected=mois.key labelAttr="label" nameAttr="value" valueAttr="value"}}
     </select>
     {{timestamp-imgSigne mois}}
     <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.annee" value="{{annee}}" data-dtype="Number"/>
@@ -15,7 +15,7 @@
     <label></label>
     <label>heure</label>
     <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.heure" class="calendar-signe-heure" data-dtype="String">
-    {{selectOptions @root.config.heuresRdD selected=heure.key labelAttr="label" nameAttr="value" valueAttr="value"}}
+    {{selectOptions (RDD_CONFIG 'heuresRdD') selected=heure.key labelAttr="label" nameAttr="value" valueAttr="value"}}
     </select>
     {{timestamp-imgSigne heure}}
     <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.minute" value="{{minute}}" data-dtype="Number"/>

templates/item/partial-environnement.html

@@ -27,7 +27,7 @@
     </label>
     <span class="flexrow">
       <select name="milieu-{{key}}-rarete" class="environnement-rarete flex-shrink" data-dtype="String">
-        {{selectOptions @root.config.raretes selected=env.rarete labelAttr="label" valueAttr="value" nameAttr="value"}}
+        {{selectOptions (RDD_CONFIG 'raretes') selected=env.rarete labelAttr="label" valueAttr="value" nameAttr="value"}}
       </select>
       {{rangePicker name="milieu-{{key}}-frequence" value=env.frequence min=(rarete-getChamp env.rarete 'min') max=(rarete-getChamp env.rarete 'max') step=1}}
       <label>[{{rarete-getChamp env.rarete 'min'}}-{{rarete-getChamp env.rarete 'max'}}]</label>