Merge pull request #3 from codethechange/fix-buttons

style(new and update patients): fixing up some of the text for buttons

.env.example

@@ -1 +1 @@
-REACT_APP_HOSPITALRUN_API=http://localhost:5984
+REACT_APP_HOSPITALRUN_API=http://localhost:5984

src/__tests__/imagings/requests/NewImagingRequest.test.tsx

@@ -131,7 +131,7 @@ describe('New Imaging Request', () => {
       const wrapper = await setup()
       const saveButton = wrapper.find(Button).at(0)
       expect(saveButton).toBeDefined()
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('imagings.requests.create')
     })
 
     it('should render a cancel button', async () => {
@@ -205,7 +205,7 @@ describe('New Imaging Request', () => {
 
       const saveButton = wrapper.find(Button).at(0)
       const onClick = saveButton.prop('onClick') as any
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('imagings.requests.create')
       await act(async () => {
         await onClick()
       })

src/__tests__/labs/ViewLab.test.tsx

@@ -234,7 +234,7 @@ describe('View Lab', () => {
         ])
 
         const buttons = wrapper.find(Button)
-        expect(buttons.at(0).text().trim()).toEqual('actions.update')
+        expect(buttons.at(0).text().trim()).toEqual('labs.requests.update')
 
         expect(buttons.at(1).text().trim()).toEqual('labs.requests.complete')
 

src/__tests__/labs/requests/NewLabRequest.test.tsx

@@ -104,7 +104,7 @@ describe('New Lab Request', () => {
       const { wrapper } = await setup()
       const saveButton = wrapper.find(Button).at(0)
       expect(saveButton).toBeDefined()
-      expect(saveButton.text().trim()).toEqual('labs.requests.save')
+      expect(saveButton.text().trim()).toEqual('labs.requests.new')
     })
 
     it('should render a cancel button', async () => {

src/__tests__/medications/ViewMedication.test.tsx

@@ -167,7 +167,7 @@ describe('View Medication', () => {
         ])
 
         const buttons = wrapper.find(Button)
-        expect(buttons.at(0).text().trim()).toEqual('actions.update')
+        expect(buttons.at(0).text().trim()).toEqual('medications.requests.update')
 
         expect(buttons.at(1).text().trim()).toEqual('medications.requests.cancel')
       })

src/__tests__/medications/requests/NewMedicationRequest.test.tsx

@@ -88,7 +88,7 @@ describe('New Medication Request', () => {
       const { wrapper } = await setup()
       const saveButton = wrapper.find(Button).at(0)
       expect(saveButton).toBeDefined()
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('medications.requests.new')
     })
 
     it('should render a cancel button', async () => {

src/__tests__/patients/edit/EditPatient.test.tsx

@@ -106,7 +106,7 @@ describe('Edit Patient', () => {
 
     const saveButton = wrapper.find('.btn-save').at(0)
     const onClick = saveButton.prop('onClick') as any
-    expect(saveButton.text().trim()).toEqual('actions.save')
+    expect(saveButton.text().trim()).toEqual('patients.updatePatient')
 
     await act(async () => {
       await onClick()

src/__tests__/patients/new/NewPatient.test.tsx

@@ -93,7 +93,7 @@ describe('New Patient', () => {
 
     const saveButton = wrapper.find('.btn-save').at(0)
     const onClick = saveButton.prop('onClick') as any
-    expect(saveButton.text().trim()).toEqual('actions.save')
+    expect(saveButton.text().trim()).toEqual('patients.createPatient')
 
     await act(async () => {
       await onClick()
@@ -112,7 +112,7 @@ describe('New Patient', () => {
 
     const saveButton = wrapper.find('.btn-save').at(0)
     const onClick = saveButton.prop('onClick') as any
-    expect(saveButton.text().trim()).toEqual('actions.save')
+    expect(saveButton.text().trim()).toEqual('patients.createPatient')
 
     act(() => {
       onClick()
@@ -139,7 +139,7 @@ describe('New Patient', () => {
 
     const saveButton = wrapper.find('.btn-save').at(0)
     const onClick = saveButton.prop('onClick') as any
-    expect(saveButton.text().trim()).toEqual('actions.save')
+    expect(saveButton.text().trim()).toEqual('patients.createPatient')
 
     await act(async () => {
       await onClick()

src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx

@@ -108,7 +108,7 @@ describe('Edit Appointment', () => {
 
     const saveButton = wrapper.find(Button).at(0)
     const onClick = saveButton.prop('onClick') as any
-    expect(saveButton.text().trim()).toEqual('actions.save')
+    expect(saveButton.text().trim()).toEqual('scheduling.appointments.updateAppointment')
 
     await act(async () => {
       await onClick()

src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx

@@ -109,7 +109,7 @@ describe('New Appointment', () => {
       wrapper.update()
 
       const saveButton = wrapper.find(Button).at(0)
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('scheduling.appointments.createAppointment')
       const onClick = saveButton.prop('onClick') as any
 
       await act(async () => {
@@ -151,9 +151,8 @@ describe('New Appointment', () => {
       })
 
       wrapper.update()
-
       const saveButton = wrapper.find(Button).at(0)
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('scheduling.appointments.createAppointment')
       const onClick = saveButton.prop('onClick') as any
 
       await act(async () => {
@@ -236,9 +235,8 @@ describe('New Appointment', () => {
       })
 
       wrapper.update()
-
       const saveButton = wrapper.find(Button).at(0)
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('scheduling.appointments.createAppointment')
       const onClick = saveButton.prop('onClick') as any
 
       await act(async () => {
@@ -274,7 +272,7 @@ describe('New Appointment', () => {
       })
       wrapper.update()
       const saveButton = wrapper.find(Button).at(0)
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('scheduling.appointments.createAppointment')
       const onClick = saveButton.prop('onClick') as any
 
       await act(async () => {

src/imagings/requests/NewImagingRequest.tsx

@@ -201,7 +201,7 @@ const NewImagingRequest = () => {
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3">
             <Button className="mr-2" color="success" onClick={onSave}>
-              {t('actions.save')}
+              {t('imagings.requests.create')}
             </Button>
             <Button color="danger" onClick={onCancel}>
               {t('actions.cancel')}

src/incidents/report/ReportIncident.tsx

@@ -135,7 +135,7 @@ const ReportIncident = () => {
       <div className="row float-right">
         <div className="btn-group btn-group-lg mt-3">
           <Button className="mr-2" color="success" onClick={onSave}>
-            {t('incidents.actions.report')}
+            {t('incidents.reports.new')}
           </Button>
           <Button color="danger" onClick={onCancel}>
             {t('actions.cancel')}

src/labs/ViewLab.tsx

@@ -121,7 +121,7 @@ const ViewLab = () => {
 
     buttons.push(
       <Button className="mr-2" color="success" onClick={onUpdate} key="actions.update">
-        {t('actions.update')}
+        {t('labs.requests.update')}
       </Button>,
     )
 

src/labs/requests/NewLabRequest.tsx

@@ -173,9 +173,8 @@ const NewLabRequest = () => {
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3">
             <Button className="mr-2" color="success" onClick={onSave}>
-              {t('labs.requests.save')}
+              {t('labs.requests.new')}
             </Button>
-
             <Button color="danger" onClick={onCancel}>
               {t('actions.cancel')}
             </Button>

src/medications/ViewMedication.tsx

@@ -126,7 +126,7 @@ const ViewMedication = () => {
 
     buttons.push(
       <Button className="mr-2" color="success" onClick={onUpdate} key="actions.update">
-        {t('actions.update')}
+        {t('medications.requests.update')}
       </Button>,
     )
 

src/medications/requests/NewMedicationRequest.tsx

@@ -227,7 +227,7 @@ const NewMedicationRequest = () => {
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3">
             <Button className="mr-2" color="success" onClick={onSave}>
-              {t('actions.save')}
+              {t('medications.requests.new')}
             </Button>
             <Button color="danger" onClick={onCancel}>
               {t('actions.cancel')}

src/patients/edit/EditPatient.tsx

@@ -79,7 +79,7 @@ const EditPatient = () => {
       <div className="row float-right">
         <div className="btn-group btn-group-lg">
           <Button className="btn-save mr-2" color="success" onClick={onSave}>
-            {t('actions.save')}
+            {t('patients.updatePatient')}
           </Button>
           <Button className="btn-cancel" color="danger" onClick={onCancel}>
             {t('actions.cancel')}

src/patients/new/NewPatient.tsx

@@ -100,7 +100,7 @@ const NewPatient = () => {
       <div className="row float-right">
         <div className="btn-group btn-group-lg mt-3">
           <Button className="btn-save mr-2" color="success" onClick={onSave}>
-            {t('actions.save')}
+            {t('patients.createPatient')}
           </Button>
           <Button className="btn-cancel" color="danger" onClick={onCancel}>
             {t('actions.cancel')}

src/scheduling/appointments/edit/EditAppointment.tsx

@@ -87,7 +87,7 @@ const EditAppointment = () => {
       <div className="row float-right">
         <div className="btn-group btn-group-lg">
           <Button className="mr-2" color="success" onClick={onSave}>
-            {t('actions.save')}
+            {t('scheduling.appointments.updateAppointment')}
           </Button>
           <Button color="danger" onClick={onCancel}>
             {t('actions.cancel')}

src/scheduling/appointments/new/NewAppointment.tsx

@@ -112,7 +112,7 @@ const NewAppointment = () => {
         <div className="row float-right">
           <div className="btn-group btn-group-lg">
             <Button className="mr-2" color="success" onClick={onSave}>
-              {t('actions.save')}
+              {t('scheduling.appointments.createAppointment')}
             </Button>
             <Button color="danger" onClick={onCancelClick}>
               {t('actions.cancel')}

src/shared/locales/enUs/translations/imagings/index.ts

@@ -10,6 +10,7 @@ export default {
       label: 'Imaging Requests',
       new: 'New Imaging Request',
       view: 'View Imaging',
+      create: 'Request Imaging',
       cancel: 'Cancel Imaging',
       complete: 'Complete Imaging',
       error: {

src/shared/locales/enUs/translations/labs/index.ts

@@ -21,6 +21,7 @@ export default {
       view: 'View Lab',
       cancel: 'Cancel Lab',
       complete: 'Complete Lab',
+      update: 'Update Lab',
       error: {
         unableToRequest: 'Unable to create new lab request.',
         unableToComplete: 'Unable to complete lab request.',

src/shared/locales/enUs/translations/medications/index.ts

@@ -38,6 +38,7 @@ export default {
       view: 'View Medication',
       cancel: 'Cancel Medication',
       complete: 'Complete Medication',
+      update: 'Update Medication',
       error: {
         unableToRequest: 'Unable to create Medication request.',
         unableToComplete: 'Unable to complete Medication request.',

src/shared/locales/enUs/translations/patients/index.ts

@@ -6,8 +6,10 @@ export default {
     viewPatients: 'View Patients',
     noPatients: "There are no patients yet, let's add the first one!",
     viewPatient: 'View Patient',
+    createPatient: 'Create Patient',
     newPatient: 'New Patient',
     editPatient: 'Edit Patient',
+    updatePatient: 'Update Patient',
     successfullyCreated: 'Successfully created patient',
     successfullyAddedNote: 'Successfully added the new note',
     successfullyAddedRelatedPerson: 'Successfully added a new related person',

src/shared/locales/enUs/translations/scheduling/index.ts

@@ -6,8 +6,10 @@ export default {
       new: 'New Appointment',
       schedule: 'Appointment Schedule',
       editAppointment: 'Edit Appointment',
+      createAppointment: 'Schedule Appointment',
       deleteAppointment: 'Delete Appointment',
       viewAppointment: 'View Appointment',
+      updateAppointment: 'Update Appointment',
     },
     appointment: {
       startDate: 'Start Date',