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

Link appointment to lab request #2184 #2243

Closed
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0739d5b
feat(model): added field for appointment in the Lab model
yosephAHMED Jul 13, 2020
8b1f96d
feat(lab_appointment): appointments display for the specific patient …
yosephAHMED Jul 13, 2020
748574b
fix(lab_appointment): cleaned up code and formatted startDateTime of …
yosephAHMED Jul 13, 2020
9683df8
feat(lab_appointments): render patient appointments in Dropdown compo…
yosephAHMED Jul 15, 2020
1d499f0
style: cleaned up code and removed comments that were not needed
yosephAHMED Jul 15, 2020
59f0e8c
feat(lab_appointments): pass Appointment object to onPatientChange ba…
yosephAHMED Jul 15, 2020
127adae
feat(lab_appointments): state of appointmentToSave correctly matches …
yosephAHMED Jul 16, 2020
1cb4987
feat(lab_appointments): local state of appointment stores startDateTi…
yosephAHMED Jul 16, 2020
64c1d88
feat(lab_appointment): display the appointment details for the lab re…
yosephAHMED Jul 16, 2020
f9782d7
feat(lab_appointments): dropdown visibility feature and ability to ch…
yosephAHMED Jul 17, 2020
3037992
style: patient and appointments Dropdown in same row
yosephAHMED Jul 17, 2020
f9d5f2e
style: disabled default padding-left 15px in container div
yosephAHMED Jul 18, 2020
84eb3e6
style: added a Label for Appointment and cleaned up some code
yosephAHMED Jul 18, 2020
e711bee
fix: when switching patients during lab request, appointment state is…
yosephAHMED Jul 18, 2020
c4ce3dc
fix: changed div className for appointment to match section
yosephAHMED Jul 18, 2020
68ac08c
Merge branch 'master' into Enhancement-Lab-Appointment
matteovivona Jul 19, 2020
ab2a5da
Merge branch 'master' into Enhancement-Lab-Appointment
yosephAHMED Jul 20, 2020
036735e
Merge branch 'Enhancement-Lab-Appointment' of https://github.com/yose…
yosephAHMED Jul 21, 2020
400423b
Merge branch 'master' into Enhancement-Lab-Appointment
matteovivona Jul 21, 2020
a1da3cf
fix: eslint test cases should now pass
yosephAHMED Jul 21, 2020
4fd929d
Merge branch 'Enhancement-Lab-Appointment' of https://github.com/yose…
yosephAHMED Jul 21, 2020
6cb70b4
fix: removed incorrect className for appointment div
yosephAHMED Jul 21, 2020
f2b27ec
fix: removed non-existant div className for appointment
yosephAHMED Jul 21, 2020
e5c05cd
refactor: change Dropdown component to a SelectWithLabelFormGroup com…
yosephAHMED Jul 22, 2020
32614c0
fix: dispatch retrieves appointments based on patient.id
yosephAHMED Jul 22, 2020
0d49e6e
feat: render patient appointments in SelectWithLabFormGroup component…
yosephAHMED Jul 22, 2020
41b5a0c
style: cleaned up code
yosephAHMED Jul 22, 2020
64c6e13
feat: update local state and send dispatch iff patient is defined
yosephAHMED Jul 23, 2020
e858abc
feat: toggle appointment visibility based on patient state
yosephAHMED Jul 23, 2020
3c07219
feat: changing patient will reset state of patient and appointment to…
yosephAHMED Jul 23, 2020
7681eaf
style: added a div to wrap appointments selection dropdown
yosephAHMED Jul 23, 2020
c3fc749
refactor: swapped bootstrap styling for HospitalRun components instead
yosephAHMED Jul 23, 2020
4ef2054
Merge branch 'master' into Enhancement-Lab-Appointment
matteovivona Jul 24, 2020
45dbae8
Merge branch 'Enhancement-Lab-Appointment' of https://github.com/yose…
yosephAHMED Jul 24, 2020
c213a58
style: code pattern for displaying appointment information fixed
yosephAHMED Jul 28, 2020
faf90cd
feat(test): added test for displaying appointment information on ViewLab
yosephAHMED Jul 28, 2020
721eb0b
Merge branch 'master' into Enhancement-Lab-Appointment
matteovivona Jul 28, 2020
806e849
feat: pulled new files from upstream master branch
yosephAHMED Jul 28, 2020
4af5003
Merge branch 'Enhancement-Lab-Appointment' of https://github.com/yose…
yosephAHMED Jul 28, 2020
0584a8c
WIP(labs): link appointment to lab request
morrme Aug 5, 2020
234a339
Merge branch 'master' into Enhancement-Lab-Appointment
morrme Aug 5, 2020
283d598
fix(lab):tests for new lab request
blestab Aug 7, 2020
3ca39f2
fix(lab):tests for new lab request continued
blestab Aug 12, 2020
b837f4b
fix(lab):new lab request build error
blestab Aug 12, 2020
1c92ccd
Merge branch 'master' into Enhancement-Lab-Appointment
blestab Aug 12, 2020
23e3486
fix(lab): restore success toast
blestab Aug 13, 2020
4efcfd1
Merge branch 'master' into Enhancement-Lab-Appointment
fox1t Sep 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(lab):new lab request build error
  • Loading branch information
blestab committed Aug 12, 2020
commit b837f4b565d5cb8f783f3d01ae6609ea66cd99d1
2 changes: 1 addition & 1 deletion src/labs/requests/NewLabRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const NewLabRequest = () => {
label={t('Appointments')}
options={appointmentOptions}
defaultSelected={appointmentOptions.filter(
({ value }) => value === newLabRequest.appointment,
(value: string) => value === newLabRequest.appointment,
)}
onChange={(values) => onAppointmentChange(values[0])}
isRequired
Expand Down