From 7ab1578e627dcb6249be47f0361ab606c8ec0bd9 Mon Sep 17 00:00:00 2001 From: Sandeep Puthanveetil Satheesan Date: Sat, 13 Mar 2021 17:21:17 -0600 Subject: [PATCH 1/3] Fix health rules file. (#568) --- CHANGELOG.md | 3 ++ assets/health.rules.json | 98 ++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5ba37b0..9270a9be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Apply WWCL.Disclaimers in Safer app [#562](https://github.com/rokwire/safer-illinois-app/issues/562) - Maine health history change [#563](https://github.com/rokwire/safer-illinois-app/issues/563) +### Fixed +- Health rules file. [#567](https://github.com/rokwire/safer-illinois-app/issues/567) + ## [2.9.18] - 2021-03-09 ### Added - Fire Analytics events in Pending Family Members popup. diff --git a/assets/health.rules.json b/assets/health.rules.json index fe36ea06..254dc203 100644 --- a/assets/health.rules.json +++ b/assets/health.rules.json @@ -14,11 +14,11 @@ }, "statuses": { - "PCR.xpositive": { - "health_status": "red", - "priority": 11, - "next_step_html": "positive.step.html" - }, + "PCR.xpositive": { + "health_status": "red", + "priority": 11, + "next_step_html": "positive.step.html" + }, "PCR.positive": { "condition": "timeout", "params": { @@ -42,7 +42,7 @@ "next_step_html": "positive.step.html" } }, - + "PCR.positive-IP": { "condition": "timeout", "params": { @@ -166,7 +166,7 @@ }, "PCR.negative": "test-monitor", - + "PCR.invalid": { "condition": "require-test", "params": { @@ -257,7 +257,7 @@ } } }, - + "force-test": { "condition": "require-test", "params": { @@ -296,7 +296,7 @@ "reason": "test.required.reason" } }, - + "symptoms-match": { "health_status": "orange", "priority": 1, @@ -330,7 +330,7 @@ "reason": "exposure.reason" } }, - + "quarantine-on": { "health_status": "orange", "priority": 10, @@ -355,7 +355,7 @@ "next_step": "test.resume.step", "next_step_interval": "UserTestMonitorInterval", "warning": "test.future.warning" - }, + }, "fail": { "health_status": "orange", "priority": -1, @@ -380,7 +380,7 @@ "next_step": "test.resume.step", "next_step_interval": "UndergraduateTestMonitorInterval", "warning": "test.future.warning" - }, + }, "fail": { "health_status": "orange", "priority": -1, @@ -408,7 +408,7 @@ } } } - }, + }, "out-of-test-compliance": { "condition": "require-test", @@ -430,12 +430,12 @@ } }, - "release": { - "health_status": "orange", - "priority": -1, - "next_step": "release.step", - "reason": "release.reason" - } + "release": { + "health_status": "orange", + "priority": -1, + "next_step": "release.step", + "reason": "release.reason" + } }, "tests" : { @@ -495,7 +495,7 @@ { "result": "POSITIVE", "category": "PCR.positive", - "disclaimer_html": "disclaimers.covid-19_pcr.positive.html", + "disclaimer_html": null, "status": "PCR.positive" }, { @@ -513,25 +513,25 @@ { "result": "NEGATIVE", "category": "PCR.negative", - "disclaimer_html": "disclaimers.covid-19_pcr.negative.html", + "disclaimer_html": null, "status": "PCR.negative" }, { "result": "INVALID", "category": "PCR.invalid", - "disclaimer_html": "disclaimers.covid-19_pcr.invalid.html", + "disclaimer_html": null, "status": "PCR.invalid" }, { "result": "INCONCLUSIVE", "category": "PCR.invalid", - "disclaimer_html": "disclaimers.covid-19_pcr.inconclusive.html", + "disclaimer_html": null, "status": "PCR.invalid" }, { "result": "REJECTED", "category": "PCR.invalid", - "disclaimer_html": "disclaimers.covid-19_pcr.rejected.html", + "disclaimer_html": null, "status": "PCR.invalid" } ] @@ -653,7 +653,7 @@ } ] }, - + "symptoms": { "rules": [ { @@ -669,7 +669,7 @@ "status": "symptoms-match" } ], - + "groups": [ { "id": null, @@ -772,7 +772,7 @@ } ] }, - + "contact_trace": { "rules": [ { @@ -781,7 +781,7 @@ } ] }, - + "actions": { "rules": [ { @@ -830,15 +830,15 @@ "test.resume.step": "Resume testing on your assigned days", "test.future.warning": "You will turn orange/access denied if no negative test by {next_step_date}.", "test.past.reason": "Your status changed to Orange because you are past due for another test.", - "test.multiple.step.html": "

You must take two on-campus tests by Jan. 25.

See testing schedule and rules.

", + "test.multiple.step.html": "

You must take two on-campus tests by Jan. 25.

See testing schedule and rules.

", "symptoms.step": "Take a COVID-19 test now", "symptoms.reason": "Your status changed to Orange because you self-reported symptoms consistent with the virus.", "exposure.step.html": "

You have likely been exposed to a person who is infected with COVID-19.

", "exposure.reason": "Your status changed to Orange because you received an exposure notification.", "quarantine-on.step": "Stay at home and avoid contacts", "quarantine-on.reason": "Your status changed to Orange because the Public Health department placed you in Quarantine.", - "release.step": "Take a SHIELD Saliva Test", - "release.reason": "Your status changed to Orange because the Public Health department requires you to take a test.", + "release.step": "Take a SHIELD Saliva Test", + "release.reason": "Your status changed to Orange because the Public Health department requires you to take a test.", "symptoms.no-symptoms": "No symptoms", "symptoms.fever": "Fever", "symptoms.chills": "Chills", @@ -858,11 +858,11 @@ "symptoms.congestion-or-runny-nose": "Congestion or runny nose", "symptoms.nausea-or-vomiting": "Nausea or vomiting", "symptoms.diarrhea":"Diarrhea", - "disclaimers.covid-19_pcr.positive.html": "

POSITIVE for COVID-19

Test result is positive for SARS-CoV-2.

This is a real-time PCR assay for the qualitative detection of SARS-CoV-2, the virus that causes COVID-19 disease. This is a laboratory-developed test based on a test developed at the Centers for Disease Control and Prevention, and its performance characteristics have been validated at the WVDL-WSLH COVID-19 Laboratory. It has not been cleared or approved by the US Food and Drug Administration. Testing for this specimen was performed by the WVDL-WSLH COVID-19 Laboratory, Madison, WI under the direction of Errin C. Rider, Ph.D., D(ABMM), M(ASCP)CM, Director of Clinical Laboratory Services.

", - "disclaimers.covid-19_pcr.negative.html": "

NEGATIVE for COVID-19.

A negative test result does not preclude SARS-CoV-2 infection and should not be used as the sole basis for patient management decisions. Clinical observations, patient history, and epidemiologic information must also be considered.

This is a real-time PCR assay for the qualitative detection of SARS-CoV-2, the virus that causes COVID-19 disease. This is a laboratory-developed test based on a test developed at the Centers for Disease Control and Prevention, and its performance characteristics have been validated at the WVDL-WSLH COVID-19 Laboratory. It has not been cleared or approved by the US Food and Drug Administration. Testing for this specimen was performed by the WVDL-WSLH COVID-19 Laboratory, Madison, WI under the direction of Errin C. Rider, Ph.D., D(ABMM), M(ASCP)CM, Director of Clinical Laboratory Services.

", - "disclaimers.covid-19_pcr.invalid.html": "

Repeat testing is suggested.

This specimen exhibited inhibition in the PCR assay or the specimen contained an inadequate amount of clinical material. If clinically warranted, re-collecting a specimen for follow-up testing is recommended.

This is a real-time PCR assay for the qualitative detection of SARS-CoV-2, the virus that causes COVID-19 disease. This is a laboratory-developed test based on a test developed at the Centers for Disease Control and Prevention, and its performance characteristics have been validated at the WVDL-WSLH COVID-19 Laboratory. It has not been cleared or approved by the US Food and Drug Administration. Testing for this specimen was performed by the WVDL-WSLH COVID-19 Laboratory, Madison, WI under the direction of Errin C. Rider, Ph.D., D(ABMM), M(ASCP)CM, Director of Clinical Laboratory Services.

", - "disclaimers.covid-19_pcr.inconclusive.html": "

Repeat testing is suggested.

The test result did not meet the full criteria for the presence of SARS-CoV-2. If clinically warranted, repeat testing is suggested.

This is a real-time PCR assay for the qualitative detection of SARS-CoV-2, the virus that causes COVID-19 disease. This is a laboratory-developed test based on a test developed at the Centers for Disease Control and Prevention, and its performance characteristics have been validated at the WVDL-WSLH COVID-19 Laboratory. It has not been cleared or approved by the US Food and Drug Administration. Testing for this specimen was performed by the WVDL-WSLH COVID-19 Laboratory, Madison, WI under the direction of Errin C. Rider, Ph.D., D(ABMM), M(ASCP)CM, Director of Clinical Laboratory Services.

", - "disclaimers.covid-19_pcr.rejected.html": "

This is a real-time PCR assay for the qualitative detection of SARS-CoV-2, the virus that causes COVID-19 disease. This is a laboratory-developed test based on a test developed at the Centers for Disease Control and Prevention, and its performance characteristics have been validated at the WVDL-WSLH COVID-19 Laboratory. It has not been cleared or approved by the US Food and Drug Administration. Testing for this specimen was performed by the WVDL-WSLH COVID-19 Laboratory, Madison, WI under the direction of Errin C. Rider, Ph.D., D(ABMM), M(ASCP)CM, Director of Clinical Laboratory Services.

" + "disclaimers.covid-19_pcr.positive.html": "", + "disclaimers.covid-19_pcr.negative.html": "", + "disclaimers.covid-19_pcr.invalid.html": "", + "disclaimers.covid-19_pcr.inconclusive.html": "", + "disclaimers.covid-19_pcr.rejected.html": "" }, "es": { "default.step": "Realice una prueba de saliva SHIELD cuando regrese al campus.", @@ -882,15 +882,15 @@ "test.resume.step": "Reanudar las pruebas en los días asignados", "test.future.warning": "Se volverá naranja / acceso denegado si no hay una prueba negativa antes del {next_step_date}.", "test.past.reason": "Su estado cambió a Naranja porque está atrasado para otro examen.", - "test.multiple.step.html": "

Debes de tomar dos pruebas en el campus antes del 25 de enero.

Ver el calendario y las reglas de las pruebas.

", + "test.multiple.step.html": "

Debes de tomar dos pruebas en el campus antes del 25 de enero.

Ver el calendario y las reglas de las pruebas.

", "symptoms.step": "Realice una prueba de COVID-19 ahora", "symptoms.reason": "Su estado cambió a Naranja porque usted mismo informó de síntomas consistentes con el virus.", "exposure.step.html": "

Es probable que haya estado expuesto a una persona infectada con COVID-19.

", "exposure.reason": "Su estado cambió a Naranja porque recibió una notificación de exposición.", "quarantine-on.step": "Quédese en casa y evite los contactos", "quarantine-on.reason": "Su estado cambió a Orange porque el departamento de Salud Pública lo puso en cuarentena.", - "release.step": "Realice una prueba de saliva SHIELD", - "release.reason": "Su estado cambió a Orange porque el departamento de Salud Pública requiere que tome una prueba.", + "release.step": "Realice una prueba de saliva SHIELD", + "release.reason": "Su estado cambió a Orange porque el departamento de Salud Pública requiere que tome una prueba.", "symptoms.no-symptoms": "Sin síntomas", "symptoms.fever": "Fiebre", "symptoms.chills": "Resfriado", @@ -910,11 +910,11 @@ "symptoms.congestion-or-runny-nose": "Congestión o secreción nasal", "symptoms.nausea-or-vomiting": "Náuseas o vómitos", "symptoms.diarrhea": "Diarrea", - "disclaimers.covid-19_pcr.positive.html": "

POSITIVO para COVID-19

El resultado de la prueba es positivo para el SARS-CoV-2.

Este es un ensayo de PCR en tiempo real para la detección cualitativa del SARS-CoV-2, el virus que causa la enfermedad COVID-19. Esta es una prueba desarrollada en laboratorio basada en una prueba desarrollada en los Centros para el Control y la Prevención de Enfermedades, y sus características de rendimiento han sido validadas en el Laboratorio WVDL-WSLH COVID-19. No ha sido autorizado ni aprobado por la Administración de Drogas y Alimentos de EE. UU. La prueba para esta muestra fue realizada por el Laboratorio WVDL-WSLH COVID-19, Madison, WI bajo la dirección de Errin C. Rider, Ph.D., D (ABMM), M (ASCP) CM, Director de Servicios de Laboratorio Clínico.

", - "disclaimers.covid-19_pcr.negative.html": "

NEGATIVO para COVID-19.

Un resultado negativo de la prueba no excluye la infección por SARS-CoV-2 y no debe usarse como la única base para las decisiones de manejo del paciente. También se deben considerar las observaciones clínicas, el historial del paciente y la información epidemiológica.

Este es un ensayo de PCR en tiempo real para la detección cualitativa del SARS-CoV-2, el virus que causa la enfermedad COVID-19. Esta es una prueba desarrollada en laboratorio basada en una prueba desarrollada en los Centros para el Control y la Prevención de Enfermedades, y sus características de rendimiento han sido validadas en el Laboratorio WVDL-WSLH COVID-19. No ha sido autorizado ni aprobado por la Administración de Drogas y Alimentos de EE. UU. La prueba para esta muestra fue realizada por el Laboratorio WVDL-WSLH COVID-19, Madison, WI bajo la dirección de Errin C. Rider, Ph.D., D (ABMM), M (ASCP) CM, Director de Servicios de Laboratorio Clínico.

", - "disclaimers.covid-19_pcr.invalid.html": "

Se sugiere repetir la prueba.

Esta muestra mostró inhibición en el ensayo de PCR o la muestra contenía una cantidad inadecuada de material clínico. Si está clínicamente justificado, se recomienda volver a recolectar una muestra para las pruebas de seguimiento.

Este es un ensayo de PCR en tiempo real para la detección cualitativa de SARS-CoV-2, el virus que causa COVID-19 enfermedad. Esta es una prueba desarrollada en laboratorio basada en una prueba desarrollada en los Centros para el Control y la Prevención de Enfermedades, y sus características de rendimiento han sido validadas en el Laboratorio WVDL-WSLH COVID-19. No ha sido autorizado ni aprobado por la Administración de Drogas y Alimentos de EE. UU. La prueba para esta muestra fue realizada por el Laboratorio WVDL-WSLH COVID-19, Madison, WI bajo la dirección de Errin C. Rider, Ph.D., D (ABMM), M (ASCP) CM, Director de Servicios de Laboratorio Clínico.

", - "disclaimers.covid-19_pcr.inconclusive.html": "

Se sugiere repetir la prueba.

El resultado de la prueba no cumplió con los criterios completos para la presencia de SARS-CoV-2. Si está clínicamente justificado, se sugiere repetir la prueba.

Este es un ensayo de PCR en tiempo real para la detección cualitativa del SARS-CoV-2, el virus que causa la enfermedad COVID-19. Esta es una prueba desarrollada en laboratorio basada en una prueba desarrollada en los Centros para el Control y la Prevención de Enfermedades, y sus características de rendimiento han sido validadas en el Laboratorio WVDL-WSLH COVID-19. No ha sido autorizado ni aprobado por la Administración de Drogas y Alimentos de EE. UU. La prueba para esta muestra fue realizada por el Laboratorio WVDL-WSLH COVID-19, Madison, WI bajo la dirección de Errin C. Rider, Ph.D., D (ABMM), M (ASCP) CM, Director de Servicios de Laboratorio Clínico.

", - "disclaimers.covid-19_pcr.rejected.html": "

Este es un ensayo de PCR en tiempo real para la detección cualitativa de SARS-CoV-2, el virus que causa la enfermedad COVID-19. Esta es una prueba desarrollada en laboratorio basada en una prueba desarrollada en los Centros para el Control y la Prevención de Enfermedades, y sus características de rendimiento han sido validadas en el Laboratorio WVDL-WSLH COVID-19. No ha sido autorizado ni aprobado por la Administración de Drogas y Alimentos de EE. UU. La prueba para esta muestra fue realizada por el Laboratorio WVDL-WSLH COVID-19, Madison, WI bajo la dirección de Errin C. Rider, Ph.D., D (ABMM), M (ASCP) CM, Director de Servicios de Laboratorio Clínico.

" + "disclaimers.covid-19_pcr.positive.html": "", + "disclaimers.covid-19_pcr.negative.html": "", + "disclaimers.covid-19_pcr.invalid.html": "", + "disclaimers.covid-19_pcr.inconclusive.html": "", + "disclaimers.covid-19_pcr.rejected.html": "" }, "zh": { "default.step": "返回校園後，請參加SHIELD唾液測試。", @@ -962,11 +962,11 @@ "symptoms.congestion-or-runny-nose": "充血或流鼻涕", "symptoms.nausea-or-vomiting": "噁心或嘔吐", "symptoms.diarrhea":"腹瀉", - "disclaimers.covid-19_pcr.positive.html": "

對COVID-19有利

測試結果為SARS-CoV-2陽性。

這是用於定性檢測SARS-CoV-2（一種引起COVID-19疾病的病毒）的實時PCR分析方法。 這是一項基於實驗室開發的測試，基於疾病控制與預防中心開發的測試，並且其性能特徵已在WVDL-WSLH COVID-19實驗室進行了驗證。 它尚未被美國食品和藥物管理局清除或批准。 由威斯康星州麥迪遜市的WVDL-WSLH COVID-19實驗室在臨床實驗室服務總監Errin C. Rider博士，D（ABMM），M（ASCP）CM的指導下對該樣品進行了測試。

", - "disclaimers.covid-19_pcr.negative.html": "

負于COVID-19

檢測結果陰性並不排除SARS-CoV-2感染，因此不應作為患者管理決策的唯一依據。 還必須考慮臨床觀察，患者病史和流行病學信息。

這是一種實時PCR檢測方法，用於定性檢測導致COVID-19疾病的病毒SARS-CoV-2。 這是一項基於實驗室開發的測試，基於疾病控制與預防中心開發的測試，並且其性能特徵已在WVDL-WSLH COVID-19實驗室進行了驗證。 它尚未被美國食品和藥物管理局清除或批准。 由威斯康星州麥迪遜市的WVDL-WSLH COVID-19實驗室在臨床實驗室服務總監Errin C. Rider博士，D（ABMM），M（ASCP）CM的指導下對該樣品進行了測試。

", - "disclaimers.covid-19_pcr.invalid.html": "

建議重複測試。

該標本在PCR分析中表現出抑製作用，或者標本中臨床物質的含量不足。 如果臨床需要，建議重新收集標本以進行後續測試。

這是一種實時PCR檢測方法，用於定性檢測SARS-CoV-2（引起COVID-19的病毒） 疾病。 這是一項基於實驗室開發的測試，基於疾病控制與預防中心開發的測試，並且其性能特徵已在WVDL-WSLH COVID-19實驗室進行了驗證。 它尚未被美國食品和藥物管理局清除或批准。 由威斯康星州麥迪遜市的WVDL-WSLH COVID-19實驗室在臨床實驗室服務總監Errin C. Rider博士，D（ABMM），M（ASCP）CM的指導下對該樣品進行了測試。

", - "disclaimers.covid-19_pcr.inconclusive.html": "

建議重複測試。

測試結果不符合SARS-CoV-2存在的完整標準。 如果臨床上需要，建議重複測試。

這是一種實時PCR檢測方法，用於定性檢測SARS-CoV-2（一種引起COVID-19疾病的病毒）。 這是一項基於實驗室開發的測試，基於疾病控制與預防中心開發的測試，並且其性能特徵已在WVDL-WSLH COVID-19實驗室進行了驗證。 它尚未被美國食品和藥物管理局清除或批准。 由威斯康星州麥迪遜市的WVDL-WSLH COVID-19實驗室在臨床實驗室服務總監Errin C. Rider博士，D（ABMM），M（ASCP）CM的指導下對該樣品進行了測試。

", - "disclaimers.covid-19_pcr.rejected.html": "

這是用於定性檢測SARS-CoV-2（一種引起COVID-19疾病的病毒）的實時PCR分析方法。 這是一項基於實驗室開發的測試，基於疾病控制與預防中心開發的測試，並且其性能特徵已在WVDL-WSLH COVID-19實驗室進行了驗證。 它尚未被美國食品和藥物管理局清除或批准。 由威斯康星州麥迪遜市的WVDL-WSLH COVID-19實驗室在臨床實驗室服務總監Errin C. Rider博士，D（ABMM），M（ASCP）CM的指導下對該樣品進行了測試。

" + "disclaimers.covid-19_pcr.positive.html": "", + "disclaimers.covid-19_pcr.negative.html": "", + "disclaimers.covid-19_pcr.invalid.html": "", + "disclaimers.covid-19_pcr.inconclusive.html": "", + "disclaimers.covid-19_pcr.rejected.html": "" } } } From 68a65dafa5ced8be2dcc8020b2407f3b8f48c6ff Mon Sep 17 00:00:00 2001 From: Sandeep Puthanveetil Satheesan Date: Sat, 13 Mar 2021 19:35:18 -0600 Subject: [PATCH 2/3] Update version number. --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b966855d..f7b3e32f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Illinois client application. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.9.19+919 +version: 2.9.20+920 environment: sdk: ">=2.2.0 <3.0.0" From c0e11394beff3475935597540d4ae5d2b6974c96 Mon Sep 17 00:00:00 2001 From: Sandeep Puthanveetil Satheesan Date: Sat, 13 Mar 2021 19:36:25 -0600 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9270a9be..6cfb31cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## [2.9.20] - 2021-03-13 +### Changed +- Updated version number to 2.9.20+920 for resubmission. + ## [2.9.19] - 2021-03-12 ### Changed - Disable Accept/Revoke buttons initially in Pending Family Members popup.