This repository has been archived by the owner on Jan 9, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/admin/lookup/controller.js # app/admin/lookup/edit/template.hbs # app/admin/lookup/template.hbs # app/locales/en/translations.js
# Conflicts: # app/admin/lookup/controller.js # app/admin/lookup/template.hbs # app/locales/en/translations.js # app/mixins/navigation.js # app/router.js # prod/assets/hospitalrun-56f8b368caa298fe91b9564acb6c9714.css # prod/index.html # prod/manifest.appcache # prod/service-worker.js
Fixes issues with using deprecated/removed browser functionality
Patient, inventory and incident now use the same code to generate friendlyid
Updated incident per requirements here: https://github.com/HospitalRun/planning/blob/master/Requirements/v1_0/In cident-Management.md
Changed code used for patient photos to be reusable so that it can be used for incident attachments
# Conflicts: # app/locales/en/translations.js
We should be pulling looking lists from a service instead of from parent routes.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #933
This PR completes the requires for incident reporting as documented here:
https://github.com/HospitalRun/planning/blob/master/Requirements/v1_0/Incident-Management.md
Also fixes #966, which is the issue of not being able to take photos from a webcam due to deprecated changes to WebRTC being removed from Chrome.
cc @HospitalRun/core-maintainers