From b3655d011e13b584de1dc74fcc7e3451456cec42 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 16 Sep 2024 18:37:41 +0200 Subject: [PATCH] Add new options for education --- modules/common/tedeum-config.js | 2 +- modules/data/tedeum-schema-education.js | 14 ++++++++--- packs/competences/{000189.log => 000201.log} | 0 packs/competences/CURRENT | 2 +- packs/competences/LOG | 16 ++++++------ packs/competences/LOG.old | 23 ++++++------------ .../{MANIFEST-000187 => MANIFEST-000199} | Bin 178 -> 178 bytes packs/equipment/{000248.log => 000260.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++++------ packs/equipment/LOG.old | 14 +++++------ packs/equipment/MANIFEST-000246 | Bin 69 -> 0 bytes packs/equipment/MANIFEST-000258 | Bin 0 -> 69 bytes system.json | 4 +-- templates/items/item-education-sheet.hbs | 19 ++++++++++++--- 15 files changed, 61 insertions(+), 49 deletions(-) rename packs/competences/{000189.log => 000201.log} (100%) rename packs/competences/{MANIFEST-000187 => MANIFEST-000199} (71%) rename packs/equipment/{000248.log => 000260.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000246 create mode 100644 packs/equipment/MANIFEST-000258 diff --git a/modules/common/tedeum-config.js b/modules/common/tedeum-config.js index 701d333..c318a7a 100644 --- a/modules/common/tedeum-config.js +++ b/modules/common/tedeum-config.js @@ -146,7 +146,7 @@ export const TEDEUM_CONFIG = { }, etapesEducation: { pouponniere: { label: "La Pouponnière", value: "pouponniere", agemin: 0, agemax: 6, nbCompetences: 2, nbCaracteristiques: 3, hasQuestionnaire: true, hasMultiplier: false }, - petitsgrimauds: { label: "La classe des Petits Grimauds", value: "petitsgrimauds", agemin: 7, agemax: 12,nbCompetences: 2, nbCaracteristiques: 3, hasQuestionnaire: true, hasMultiplier: false }, + petitsgrimauds: { label: "La classe des Petits Grimauds", value: "petitsgrimauds", agemin: 7, agemax: 12,nbCompetences: 10, nbCaracteristiques: 3, hasQuestionnaire: true, hasMultiplier: false }, rosevie: { label: "Les Roses de la Vie", value: "rosevie", agemin: 13, agemax: 16, nbCompetences: 2, nbCaracteristiques: 3, hasQuestionnaire: true, hasMultiplier: false }, ageviril: { label: "L'Age Viril", value: "ageviril", agemin: 17, agemax: 17, nbCompetences: 9, nbCaracteristiques: 2, hasQuestionnaire: false, hasMultiplier: true }, }, diff --git a/modules/data/tedeum-schema-education.js b/modules/data/tedeum-schema-education.js index 1b074ad..3bb8fec 100644 --- a/modules/data/tedeum-schema-education.js +++ b/modules/data/tedeum-schema-education.js @@ -20,12 +20,14 @@ export class TeDeumEducationSchema extends foundry.abstract.TypeDataModel { }); return caracs; }, {})); - schema.competences = new fields.SchemaField(Array.fromRange(9, 1).reduce((comps, i) => { + schema.competences = new fields.SchemaField(Array.fromRange(10, 1).reduce((comps, i) => { comps[`comp${i}`] = new fields.SchemaField({ - compName: new fields.StringField({ required: true, blank: true, initial: "" }) + compName: new fields.StringField({ required: true, blank: true, initial: "" }), + toSelect: new fields.BooleanField({ initial: false }) }); return comps; }, {})); + schema.questionnaire = new fields.SchemaField(Array.fromRange(6, 1).reduce((questions, i) => { questions[`question${i}`] = new fields.SchemaField({ question: new fields.StringField({ required: true, blank: true, initial: "" }), @@ -33,7 +35,13 @@ export class TeDeumEducationSchema extends foundry.abstract.TypeDataModel { resp[`reponse${i}`] = new fields.SchemaField({ num: new fields.NumberField({ ...requiredInteger, initial: i, min:i }), reponse: new fields.StringField({ required: true, blank: true, initial: "" }), - compName: new fields.StringField({ required: true, blank: true, initial: "" }) + toSelect: new fields.BooleanField({ initial: false }), + compList: new fields.SchemaField(Array.fromRange(10, 1).reduce((comps, i) => { + comps[`comp${i}`] = new fields.SchemaField({ + compName: new fields.StringField({ required: true, blank: true, initial: "" }), + }); + return comps; + }, {})) }); return resp; }, {})) diff --git a/packs/competences/000189.log b/packs/competences/000201.log similarity index 100% rename from packs/competences/000189.log rename to packs/competences/000201.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 7832dba..d0dd497 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000187 +MANIFEST-000199 diff --git a/packs/competences/LOG b/packs/competences/LOG index 52cdc5e..27f071f 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/09/15-09:09:43.526436 7fed160006c0 Recovering log #184 -2024/09/15-09:09:43.537940 7fed160006c0 Delete type=3 #182 -2024/09/15-09:09:43.538043 7fed160006c0 Delete type=0 #184 -2024/09/15-09:09:59.401905 7fed0f8006c0 Level-0 table #190: started -2024/09/15-09:09:59.401945 7fed0f8006c0 Level-0 table #190: 0 bytes OK -2024/09/15-09:09:59.409586 7fed0f8006c0 Delete type=0 #188 -2024/09/15-09:09:59.423616 7fed0f8006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/09/15-09:09:59.423675 7fed0f8006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:32:36.554014 7fe046a006c0 Recovering log #197 +2024/09/16-18:32:36.565518 7fe046a006c0 Delete type=3 #195 +2024/09/16-18:32:36.565621 7fe046a006c0 Delete type=0 #197 +2024/09/16-18:36:53.391303 7fe045a006c0 Level-0 table #202: started +2024/09/16-18:36:53.391343 7fe045a006c0 Level-0 table #202: 0 bytes OK +2024/09/16-18:36:53.399083 7fe045a006c0 Delete type=0 #200 +2024/09/16-18:36:53.399373 7fe045a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:36:53.399401 7fe045a006c0 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 78fcf29..3341886 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,15 +1,8 @@ -2024/09/15-09:03:43.731841 7fed14c006c0 Recovering log #180 -2024/09/15-09:03:43.743172 7fed14c006c0 Delete type=3 #178 -2024/09/15-09:03:43.743277 7fed14c006c0 Delete type=0 #180 -2024/09/15-09:08:48.976994 7fed0f8006c0 Level-0 table #185: started -2024/09/15-09:08:48.980507 7fed0f8006c0 Level-0 table #185: 4868 bytes OK -2024/09/15-09:08:48.986700 7fed0f8006c0 Delete type=0 #183 -2024/09/15-09:08:48.987102 7fed0f8006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/09/15-09:08:48.987202 7fed0f8006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at '!items!yHrOmBf8pBcPmeBZ' @ 721 : 1 -2024/09/15-09:08:48.987214 7fed0f8006c0 Compacting 1@1 + 1@2 files -2024/09/15-09:08:48.991110 7fed0f8006c0 Generated table #186@1: 114 keys, 17714 bytes -2024/09/15-09:08:48.991153 7fed0f8006c0 Compacted 1@1 + 1@2 files => 17714 bytes -2024/09/15-09:08:48.998420 7fed0f8006c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/09/15-09:08:48.998583 7fed0f8006c0 Delete type=2 #121 -2024/09/15-09:08:48.998824 7fed0f8006c0 Delete type=2 #185 -2024/09/15-09:08:49.022092 7fed0f8006c0 Manual compaction at level-1 from '!items!yHrOmBf8pBcPmeBZ' @ 721 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:29:35.753255 7fe04ce006c0 Recovering log #193 +2024/09/16-18:29:35.765013 7fe04ce006c0 Delete type=3 #191 +2024/09/16-18:29:35.765102 7fe04ce006c0 Delete type=0 #193 +2024/09/16-18:32:32.659108 7fe045a006c0 Level-0 table #198: started +2024/09/16-18:32:32.659176 7fe045a006c0 Level-0 table #198: 0 bytes OK +2024/09/16-18:32:32.666135 7fe045a006c0 Delete type=0 #196 +2024/09/16-18:32:32.666413 7fe045a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:32:32.666456 7fe045a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000187 b/packs/competences/MANIFEST-000199 similarity index 71% rename from packs/competences/MANIFEST-000187 rename to packs/competences/MANIFEST-000199 index 2b82660fcf07d0ad82b6405e4b430da966561bae..8ad74c1cb87fd7b5fc73945d595c02155406f9ad 100644 GIT binary patch delta 43 tcmdnQxQTH>pUS5dOBX=DoErcNaQp~1OPqF47>mU delta 43 tcmdnQxQTH>pGtgJSQ|G3Bhwy6P6p<^j4T&f-L9 {{selectOptions @root.competences selected=comp.compName labelAttr="name" blank=""}} + + {{/if}} {{/each}} @@ -75,10 +77,19 @@ name="system.questionnaire.{{quesKey}}.reponses.{{repKey}}.reponse" value="{{reponse.reponse}}" data-dtype="String" /> - - + + + {{#if reponse.toSelect}} + {{#each reponse.compList as |comp compKey|}} + + {{/each}} + {{else}} + + {{/if}} {{/each}}