diff --git a/modules/data/tedeum-schema-education.js b/modules/data/tedeum-schema-education.js index 14888a5..f8918c2 100644 --- a/modules/data/tedeum-schema-education.js +++ b/modules/data/tedeum-schema-education.js @@ -51,7 +51,9 @@ export class TeDeumEducationSchema extends foundry.abstract.TypeDataModel { }); return questions; }, {})); + schema.cagnotteMultiplier = new fields.NumberField({ ...requiredDouble, initial: 1.0, min: 0 }); + schema.cagnotteDivider = new fields.NumberField({ ...requiredDouble, initial: 1.0, min: 0 }); schema.description = new fields.HTMLField({ required: true, blank: true }); diff --git a/packs/competences/000221.log b/packs/competences/000229.log similarity index 100% rename from packs/competences/000221.log rename to packs/competences/000229.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 7d68d99..ca06e10 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000219 +MANIFEST-000227 diff --git a/packs/competences/LOG b/packs/competences/LOG index 3251009..ff0ac80 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/12/05-22:39:44.005394 7f29121fa6c0 Recovering log #217 -2024/12/05-22:39:44.016531 7f29121fa6c0 Delete type=3 #215 -2024/12/05-22:39:44.016618 7f29121fa6c0 Delete type=0 #217 -2024/12/05-22:46:07.977970 7f2907bff6c0 Level-0 table #222: started -2024/12/05-22:46:07.978044 7f2907bff6c0 Level-0 table #222: 0 bytes OK -2024/12/05-22:46:07.996371 7f2907bff6c0 Delete type=0 #220 -2024/12/05-22:46:08.015732 7f2907bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/12/05-22:46:08.015771 7f2907bff6c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/12/19-19:13:41.535801 7fd2597fa6c0 Recovering log #225 +2024/12/19-19:13:41.545771 7fd2597fa6c0 Delete type=3 #223 +2024/12/19-19:13:41.545831 7fd2597fa6c0 Delete type=0 #225 +2024/12/19-19:14:58.099316 7fd258ff96c0 Level-0 table #230: started +2024/12/19-19:14:58.099357 7fd258ff96c0 Level-0 table #230: 0 bytes OK +2024/12/19-19:14:58.106002 7fd258ff96c0 Delete type=0 #228 +2024/12/19-19:14:58.106236 7fd258ff96c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/12/19-19:14:58.106270 7fd258ff96c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index 07293d6..94a89ba 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/12/05-16:21:20.555186 7f29109f76c0 Recovering log #213 -2024/12/05-16:21:20.566495 7f29109f76c0 Delete type=3 #211 -2024/12/05-16:21:20.566656 7f29109f76c0 Delete type=0 #213 -2024/12/05-16:23:37.025219 7f2907bff6c0 Level-0 table #218: started -2024/12/05-16:23:37.025290 7f2907bff6c0 Level-0 table #218: 0 bytes OK -2024/12/05-16:23:37.032109 7f2907bff6c0 Delete type=0 #216 -2024/12/05-16:23:37.051280 7f2907bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/12/05-16:23:37.051328 7f2907bff6c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/12/19-19:08:49.179638 7fd259ffb6c0 Recovering log #221 +2024/12/19-19:08:49.257853 7fd259ffb6c0 Delete type=3 #219 +2024/12/19-19:08:49.257915 7fd259ffb6c0 Delete type=0 #221 +2024/12/19-19:13:19.337885 7fd258ff96c0 Level-0 table #226: started +2024/12/19-19:13:19.337919 7fd258ff96c0 Level-0 table #226: 0 bytes OK +2024/12/19-19:13:19.343989 7fd258ff96c0 Delete type=0 #224 +2024/12/19-19:13:19.344154 7fd258ff96c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/12/19-19:13:19.355146 7fd258ff96c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000219 b/packs/competences/MANIFEST-000227 similarity index 71% rename from packs/competences/MANIFEST-000219 rename to packs/competences/MANIFEST-000227 index 5dc58fd..2e902c4 100644 Binary files a/packs/competences/MANIFEST-000219 and b/packs/competences/MANIFEST-000227 differ diff --git a/packs/equipment/000280.log b/packs/equipment/000288.log similarity index 100% rename from packs/equipment/000280.log rename to packs/equipment/000288.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 46160dd..7f70877 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000278 +MANIFEST-000286 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 34099c0..6e5685d 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2024/12/05-22:39:43.992069 7f29111f86c0 Recovering log #276 -2024/12/05-22:39:44.002494 7f29111f86c0 Delete type=3 #274 -2024/12/05-22:39:44.002588 7f29111f86c0 Delete type=0 #276 -2024/12/05-22:46:07.996679 7f2907bff6c0 Level-0 table #281: started -2024/12/05-22:46:07.996763 7f2907bff6c0 Level-0 table #281: 0 bytes OK -2024/12/05-22:46:08.015419 7f2907bff6c0 Delete type=0 #279 -2024/12/05-22:46:08.015747 7f2907bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/12/19-19:13:41.522670 7fd25affd6c0 Recovering log #284 +2024/12/19-19:13:41.533410 7fd25affd6c0 Delete type=3 #282 +2024/12/19-19:13:41.533475 7fd25affd6c0 Delete type=0 #284 +2024/12/19-19:14:58.092310 7fd258ff96c0 Level-0 table #289: started +2024/12/19-19:14:58.092367 7fd258ff96c0 Level-0 table #289: 0 bytes OK +2024/12/19-19:14:58.099065 7fd258ff96c0 Delete type=0 #287 +2024/12/19-19:14:58.106214 7fd258ff96c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index e4c0c36..acf0e6a 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2024/12/05-16:21:20.538734 7f29121fa6c0 Recovering log #272 -2024/12/05-16:21:20.551111 7f29121fa6c0 Delete type=3 #270 -2024/12/05-16:21:20.551262 7f29121fa6c0 Delete type=0 #272 -2024/12/05-16:23:37.044493 7f2907bff6c0 Level-0 table #277: started -2024/12/05-16:23:37.044575 7f2907bff6c0 Level-0 table #277: 0 bytes OK -2024/12/05-16:23:37.051046 7f2907bff6c0 Delete type=0 #275 -2024/12/05-16:23:37.051313 7f2907bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/12/19-19:08:49.114880 7fd2597fa6c0 Recovering log #280 +2024/12/19-19:08:49.177206 7fd2597fa6c0 Delete type=3 #278 +2024/12/19-19:08:49.177298 7fd2597fa6c0 Delete type=0 #280 +2024/12/19-19:13:19.323749 7fd258ff96c0 Level-0 table #285: started +2024/12/19-19:13:19.323796 7fd258ff96c0 Level-0 table #285: 0 bytes OK +2024/12/19-19:13:19.330462 7fd258ff96c0 Delete type=0 #283 +2024/12/19-19:13:19.344134 7fd258ff96c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000278 b/packs/equipment/MANIFEST-000278 deleted file mode 100644 index 4e5ca65..0000000 Binary files a/packs/equipment/MANIFEST-000278 and /dev/null differ diff --git a/packs/equipment/MANIFEST-000286 b/packs/equipment/MANIFEST-000286 new file mode 100644 index 0000000..300435d Binary files /dev/null and b/packs/equipment/MANIFEST-000286 differ diff --git a/templates/items/item-education-sheet.hbs b/templates/items/item-education-sheet.hbs index a9040b9..0a5c0af 100644 --- a/templates/items/item-education-sheet.hbs +++ b/templates/items/item-education-sheet.hbs @@ -56,7 +56,7 @@ {{selectOptions @root.competences selected=comp.compName labelAttr="name" blank=""}} - + {{/if}} {{/each}} @@ -68,6 +68,12 @@ name="system.cagnotteMultiplier" value="{{system.cagnotteMultiplier}}" data-dtype="Number" /> +
  • + + +
  • {{/if}} {{#if hasQuestionnaire}}