Skip to content

Commit

Permalink
Merge pull request #566 from rokwire/release/v2.9.19+919
Browse files Browse the repository at this point in the history
Release/v2.9.19+919
  • Loading branch information
sandeep-ps authored Mar 13, 2021
2 parents 672f881 + 7ab1578 commit 1fea6dd
Show file tree
Hide file tree
Showing 19 changed files with 514 additions and 219 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [2.9.19] - 2021-03-12
### Changed
- Disable Accept/Revoke buttons initially in Pending Family Members popup.
- Changed permission request buttons to "Continue" [#560](https://github.com/rokwire/safer-illinois-app/issues/560)
- 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.
Expand Down
86 changes: 54 additions & 32 deletions assets/health.rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -42,7 +42,7 @@
"next_step_html": "positive.step.html"
}
},

"PCR.positive-IP": {
"condition": "timeout",
"params": {
Expand Down Expand Up @@ -166,7 +166,7 @@
},

"PCR.negative": "test-monitor",

"PCR.invalid": {
"condition": "require-test",
"params": {
Expand Down Expand Up @@ -257,7 +257,7 @@
}
}
},

"force-test": {
"condition": "require-test",
"params": {
Expand Down Expand Up @@ -296,7 +296,7 @@
"reason": "test.required.reason"
}
},

"symptoms-match": {
"health_status": "orange",
"priority": 1,
Expand Down Expand Up @@ -330,7 +330,7 @@
"reason": "exposure.reason"
}
},

"quarantine-on": {
"health_status": "orange",
"priority": 10,
Expand All @@ -355,7 +355,7 @@
"next_step": "test.resume.step",
"next_step_interval": "UserTestMonitorInterval",
"warning": "test.future.warning"
},
},
"fail": {
"health_status": "orange",
"priority": -1,
Expand All @@ -380,7 +380,7 @@
"next_step": "test.resume.step",
"next_step_interval": "UndergraduateTestMonitorInterval",
"warning": "test.future.warning"
},
},
"fail": {
"health_status": "orange",
"priority": -1,
Expand Down Expand Up @@ -408,7 +408,7 @@
}
}
}
},
},

"out-of-test-compliance": {
"condition": "require-test",
Expand All @@ -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" : {
Expand Down Expand Up @@ -495,36 +495,43 @@
{
"result": "POSITIVE",
"category": "PCR.positive",
"disclaimer_html": null,
"status": "PCR.positive"
},
{
"result": "POSITIVE-IP",
"category": "PCR.positive",
"disclaimer_html": null,
"status": "PCR.positive-IP"
},
{
"result": "POSITIVE-NIP",
"category": "PCR.negative",
"disclaimer_html": null,
"status": "PCR.positive-NIP"
},
{
"result": "NEGATIVE",
"category": "PCR.negative",
"disclaimer_html": null,
"status": "PCR.negative"
},
{
"result": "INVALID",
"category": "PCR.invalid",
"disclaimer_html": null,
"status": "PCR.invalid"
},
{
"result": "INCONCLUSIVE",
"category": "PCR.invalid",
"disclaimer_html": null,
"status": "PCR.invalid"
},
{
"result": "REJECTED",
"category": "PCR.invalid",
"disclaimer_html": null,
"status": "PCR.invalid"
}
]
Expand Down Expand Up @@ -646,7 +653,7 @@
}
]
},

"symptoms": {
"rules": [
{
Expand All @@ -662,7 +669,7 @@
"status": "symptoms-match"
}
],

"groups": [
{
"id": null,
Expand Down Expand Up @@ -765,7 +772,7 @@
}
]
},

"contact_trace": {
"rules": [
{
Expand All @@ -774,7 +781,7 @@
}
]
},

