Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Incident reporting #987

Merged
merged 40 commits into from
Mar 13, 2017
Merged

Incident reporting #987

merged 40 commits into from
Mar 13, 2017

Conversation

jkleinsc
Copy link
Member

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

# 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
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.
@jkleinsc jkleinsc merged commit d305705 into master Mar 13, 2017
@jkleinsc jkleinsc deleted the incident-reporting branch March 13, 2017 19:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cannot open take photo / photo upload dialog Incident Management for 1.0
1 participant