From 17f759cd9c020a3611b737b8c927d3eaaee9fce9 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Mon, 11 Nov 2024 07:49:43 +0200 Subject: [PATCH 1/2] UHF-10807: Add example for new form + update schema --- .gitignore | 3 + conf/examples/esimerkki_72_SOTEPEYLEIS.json | 398 ++++++++++++++++++++ conf/tietoliikennesanoma_schema.json | 15 +- 3 files changed, 410 insertions(+), 6 deletions(-) create mode 100644 conf/examples/esimerkki_72_SOTEPEYLEIS.json diff --git a/.gitignore b/.gitignore index db56f0256..85db03700 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ public/sites/default/local.services.yml ## testing results *coverage.xml html-coverage + +# Ignore the folder created by Visual Studio Code +*:Zone.Identifier* diff --git a/conf/examples/esimerkki_72_SOTEPEYLEIS.json b/conf/examples/esimerkki_72_SOTEPEYLEIS.json new file mode 100644 index 000000000..b3d54812f --- /dev/null +++ b/conf/examples/esimerkki_72_SOTEPEYLEIS.json @@ -0,0 +1,398 @@ +{ + "compensation": { + "applicationInfoArray": [ + { + "ID": "applicationType", + "label": "Hakemustyyppi", + "value": "SOTEPEYLEIS", + "valueType": "string" + }, + { + "ID": "applicationTypeID", + "label": "Hakemustyypin numero", + "value": "72", + "valueType": "int" + }, + { + "ID": "formTimeStamp", + "label": "Hakemuksen/sanoman lähetyshetki", + "value": "2024-10-01T12:43:02.001", + "valueType": "datetime" + }, + { + "ID": "applicationNumber", + "label": "Hakemusnumero", + "value": "SOTEPEYLEIS-1", + "valueType": "string" + }, + { + "ID": "status", + "label": "Tila", + "value": "Vastaanotettu", + "valueType": "string" + }, + { + "ID": "actingYear", + "label": "Hakemusvuosi", + "value": "2024", + "valueType": "int" + } + ], + "currentAddressInfoArray": [ + { + "ID": "contactPerson", + "label": "Yhteyshenkilö", + "value": "Teemu Testaushenkilö", + "valueType": "string" + }, + { + "ID": "phoneNumber", + "label": "Puhelinnumero", + "value": "+358404040404", + "valueType": "string" + }, + { + "ID": "street", + "label": "Katuosoite", + "value": "Annankatu 18 Ö 905", + "valueType": "string" + }, + { + "ID": "city", + "label": "Postitoimipaikka", + "value": "Helsinki", + "valueType": "string" + }, + { + "ID": "postCode", + "label": "Postinumero", + "value": "00120", + "valueType": "string" + }, + { + "ID": "country", + "label": "Maa", + "value": "Suomi", + "valueType": "string" + } + ], + "applicantInfoArray": [ + { + "ID": "applicantType", + "label": "Hakijan tyyppi", + "value": "2", + "valueType": "string" + }, + { + "ID": "companyNumber", + "label": "Rekisterinumero", + "value": "5647641-1", + "valueType": "string" + }, + { + "ID": "communityOfficialName", + "label": "Yhteisön nimi", + "value": "TietoTesti Kh yleis 001 10062021", + "valueType": "string" + }, + { + "ID": "communityOfficialNameShort", + "label": "Yhteisön lyhenne", + "value": "TT ry", + "valueType": "string" + }, + { + "ID": "registrationDate", + "label": "Rekisteröimispäivä", + "value": "2021-01-01T00:00:00.000", + "valueType": "datetime" + }, + { + "ID": "foundingYear", + "label": "Perustamisvuosi", + "value": "2021", + "valueType": "int" + }, + { + "ID": "home", + "label": "Kotipaikka", + "value": "Helsinki", + "valueType": "string" + }, + { + "ID": "homePage", + "label": "www-sivut", + "value": "www.ttry.fi", + "valueType": "string" + }, + { + "ID": "email", + "label": "Sähköpostiosoite", + "value": "tsto@ttry.fi", + "valueType": "string" + } + ], + "applicantOfficialsArray": [ + [ + { + "ID": "email", + "label": "Sähköposti", + "value": "teemu@ttry.fi", + "valueType": "string" + }, + { + "ID": "role", + "label": "Rooli", + "value": "1", + "valueType": "string" + }, + { + "ID": "name", + "label": "Nimi", + "value": "Teemu Testaushenkilö", + "valueType": "string" + }, + { + "ID": "phone", + "label": "Puhelinnumero", + "value": "09-616527788", + "valueType": "string" + } + ] + ], + "bankAccountArray": [ + { + "ID": "accountNumber", + "label": "Tilinumero", + "value": "FI9640231442000454", + "valueType": "string" + } + ], + "compensationInfo": { + "generalInfoArray": [ + { + "ID": "purpose", + "label": "Haetun avustuksen käyttötarkoitus", + "value": "Käyttötarkoituksenamme on se että ... kts. liite 10.", + "valueType": "string" + }, + { + "ID": "explanation", + "label": "Selvitys edellisen avustuksen käytöstä", + "value": "Emme saaneet viime vuonna avustusta lainkaan.", + "valueType": "string" + }, + { + "ID": "whoBenefits", + "label": "Ketkä toiminnastanne erityisesti hyötyvät", + "value": "Tästähän siis hyötyvät ihan kaikki", + "valueType": "string" + }, + { + "ID": "changesOnSuccess", + "label": "Minkälaisia muutoksia tapahtuu, jos onnistutte?", + "value": "Pelkästään positiivisia muutoksia", + "valueType": "string" + }, + { + "ID": "resultsOfActivities", + "label": "Minkälaisia hyötyjä avustettavan toiminnan seurauksena syntyy?", + "value": "Kaikki sujuu paremmin ja turvallisemmin jatkossa", + "valueType": "string" + } + ], + "compensationArray": [ + [ + { + "ID": "subventionType", + "label": "Avustuslaji", + "value": "6", + "valueType": "string" + }, + { + "ID": "amount", + "label": "Euroa", + "value": "3533.00", + "valueType": "double" + } + ] + ] + }, + "otherCompensationsInfo": { + "otherCompensationsArray": [ + [ + { + "ID": "issuer", + "label": "Myöntäjä", + "value": "5", + "valueType": "string" + }, + { + "ID": "issuerName", + "label": "Myöntäjän nimi", + "value": "Joku Säätiö Sr.", + "valueType": "string" + }, + { + "ID": "year", + "label": "Vuosi", + "value": "2021", + "valueType": "string" + }, + { + "ID": "amount", + "label": "Euroa", + "value": "2800", + "valueType": "double" + }, + { + "ID": "purpose", + "label": "Tarkoitus", + "value": "Matkakuluihin ja muihin ylimääräisiin menoihin.", + "valueType": "string" + } + ] + ] + }, + "activitiesInfoArray": [ + { + "ID": "businessPurpose", + "label": "Toiminnan tarkoitus", + "value": "Meidän toimintamme tarkoituksena on että ...", + "valueType": "string" + }, + { + "ID": "communityPracticesBusiness", + "label": "Yhteisö harjoittaa liiketoimintaa", + "value": "false", + "valueType": "bool" + }, + { + "ID": "membersApplicantPersonGlobal", + "label": "Hakijayhteisö, henkilöjäseniä", + "value": "50", + "valueType": "int" + }, + { + "ID": "membersApplicantCommunityGlobal", + "label": "Hakijayhteisö, yhteisöjäseniä", + "value": "12", + "valueType": "int" + }, + { + "ID": "membersApplicantPersonLocal", + "label": "Hakijayhteisö, helsinkiläisiä henkilöjäseniä", + "value": "45", + "valueType": "int" + }, + { + "ID": "membersApplicantCommunityLocal", + "label": "Hakijayhteisö, helsinkiläisiä yhteisöjäseniä", + "value": "23", + "valueType": "int" + }, + { + "ID": "feePerson", + "label": "Jäsenmaksun suuruus, Henkilöjäsen euroa", + "value": "38", + "valueType": "double" + }, + { + "ID": "feeCommunity", + "label": "Jäsenmaksun suuruus, Yhteisöjäsen euroa", + "value": "98", + "valueType": "double" + } + ], + "additionalInformation": "Tällä kertaa ei ole muuta ilmoitettavaa tähän hakemukseen", + "senderInfoArray": [ + { + "ID": "firstname", + "label": "Etunimi", + "value": "Testaaja", + "valueType": "string" + }, + { + "ID": "lastname", + "label": "Sukunimi", + "value": "Tiina", + "valueType": "string" + }, + { + "ID": "personID", + "label": "Henkilötunnus", + "value": "171756-1234", + "valueType": "string" + }, + { + "ID": "userID", + "label": "Käyttäjätunnus", + "value": "testatii", + "valueType": "string" + }, + { + "ID": "email", + "label": "Sähköposti", + "value": "tiina.testaaja@testiyhdistys.fi", + "valueType": "string" + } + ] + }, + "attachmentsInfo": { + "attachmentsArray": [ + [ + { + "ID": "description", + "value": "Vuosikokouksen pöytäkirja", + "valueType": "string" + }, + { + "ID": "fileType", + "value": "1", + "valueType": "int" + }, + { + "ID": "isDeliveredLater", + "value": "false", + "valueType": "bool" + }, + { + "ID": "isIncludedInOtherFile", + "value": "true", + "valueType": "bool" + } + ], + [ + { + "ID": "description", + "value": "Muu liite", + "valueType": "string" + }, + { + "ID": "fileType", + "value": "1", + "valueType": "int" + }, + { + "ID": "isDeliveredLater", + "value": "true", + "valueType": "bool" + }, + { + "ID": "isIncludedInOtherFile", + "value": "false", + "valueType": "bool" + } + ] + ], + "generalInfoArray": [ + { + "ID": "extraInfo", + "label": "Lisäselvitys liitteistä", + "value": "Tässä voi olla joku kaikkia liitteitä yhteisesti koskeva selvitys", + "valueType": "string" + } + ] + }, + "formUpdate": false +} \ No newline at end of file diff --git a/conf/tietoliikennesanoma_schema.json b/conf/tietoliikennesanoma_schema.json index ca6524b6f..fd18125ef 100644 --- a/conf/tietoliikennesanoma_schema.json +++ b/conf/tietoliikennesanoma_schema.json @@ -282,7 +282,10 @@ "nameOfEvent", "rentalApplied", "compensationExtraQuestion", - "targetOfSubvention" + "targetOfSubvention", + "whoBenefits", + "changesOnSuccess", + "resultsOfActivities" ] }, "label": { @@ -947,8 +950,8 @@ } } }, - "customQuestionsInfo": { - "description": "Made for 'Tarkemmat tiedot' but tried to be named generic enough so could be used in other places same as activityBasisInfo but that naming is too specific", + "customQuestionsInfo": { + "description": "Made for 'Tarkemmat tiedot' but tried to be named generic enough so could be used in other places same as activityBasisInfo but that naming is too specific", "type": "object", "properties": { "customQuestionsArray": { @@ -975,13 +978,13 @@ "bool", "datetime", "float", - "double" + "double" ] } }, "required": [ "ID", - "label", + "label", "value", "valueType" ] @@ -2888,4 +2891,4 @@ "compensation", "attachmentsInfo" ] -} +} \ No newline at end of file From 18271bfc1bf8ee54a676f34abd5d6e816559aae6 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Mon, 11 Nov 2024 07:52:05 +0200 Subject: [PATCH 2/2] UHF-10807: Fix formatting for schema file. --- conf/tietoliikennesanoma_schema.json | 1699 +++++++++++++------------- 1 file changed, 849 insertions(+), 850 deletions(-) diff --git a/conf/tietoliikennesanoma_schema.json b/conf/tietoliikennesanoma_schema.json index fd18125ef..c2194c1bc 100644 --- a/conf/tietoliikennesanoma_schema.json +++ b/conf/tietoliikennesanoma_schema.json @@ -17,9 +17,9 @@ "enum": [ "applicationType", "applicationTypeID", - "createdFormTimeStamp", + "createdFormTimeStamp", "formTimeStamp", - "submittedFormTimeStamp", + "submittedFormTimeStamp", "applicationNumber", "status", "sector", @@ -47,7 +47,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -91,7 +91,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -127,7 +127,7 @@ "email", "homePage", "isSportsClub", - "communityType" + "communityType" ] }, "label": { @@ -145,7 +145,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -191,7 +191,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -233,7 +233,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -268,24 +268,24 @@ "purpose", "description", "compensationPreviousYear", - "yearsForMultiYearApplication", - "breakdownOfYearlySums", - "organizationBelongsToStateShareSystem", - "primaryArt", - "isFestival", - "internalOrder", - "eventDayCount", - "performanceCount", - "estimatedVisitors", - "premiereLocation", - "firstPublicDate", - "nameOfEvent", - "rentalApplied", - "compensationExtraQuestion", - "targetOfSubvention", - "whoBenefits", - "changesOnSuccess", - "resultsOfActivities" + "yearsForMultiYearApplication", + "breakdownOfYearlySums", + "organizationBelongsToStateShareSystem", + "primaryArt", + "isFestival", + "internalOrder", + "eventDayCount", + "performanceCount", + "estimatedVisitors", + "premiereLocation", + "firstPublicDate", + "nameOfEvent", + "rentalApplied", + "compensationExtraQuestion", + "targetOfSubvention", + "whoBenefits", + "changesOnSuccess", + "resultsOfActivities" ] }, "label": { @@ -303,7 +303,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -361,7 +361,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -401,7 +401,7 @@ "caretakerName", "caretakerAddress", "totalCostsOfType", - "usedAmount" + "usedAmount" ] }, "label": { @@ -419,7 +419,7 @@ "bool", "datetime", "float", - "double" + "double" ] }, "otherCostsArray": { @@ -494,7 +494,7 @@ "bool", "datetime", "float", - "double" + "double" ] } } @@ -540,7 +540,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -559,8 +559,8 @@ "compensationArray" ] }, - "communityInfo": { - "description": "'Yhteisön tiedot' section of the application", + "communityInfo": { + "description": "'Yhteisön tiedot' section of the application", "type": "object", "properties": { "generalCommunityInfoArray": { @@ -584,7 +584,7 @@ "staffManyearsParttime", "staffManyearsVoluntary", "staffManyearsSummary", - "isOwnerOrPrimaryTenantOfArtpremises" + "isOwnerOrPrimaryTenantOfArtpremises" ] }, "label": { @@ -602,7 +602,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -625,7 +625,7 @@ "description": "Identifies the data of the array item", "type": "string", "enum": [ - "premiseType", + "premiseType", "premiseName", "postCode", "isOthersUse", @@ -648,7 +648,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -664,252 +664,251 @@ "required": [ "generalCommunityInfoArray" ] - - }, - "activityInfo": { - "description": "'Toiminta' section of the application, for KUVA applications", - "type": "object", - "properties": { - "plannedActivityInfoArray": { - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "eventDaysCountHki", - "performanceCountHki", - "performanceCountAll", - "performanceVisitorsHki", - "performanceVisitorsAll", - "exhibitionCountHki", - "exhibitionCountAll", - "exhibitionVisitorsHki", - "exhibitionVisitorsAll", - "workshopCountHki", - "workshopCountAll", - "workshopVisitorsHki", - "workshopVisitorsAll", - "eventsHkiTotal", - "eventsTotal", - "eventsVisitorsHkiTotal", - "eventsVisitorsTotal", - "firstPublicPerformancesCount", - "premiereCountHki", - "firstPublicEventLocationHki", - "firstPublicEventLocationPostCode", - "isOwnedByCity", - "premisesCount", - "eventOrFestivalDates", - "firstPublicOccasionDate", - "projectStartDate", - "projectEndDate", - "detailedProjectDescription", - "otherKeyActivities" - ] - }, - "label": { - "description": "For future use, field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "value", - "valueType" - ] - } - }, - "realizedActivityInfoArray": { - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "isEventOrFestival", - "eventDaysCount", - "performanceCountHki", - "performanceCountAll", - "performanceVisitorsHki", - "performanceVisitorsAll", - "exhibitionCountHki", - "exhibitionCountAll", - "exhibitionVisitorsHki", - "exhibitionVisitorsAll", - "workshopCountHki", - "workshopCountAll", - "workshopVisitorsHki", - "workshopVisitorsAll", - "eventsHkiTotal", - "eventsTotal", - "eventsVisitorsHkiTotal", - "eventsVisitorsTotal", - "firstPublicPerformancesCount", - "premiereCountHki", - "premisesCount", - "pupilsChildhoodAll", - "pupilsChildhoodGirls", - "pupilsChildhoodBoys", - "wideBasicStudiesAll", - "wideBasicStudiesGirls", - "wideBasicStudiesBoys", - "wideAdvancedStudiesAll", - "wideAdvancedStudiesGirls", - "wideAdvancedStudiesBoys", - "generalStudiesAll", - "generalStudiesGirls", - "generalStudiesBoys", - "teachingPersonnel", - "wayOfSelection", - "personalTeaching", - "freeStudents", - "lessonsChildhood", - "lessonsWideBasicStudies", - "lessonsWideAdvancedStudies", - "lessonsGeneralStudies", - "lessonsTotal" - ] - }, - "label": { - "description": "For future use, field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "value", - "valueType" - ] - } - }, - "plannedPremisesArray": { - "description": "Information about several premises, each as one item/array of this array", - "type": "array", - "items": { - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "premiseName", - "postCode", - "isOwnedByCity" - ] - }, - "label": { - "description": "For future use, field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "value", - "valueType" - ] - } - } - }, - "realizedPremisesArray": { - "description": "Information about several premises, each as one item/array of this array", - "type": "array", - "items": { - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "premiseName", - "postCode", - "isOwnedByCity", - "premiseType", - "premiseSuitability", - "citySection" - ] - }, - "label": { - "description": "For future use, field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "value", - "valueType" - ] - } - } - } - } - }, - "activityBasisInfo": { - "description": "'Toiminnan lähtökohdat' section of the application, for KUVA applications", + }, + "activityInfo": { + "description": "'Toiminta' section of the application, for KUVA applications", + "type": "object", + "properties": { + "plannedActivityInfoArray": { + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "eventDaysCountHki", + "performanceCountHki", + "performanceCountAll", + "performanceVisitorsHki", + "performanceVisitorsAll", + "exhibitionCountHki", + "exhibitionCountAll", + "exhibitionVisitorsHki", + "exhibitionVisitorsAll", + "workshopCountHki", + "workshopCountAll", + "workshopVisitorsHki", + "workshopVisitorsAll", + "eventsHkiTotal", + "eventsTotal", + "eventsVisitorsHkiTotal", + "eventsVisitorsTotal", + "firstPublicPerformancesCount", + "premiereCountHki", + "firstPublicEventLocationHki", + "firstPublicEventLocationPostCode", + "isOwnedByCity", + "premisesCount", + "eventOrFestivalDates", + "firstPublicOccasionDate", + "projectStartDate", + "projectEndDate", + "detailedProjectDescription", + "otherKeyActivities" + ] + }, + "label": { + "description": "For future use, field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "value", + "valueType" + ] + } + }, + "realizedActivityInfoArray": { + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "isEventOrFestival", + "eventDaysCount", + "performanceCountHki", + "performanceCountAll", + "performanceVisitorsHki", + "performanceVisitorsAll", + "exhibitionCountHki", + "exhibitionCountAll", + "exhibitionVisitorsHki", + "exhibitionVisitorsAll", + "workshopCountHki", + "workshopCountAll", + "workshopVisitorsHki", + "workshopVisitorsAll", + "eventsHkiTotal", + "eventsTotal", + "eventsVisitorsHkiTotal", + "eventsVisitorsTotal", + "firstPublicPerformancesCount", + "premiereCountHki", + "premisesCount", + "pupilsChildhoodAll", + "pupilsChildhoodGirls", + "pupilsChildhoodBoys", + "wideBasicStudiesAll", + "wideBasicStudiesGirls", + "wideBasicStudiesBoys", + "wideAdvancedStudiesAll", + "wideAdvancedStudiesGirls", + "wideAdvancedStudiesBoys", + "generalStudiesAll", + "generalStudiesGirls", + "generalStudiesBoys", + "teachingPersonnel", + "wayOfSelection", + "personalTeaching", + "freeStudents", + "lessonsChildhood", + "lessonsWideBasicStudies", + "lessonsWideAdvancedStudies", + "lessonsGeneralStudies", + "lessonsTotal" + ] + }, + "label": { + "description": "For future use, field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "value", + "valueType" + ] + } + }, + "plannedPremisesArray": { + "description": "Information about several premises, each as one item/array of this array", + "type": "array", + "items": { + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "premiseName", + "postCode", + "isOwnedByCity" + ] + }, + "label": { + "description": "For future use, field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "value", + "valueType" + ] + } + } + }, + "realizedPremisesArray": { + "description": "Information about several premises, each as one item/array of this array", + "type": "array", + "items": { + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "premiseName", + "postCode", + "isOwnedByCity", + "premiseType", + "premiseSuitability", + "citySection" + ] + }, + "label": { + "description": "For future use, field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "value", + "valueType" + ] + } + } + } + } + }, + "activityBasisInfo": { + "description": "'Toiminnan lähtökohdat' section of the application, for KUVA applications", "type": "object", "properties": { "activityBasisArray": { @@ -936,22 +935,22 @@ "bool", "datetime", "float", - "double" + "double" ] } }, "required": [ "ID", - "label", + "label", "value", "valueType" ] } } } - }, - "customQuestionsInfo": { - "description": "Made for 'Tarkemmat tiedot' but tried to be named generic enough so could be used in other places same as activityBasisInfo but that naming is too specific", + }, + "customQuestionsInfo": { + "description": "Made for 'Tarkemmat tiedot' but tried to be named generic enough so could be used in other places same as activityBasisInfo but that naming is too specific", "type": "object", "properties": { "customQuestionsArray": { @@ -978,20 +977,20 @@ "bool", "datetime", "float", - "double" + "double" ] } }, "required": [ "ID", - "label", + "label", "value", "valueType" ] } } } - }, + }, "eventInfoArray": { "description": "'Tapahtuman tiedot' and 'Kustannukset' (which is actually events info in application type 33) section of the application", "type": "array", @@ -1049,7 +1048,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1099,7 +1098,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1145,7 +1144,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1157,40 +1156,40 @@ } } }, - "otherCompensationsInfoArray": { - "description": "Other compensations related information, like total sums of the arrays", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "otherCompensationsTotal", - "otherAppliedCompensationsTotal" - ] - }, - "label": { - "description": "For future use, field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - } - } + "otherCompensationsInfoArray": { + "description": "Other compensations related information, like total sums of the arrays", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "otherCompensationsTotal", + "otherAppliedCompensationsTotal" + ] + }, + "label": { + "description": "For future use, field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + } + } } } }, @@ -1233,7 +1232,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1309,10 +1308,10 @@ "feeCommunity", "lastYearActiveMembersVisits", "lastYearOtherMemberVisits", - "youngPeopleParticipation", + "youngPeopleParticipation", "lastYearYoungPeopleParticipation", - "lastYearYoungPeopleParticipationDigital", - "participation" + "lastYearYoungPeopleParticipationDigital", + "participation" ] }, "label": { @@ -1330,7 +1329,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1390,7 +1389,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1413,11 +1412,11 @@ "enum": [ "adultsMale", "adultsFemale", - "adultsOther", + "adultsOther", "adultsAll", "juniorsMale", "juniorsFemale", - "juniorsOther", + "juniorsOther", "juniorsAll" ] }, @@ -1436,7 +1435,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1480,7 +1479,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1492,7 +1491,7 @@ } } }, - "hiredOfficialsInfo": { + "hiredOfficialsInfo": { "description": "Additional information for hiredOfficials.", "type": "array", "items": { @@ -1520,7 +1519,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1567,7 +1566,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1590,7 +1589,7 @@ "type": "string", "enum": [ "membershipsFeesTotal", - "descriptionOnYoungPeopleParticipation" + "descriptionOnYoungPeopleParticipation" ] }, "label": { @@ -1608,7 +1607,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1637,48 +1636,48 @@ "enum": [ "adultMale", "adultFemale", - "adultOther", + "adultOther", "adultAll", "juniorMale", "juniorFemale", - "juniorOther", + "juniorOther", "juniorAll", "menGlobal", "menLocal", "womenGlobal", "womenLocal", - "adultOthersGlobal", - "adultOthersLocal", - "seniorMenGlobal", - "seniorMenLocal", - "seniorWomenGlobal", - "seniorWomenLocal", - "seniorOthersGlobal", - "seniorOthersLocal", + "adultOthersGlobal", + "adultOthersLocal", + "seniorMenGlobal", + "seniorMenLocal", + "seniorWomenGlobal", + "seniorWomenLocal", + "seniorOthersGlobal", + "seniorOthersLocal", "boysGlobal", "boysLocal", "girlsGlobal", "girlsLocal", - "juniorOthersGlobal", - "juniorOthersLocal", + "juniorOthersGlobal", + "juniorOthersLocal", "activeFanciersMenGlobal", "activeFanciersMenLocal", "activeFanciersWomenGlobal", "activeFanciersWomenLocal", - "activeFanciersAdultOthersGlobal", - "activeFanciersAdultOthersLocal", + "activeFanciersAdultOthersGlobal", + "activeFanciersAdultOthersLocal", "activeFanciersBoysGlobal", "activeFanciersBoysLocal", "activeFanciersGirlsGlobal", "activeFanciersGirlsLocal", - "activeFanciersJuniorOthersGlobal", + "activeFanciersJuniorOthersGlobal", "activeFanciersJuniorOthersLocal", - "activeFanciersSeniorMenGlobal", + "activeFanciersSeniorMenGlobal", "activeFanciersSeniorMenLocal", "activeFanciersSeniorWomenGlobal", "activeFanciersSeniorWomenLocal", - "activeFanciersSeniorOthersGlobal", - "activeFanciersSeniorOthersLocal", + "activeFanciersSeniorOthersGlobal", + "activeFanciersSeniorOthersLocal", "feeAdults", "feeJuniors", "allCoaches", @@ -1700,7 +1699,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1724,18 +1723,18 @@ "type": "string", "enum": [ "sectionName", - "sectionOther", + "sectionOther", "men", "women", - "adultOthers", - "seniorMen", - "seniorWomen", - "seniorOthers", + "adultOthers", + "seniorMen", + "seniorWomen", + "seniorOthers", "boys", "girls", - "juniorOthers", + "juniorOthers", "adultHours", - "seniorHours", + "seniorHours", "juniorHours" ] }, @@ -1754,7 +1753,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1816,13 +1815,13 @@ "bool", "datetime", "float", - "double" + "double" ] } }, "required": [ "ID", - "label", + "label", "value", "valueType" ] @@ -1846,7 +1845,7 @@ "totalSpecialGroupCount", "totalPersonnelCount", "totalRentCosts", - "digitalPremises" + "digitalPremises" ] }, "label": { @@ -1864,13 +1863,13 @@ "bool", "datetime", "float", - "double" + "double" ] } }, "required": [ "ID", - "label", + "label", "value", "valueType" ] @@ -1903,7 +1902,7 @@ "hoursPerDay", "lessorName", "lessorPhone", - "lessorPhoneOrEmail", + "lessorPhoneOrEmail", "lessorAddress", "lessorPostalCode", "lessorPostOffice" @@ -1924,7 +1923,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -1948,7 +1947,7 @@ "enum": [ "rentsInformation", "totalRentCosts", - "extraQuestion" + "extraQuestion" ] }, "label": { @@ -1966,7 +1965,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2010,7 +2009,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2044,17 +2043,17 @@ "eventOtherGrantedFrom", "employeeSalaries", "socialSecurityCosts", - "mandatoryAndOptionalPersonelCosts", + "mandatoryAndOptionalPersonelCosts", "travelCosts", - "travelAndTrainingCosts", + "travelAndTrainingCosts", "totalEmployeeCosts", - "otherValuables", - "isPartOfVOS", - "wasPartOfVOS", - "plannedCompensationsShareOfCosts", - "compensationsShareOfCosts", - "selfFinancingDescription", - "selfFinancingAmount" + "otherValuables", + "isPartOfVOS", + "wasPartOfVOS", + "plannedCompensationsShareOfCosts", + "compensationsShareOfCosts", + "selfFinancingDescription", + "selfFinancingAmount" ] }, "label": { @@ -2072,7 +2071,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2084,450 +2083,450 @@ } }, "incomeGroupsArrayStatic": { - "description": "Each item in this array represents one income group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "incomeGroupName": { - "type":"string", - "enum": [ - "general", - "budgetForProjectAndDevelopment", - "budgetForOperatingAndArtsTeaching" - ] - }, - "incomeRowsArrayStatic": { - "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "compensation", - "customerFees", - "donations", - "entryFees", - "otherCompensations", - "sponsorships", - "sales", - "compensationFromCulturalAffairs", - "otherCompensationFromCity", - "otherCompensationType", - "totalIncome", - "incomeWithoutCompensations", - "plannedStateOperativeSubvention", - "plannedOtherCompensations", - "ownFunding", - "financialFundingAndInterests", - "plannedTotalIncome", - "plannedTotalIncomeWithoutSubventions", - "plannedShareOfIncomeWithoutSubventions", - "stateOperativeSubvention", - "totalIncomeWithoutSubventions", - "shareOfIncomeWithoutSubventions" - ] - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "otherIncomeRowsArrayStatic": { - "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "groupsTotalSum": { - "type": "number" - } - } + "description": "Each item in this array represents one income group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "incomeGroupName": { + "type": "string", + "enum": [ + "general", + "budgetForProjectAndDevelopment", + "budgetForOperatingAndArtsTeaching" + ] + }, + "incomeRowsArrayStatic": { + "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "compensation", + "customerFees", + "donations", + "entryFees", + "otherCompensations", + "sponsorships", + "sales", + "compensationFromCulturalAffairs", + "otherCompensationFromCity", + "otherCompensationType", + "totalIncome", + "incomeWithoutCompensations", + "plannedStateOperativeSubvention", + "plannedOtherCompensations", + "ownFunding", + "financialFundingAndInterests", + "plannedTotalIncome", + "plannedTotalIncomeWithoutSubventions", + "plannedShareOfIncomeWithoutSubventions", + "stateOperativeSubvention", + "totalIncomeWithoutSubventions", + "shareOfIncomeWithoutSubventions" + ] + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "otherIncomeRowsArrayStatic": { + "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "groupsTotalSum": { + "type": "number" + } } + } }, "costGroupsArrayStatic": { - "description": "Each item in this array represents one cost group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "costGroupName": { - "type": "string", - "enum": [ - "general", - "budgetForProjectAndDevelopment", - "budgetForOperatingAndArtsTeaching", - "subventionUseCosts", - "costsForServicesAcquired", - "costsForMaterialsSuppliesAndGoods", - "otherCosts", - "useOfCustomerFeeIncome" - ] - }, - "costRowsArrayStatic": { - "description": "Each item in this array represents one cost line of the group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string", - "enum": [ - "salaries", - "personnelSocialSecurityCosts", - "rentSum", - "materials", - "transport", - "food", - "pr", - "insurance", - "snacks", - "cleaning", - "premisesService", - "travel", - "heating", - "servicesTotal", - "water", - "electricity", - "suppliesTotal", - "admin", - "accounting", - "health", - "otherCostsTotal", - "services", - "supplies", - "useOfCustomerFeesTotal", - "totalCosts", - "netCosts", - "performerFees", - "otherFees", - "personnelSideCosts", - "generalCosts", - "permits", - "setsAndCostumes", - "equipment", - "premises", - "security", - "marketing", - "costsWithoutDeferredItems", - "generalCostsTotal", - "allCostsTotal", - "showCosts", - "travelCosts", - "transportCosts", - "plannedTotalCosts" - ] - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "otherCostRowsArrayStatic": { - "description": "Each item in this array represents one cost line of the group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "groupsTotalSum": { - "type": "number" - } - } + "description": "Each item in this array represents one cost group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "costGroupName": { + "type": "string", + "enum": [ + "general", + "budgetForProjectAndDevelopment", + "budgetForOperatingAndArtsTeaching", + "subventionUseCosts", + "costsForServicesAcquired", + "costsForMaterialsSuppliesAndGoods", + "otherCosts", + "useOfCustomerFeeIncome" + ] + }, + "costRowsArrayStatic": { + "description": "Each item in this array represents one cost line of the group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string", + "enum": [ + "salaries", + "personnelSocialSecurityCosts", + "rentSum", + "materials", + "transport", + "food", + "pr", + "insurance", + "snacks", + "cleaning", + "premisesService", + "travel", + "heating", + "servicesTotal", + "water", + "electricity", + "suppliesTotal", + "admin", + "accounting", + "health", + "otherCostsTotal", + "services", + "supplies", + "useOfCustomerFeesTotal", + "totalCosts", + "netCosts", + "performerFees", + "otherFees", + "personnelSideCosts", + "generalCosts", + "permits", + "setsAndCostumes", + "equipment", + "premises", + "security", + "marketing", + "costsWithoutDeferredItems", + "generalCostsTotal", + "allCostsTotal", + "showCosts", + "travelCosts", + "transportCosts", + "plannedTotalCosts" + ] + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "otherCostRowsArrayStatic": { + "description": "Each item in this array represents one cost line of the group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "groupsTotalSum": { + "type": "number" + } } + } }, "incomeGroupsArrayDynamic": { - "description": "Each item in this array represents one income group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "incomeGroupName": { - "type":"string" - }, - "incomeRowsArrayDynamic": { - "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "otherIncomeGroupName": { - "type":"string" - }, - "otherIncomeRowsArrayDynamic": { - "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "groupsTotalSum": { - "type": "number" - } - } + "description": "Each item in this array represents one income group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "incomeGroupName": { + "type": "string" + }, + "incomeRowsArrayDynamic": { + "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "otherIncomeGroupName": { + "type": "string" + }, + "otherIncomeRowsArrayDynamic": { + "description": "Each item in this array represents one income line. The group in which it belongs in is identified by group name", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "groupsTotalSum": { + "type": "number" + } } + } }, "costGroupsArrayDynamic": { - "description": "Each item in this array represents one cost group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "costGroupName": { - "type": "string" - }, - "costRowsArrayDynamic": { - "description": "Each item in this array represents one cost line of the group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "otherCostGroupName": { - "type": "string" - }, - "otherCostRowsArrayDynamic": { - "description": "Each item in this array represents one cost line of the group.", - "type": "array", - "items": { - "type": "object", - "properties": { - "ID": { - "description": "Identifies the data of the array item", - "type": "string" - }, - "label": { - "description": "Field's name in the UI", - "type": "string" - }, - "value": { - "type": "string" - }, - "valueType": { - "type": "string", - "enum": [ - "string", - "int", - "bool", - "datetime", - "float", - "double" - ] - } - }, - "required": [ - "ID", - "label", - "value", - "valueType" - ] - } - }, - "groupsTotalSum": { - "type": "number" - } - } + "description": "Each item in this array represents one cost group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "costGroupName": { + "type": "string" + }, + "costRowsArrayDynamic": { + "description": "Each item in this array represents one cost line of the group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "otherCostGroupName": { + "type": "string" + }, + "otherCostRowsArrayDynamic": { + "description": "Each item in this array represents one cost line of the group.", + "type": "array", + "items": { + "type": "object", + "properties": { + "ID": { + "description": "Identifies the data of the array item", + "type": "string" + }, + "label": { + "description": "Field's name in the UI", + "type": "string" + }, + "value": { + "type": "string" + }, + "valueType": { + "type": "string", + "enum": [ + "string", + "int", + "bool", + "datetime", + "float", + "double" + ] + } + }, + "required": [ + "ID", + "label", + "value", + "valueType" + ] + } + }, + "groupsTotalSum": { + "type": "number" + } } + } } } }, @@ -2568,7 +2567,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2594,7 +2593,7 @@ "enum": [ "projectName", "goal", - "content", + "content", "startDate", "endDate", "location", @@ -2602,9 +2601,9 @@ "membersLocal", "membersYoungest", "membersOldest", - "age7to28yearsLocal", - "all", - "extraQuestion" + "age7to28yearsLocal", + "all", + "extraQuestion" ] }, "label": { @@ -2622,7 +2621,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2669,7 +2668,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2764,7 +2763,7 @@ "bool", "datetime", "float", - "double" + "double" ] } }, @@ -2825,23 +2824,23 @@ "eventSource": { "type": "string" }, - "eventID": { - "type": "string" - }, - "eventTarget": { - "type": "string" - }, + "eventID": { + "type": "string" + }, + "eventTarget": { + "type": "string" + }, "timeUpdated": { "type": "string", "format": "date-time" }, - "timeCreated": { - "type": "string", - "format": "date-time" - }, - "eventDescription": { - "type": "string" - } + "timeCreated": { + "type": "string", + "format": "date-time" + }, + "eventDescription": { + "type": "string" + } } } }, @@ -2853,9 +2852,9 @@ "caseID": { "type": "string" }, - "messageID": { - "type": "string" - }, + "messageID": { + "type": "string" + }, "body": { "type": "string" }, @@ -2891,4 +2890,4 @@ "compensation", "attachmentsInfo" ] -} \ No newline at end of file +}