Calendrier/timestamp, suite

Correction autour des éditeurs/affichages
Migration de la date du monde dans les settings

templates/calendar-astrologie-template.html

@@ -37,6 +37,7 @@
           <span class="flex-grow-2">
             |{{#each heuresDef as |ajustement|}}
             <span>
+              <strong>{{ajustement.ajustement}}</strong>
               {{#each ajustement.heures as |heure|}}
               {{timestamp-imgSigneHeure heure}}
               {{/each}}

templates/calendar-editor-template.html

@@ -8,37 +8,12 @@
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
-      <div class="flexcol flex-shrink">
-        <label for="jourMois">Jour</label>
-        <input type="number" class="number-x4" name="jourMois" value="{{jourMois}}" data-dtype="Number" min="1" max="28"/>
-      </div>
-      <div class="flexcol">
-        <label for="nomMois">Mois</label>
-        <select name="nomMois" data-dtype="String">
-          {{#select nomMois}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
-          {{/select}}
-        </select>
-      </div>
-      <div class="flexcol flex-shrink">
-        <label for="annee">Année</label>
-        <input type="number" class="number-x4" name="annee" value="{{annee}}" data-dtype="Number" min="0"/>
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="flexcol">
-        <label for="nomHeure">Heure</label>
-        <select name="nomHeure" data-dtype="String">
-          {{#select nomHeure}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
-          {{/select}}
-        </select>
-      </div>
-      <div class="flexcol flex-shrink">
-        <label for="minutesRelative">Minutes</label>
-        <input type="number" class="number-x4" name="minutesRelative" value="{{minutesRelative}}" data-dtype="Number" min="0" max="119"/>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs" 
+        (timestamp-extract timestamp)
+          path='calendar'
+          label='Date courante'
+          disabled=''
+      }}
     </div>
   </section>
-  
 </form>

templates/calendar-template.html

@@ -5,7 +5,7 @@
     <i class="astrologie-btn-edit fas fa-cog" title="Astrologie"></i>
     {{/if}}
 		<div class="calendar-hdr">
-			<p id="calendar-move-handle" class="calendar-date-rdd" title="Deplacer">Jour {{jourMois}} de {{nomMois}} ({{nomSaison}})</p>
+			<p id="calendar-move-handle" class="calendar-date-rdd" title="Deplacer">{{jourDuMois}} {{mois.label}} ({{mois.saison}})</p>
     </div>
 		<div class="calendar-container">
       {{#if isGM}}
@@ -20,15 +20,12 @@
 			</div>
       {{/if}}
 			<div class="calendar-weekday-time">
-				{{#if isGM}}
 				<a class="ajout-chronologie calendar-weekday">
-					<img class="calendar-heure-img" src="{{iconHeure}}" alt="{{nomHeure}}"/>&nbsp;<span class="calendar-heure-texte">{{nomHeure}}</span>
-				</a>
-				<p class="calendar-time-disp calendar-time isGM">{{minutesRelative}} minutes</p>
-				{{else}}
-				<a class="ajout-chronologie">
-					<img class="calendar-heure-img" src="{{iconHeure}}" alt="{{nomHeure}}"/>&nbsp;<span class="calendar-heure-texte">{{nomHeure}}</span>
+					<img class="calendar-heure-img" src="{{heure.icon}}" alt="{{nomHeure}}"/>&nbsp;
+					<span class="calendar-heure-texte">{{heure.label}}</span>
 				</a>
+				{{#if isGM}}
+				<p class="calendar-time-disp calendar-time isGM">{{minute}} minutes</p>
 				{{/if}}
 			</div>
       {{#if isGM}}

templates/chronologie-entry.html

@@ -1,4 +1,4 @@
-<h2>{{dateRdD.jour}} {{signeHeure 'label' dateRdD.moisRdD}}, an {{dateRdD.annee}} à l'heure de {{signeHeure 'label' heureRdD}}</h2>
+<h2>{{dateRdD.jour}} {{dateRdD.mois.label}} {{dateRdD.annee}}, à l'heure de {{dateRdD.heure.label}}</h2>
 <p>{{information}}</p>
 <p class="poesie-reference">Par {{auteur}} ({{dateReel}})</p>
 <hr>

templates/common/timestamp.hbs

@@ -1,23 +1,27 @@
 <div class="flexcol">
   <div class="flexrow">
     <label>{{label}}</label>
-    <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="flex-shrink number-x2" name="{{path}}.jour" value="{{jour}}" data-dtype="Number" min="1" max="28"/>
-    {{timestamp-imgSigne mois}}
+    <input {{#if disabled}}{{disabled}}{{/if}} 
+        class="flex-shrink number-x2"
+        type="number" data-dtype="Number" min="1" max="28"
+        name="{{path}}.jourDuMois" value="{{jourDuMois}}" />
     <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.mois" class="flex-shrink" data-dtype="String">
       {{#select mois.key}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
       {{/select}}
     </select>
+    {{timestamp-imgSigne mois}}
     <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.annee" value="{{annee}}" data-dtype="Number"/>
   </div>
   <div class="flexrow">
     <label>à l'heure de</label>
-    {{timestamp-imgSigne heure}}
     <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.heure" class="flex-shrink" data-dtype="String">
       {{#select heure.key}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
       {{/select}}
     </select>
+    {{timestamp-imgSigne heure}}
     <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.minute" value="{{minute}}" data-dtype="Number"/>
+    <label>minutes</label>
   </div>
 </div>

templates/dialog-chronologie.html

@@ -9,24 +9,12 @@
       <textarea autocomplete="off" title="Information" name="information">{{information}}</textarea>
     </div>
     <div class="form-group">
-      <label for="heureRdD">Heure</label>
-      <select type="text" name="heureRdD" value="{{heureRdD}}" data-dtype="String" />
-        {{#select heureRdD}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
-        {{/select}}
-      </select>
-    </div>
-    <div class="form-group">
-      <label for="jourRdD">Date en jeu</label>
-      <span class="flexrow">
-        <input type="text" name="jourRdD" value="{{jourRdD}}" data-dtype="Number" min="1" max="28"/>
-        <select type="text" name="dateRdD.moisRdD.key" value="{{dateRdD.moisRdD.key}}" data-dtype="String" >
-          {{#select dateRdD.moisRdD.key}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
-          {{/select}}
-        </select>
-        <input type="text" name="dateRdD.annee" value="{{dateRdD.annee}}" data-dtype="Number" />
-      </span>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs" 
+      (timestamp-extract timestamp)
+        path='chronologie'
+        label='Date en jeu'
+        disabled=''
+      }}
     </div>
     <div class="form-group">
       <label for="dateReel">Date réelle</label>