From f3c94cca78b17b29b3a1a46ad17cb2a9e167d93c Mon Sep 17 00:00:00 2001 From: Damion Dooley Date: Mon, 11 Nov 2024 17:15:34 -0800 Subject: [PATCH] Cancogen bug fix to menu --- .../canada_covid19/locales/fr/schema.json | 40 ++++++++++++------- .../canada_covid19/locales/fr/schema.yaml | 22 ++++++---- web/templates/canada_covid19/schema.json | 18 ++++++++- web/templates/canada_covid19/schema.yaml | 8 ++++ web/templates/canada_covid19/schema_enums.tsv | 4 +- 5 files changed, 66 insertions(+), 26 deletions(-) diff --git a/web/templates/canada_covid19/locales/fr/schema.json b/web/templates/canada_covid19/locales/fr/schema.json index fcaec4f5..7b1a0262 100644 --- a/web/templates/canada_covid19/locales/fr/schema.json +++ b/web/templates/canada_covid19/locales/fr/schema.json @@ -40,21 +40,7 @@ "UmbrellaBioprojectAccessionMenu": { "name": "UmbrellaBioprojectAccessionMenu", "title": "Menu « Accès au bioprojet cadre »", - "from_schema": "https://example.com/CanCOGeN_Covid-19", - "permissible_values": { - "day 1": { - "text": "day 1", - "title": "Jour 1" - }, - "day 8": { - "text": "day 8", - "title": "Jour 8" - }, - "day 10": { - "text": "day 10", - "title": "Jour 10" - } - } + "from_schema": "https://example.com/CanCOGeN_Covid-19" }, "NullValueMenu": { "name": "NullValueMenu", @@ -2295,6 +2281,11 @@ } } }, + "HostDiseaseMenu": { + "name": "HostDiseaseMenu", + "title": "Menu « Maladie de l’hôte »", + "from_schema": "https://example.com/CanCOGeN_Covid-19" + }, "HostAgeBinMenu": { "name": "HostAgeBinMenu", "title": "Menu « Groupe d’âge de l’hôte »", @@ -2858,6 +2849,25 @@ } } }, + "BorderTestingTestDayTypeMenu": { + "name": "BorderTestingTestDayTypeMenu", + "title": "Menu « Jour du dépistage à la frontière »", + "from_schema": "https://example.com/CanCOGeN_Covid-19", + "permissible_values": { + "day 1": { + "text": "day 1", + "title": "Jour 1" + }, + "day 8": { + "text": "day 8", + "title": "Jour 8" + }, + "day 10": { + "text": "day 10", + "title": "Jour 10" + } + } + }, "TravelHistoryAvailabilityMenu": { "name": "TravelHistoryAvailabilityMenu", "title": "Menu « Disponibilité des antécédents de voyage »", diff --git a/web/templates/canada_covid19/locales/fr/schema.yaml b/web/templates/canada_covid19/locales/fr/schema.yaml index 737fc4d8..755f4b51 100644 --- a/web/templates/canada_covid19/locales/fr/schema.yaml +++ b/web/templates/canada_covid19/locales/fr/schema.yaml @@ -2198,13 +2198,7 @@ slots: enums: UmbrellaBioprojectAccessionMenu: name: UmbrellaBioprojectAccessionMenu - permissible_values: - day 1: - title: Jour 1 - day 8: - title: Jour 8 - day 10: - title: Jour 10 + permissible_values: {} title: "Menu \xAB\_Acc\xE8s au bioprojet cadre\_\xBB" NullValueMenu: name: NullValueMenu @@ -3355,6 +3349,10 @@ enums: VeroE6/TMPRSS2 cell line: title: "Lign\xE9e cellulaire VeroE6/TMPRSS2" title: "Menu \xAB\_Laboratoire h\xF4te\_\xBB" + HostDiseaseMenu: + name: HostDiseaseMenu + permissible_values: {} + title: "Menu \xAB\_Maladie de l\u2019h\xF4te\_\xBB" HostAgeBinMenu: name: HostAgeBinMenu permissible_values: {} @@ -3642,6 +3640,16 @@ enums: Land: title: Voie terrestre title: "Menu \xAB\_ Type de point d\u2019entr\xE9e du voyage\_\xBB" + BorderTestingTestDayTypeMenu: + name: BorderTestingTestDayTypeMenu + permissible_values: + day 1: + title: Jour 1 + day 8: + title: Jour 8 + day 10: + title: Jour 10 + title: "Menu \xAB\_Jour du d\xE9pistage \xE0 la fronti\xE8re\_\xBB" TravelHistoryAvailabilityMenu: name: TravelHistoryAvailabilityMenu permissible_values: diff --git a/web/templates/canada_covid19/schema.json b/web/templates/canada_covid19/schema.json index dc97f0a4..d3afbcab 100644 --- a/web/templates/canada_covid19/schema.json +++ b/web/templates/canada_covid19/schema.json @@ -2919,7 +2919,14 @@ "text": "VeroE6/TMPRSS2 cell line", "meaning": "GENEPIO:0100044", "is_a": "Vero E6 cell line" - }, + } + } + }, + "HostDiseaseMenu": { + "name": "HostDiseaseMenu", + "title": "host disease menu", + "from_schema": "https://example.com/CanCOGeN_Covid-19", + "permissible_values": { "COVID-19": { "text": "COVID-19", "meaning": "MONDO:0100096" @@ -3669,7 +3676,14 @@ "Land": { "text": "Land", "meaning": "GENEPIO:0100409" - }, + } + } + }, + "BorderTestingTestDayTypeMenu": { + "name": "BorderTestingTestDayTypeMenu", + "title": "border testing test day type menu", + "from_schema": "https://example.com/CanCOGeN_Covid-19", + "permissible_values": { "day 1": { "text": "day 1", "meaning": "GENEPIO:0100410" diff --git a/web/templates/canada_covid19/schema.yaml b/web/templates/canada_covid19/schema.yaml index 3d0a017c..e0830625 100644 --- a/web/templates/canada_covid19/schema.yaml +++ b/web/templates/canada_covid19/schema.yaml @@ -4790,6 +4790,10 @@ enums: text: VeroE6/TMPRSS2 cell line meaning: GENEPIO:0100044 is_a: Vero E6 cell line + HostDiseaseMenu: + name: HostDiseaseMenu + title: host disease menu + permissible_values: COVID-19: text: COVID-19 meaning: MONDO:0100096 @@ -5369,6 +5373,10 @@ enums: Land: text: Land meaning: GENEPIO:0100409 + BorderTestingTestDayTypeMenu: + name: BorderTestingTestDayTypeMenu + title: border testing test day type menu + permissible_values: day 1: text: day 1 meaning: GENEPIO:0100410 diff --git a/web/templates/canada_covid19/schema_enums.tsv b/web/templates/canada_covid19/schema_enums.tsv index 37e0bf27..56afe5da 100644 --- a/web/templates/canada_covid19/schema_enums.tsv +++ b/web/templates/canada_covid19/schema_enums.tsv @@ -614,7 +614,7 @@ lab host menu LabHostMenu Menu « Laboratoire hôte » GENEPIO:0100041 293/ACE GENEPIO:0100044 VeroE6/TMPRSS2 cell line Lignée cellulaire VeroE6/TMPRSS2 -host disease menu UmbrellaBioprojectAccessionMenu Menu « Maladie de l’hôte » MONDO:0100096 COVID-19 COVID-19 +host disease menu HostDiseaseMenu Menu « Maladie de l’hôte » MONDO:0100096 COVID-19 COVID-19 host age bin menu HostAgeBinMenu Menu « Groupe d’âge de l’hôte » GENEPIO:0100049 0 - 9 0 - 9 @@ -778,7 +778,7 @@ travel point of entry type menu TravelPointOfEntryTypeMenu Menu «  Type de poi GENEPIO:0100409 Land Voie terrestre -border testing test day type menu UmbrellaBioprojectAccessionMenu Menu « Jour du dépistage à la frontière » GENEPIO:0100410 day 1 Jour 1 +border testing test day type menu BorderTestingTestDayTypeMenu Menu « Jour du dépistage à la frontière » GENEPIO:0100410 day 1 Jour 1 GENEPIO:0100411 day 8 Jour 8 GENEPIO:0100412 day 10 Jour 10