Skip to content

Commit

Permalink
Merge branch 'feature/issue-306' of https://github.com/rokwire/safer-…
Browse files Browse the repository at this point in the history
…illinois-app into feature/issue-306

* 'feature/issue-306' of https://github.com/rokwire/safer-illinois-app:
  version: 2.8.2+802
  Updated CHANGELOG.md
  Created "force-test" rule status (#319); Introduced origin for rule intervals (#319); Added support for referenceDate when evaluating rule status (#319); Added "Force Test" action button in DebugCreateEventPanel (#319).
  Acknowledge status priority on status downgrade. Do not allow downgrade of PCR.positive-NIP yellow status by regular events (#319).
  Add http as well [#315]
  Add changelog [#315]
  Fix Unable to log in with iOS Default Browser changed [#315]
  • Loading branch information
Mihail Varbanov committed Oct 22, 2020
2 parents fab1067 + 3f1247c commit dc6ab83
Show file tree
Hide file tree
Showing 7 changed files with 310 additions and 164 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [2.8.1] - 2020-10-21
### Added
- Added "force-test" rule status and action. [#319](https://github.com/rokwire/safer-illinois-app/issues/319).
- Added "referenceDate" origin when evaluating status. [#319](https://github.com/rokwire/safer-illinois-app/issues/319).

### Changed
- Apply rule status priority on status downgrade. [#319](https://github.com/rokwire/safer-illinois-app/issues/319).

### Fixed
- Unable to log in with iOS Default Browser changed [#315](https://github.com/rokwire/safer-illinois-app/issues/315).

## [2.8.1] - 2020-10-20
### Added
- Added ability to turn off multiple organizations support and build single organization app.
Expand Down
47 changes: 45 additions & 2 deletions assets/health.rules.json
Expand Up @@ -80,7 +80,7 @@
},
"fail": {
"health_status": "yellow",
"priority": 1,
"priority": 3,
"next_step_html": "<h6>You are not required to self-isolate, and you are not required to submit to campus testing for a period of 60 days unless directed to do so by your licensed health professional. Your Safer Illinois App is set to allow you access for this period. Contact <a href='mailto:covidwellness@illinois.edu'>covidwellness@illinois.edu</a> if you have questions or need help.</h6>",
"next_step_interval": 60,
"event_explanation": "Your Saliva PCR test shows the VIRUS IS DETECTED in your REPEAT POSITIVE at a NON-INFECTIOUS LEVEL.",
Expand Down Expand Up @@ -180,7 +180,46 @@
}
}
},


"force-test": {
"condition": "require-test",
"params": {
"interval": { "min": 0, "scope": "future" }
},
"success": {
"condition": "timeout",
"params": {
"interval": { "min": 0, "max": 3, "scope": "future", "origin": "referenceDate" }
},
"success": {
"condition": "require-test",
"params": {
"interval": { "min": 4, "scope": "future", "origin": "referenceDate" }
},
"success": null,
"fail": {
"health_status": "orange",
"priority": 1,
"next_step": "Get another test now",
"reason": "Your status changed to Orange because you are past due for another test."
}
},
"fail": {
"health_status": "orange",
"priority": 2,
"next_step": "Get a test after {next_step_date}",
"next_step_interval": { "value": 3, "origin": "referenceDate" },
"reason": "Your status changed to Orange because you are required to take another test."
}
},
"fail": {
"health_status": "orange",
"priority": 1,
"next_step": "Get a test now",
"reason": "Your status changed to Orange because you are required to get a test."
}
},

"symptoms-match": {
"health_status": "orange",
"priority": 1,
Expand Down Expand Up @@ -668,6 +707,10 @@
{
"type": "test_pending",
"status": "test-monitor"
},
{
"type": "force-test",
"status": "force-test"
}
]
}
Expand Down
5 changes: 5 additions & 0 deletions ios/Runner/Info.plist
Expand Up @@ -35,6 +35,11 @@
</array>
</dict>
</array>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>https</string>
<string>http</string>
</array>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
Expand Down

0 comments on commit dc6ab83

Please sign in to comment.