Merge branch 'main' into ft-add-support-of-location-attribute

openmrs · Oct 10, 2024 · 7813ad8 · 7813ad8
2 parents a4eb9d5 + de07ee4
commit 7813ad8
Show file tree

Hide file tree

Showing 60 changed files with 1,277 additions and 967 deletions.
diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,6 @@ results.xml
 moduleName
 
 .env
+
+# vim
+.swp
diff --git a/.tx/config b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-active-visits-app]
+[o:openmrs:p:openmrs3:r:esm-active-visits-app]
 file_filter            = packages/esm-active-visits-app/translations/<lang>.json
 source_file            = packages/esm-active-visits-app/translations/en.json
 source_lang            = en
@@ -10,7 +10,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-active-visits-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-appointments-app]
+[o:openmrs:p:openmrs3:r:esm-appointments-app]
 file_filter            = packages/esm-appointments-app/translations/<lang>.json
 source_file            = packages/esm-appointments-app/translations/en.json
 source_lang            = en
@@ -19,7 +19,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-appointments-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-bed-management-app]
+[o:openmrs:p:openmrs3:r:esm-bed-management-app]
 file_filter            = packages/esm-bed-management-app/translations/<lang>.json
 source_file            = packages/esm-bed-management-app/translations/en.json
 source_lang            = en
@@ -28,7 +28,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-bed-management-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-list-management-app]
+[o:openmrs:p:openmrs3:r:esm-patient-list-management-app]
 file_filter            = packages/esm-patient-list-management-app/translations/<lang>.json
 source_file            = packages/esm-patient-list-management-app/translations/en.json
 source_lang            = en
@@ -37,7 +37,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-list-management-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-registration-app]
+[o:openmrs:p:openmrs3:r:esm-patient-registration-app]
 file_filter            = packages/esm-patient-registration-app/translations/<lang>.json
 source_file            = packages/esm-patient-registration-app/translations/en.json
 source_lang            = en
@@ -46,7 +46,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-registration-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-search-app]
+[o:openmrs:p:openmrs3:r:esm-patient-search-app]
 file_filter            = packages/esm-patient-search-app/translations/<lang>.json
 source_file            = packages/esm-patient-search-app/translations/en.json
 source_lang            = en
@@ -55,7 +55,7 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-search-app
 
-[o:openmrs:p:openmrs-esm-patient-management:r:esm-service-queues-app]
+[o:openmrs:p:openmrs3:r:esm-service-queues-app]
 file_filter            = packages/esm-service-queues-app/translations/<lang>.json
 source_file            = packages/esm-service-queues-app/translations/en.json
 source_lang            = en

diff --git a/__mocks__/emr-configuration.mock.ts b/__mocks__/emr-configuration.mock.ts
@@ -3,4 +3,6 @@ export const emrConfigurationMock = {
   consultFreeTextCommentsConcept: { uuid: '162169AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' },
   visitNoteEncounterType: { uuid: 'd7151f82-c1f3-4152-a605-2f9ea7414a79' },
   admissionEncounterType: { uuid: 'e8151f82-c1f3-4152-a605-2f9ea7414a79' },
+  inpatientNoteEncounterType: { uuid: 'f8151f82-c1f3-4152-a605-2f9ea7414a79' },
+  transferRequestEncounterType: { uuid: 'g8151f82-c1f3-4152-a605-2f9ea7414a79' },
 };
