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

fix: reportedBy issue #2810

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
b2fd7c1
fixed the reportBy issue #2539
Rockingrajat Oct 27, 2021
6847bda
added comments
Rockingrajat Oct 27, 2021
a55aa4a
Merge branch 'master' into master
Nov 2, 2021
b1fd5e4
Merge branch 'master' into master
Nov 2, 2021
027c6d6
Merge branch 'master' into master
Nov 2, 2021
c1995b9
Merge branch 'master' into master
Nov 2, 2021
ae25b3c
Merge branch 'master' into master
Nov 2, 2021
1e00c3b
Merge branch 'master' into master
Nov 2, 2021
3b229da
Merge branch 'master' into master
Nov 2, 2021
85dd171
Merge branch 'master' into master
Nov 3, 2021
1f06ba4
Merge branch 'master' into master
Nov 3, 2021
cc5264c
Merge branch 'master' into master
Nov 10, 2021
765c9c9
Merge branch 'master' into master
Nov 10, 2021
4f14a63
Merge branch 'master' into master
Nov 12, 2021
7026f05
Merge branch 'master' into master
Nov 12, 2021
94bba01
Merge branch 'master' into master
Nov 15, 2021
820e65f
Merge branch 'master' into master
Nov 17, 2021
c4e0fb2
Merge branch 'master' into master
Nov 17, 2021
51d9a38
Merge branch 'master' into master
Nov 17, 2021
a84ce25
Merge branch 'master' into master
Nov 17, 2021
4e60faa
Merge branch 'master' into master
Nov 17, 2021
a5cfe10
Merge branch 'master' into master
Nov 17, 2021
1189a86
Merge branch 'master' into master
Nov 17, 2021
5bab39a
Merge branch 'master' into master
Nov 18, 2021
878846c
Merge branch 'master' into master
Nov 19, 2021
42808e4
Merge branch 'master' into master
Nov 19, 2021
c81422b
Merge branch 'master' into master
Nov 19, 2021
67e1edc
Merge branch 'master' into master
Nov 19, 2021
a139382
Merge branch 'master' into master
Nov 19, 2021
2ea55ce
Merge branch 'master' into master
Nov 21, 2021
7cae02e
Merge branch 'master' into master
Nov 23, 2021
fc97bba
Merge branch 'master' into master
Nov 23, 2021
045e2ce
Merge branch 'master' into master
Nov 23, 2021
9bbae4e
Merge branch 'master' into master
Nov 25, 2021
54b6b68
Merge branch 'master' into master
Nov 25, 2021
db24820
Merge branch 'master' into master
Nov 29, 2021
3d2fb2e
Merge branch 'master' into master
Dec 4, 2021
4cac762
Merge branch 'master' into master
Dec 13, 2021
79e3cdb
Merge branch 'master' into master
Dec 13, 2021
9dc2ac2
Merge branch 'master' into master
Dec 17, 2021
9db86a6
Merge branch 'master' into master
Dec 17, 2021
0e41cd0
Merge branch 'master' into master
Dec 17, 2021
5cfe61b
Merge branch 'master' into master
Dec 17, 2021
26120e1
Merge branch 'master' into master
Dec 17, 2021
69b42d9
Merge branch 'master' into master
Dec 17, 2021
c599526
Merge branch 'master' into master
Dec 23, 2021
efc96a7
Merge branch 'master' into master
Dec 27, 2021
ac4cabf
Merge branch 'master' into master
Dec 27, 2021
e6c7c07
Merge branch 'master' into master
Dec 27, 2021
f24b395
Merge branch 'master' into master
Dec 28, 2021
a898c31
Merge branch 'master' into master
Dec 28, 2021
5db339b
Merge branch 'master' into master
Dec 28, 2021
642c174
Merge branch 'master' into master
Dec 28, 2021
cc4a0d1
Merge branch 'master' into master
Dec 28, 2021
5308530
Merge branch 'master' into master
Jan 2, 2022
1dbf6d7
Merge branch 'master' into master
Jan 2, 2022
d94c614
Merge branch 'master' into master
Jan 2, 2022
841dada
Merge branch 'master' into master
Jan 4, 2022
0a3297c
Merge branch 'master' into master
Jan 4, 2022
eefc938
Merge branch 'master' into master
Feb 12, 2022
6c1a38f
Merge branch 'master' into master
Feb 12, 2022
23d539b
Merge branch 'master' into master
Feb 12, 2022
bcee295
Merge branch 'master' into master
Feb 12, 2022
576930a
Merge branch 'master' into master
Feb 12, 2022
b542e17
Merge branch 'master' into master
Feb 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/__tests__/incidents/report/ReportIncident.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Report Incident', () => {

userEvent.type(departmentInput, 'Engineering Bay')
expect(departmentInput).toHaveDisplayValue('Engineering Bay')
})
})

it('renders a category form element that allows user input', async () => {
setup([Permissions.ViewIncident, Permissions.ResolveIncident])
Expand Down
3 changes: 2 additions & 1 deletion src/incidents/hooks/useReportIncident.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ import IncidentRepository from '../../shared/db/IncidentRepository'
import Incident from '../../shared/model/Incident'
import validateIncident from '../util/validate-incident'


const getIncidentCode = (): string => `I-${shortid.generate()}`

export function reportIncident(incident: Incident): Promise<Incident> {
const error = validateIncident(incident)

if (isEmpty(error)) {
const updatedIncident: Incident = {
...incident,
code: getIncidentCode(),
status: 'reported',
reportedBy: 'some user',
reportedOn: new Date(Date.now()).toISOString(),
}
return IncidentRepository.save(updatedIncident)
Expand Down
7 changes: 6 additions & 1 deletion src/incidents/report/ReportIncident.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,28 @@ import Incident from '../../shared/model/Incident'
import Patient from '../../shared/model/Patient'
import useReportIncident from '../hooks/useReportIncident'
import { IncidentError } from '../util/validate-incident'
import {useSelector } from 'react-redux'
import { RootState } from '../../shared/store'

const ReportIncident = () => {
const [mutate] = useReportIncident()
const history = useHistory()
const { t } = useTranslator()
const updateTitle = useUpdateTitle()
const {user} = useSelector((state: RootState) => state.user)

useEffect(() => {
updateTitle(t('incidents.reports.new'))
})
const breadcrumbs = [
{
i18nKey: 'incidents.reports.new',
i18nKey: 'incidents.reports.new',
location: `/incidents/new`,
},
]
useAddBreadcrumbs(breadcrumbs)
const [incident, setIncident] = useState({
reportedBy: user?.id || 'some user', //user is read from redux store state.user and the id is used while showing details
date: new Date().toISOString(),
department: '',
category: '',
Expand Down