"actions": {
"rules": [
{
Expand Down Expand Up @@ -823,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": "<h3>You must take two on-campus tests by Jan. 25.</h3><ul><li>Separate the tests by three days of quarantine:&nbsp;if the first test is on day one, the second test will be on day five.</li><li>Limit yourself to essential activities until you get the second negative result.</li><li>Your building access will change to Granted (Yellow) with the second negative test result.</li></ul><p>See <a href=https://covid19.illinois.edu/spring-2021-return-to-campus-for-students/'> testing schedule and rules</a>.</p>",
"test.multiple.step.html": "<h3>You must take two on-campus tests by Jan. 25.</h3><ul><li>Separate the tests by three days of quarantine:&nbsp;if the first test is on day one, the second test will be on day five.</li><li>Limit yourself to essential activities until you get the second negative result.</li><li>Your building access will change to Granted (Yellow) with the second negative test result.</li></ul><p>See <a href=https://covid19.illinois.edu/spring-2021-return-to-campus-for-students/'> testing schedule and rules</a>.</p>",
"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": "<h3>You have likely been exposed to a person who is infected with COVID-19.</h3><ul><h6><li>You must quarantine yourself immediately.</li></h6><h6><li>Stay home. Do not go to work, school, or public areas.</li></h6><h6><li>Separate yourself from others in your home.</li></h6><h6><li>Contact <a href='mailto:[email protected]'>[email protected]</a> for guidance.</li></h6><h6><li>Get tested after {next_step_date} to see if you have developed the disease.</li></h6><h6><li>More Info: <a href='https://covid19.illinois.edu/health-and-support/quarantine-and-isolation/'>Quarantine and Isolation</a></li></h6></ul>",
"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",
Expand All @@ -850,7 +857,12 @@
"symptoms.sore-throat": "Sore Throat",
"symptoms.congestion-or-runny-nose": "Congestion or runny nose",
"symptoms.nausea-or-vomiting": "Nausea or vomiting",
"symptoms.diarrhea":"Diarrhea"
"symptoms.diarrhea":"Diarrhea",
"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.",
Expand All @@ -870,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": "<h3>Debes de tomar dos pruebas en el campus antes del 25 de enero.</h3><ul><li>Separe las pruebas con tres d&iacute;as de cuarentena: &nbsp;si la primera prueba es el d&iacute;a uno, la segunda prueba ser&aacute; el d&iacute;a cinco.</li><li>Lim&iacute;tese a las actividades esenciales hasta que obtenga el segundo resultado negativo.</li><li>El acceso al edificio cambiar&aacute; a Concedido (amarillo) con el segundo resultado negativo de la prueba.</li></ul><p>Ver el <a href='https://covid19.illinois.edu/spring-2021-return-to-campus-for-students/'>calendario y las reglas de las pruebas</a>.</p>",
"test.multiple.step.html": "<h3>Debes de tomar dos pruebas en el campus antes del 25 de enero.</h3><ul><li>Separe las pruebas con tres d&iacute;as de cuarentena: &nbsp;si la primera prueba es el d&iacute;a uno, la segunda prueba ser&aacute; el d&iacute;a cinco.</li><li>Lim&iacute;tese a las actividades esenciales hasta que obtenga el segundo resultado negativo.</li><li>El acceso al edificio cambiar&aacute; a Concedido (amarillo) con el segundo resultado negativo de la prueba.</li></ul><p>Ver el <a href='https://covid19.illinois.edu/spring-2021-return-to-campus-for-students/'>calendario y las reglas de las pruebas</a>.</p>",
"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": "<h3>Es probable que haya estado expuesto a una persona infectada con COVID-19.</h3><ul><h6><li>Debe ponerse en cuarentena inmediatamente.</li></h6><h6><li>Quedarse en casa. No vaya al trabajo, la escuela o áreas públicas.</li></h6><h6><li>Sepárate de las demás en tu casa.</li></h6><h6><li>Póngase en contacto con <a href='mailto:[email protected]'>[email protected]</a> para obtener orientación.</li></h6><h6><li>Hágase la prueba después del {next_step_date} para ver si ha desarrollado la enfermedad.</li></h6><h6><li>Más información: <a href='https://covid19.illinois.edu/health-and-support/quarantine-and-isolation/'>Cuarentena y aislamiento</a></li></h6></ul>",
"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",
Expand All @@ -897,7 +909,12 @@
"symptoms.sore-throat": "Dolor de garganta",
"symptoms.congestion-or-runny-nose": "Congestión o secreción nasal",
"symptoms.nausea-or-vomiting": "Náuseas o vómitos",
"symptoms.diarrhea": "Diarrea"
"symptoms.diarrhea": "Diarrea",
"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唾液測試。",
Expand Down Expand Up @@ -944,7 +961,12 @@
"symptoms.sore-throat": "咽喉痛",
"symptoms.congestion-or-runny-nose": "充血或流鼻涕",
"symptoms.nausea-or-vomiting": "噁心或嘔吐",
"symptoms.diarrhea":"腹瀉"
"symptoms.diarrhea":"腹瀉",
"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": ""
}
}
}
8 changes: 4 additions & 4 deletions assets/strings.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"panel.onboarding.location.label.title": "Turn on Location Services",
"panel.onboarding.location.label.title.hint": "Header 1",
"panel.onboarding.location.label.description": "Background location is required for Bluetooth-based exposure notification to work on your phone",
"panel.onboarding.location.button.allow.title": "Enable Location Services",
"panel.onboarding.location.button.allow.title": "Continue",
"panel.onboarding.location.button.allow.hint": "",
"panel.onboarding.location.button.dont_allow.title": "Not right now",
"panel.onboarding.location.button.dont_allow.hint": "Skip sharing location",
Expand All @@ -70,7 +70,7 @@
"panel.onboarding.bluetooth.label.title": "Enable Bluetooth",
"panel.onboarding.bluetooth.label.title.hint": "Header 1",
"panel.onboarding.bluetooth.label.description": "Use Bluetooth to alert you to potential exposure to COVID-19.",
"panel.onboarding.bluetooth.button.allow.title": "Enable Bluetooth",
"panel.onboarding.bluetooth.button.allow.title": "Continue",
"panel.onboarding.bluetooth.button.allow.hint": "",
"panel.onboarding.bluetooth.button.dont_allow.title": "Not right now",
"panel.onboarding.bluetooth.button.dont_allow.hint": "Skip enabling Bluetooth",
Expand All @@ -81,7 +81,7 @@
"panel.onboarding.notifications.label.title.hint": "Header 1",
"panel.onboarding.notifications.label.description1": "Get notified about COVID-19 info",
"panel.onboarding.notifications.label.description2": "This is required for Exposure Notifications to work in background on your phone",
"panel.onboarding.notifications.button.allow.title": "Enable Notifications",
"panel.onboarding.notifications.button.allow.title": "Continue",
"panel.onboarding.notifications.button.allow.hint": "",
"panel.onboarding.notifications.button.dont_allow.title": "Not right now",
"panel.onboarding.notifications.button.dont_allow.hint": "Skip receiving notifications",
Expand Down Expand Up @@ -588,7 +588,7 @@
"panel.health.covid19.history.label.contact_trace.details": "contact trace: ",
"panel.health.covid19.history.label.action.title": "Action Required",
"panel.health.covid19.history.label.action.details": "action: ",
"panel.health.covid19.history.label.result.title": "Result: ",
"panel.health.covid19.history.label.result.title": "Result",
"panel.health.covid19.history.label.location.title": "Test Location",
"panel.health.covid19.history.label.technician_name.title": "Technician Name",
"panel.health.covid19.history.label.technician_id.title": "Technician ID",
Expand Down
8 changes: 4 additions & 4 deletions assets/strings.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"panel.onboarding.location.label.title": "Activar los servicios de ubicación",
"panel.onboarding.location.label.hint": "Encabezado 1",
"panel.onboarding.location.label.description": "Se requiere una ubicación en segundo plano para que la notificación de exposición basada en Bluetooth funcione en su teléfono ",
"panel.onboarding.location.button.allow.title": "Servicio de localización activado",
"panel.onboarding.location.button.allow.title": "Comenzar",
"panel.onboarding.location.button.allow.hint": "",
"panel.onboarding.location.button.dont_allow.title": "No en este momento",
"panel.onboarding.location.button.dont_allow.hint": "Omitir ubicación para compartir",
Expand All @@ -70,7 +70,7 @@
"panel.onboarding.bluetooth.label.title": "Habilitar Bluetooth",
"panel.onboarding.bluetooth.label.title.hint": "Encabezado 1",
"panel.onboarding.bluetooth.label.description": "Usar Bluetooth para alertarlo sobre la posible exposición al COVID-19.",
"panel.onboarding.bluetooth.button.allow.title": "Habilitar Bluetooth",
"panel.onboarding.bluetooth.button.allow.title": "Comenzar",
"panel.onboarding.bluetooth.button.allow.hint": "",
"panel.onboarding.bluetooth.button.dont_allow.title": "No en este momento",
"panel.onboarding.bluetooth.button.dont_allow.hint": "Omitir habilitar Bluetooth",
Expand All @@ -81,7 +81,7 @@
"panel.onboarding.notifications.label.hint": "Encabezado 1",
"panel.onboarding.notifications.label.description1": "Reciba notificaciones sobre la información de COVID-19",
"panel.onboarding.notifications.label.description2": "Esto es necesario para que las notificaciones de exposición funcionen en segundo plano en su teléfono",
"panel.onboarding.notifications.button.allow.title": "Permitir notificaciones",
"panel.onboarding.notifications.button.allow.title": "Comenzar",
"panel.onboarding.notifications.button.allow.hint": "",
"panel.onboarding.notifications.button.dont_allow.title": "No en este momento",
"panel.onboarding.notifications.button.dont_allow.hint": "Omitir recibir notificaciones",
Expand Down Expand Up @@ -587,7 +587,7 @@
"panel.health.covid19.history.label.contact_trace.details": "seguimiento de contacto: ",
"panel.health.covid19.history.label.action.title": "Acción requerida",
"panel.health.covid19.history.label.action.details": "acción: ",
"panel.health.covid19.history.label.result.title": "Resultado: ",
"panel.health.covid19.history.label.result.title": "Resultado",
"panel.health.covid19.history.label.location.title": "Lugar de prueba",
"panel.health.covid19.history.label.technician_name.title": "Nombre del técnico",
"panel.health.covid19.history.label.technician_id.title": "ID del técnico",
Expand Down
8 changes: 4 additions & 4 deletions assets/strings.zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"panel.onboarding.location.label.title": "打开位置服务",
"panel.onboarding.location.label.title.hint": "标题1",
"panel.onboarding.location.label.description": "要在手機上使用基於藍牙的曝光通知,需要背景位置",
"panel.onboarding.location.button.allow.title": "啟用位置服務",
"panel.onboarding.location.button.allow.title": "继续",
"panel.onboarding.location.button.allow.hint": "",
"panel.onboarding.location.button.dont_allow.title": "暂时不",
"panel.onboarding.location.button.dont_allow.hint": "跳过共享位置",
Expand All @@ -70,7 +70,7 @@
"panel.onboarding.bluetooth.label.title": "启用蓝牙",
"panel.onboarding.bluetooth.label.title.hint": "标题1",
"panel.onboarding.bluetooth.label.description": "使用藍牙提醒您可能接觸到COVID-19.",
"panel.onboarding.bluetooth.button.allow.title": "启用蓝牙",
"panel.onboarding.bluetooth.button.allow.title": "继续",
"panel.onboarding.bluetooth.button.allow.hint": "",
"panel.onboarding.bluetooth.button.dont_allow.title": "不是现在",
"panel.onboarding.bluetooth.button.dont_allow.hint": "跳过启用蓝牙",
Expand All @@ -81,7 +81,7 @@
"panel.onboarding.notifications.label.hint": "标题1",
"panel.onboarding.notifications.label.description1": "您將收到COVID-19信息",
"panel.onboarding.notifications.label.description2": "這是曝光通知在手機上後台運行所必需的",
"panel.onboarding.notifications.button.allow.title": "啟用通知",
"panel.onboarding.notifications.button.allow.title": "继续",
"panel.onboarding.notifications.button.allow.hint": "",
"panel.onboarding.notifications.button.dont_allow.title": "暂时不",
"panel.onboarding.notifications.button.dont_allow.hint": "跳过接收通知",
Expand Down Expand Up @@ -587,7 +587,7 @@
"panel.health.covid19.history.label.contact_trace.details": "接触者追踪: ",
"panel.health.covid19.history.label.action.title": "需要採取的行動",
"panel.health.covid19.history.label.action.details": "行動:",
"panel.health.covid19.history.label.result.title": "结果: ",
"panel.health.covid19.history.label.result.title": "结果",
"panel.health.covid19.history.label.location.title": "测试位置",
"panel.health.covid19.history.label.technician_name.title": "技术人员姓名",
"panel.health.covid19.history.label.technician_id.title": "技术人员 ID",
Expand Down
Loading

0 comments on commit 1fea6dd

Please sign in to comment.