diff --git a/e2e/commands/cohort-operations.ts b/e2e/commands/cohort-operations.ts
@@ -1,5 +1,5 @@
-import { APIRequestContext, expect } from '@playwright/test';
-import { Patient } from './patient-operations';
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Patient } from './patient-operations';
 
 export interface CohortType {
   uuid: string;

diff --git a/packages/esm-active-visits-app/translations/es.json b/packages/esm-active-visits-app/translations/es.json
@@ -16,21 +16,21 @@
   "noActiveVisitsForLocation": "No hay visitas activas para esta ubicación.",
   "noDiagnosesFound": "No se encontraron diagnósticos",
   "noEncountersFound": "No se encontraron encuentros",
-  "noMedicationsFound": "No se encontraron medicaciones",
-  "noNotesToShowForPatient": "No hay notas para mostrar de este paciente",
+  "noMedicationsFound": "No se encontraron medicamentos",
+  "noNotesToShowForPatient": "No hay notas para mostrar para este paciente",
   "noObservationsFound": "No se encontraron observaciones",
   "notes": "Notas",
   "noVisitsToDisplay": "No hay visitas para mostrar",
-  "orderDurationAndUnit": "para {{duration}} {{durationUnit}}",
+  "orderDurationAndUnit": "por {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duración indefinida",
-  "patients": "Patients",
+  "patients": "Pacientes",
   "provider": "Proveedor",
   "quantity": "Cantidad",
-  "refills": "Recargas",
+  "refills": "Reposiciones",
   "tests": "Pruebas",
   "thereIsNoInformationToDisplayHere": "No hay información para mostrar aquí",
-  "time": "Tiempo",
-  "totalVisits": "Total Visits Today",
+  "time": "Hora",
+  "totalVisits": "Total de Visitas Hoy",
   "visitStartTime": "Tiempo de Visita",
   "visitSummary": "Resumen de Visita",
   "visitType": "Tipo de Visita"

diff --git a/packages/esm-appointments-app/translations/es.json b/packages/esm-appointments-app/translations/es.json
@@ -8,34 +8,34 @@
   "appointmentCancelled": "Cita cancelada",
   "appointmentCancelledSuccessfully": "Cita cancelada con éxito",
   "appointmentColor": "Color de la cita",
-  "appointmentConflict": "Appointment conflict",
-  "appointmentEdited": "Appointment edited",
-  "appointmentEditError": "Error editing appointment",
-  "appointmentEnded": "Appointment ended",
-  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed.",
-  "appointmentEndedButVisitNotClosedError": "Appointment ended, but error closing visit",
-  "appointmentEndedSuccessfully": "Appointment successfully ended.",
-  "appointmentEndError": "Error ending appointment",
+  "appointmentConflict": "Conflicto en las citas",
+  "appointmentEdited": "Cita editada",
+  "appointmentEditError": "Error al editar cita",
+  "appointmentEnded": "Cita finalizada",
+  "appointmentEndedAndVisitClosedSuccessfully": "Cita finalizada con éxito y visita cerrada con éxito ",
+  "appointmentEndedButVisitNotClosedError": "Cita finalizada, pero hubo un error al cerrar la visita",
+  "appointmentEndedSuccessfully": "Cita finalizada con éxito ",
+  "appointmentEndError": "Error al finalizar cita",
   "appointmentFormError": "Error al programar la cita",
   "appointmentHistory": "Historial de citas",
   "appointmentMetrics": "Métricas de citas",
   "appointmentMetricsLoadError": "",
-  "appointmentNoteLabel": "Write an additional note",
-  "appointmentNotePlaceholder": "Write any additional points here",
+  "appointmentNoteLabel": "Escriba una nota adicional",
+  "appointmentNotePlaceholder": "Escriba algún punto adicional aquí",
   "appointmentNotes": "Notas de cita",
   "appointmentNowVisible": "Ahora es visible en la página de Citas",
   "appointments": "Citas",
-  "Appointments": "Appointments",
-  "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments calendar",
+  "Appointments": "Citas",
+  "appointments_lower": "citas",
+  "appointmentsCalendar": "Calendario de citas",
   "appointmentScheduled": "Cita programada",
   "appointmentService": "Servicio de citas",
   "appointmentServiceCreate": "Servicio de citas creado exitosamente",
   "appointmentServiceName": "Nombre del servicio de citas",
-  "appointmentsScheduledForToday": "appointments scheduled for today",
-  "appointmentsTable": "Appointments table",
+  "appointmentsScheduledForToday": "citas agendadas para hoy",
+  "appointmentsTable": "Tabla de citas",
   "appointmentStatus": "Appointment status",
-  "appointmentToFulfill": "Select appointment to fulfill",
+  "appointmentToFulfill": "Seleccione cita para completar",
   "appointmentType": "Tipo de cita",
   "appointmentType_title": "Tipo de cita",
   "back": "Atrás",
@@ -47,120 +47,120 @@
   "cancelled": "Cancelada",
   "checkedIn": "Checked in",
   "checkedOut": "Completada",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Compruebe los filtros anteriores",
   "checkIn": "Registrar",
   "checkOut": "Finalizar",
-  "chooseAppointmentType": "Choose appointment type",
-  "chooseLocation": "Choose a location",
-  "chooseProvider": "Choose a provider",
+  "chooseAppointmentType": "Escoja un tipo de cita",
+  "chooseLocation": "Escoja una ubicación",
+  "chooseProvider": "Escoja un proveedor",
   "chooseService": "Seleccionar servicio",
   "completed": "Completado",
-  "Contact": "Contact {{index}}",
-  "countMore_one": "{{count}} more",
-  "countMore_other": "{{count}} more",
+  "Contact": "Contacto {{index}}",
+  "countMore_one": "{{count}} más",
+  "countMore_other": "{{count}} más",
   "createAppointmentService": "Crear servicios de citas",
   "createNewAppointment": "Crear nueva cita",
   "date": "Fecha",
   "date&Time": "Date & time",
-  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
-  "dateOfBirth": "Date of birth",
-  "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
-  "dateTime": "Date & Time",
-  "day": "Day",
-  "daysOfWeek": "Days of the week",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La fecha en que se emitió la cita no puede ser posterior a la fecha de la cita",
+  "dateOfBirth": "Fecha de nacimiento",
+  "dateScheduled": "Fecha de emisión de la cita",
+  "dateScheduledDetail": "Fecha de emisión de la cita",
+  "dateTime": "Fecha y hora",
+  "day": "Día",
+  "daysOfWeek": "Días de la semana",
   "discard": "Descartar",
   "download": "Descargar",
-  "durationErrorMessage": "Duration should be greater than zero",
-  "durationInMinutes": "Duration (minutes)",
+  "durationErrorMessage": "La duración debería ser mayor a cero",
+  "durationInMinutes": "Duración (minutos)",
   "durationMins": "Duración (min)",
   "edit": "Editar",
   "editAppointment": "Editar cita",
   "editAppointments": "Editar cita",
-  "emptyStateText": "There are no <1>{{displayText}}</1> to display",
+  "emptyStateText": "No hay <1>{{displayText}}</1> para mostrar",
   "encounters": "Encuentros",
   "encounterType": "Tipo de encuentro",
-  "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
-  "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
-  "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "endDate": "End date",
+  "endAppointmentAndVisitConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa y cerrará la visita activa para este paciente.",
+  "endAppointmentConfirmation": "¿Está seguro de que desea marcar al paciente como dado de alta para esta cita?",
+  "endAppointmentConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa.",
+  "endDate": "Fecha de finalización",
   "endTime": "Hora de finalización",
   "errorCreatingAppointmentService": "Error creating appointment service",
   "expected": "Expected",
-  "filterTable": "Filter table",
+  "filterTable": "Filtrar tabla",
   "gender": "Género",
-  "highestServiceVolume": "Highest volume service: {{time}}",
+  "highestServiceVolume": "Servicio de mayor volumen: {{time}}",
   "identifier": "Identificador",
-  "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
-  "isRecurringAppointment": "Is this a recurring appointment?",
-  "itemsPerPage": "Items per page",
+  "invalidNumber": "El número no es válido",
+  "invalidTime": "Hora inválida",
+  "isRecurringAppointment": "¿Esta es una cita recurrente?",
+  "itemsPerPage": "Elementos por página",
   "loading": "Loading",
   "location": "Ubicación",
   "medications": "Medicamentos",
   "missed": "Perdida",
-  "next": "Next",
-  "nextMonth": "Next month",
-  "nextPage": "Next page",
+  "next": "Siguiente",
+  "nextMonth": "Siguiente mes",
+  "nextPage": "Siguiente página",
   "no": "No",
-  "noAppointmentsToDisplay": "No appointments to display",
-  "noContent": "No Content",
+  "noAppointmentsToDisplay": "No hay citas para mostrar",
+  "noContent": "No hay contenido",
   "noCurrentAppointments": "No hay citas programadas que mostrar para hoy para este paciente",
   "noEncountersFound": "No se encontraron encuentros",
   "noPastAppointments": "No hay citas anteriores para mostrar para este paciente",
   "noPreviousVisitFound": "No se encontraron visitas anteriores",
   "notArrived": "No ha llegado",
-  "note": "Note",
+  "note": "Nota",
   "notes": "Notas",
   "noUpcomingAppointments": "No hay próximas citas para mostrar para este paciente",
   "noUpcomingAppointmentsForPatient": "No hay próximas citas para mostrar para este paciente",
-  "pageNumber": "Page number",
+  "pageNumber": "Número de página",
   "past": "Anterior",
   "patientDetails": "Detalles del paciente",
-  "patientDoubleBooking": "Patient already booked for an appointment at this time",
+  "patientDoubleBooking": "El paciente ya agendó una cita para esta hora",
   "patientName": "Nombre del paciente",
   "patients": "Pacientes",
-  "period": "Period",
-  "prev": "Prev",
-  "previousMonth": "Previous month",
-  "previousPage": "Previous page",
+  "period": "Periodo",
+  "prev": "Ant",
+  "previousMonth": "Mes anterior",
+  "previousPage": "Página anterior",
   "provider": "Proveedor",
   "providers": "Proveedores",
-  "providersBooked": "Providers booked: {{time}}",
-  "recurringAppointment": "Recurring Appointment",
-  "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
-  "repeatEvery": "Repeat every",
+  "providersBooked": "Proveedores agendados: {{time}}",
+  "recurringAppointment": "Cita recurrente",
+  "recurringAppointmentShouldHaveEndDate": "Una cita recurrente debería tener una fecha de finalización",
+  "repeatEvery": "Repetir cada",
   "save": "Guardar",
-  "saveAndClose": "Save and close",
+  "saveAndClose": "Guardar y cerrar",
   "scheduled": "Programada",
   "scheduledAppointments": "Citas programadas",
-  "scheduledForToday": "Scheduled For Today",
-  "selectALocation": "Select a location",
+  "scheduledForToday": "Agendada Para Hoy",
+  "selectALocation": "Seleccionar una ubicación",
   "selectAppointmentStatus": "Seleccionar estado",
   "selectAppointmentType": "Seleccionar tipo de cita",
   "selectLocation": "Seleccionar ubicación",
   "selectOption": "Seleccionar una opción",
-  "selectProvider": "Select a provider",
+  "selectProvider": "Seleccionar un proveedor",
   "selectService": "Seleccionar servicio",
   "selectServiceType": "Seleccionar tipo de servicio",
   "service": "Servicio",
   "serviceName": "Nombre del servicio",
   "serviceType": "Tipo de servicio",
-  "serviceUnavailable": "Appointment time is outside of service hours",
-  "startDate": "Start date",
+  "serviceUnavailable": "La hora de la cita está fuera de las horas de servicio",
+  "startDate": "Fecha de inicio",
   "startTime": "Hora de inicio",
-  "status": "Status",
+  "status": "Estado",
   "time": "Tiempo",
   "today": "Hoy",
-  "todays": "Today's",
-  "type": "Type",
+  "todays": "Hoy día es",
+  "type": "Tip",
   "unscheduled": "No programada",
   "unscheduledAppointments": "Citas no programadas",
   "unscheduledAppointments_lower": "citas no programadas",
   "upcoming": "Próximas",
   "upcomingAppointments": "Próximas citas",
   "view": "Ver",
   "vitals": "Signos vitales",
-  "week": "Week",
+  "week": "Semana",
   "yes": "Sí"
 }