Skip to content

Commit

Permalink
Merge branch 'main' into refactor/base-visit-type-component
Browse files Browse the repository at this point in the history
  • Loading branch information
denniskigen committed Sep 30, 2024
2 parents d8e2c81 + b07de64 commit f2deea4
Show file tree
Hide file tree
Showing 9 changed files with 184 additions and 196 deletions.
14 changes: 7 additions & 7 deletions packages/esm-patient-chart-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,33 +181,33 @@ export const markPatientDeceasedForm = getAsyncLifecycle(
},
);

export const cancelVisitDialog = getAsyncLifecycle(() => import('./visit/visit-prompt/cancel-visit-dialog.component'), {
export const cancelVisitModal = getAsyncLifecycle(() => import('./visit/visit-prompt/cancel-visit-dialog.component'), {
featureName: 'cancel visit',
moduleName,
});

export const startVisitDialog = getAsyncLifecycle(() => import('./visit/visit-prompt/start-visit-dialog.component'), {
export const startVisitModal = getAsyncLifecycle(() => import('./visit/visit-prompt/start-visit-dialog.component'), {
featureName: 'start visit',
moduleName,
});

export const deleteVisitDialog = getAsyncLifecycle(() => import('./visit/visit-prompt/delete-visit-dialog.component'), {
export const deleteVisitModal = getAsyncLifecycle(() => import('./visit/visit-prompt/delete-visit-dialog.component'), {
featureName: 'delete visit',
moduleName,
});

export const modifyVisitDateDialog = getAsyncLifecycle(() => import('./visit/visit-prompt/modify-visit-date.modal'), {
featureName: 'delete visit',
export const modifyVisitDateModal = getAsyncLifecycle(() => import('./visit/visit-prompt/modify-visit-date.modal'), {
featureName: 'modify visit date',
moduleName,
});

export const endVisitDialog = getAsyncLifecycle(() => import('./visit/visit-prompt/end-visit-dialog.component'), {
export const endVisitModal = getAsyncLifecycle(() => import('./visit/visit-prompt/end-visit-dialog.component'), {
featureName: 'end visit',
moduleName,
});

export const markPatientAliveModal = getAsyncLifecycle(() => import('./mark-patient-alive/mark-patient-alive.modal'), {
featureName: 'Mark patient alive',
featureName: 'mark patient alive',
moduleName,
});

Expand Down
60 changes: 24 additions & 36 deletions packages/esm-patient-chart-app/src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,36 +146,6 @@
"online": true,
"offline": true
},
{
"name": "cancel-visit-dialog",
"component": "cancelVisitDialog",
"online": true,
"offline": true
},
{
"name": "start-visit-dialog",
"component": "startVisitDialog",
"online": true,
"offline": true
},
{
"name": "delete-visit-dialog",
"component": "deleteVisitDialog",
"online": true,
"offline": true
},
{
"name": "modify-visit-date-dialog",
"component": "modifyVisitDateDialog",
"online": true,
"offline": true
},
{
"name": "end-visit-dialog",
"component": "endVisitDialog",
"online": true,
"offline": true
},
{
"name": "start-visit-button-patient-search",
"slot": "start-visit-button-slot",
Expand All @@ -190,12 +160,6 @@
"online": true,
"offline": true
},
{
"name": "delete-encounter-modal",
"component": "deleteEncounterModal",
"online": true,
"offline": true
},
{
"name": "current-visit-summary",
"component": "currentVisitSummary",
Expand Down Expand Up @@ -231,9 +195,33 @@
}
],
"modals": [
{
"name": "cancel-visit-dialog",
"component": "cancelVisitModal"
},
{
"name": "delete-encounter-modal",
"component": "deleteEncounterModal"
},
{
"name": "delete-visit-dialog",
"component": "deleteVisitModal"
},
{
"name": "end-visit-dialog",
"component": "endVisitModal"
},
{
"name": "mark-patient-alive-modal",
"component": "markPatientAliveModal"
},
{
"name": "modify-visit-date-dialog",
"component": "modifyVisitDateModal"
},
{
"name": "start-visit-dialog",
"component": "startVisitModal"
}
],
"pages": [
Expand Down
28 changes: 14 additions & 14 deletions packages/esm-patient-immunizations-app/translations/es.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"add": "Agregar",
"cancel": "Cancelar",
"doseNumber": "Dose Number",
"doseNumberWithinSeries": "Dose number within series",
"edit": "Edit",
"doseNumber": "Número de dosis dentro de la serie",
"doseNumberWithinSeries": "Número de dosis dentro de la serie",
"edit": "Editar",
"error": "Error",
"errorSaving": "Error al guardar la vacunación",
"expirationDate": "Fecha de vencimiento",
"goToSummary": "Ir al resumen",
"immunization": "Immunization",
"expirationDate": "Fecha de Vencimiento",
"goToSummary": "Ir al Resumen",
"immunization": "Immunización",
"immunizations": "Inmunizaciones",
"Immunizations": "Inmunizaciones",
"immunizations__lower": "immunizations",
"immunizationWorkspaceTitle": "Immunization Form",
"immunizations__lower": "inmunizaciones",
"immunizationWorkspaceTitle": "Formulario de Inmunización",
"lotNumber": "Número de lote",
"manufacturer": "Fabricante",
"pleaseSelect": "Por favor, seleccione",
"recentVaccination": "Vacunación reciente",
"save": "Guardar",
"seeAll": "Ver todo",
"sequence": "Secuencia",
"singleDoseOn": "Dosis única el",
"time": "Time",
"timeFormat ": "Time Format",
"singleDoseOn": "Dosis Única el",
"time": "Hora",
"timeFormat ": "Formato de Hora",
"vaccinationDate": "Fecha de vacunación",
"vaccinationDateRequired": "Vaccination date required",
"vaccinationSaved": "Vacunación guardada exitosamente",
"vaccinationDateRequired": "La fecha de vacunación es obligatoria",
"vaccinationSaved": "Vacunación guardada con éxito",
"vaccine": "Vacuna",
"vaccineRequired": "Vaccine required"
"vaccineRequired": "La vacuna es obligatoria"
}
128 changes: 64 additions & 64 deletions packages/esm-patient-labs-app/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,95 +11,95 @@
"clearSearchResults": "Limpiar resultados",
"closeSearchBar": "Cerrar búsqueda",
"data": "datos",
"dataLoadError": "Data load error",
"dataTimelineText": "Data timeline",
"dataLoadError": "Error en la carga de datos",
"dataTimelineText": "Calendario de datos",
"date": "Fecha",
"dateCollected": "Mostrando fecha de recogida",
"dateTime": "Date and time",
"directlyAddToBasket": "Add to basket",
"dateTime": "Fecha y hora",
"directlyAddToBasket": "Añadir a la cesta",
"discard": "Descartar",
"endDate": "End date",
"endDate": "Fecha de finalización",
"error": "Error",
"errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
"errorFetchingTestTypes": "Error al obtener resultados para \"{{searchTerm}}\"",
"errorLoadingTestTypes": "Error al cargar los tipos de pruebas",
"female": "Female",
"goToDrugOrderForm": "Order form",
"hideResultsTable": "Hide results table",
"individualTests": "Individual tests",
"labOrders": "Lab orders",
"female": "Femenino",
"goToDrugOrderForm": "Formulario de orden",
"hideResultsTable": "Ocultar tabla de resultados",
"individualTests": "Pruebas individuales",
"labOrders": "Órdenes de laboratorio",
"labReferenceNumber": "Número de referencia del laboratorio",
"male": "Male",
"male": "Masculino",
"moreResultsAvailable": "Más resultados disponibles",
"noPanelsFound": "No panels found",
"noResultsForTestTypeSearch": "No results to display for \"{{searchTerm}}\"",
"noResultsToDisplay": "No results to display",
"noTestResultsWithinSpecifiedRange": "No test results found within the specified range",
"noPanelsFound": "No se encontraron paneles",
"noResultsForTestTypeSearch": "No hay resultados para \"{{searchTerm}}\"",
"noResultsToDisplay": "No hay resultados para mostrar",
"noTestResultsWithinSpecifiedRange": "No se encontraron resultados de pruebas dentro del rango especificado",
"observationsDisplayText": "observaciones",
"onDate": "on",
"orderActionDiscontinue": "Discontinue",
"orderActionIncomplete": "Incomplete",
"onDate": "en",
"orderActionDiscontinue": "Descontinuar",
"orderActionIncomplete": "Incompleto",
"orderActionNew": "Nuevo",
"orderActionRenew": "Renew",
"orderActionRevise": "Modify",
"ordered": "Pedido",
"orderReason": "Order reason",
"other": "Other",
"overTime": "Over time",
"orderActionRenew": "Renovar",
"orderActionRevise": "Modificar",
"ordered": "Ordenado",
"orderReason": "Razón de la orden",
"other": "Otro",
"overTime": "Con el tiempo",
"panel": "Panel",
"panels": "panels",
"pleaseRequiredFields": "Please fill all required fields",
"print": "Print",
"printedBy": "Printed by",
"printTestResults": "Print test results",
"priority": "Priority",
"panels": "paneles",
"pleaseRequiredFields": "Por favor, complete todos los campos obligatorios",
"print": "Imprimir",
"printedBy": "Impreso por",
"printTestResults": "Imprimir resultados de pruebas",
"priority": "Prioridad",
"recentResults": "Resultados Recientes",
"recentTestResults": "Resultados de Pruebas Recientes",
"referenceRange": "Rango de Referencia",
"removeFromBasket": "Quitar de la cesta",
"reset": "Reset",
"resetTreeText": "Reiniciar árbol",
"resetView": "to reset this view",
"resulted": "Resultados",
"results": "Results",
"Results Viewer": "Visualizador de resultados",
"recentTestResults": "resultados de pruebas recientes",
"referenceRange": "Rango de referencia",
"removeFromBasket": "Retirar de la cesta",
"reset": "Restablecer",
"resetTreeText": "Restablecer árbol",
"resetView": "para restablecer esta vista",
"resulted": "resultó",
"results": "Resultados",
"Results Viewer": "Visualizador de Resultados",
"resultsText": "resultados",
"returnToTimeline": "Volver al calendario",
"saveOrder": "Guardar orden",
"search": "Search",
"searchAgain": "search again",
"searchByTestName": "Search by test name",
"searchFieldPlaceholder": "Search for a test type",
"searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
"searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
"searchResultsTextFor_one": "{{count}} search result for {{searchTerm}}",
"searchResultsTextFor_other": "{{count}} search results for {{searchTerm}}",
"seeAllResults": "Ver Todos los Resultados",
"showResultsTable": "Show results table",
"showTree": "Mostrar Árbol",
"startDate": "Start date",
"testName": "Nombre de la Prueba",
"testResults": "Resultados de la Prueba",
"testResults_title": "Resultados de Pruebas",
"testResultsData": "Test results data",
"tests": "Tests",
"search": "Buscar",
"searchAgain": "buscar nuevamente",
"searchByTestName": "Buscar por nombre de la prueba",
"searchFieldPlaceholder": "Buscar por tipo de prueba",
"searchResultsMatchesForTerm_one": "{{count}} resultado para {{searchTerm}}",
"searchResultsMatchesForTerm_other": "{{count}} resultados para {{searchTerm}}",
"searchResultsTextFor_one": "{{count}} resultado de búsqueda para {{searchTerm}}",
"searchResultsTextFor_other": "{{count}} resultados de búsqueda para {{searchTerm}}",
"seeAllResults": "Ver todos los resultados",
"showResultsTable": "Mostrar tabla de resultados",
"showTree": "Mostrar árbol",
"startDate": "Fecha de inicio",
"testName": "Nombre de la prueba",
"testResults": "resultados de la prueba",
"testResults_title": "Resultados de la Prueba",
"testResultsData": "Datos de los resultados de la prueba",
"tests": "Pruebas",
"testType": "Tipo de prueba",
"timeline": "Calendario",
"tree": "Árbol",
"trend": "Tendencia",
"trendline": "Trendline",
"trendline": "Línea de tendencia",
"trendlineRangeSelector1Day": "1 día",
"trendlineRangeSelector1Month": "1 mes",
"trendlineRangeSelector1Year": "1 año",
"trendlineRangeSelector5Days": "5 días",
"trendlineRangeSelector5Years": "5 años",
"trendlineRangeSelectorAll": "Todo",
"trendlineRangeSelectorMonths": "6 meses",
"tryReopeningTheForm": "Por favor, intenta lanzar el formulario de nuevo",
"trySearchingAgain": "Please try searching again",
"tryTo": "Try to",
"unknown": "Unknown",
"usingADifferentTerm": "using a different term",
"tryReopeningTheForm": "Por favor, intente abrir el formulario de nuevo",
"trySearchingAgain": "Por favor, intente buscar de nuevo",
"tryTo": "Intente",
"unknown": "Desconocido",
"usingADifferentTerm": "utilizando un término diferente",
"value": "Valor",
"view": "Ver",
"viewTimeline": "View timeline"
"viewTimeline": "Ver calendario"
}
4 changes: 2 additions & 2 deletions packages/esm-patient-lists-app/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"noPatientListsToDisplay": "No hay listas de pacientes para mostrar",
"noPatientsInList": "No hay pacientes en esta lista",
"numberOfPatients": "Número de pacientes",
"patientListDetailWorkspaceTitle": "Patient List Details",
"patientListDetailWorkspaceTitle": "Detalles de la lista de pacientes",
"patientLists": "Listas de pacientes",
"patientListsWorkspaceTitle": "Patient Lists",
"patientListsWorkspaceTitle": "Listas de Pacientes",
"patients": "pacientes",
"searchThisList": "Buscar en esta lista",
"sex": "Sexo",
Expand Down
Loading

0 comments on commit f2deea4

Please sign in to comment.