From 8a5714c1a7d2d94137eff08d608ff8fc52bf91a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 15:03:03 -0600 Subject: [PATCH 01/60] Config --- .builkite/deploy.sh | 13 +++++++++++++ .builkite/hooks/post-command | 8 ++++++++ .builkite/pipeline.yml | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 .builkite/deploy.sh create mode 100755 .builkite/hooks/post-command create mode 100644 .builkite/pipeline.yml diff --git a/.builkite/deploy.sh b/.builkite/deploy.sh new file mode 100644 index 000000000..410a9fafe --- /dev/null +++ b/.builkite/deploy.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -eo pipefail +echo "--- Copying config files from $BUILDKITE_BRANCH" | tee bk-pipeline.log +if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then + scp -i $AWS_PEM_KEY_DEV -r ./dist/* $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log +fi +if [[ "$BUILDKITE_BRANCH" == "staging" ]]; then + scp -i $AWS_PEM_KEY_STAGING -r ./dist/* $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log +fi +if [[ "$BUILDKITE_BRANCH" == "master" ]]; then + scp -i $AWS_PEM_KEY_PROD -r ./dist/* $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log +fi \ No newline at end of file diff --git a/.builkite/hooks/post-command b/.builkite/hooks/post-command new file mode 100755 index 000000000..aeddb7dbb --- /dev/null +++ b/.builkite/hooks/post-command @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "--- :file_folder: Uploading Log" + +export BUILDKITE_S3_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID +export BUILDKITE_S3_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY +buildkite-agent artifact upload "bk-*.log" s3://buildkite-logs/$BUILDKITE_PIPELINE_SLUG/$BUILDKITE_BRANCH/$BUILDKITE_BUILD_NUMBER +buildkite-agent meta-data set "acklen:build:logurl" "https://s3.amazonaws.com/buildkite-logs/$BUILDKITE_PIPELINE_SLUG/$BUILDKITE_BRANCH/$BUILDKITE_BUILD_NUMBER/bk-pipeline.log" diff --git a/.builkite/pipeline.yml b/.builkite/pipeline.yml new file mode 100644 index 000000000..899e33506 --- /dev/null +++ b/.builkite/pipeline.yml @@ -0,0 +1,8 @@ +steps: + + - name: ':rocket: Deploy' + command: '/.buildkite/deploy.sh' + branches: 'develop staging master ci-configuration' + agents: + node: 'true' + frontend: 'true' From 972714e3e46bddffe929b4074c232c7734b941a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 15:15:57 -0600 Subject: [PATCH 02/60] Typo on buildkite fodler --- {.builkite => .buildkite}/deploy.sh | 0 {.builkite => .buildkite}/hooks/post-command | 0 {.builkite => .buildkite}/pipeline.yml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {.builkite => .buildkite}/deploy.sh (100%) rename {.builkite => .buildkite}/hooks/post-command (100%) rename {.builkite => .buildkite}/pipeline.yml (100%) diff --git a/.builkite/deploy.sh b/.buildkite/deploy.sh similarity index 100% rename from .builkite/deploy.sh rename to .buildkite/deploy.sh diff --git a/.builkite/hooks/post-command b/.buildkite/hooks/post-command similarity index 100% rename from .builkite/hooks/post-command rename to .buildkite/hooks/post-command diff --git a/.builkite/pipeline.yml b/.buildkite/pipeline.yml similarity index 100% rename from .builkite/pipeline.yml rename to .buildkite/pipeline.yml From e41eced895e669e8dfbb3f98bc9ca450ceb3f2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 15:41:49 -0600 Subject: [PATCH 03/60] Testing changes pushed --- openmrs/i18n/home/locale_en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/home/locale_en.json b/openmrs/i18n/home/locale_en.json index 4cb4b7c03..9da139841 100644 --- a/openmrs/i18n/home/locale_en.json +++ b/openmrs/i18n/home/locale_en.json @@ -4,7 +4,7 @@ "MODULE_LABEL_INPATIENT_KEY": "InPatient", "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY": "Radiology Upload", "MODULE_LABEL_PATIENT_DOCUMENTS_KEY": "Patient Documents", - "MODULE_LABEL_ADMIN_KEY": "Admin", + "MODULE_LABEL_ADMIN_KEY": "Adminn", "MODULE_LABEL_REPORTS_KEY": "Reports", "MODULE_LABEL_APOOINTMENTS_KEY": "Appointments", "MODULE_LABEL_ORDERS_KEY": "Orders", From b13b6eef648f21328f9046b1e6b3d967fc4b0c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 16:01:44 -0600 Subject: [PATCH 04/60] Testing bashboard changes --- openmrs/apps/home/whiteLabel.json | 2 +- openmrs/i18n/home/locale_en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 10305921f..c5ec35955 100644 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,6 +1,6 @@ { "homePage": { - "header_text": "WELCOME TO
BAHMNI EMR & HOSPITAL SERVICE", + "header_text": "BIENVENIDOS TO
BAHMNI EMR & HOSPITAL SERVICE", "logo": "/bahmni/images/bahmniLogoFull.png", "title_text": " " }, diff --git a/openmrs/i18n/home/locale_en.json b/openmrs/i18n/home/locale_en.json index 9da139841..4cb4b7c03 100644 --- a/openmrs/i18n/home/locale_en.json +++ b/openmrs/i18n/home/locale_en.json @@ -4,7 +4,7 @@ "MODULE_LABEL_INPATIENT_KEY": "InPatient", "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY": "Radiology Upload", "MODULE_LABEL_PATIENT_DOCUMENTS_KEY": "Patient Documents", - "MODULE_LABEL_ADMIN_KEY": "Adminn", + "MODULE_LABEL_ADMIN_KEY": "Admin", "MODULE_LABEL_REPORTS_KEY": "Reports", "MODULE_LABEL_APOOINTMENTS_KEY": "Appointments", "MODULE_LABEL_ORDERS_KEY": "Orders", From 5ed10c108d43150ff9157a3e073afc01a5d51519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 16:07:34 -0600 Subject: [PATCH 05/60] Missing folders :ok: --- .buildkite/deploy.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.buildkite/deploy.sh b/.buildkite/deploy.sh index 410a9fafe..603420930 100644 --- a/.buildkite/deploy.sh +++ b/.buildkite/deploy.sh @@ -3,11 +3,14 @@ set -eo pipefail echo "--- Copying config files from $BUILDKITE_BRANCH" | tee bk-pipeline.log if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then - scp -i $AWS_PEM_KEY_DEV -r ./dist/* $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_DEV -r ./openelis $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_DEV -r ./openmrs $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log fi if [[ "$BUILDKITE_BRANCH" == "staging" ]]; then - scp -i $AWS_PEM_KEY_STAGING -r ./dist/* $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_STAGING -r ./openelis $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_STAGING -r ./openmrs $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log fi if [[ "$BUILDKITE_BRANCH" == "master" ]]; then - scp -i $AWS_PEM_KEY_PROD -r ./dist/* $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_PROD -r ./openelis $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log + scp -i $AWS_PEM_KEY_PROD -r ./openmrs $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log fi \ No newline at end of file From 7c67a4729f4e506dc2b85bd8dcf9b5f170df5a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 16:12:19 -0600 Subject: [PATCH 06/60] Adding sudo (not final code) --- .buildkite/deploy.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/deploy.sh b/.buildkite/deploy.sh index 603420930..3daf6cdb4 100644 --- a/.buildkite/deploy.sh +++ b/.buildkite/deploy.sh @@ -3,14 +3,14 @@ set -eo pipefail echo "--- Copying config files from $BUILDKITE_BRANCH" | tee bk-pipeline.log if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then - scp -i $AWS_PEM_KEY_DEV -r ./openelis $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log - scp -i $AWS_PEM_KEY_DEV -r ./openmrs $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_DEV -r ./openelis $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_DEV -r ./openmrs $AWS_USER_DEV@$AWS_IP_DEV:$AWS_DESTINATION_PATH_DEV | tee -a bk-pipeline.log fi if [[ "$BUILDKITE_BRANCH" == "staging" ]]; then - scp -i $AWS_PEM_KEY_STAGING -r ./openelis $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log - scp -i $AWS_PEM_KEY_STAGING -r ./openmrs $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_STAGING -r ./openelis $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_STAGING -r ./openmrs $AWS_USER_STAGING@$AWS_IP_STAGING:$AWS_DESTINATION_PATH_STAGING | tee -a bk-pipeline.log fi if [[ "$BUILDKITE_BRANCH" == "master" ]]; then - scp -i $AWS_PEM_KEY_PROD -r ./openelis $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log - scp -i $AWS_PEM_KEY_PROD -r ./openmrs $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_PROD -r ./openelis $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log + sudo scp -i $AWS_PEM_KEY_PROD -r ./openmrs $AWS_USER_PROD@$AWS_IP_PROD:$AWS_DESTINATION_PATH_PROD | tee -a bk-pipeline.log fi \ No newline at end of file From 4cfdab95307c65ef56f94639b6f9e6133d94085b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Garc=C3=ADa?= Date: Wed, 20 Sep 2017 16:26:28 -0600 Subject: [PATCH 07/60] Undoing welcome label --- openmrs/apps/home/whiteLabel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index c5ec35955..10305921f 100644 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,6 +1,6 @@ { "homePage": { - "header_text": "BIENVENIDOS TO
BAHMNI EMR & HOSPITAL SERVICE", + "header_text": "WELCOME TO
BAHMNI EMR & HOSPITAL SERVICE", "logo": "/bahmni/images/bahmniLogoFull.png", "title_text": " " }, From 393d0dd08f10f6a1d999a3aa7c1251e9b0ac467e Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Sat, 23 Sep 2017 12:48:45 -0600 Subject: [PATCH 08/60] Added locale_es.json file into OpenMRS Login App & changed locale_languages.json to only English and Spanish --- openmrs/apps/home/locale_languages.json | 5 +- openmrs/i18n/home/locale_es.json | 63 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 openmrs/i18n/home/locale_es.json diff --git a/openmrs/apps/home/locale_languages.json b/openmrs/apps/home/locale_languages.json index 78059ef2a..f0c28edef 100644 --- a/openmrs/apps/home/locale_languages.json +++ b/openmrs/apps/home/locale_languages.json @@ -1,6 +1,3 @@ {"locales": [ {"code": "en", "nativeName": "English"}, - {"code": "es", "nativeName": "Español"}, - {"code": "fr", "nativeName": "Français"}, - {"code": "it", "nativeName": "Italiano"}, - {"code": "pt_BR", "nativeName": "Português"}] + {"code": "es", "nativeName": "Español"}] } \ No newline at end of file diff --git a/openmrs/i18n/home/locale_es.json b/openmrs/i18n/home/locale_es.json new file mode 100644 index 000000000..322fe1411 --- /dev/null +++ b/openmrs/i18n/home/locale_es.json @@ -0,0 +1,63 @@ +{ + "BAHMNI_PAGE_TITLE_KEY": "Inicio Bahmni", + "LOGIN_LABEL_LOGIN_KEY": "Iniciar sesión", + "LOGIN_LABEL_SUBMIT_KEY": "Enviar", + "LOGIN_LABEL_ENTER_OTP_KEY": "Ingresar OTP", + "LOGIN_LABEL_USERNAME_KEY": "Nombre de usuario", + "LOGIN_LABEL_PASSWORD_KEY": "Contraseña", + "LOGIN_LABEL_LOCATION_KEY": "Ubicación", + "LOGIN_LABEL_LOGIN_ERROR_MESSAGE_KEY": "No está autenticado o su sesión ha finalizado . Por favor Iniciar sesión.", + "LOGIN_LABEL_WRONG_OTP_MESSAGE_KEY": "OTP incorrecto: ingréselo nuevamente.", + "LOGIN_MESSAGE_ENTER_USERNAME_KEY": "Ingrese su nombre de usuario", + "LOGIN_MESSAGE_ENTER_PASSWORD_KEY": "Introduzca su contraseña", + "LOGIN_LABEL_SELECT_LOCATION_KEY": "Seleccionar ubicación", + "LOGIN_LABEL_SELECT_LOCALE_KEY": "Seleccione idioma", + "HEADER_LABEL_LOGOUT_KEY": "Cerrar sesión", + "HEADER_LABEL_SYNC_KEY": "Sincronizar", + "MESSAGE_DIALOG_OPTION_COPY": "Copia Error", + "MESSAGE_DIALOG_OPTION_OKAY": "OK", + "MESSAGE_START_OPENMRS": "El servicio de OpenMRS actualmente no está disponible. Por favor verifique que el mismo se haya iniciado y actualice la página una vez que regrese.", + "LOGIN_LABEL_MAX_FAILED_ATTEMPTS": "El número de intentos incorrectos de OTP excedió. Por favor inicie sesión nuevamente. ", + "LOGIN_LABEL_OTP_EXPIRED": "Su OTP finalizó. Por favor inicie sesión nuevamente.", + "LOGIN_LABEL_RESEND_OTP": "Reenviar OTP", + "LOGIN_LABEL_RESEND_SUCCESS": "Nuevo OTP se ha enviado a su número de registro.", + "LOGIN_LABEL_MAX_RESEND_ATTEMPTS": "El número de intentos de reenvío de OTP está excedido. Por favor inicie sesión nuevamente.", + "CHANGE_PASSWORD": "Cambiar Contraseña", + "CHANGE_PASSWORD_BUTTON": "Cambiar Contraseña", + "CANCEL": "Cancelar", + "OLD_PASSWORD": "Contraseña Antigua", + "NEW_PASSWORD": "Contraseña Nueva", + "CONFIRM_PASSWORD": "Confirmar Contraseña", + "PASSWORD_DOESNOT_MATCH_WITH_NEW_PASSWORD": "Contraseña de confirmación no es identica a la nueva contraseña", + "OLD_LABEL_PASSWORD": "Ingresar contraseña antigua", + "NEW_LABEL_PASSWORD": "Ingresar contraseña nueva", + "CONFIRM_LABEL_PASSWORD": "Confirmar contraseña", + "CHANGE_PASSWORD_SUCCESSFUL_MESSAGE": "Contraseña actualizada exitosamente", + "PASSWORD_POLICY_HEADER": "Politica de Contraseña", + "PASSWORD_SHOULD_BE_MINIMUM_CHARACTERS": "Debería tener un mínimo de {{length}} carácteres", + "PASSWORD_SHOULD_CONTAIN_DIGITS": "Debería contener mínimo un número", + "PASSWORD_SHOULD_NOT_MATCH_USER_NAME": "No debería ser su nombre de usuario", + "PASSWORD_SHOULD_BE_A_MIX_OF_BOTH_UPPER_CASE_AND_LOWER_CASE": "Debería tener ambos letras mayúscuals y minúsculas", + "PASSWORD_SHOULD_MATCH_THE_REGEX": "Debería ser compatible con el regex {{regex}}", + "PASSWORD_SHOULD_HAVE_ATLEAST_ONE_NON_DIGIT": "Debería tener al menos un carácter que no es un número", + "CHANGE_PASSWORD_DOES_NOT_SUPPORT": "No tenemos esa funcionalidad actualmente, por favor contacte el administrador.", + "UNABLE_TO_GET_PROVIDER_DATA": "No se pudo conseguir los datos del proveedor", + "YOU_HAVE_NOT_BEEN_SETUP_PROVIDER": "Usted no esta designado como Proveedor, por favor contacte el administrador", + "COULD_NOT_GET_PROVIDER": "No se pudo encontrar el proveedor para el usuario actual", + "WARNING_SERVER_TIME_ZONE_MISMATCH": "La zona horaria del servidor ({{serverTime}}) es distinta de la hora/zona horaria de su navegador ({{localeTimeZone}}). Esto puede ocasionar que algunos datos o informes parezcan incorrectos. Por favor contacte al administrador para obtener más asistencia.", + "LOGIN_PAGE_HEADER_TEXT": "Hospital Militar de Honduras", + "LOGIN_PAGE_TITLE_TEXT": "TEXTO DE TÍTULO", + "LOGIN_UNSUPPORTED_BROWSER_KEY": "Bahmni es compatible con el navegador Chrome", + "MODULE_LABEL_REGISTRATION_KEY": "Registro", + "MODULE_LABEL_CLINICAL_KEY": "Clínico", + "MODULE_LABEL_INPATIENT_KEY": "Paciente Interno", + "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY": "Subir Radiografías", + "MODULE_LABEL_PATIENT_DOCUMENTS_KEY": "Documentos de Pacientes", + "MODULE_LABEL_ADMIN_KEY": "Admin", + "MODULE_LABEL_REPORTS_KEY": "Reportes", + "MODULE_LABEL_APOOINTMENTS_KEY": "Cítas", + "MODULE_LABEL_ORDERS_KEY": "Órdenes", + "MODULE_LABEL_PROGRAMS_KEY": "Programas", + "MODULE_LABEL_IMPLEMENTER_INTERFACE_KEY": "Interfaz de Implementación", + "MODULE_LABEL_ATOMFEED_CONSOLE_KEY": "Consola AtomFeed" +} \ No newline at end of file From 10bb0ea6b27a05ef4b6e5f5c2ad05ae6471997df Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Mon, 2 Oct 2017 15:30:08 -0600 Subject: [PATCH 09/60] =?UTF-8?q?Se=20corrigio=20el=20mensaje=20de=20error?= =?UTF-8?q?=20de=20inicio=20de=20sesi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/i18n/home/locale_es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/home/locale_es.json b/openmrs/i18n/home/locale_es.json index 322fe1411..c6fe7ace0 100644 --- a/openmrs/i18n/home/locale_es.json +++ b/openmrs/i18n/home/locale_es.json @@ -6,7 +6,7 @@ "LOGIN_LABEL_USERNAME_KEY": "Nombre de usuario", "LOGIN_LABEL_PASSWORD_KEY": "Contraseña", "LOGIN_LABEL_LOCATION_KEY": "Ubicación", - "LOGIN_LABEL_LOGIN_ERROR_MESSAGE_KEY": "No está autenticado o su sesión ha finalizado . Por favor Iniciar sesión.", + "LOGIN_LABEL_LOGIN_ERROR_MESSAGE_KEY": "Su usuario o contraseña no son válidos.", "LOGIN_LABEL_WRONG_OTP_MESSAGE_KEY": "OTP incorrecto: ingréselo nuevamente.", "LOGIN_MESSAGE_ENTER_USERNAME_KEY": "Ingrese su nombre de usuario", "LOGIN_MESSAGE_ENTER_PASSWORD_KEY": "Introduzca su contraseña", From 7f596d80e99dcb83e2deff1f24c9c2f284ae74f6 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Wed, 4 Oct 2017 16:35:36 -0600 Subject: [PATCH 10/60] Added Json File to Radiology, Patient Search, Patient Registration, Document Upload, Clinical Module and Internal Patient Module --- openmrs/i18n/adt/locale_es.json | 61 ++++ openmrs/i18n/clinical/locale_es.json | 321 ++++++++++++++++++++ openmrs/i18n/document-upload/locale_es.json | 7 + openmrs/i18n/registration/locale_es.json | 117 +++++++ 4 files changed, 506 insertions(+) create mode 100644 openmrs/i18n/adt/locale_es.json create mode 100644 openmrs/i18n/clinical/locale_es.json create mode 100644 openmrs/i18n/document-upload/locale_es.json create mode 100644 openmrs/i18n/registration/locale_es.json diff --git a/openmrs/i18n/adt/locale_es.json b/openmrs/i18n/adt/locale_es.json new file mode 100644 index 000000000..4ac62a572 --- /dev/null +++ b/openmrs/i18n/adt/locale_es.json @@ -0,0 +1,61 @@ +{ + + "ALL_DIAGNOSES_KEY": "Todos los diagnósticos", + + "CLINICAL_DAYS_TRANSLATION_KEY": "días ", + "CLINICAL_MONTHS_TRANSLATION_KEY": "meses", + "CLINICAL_YEARS_TRANSLATION_KEY": "Años", + + "CONCEPT_SET_GROUP_COLLAPSE_ALL_KEY": "Contraer todo", + "CONCEPT_SET_GROUP_EXPAND_ALL_KEY": "Expandir todo", + + "CONDITION_LIST_ACTIVE_SINCE": "condición de", + "CONDITION_LIST_CONDITIONS_ACTIVE": "Condiciones Activas", + "CONDITION_LIST_CONDITIONS_HISTORY_OF": "Historial de Condiciones", + "CONDITION_LIST_CONDITIONS_INACTIVE": "Condiciones Inactivas", + "CONDITION_LIST_CREATED_BY": "por", + "CONDITION_LIST_DISPLAY_CONTROL_TITLE": "Condiciones", + "CONDITION_LIST_NO_CONDITIONS": "Sin Condiciones disponibles", + "CONDITION_LIST_NOTES": "Notas", + "CONDITION_LIST_STATUS": "Estado", + + "DASHBOARD_TITLE_VITALS_KEY":"Vitales", + "DASHBOARD_TITLE_DIAGNOSIS_KEY":"Diagnostico", + "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalles de Admisión", + "DASHBOARD_TITLE_DISPOSITION_KEY":"Dispociciones", + "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalles de Admisión", + + "HOME_DASHBOARD_KEY":"Panel de Control", + "PATIENT_VISIT_PAGE_KEY":"Pagina Visita del Paciente", + "PATIENT_ADT_PAGE_KEY":"Pagina de ADT del Paciente", + "PROGRAM_MANAGEMENT_PAGE_KEY":"Pagina Administrador del Programa", + + "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ displayControl }} para este paciente", + + "MESSAGE_DEFAULT_VISIT_TYPE_INVALID_KEY": "Por favor, configure un tipo de visita predeterminada válida ", + "MESSAGE_DEFAULT_VISIT_TYPE_NOT_FOUND_KEY": "Por favor configure por defecto un tipo de visita ", + "MESSAGE_DIALOG_OPTION_COPY": "Error en la copia", + "MESSAGE_DIALOG_OPTION_OKAY": "OK", + + "MODULE_LABEL_ADMITTED_KEY":"Admitido", + "MODULE_LABEL_TO_ADMIT_KEY":"Para Admitir", + "MODULE_LABEL_TO_DISCHARGE_KEY":"Para dar de Alta", + "MODULE_LABEL_ALL_KEY":"Todos", + + + "NO_ADMISSION_DETAILS_MESSAGE": "No hay detalles de admisión para este paciente.", + "NO_DIAGNOSIS_MESSAGE": "No hay diagnóstico para este paciente", + "NO_DISPOSTIONS_AVAILABLE_MESSAGE_KEY": "No hay disposiciones disponibles.", + + "PATIENT_REGISTRATION_PAGE_KEY": "Registro", + "PATIENT_VISIT_ATTRIBUTES_PAGE_KEY": "Atributos de visita", + + "SEARCH_KEY": "Buscar", + "SEARCH_NAME_PLACEHOLDER_KEY": "Buscar nombre/{{ primaryIdentifier }} ...", + + "VISIT_CHANGE_CONFIRMATION_DIALOG_MESSAGE_KEY": "El tipo de visita actual es{{ visitType }}, ¿Desea cerrar y empezar una nueva {{ defaultVisitType }} visita? ", + "VISIT_CHANGE_CONFIRMATION_OPTION_CANCEL_KEY": "Cancelar", + "VISIT_CHANGE_CONFIRMATION_OPTION_CONTINUE_KEY": "Continue con la visita actual", + "VISIT_CHANGE_CONFIRMATION_OPTION_YES_KEY": "Si" + +} diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json new file mode 100644 index 000000000..c9a858f88 --- /dev/null +++ b/openmrs/i18n/clinical/locale_es.json @@ -0,0 +1,321 @@ + { + "ADD_MORE_KEY": "Agregue más", + "BACTERIOLOGY_BOARD_LABEL_KEY": "Bacteriología\n", + "BACTERIOLOGY_SAMPLE_ID_KEY": "ID de muestra", + "BACTERIOLOGY_TAB_TITLE_KEY": "Detalles de la muestra", + "BACTERIOLOGY_SAMPLE_COLLECTION_DATE_KEY":"Fecha de muestra", + "BACTERIOLOGY_SAMPLE_TYPE_KEY":"Tipo de muestra", + "BACTERIOLOGY_BUTTON_ADD_SAMPLE_KEY":"Agregar muestra", + "BACTERIOLOGY_BUTTON_CLEAR_KEY":"Borrar", + + "BAHMNI_HOME_TRANSLATION_KEY": "Sitio Bahmni", + + "CLINICAL_DAYS_TRANSLATION_KEY": "días ", + "CLINICAL_EXTENSION_MEDICATION_NONTB_TAB": "Medicamentos No anti-TB", + "CLINICAL_EXTENSION_MEDICATION_TB_TAB": "Medicamentos anti-TB", + "CLINICAL_MONTHS_TRANSLATION_KEY": "meses", + "CLINICAL_PRINT_ACCESS_KEY": "r", + "CLINICAL_PRINT_TRANSLATION_KEY": "Imprimir", + "CLINICAL_SAVE_TRANSLATION_KEY": "Salvar", + "CLINICAL_YEARS_TRANSLATION_KEY": "Año", + "CLINICAL_DIAGNOSIS_ORDER_PRIMARY":"Primario", + "CLINICAL_DIAGNOSIS_ORDER_SECONDARY":"Secundario", + "CLINICAL_DIAGNOSIS_CERTAINTY_CONFIRMED":"Confirmado", + "CLINICAL_DIAGNOSIS_CERTAINTY_PRESUMED":"Presunto", + "CLINICAL_SAVE_SUCCESS_MESSAGE_KEY":"Guardado", + + "CONDITION_LIST_NO_RETRO_MODE":"Lista de Condiciones", + "CONDITION_LIST_CONDITION":"Condición", + "CONDITION_LIST_STATUS":"Estatus", + "CONDITION_LIST_DATE":"Fecha", + "CLINICAL_ACTION":"Acción", + "CONDITION_LIST_ACTIVE":"Activo", + "CONDITION_LIST_INACTIVE":"Inactivo", + "CONDITION_LIST_HISTORY_OF":"Historia de", + "CLINICAL_ACCEPT":"Aceptar", + + "CONCEPT_SET_GROUP_COLLAPSE_ALL_KEY": "Desplegar todo", + "CONCEPT_SET_GROUP_EXPAND_ALL_KEY": "Expandir todo", + "CONSULTATION_PAGE_KEY": "Consulta", + "CONSULTATION_TAB_KEY": "Consulta", + + "CONDITION_LIST_DISPLAY_CONTROL_TITLE":"Condiciones", + "CONDITION_LIST_NO_CONDITIONS":"No hay Condiciones disponibles", + + "DASHBOARD_TAB_GENERAL_KEY": "General", + "DASHBOARD_TAB_GENERAL_KEY": "General", + "DASHBOARD_TAB_PATIENT_DOCUMENTS_KEY": "Documentos", + "DASHBOARD_TAB_PATIENT_MONITORING_DRUGS_START_DATE_KEY": "Monitoreo de Paciente (D)", + "DASHBOARD_TAB_PATIENT_MONITORING_TREATMENT_START_DATE_KEY": "Monitoreo de Paciente (T)", + "DASHBOARD_TAB_PATIENT_SUMMARY_KEY": "Resumen del paciente", + "DASHBOARD_TAB_TRENDS_KEY": "Tendencias", + + "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalles de Admisión", + "NO_ADMISSION_DETAILS_MESSAGE": "No hay detalles de admisión para este paciente", + "DASHBOARD_TITLE_ADVERSE_EVENTS_FORMS": "Formato de Eventos Adversos", + "DASHBOARD_TITLE_ADVERSE_EVENTS_SUMMARY": "Eventos Adversos", + "DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY": "Resultados de bacteriología", + "NO_SPECIMEN_FOUND_MESSAGE":"Ningún espécimen encontrado", + "DASHBOARD_TITLE_BASELINE_FORMS": "Información de base", + "DASHBOARD_TITLE_DIAGNOSIS_KEY":"Diagnósticos", + "NO_DIAGNOSIS_MESSAGE": "Sin diagnóstico para este paciente", + "DASHBOARD_TITLE_DISPOSITION_KEY": "Disposiciones", + "DASHBOARD_TITLE_FOLLOWUP_FORMS": "Seguimiento", + "DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY":"Órdenes de Radiología", + "DASHBOARD_TITLE_FORMS_KEY": "Formatos", + "DASHBOARD_TITLE_GYNAECOLOGY_KEY":"Ginecología", + "DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY":"Historial y Examinaciones", + "DASHBOARD_TITLE_HOSPITALIZATION_FORMS": "Hospitalización", + "DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY":"Control Visualización de Formularios", + "DASHBOARD_TITLE_LAB_RESULTS_KEY": "Resultados de Laboratorio", + "DASHBOARD_TITLE_LAB_TESTS_FORMS": "Laboratorio y Resultados de Pruebas", + "DASHBOARD_TITLE_NONTB_TREATMENTS_DETAILS": "Todos los medicamentos No- anti-TB ", + "DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY": "Valores Nutricionales", + "DASHBOARD_TITLE_OBSTETRICS_KEY":"Obstetricia", + "DASHBOARD_TITLE_OUTCOME_FORMS": "Resultado", + "DASHBOARD_TITLE_PACS_KEY":"Pacs", + "DASHBOARD_TITLE_PATIENT_DOCUMENTS": "Documentos del paciente", + "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY": "Información del paciente", + "DASHBOARD_TITLE_PROGRAMS_KEY": "Programas", + "NO_ACTIVE_PASSIVE_PROGRAMS_MESSAGE": "Inactivo/programas anteriores para este paciente", + "DASHBOARD_TITLE_RADIOLOGY_KEY": "Documentos de Radiología", + "DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY":"Radiología", + "DASHBOARD_TITLE_SECOND_VITALS_KEY": "Segundos Signos Vitales", + "DASHBOARD_TITLE_SERIOUS_ADVERSE_EVENTS_SUMMARY": "Eventos Adversos Serious", + "DASHBOARD_TITLE_TB_TREATMENTS_DETAILS": "Todos los medicamentos anti-TB activos", + "DASHBOARD_TITLE_TREATMENT_DETAIL": "Todas las recetas de TB", + "DASHBOARD_TITLE_TREATMENTS_KEY": "Tratamientos", + "NO_TREATMENTS_MESSAGE": "Sin tratamientos para este paciente.", + "DASHBOARD_TITLE_VISITS_KEY": "Visitas", + "DASHBOARD_TITLE_VITALS_KEY":"Valores Nutricionales", + + "DIAGNOSIS_BOARD_LABEL_KEY":"Diagnóstico", + "DISPOSITION_BOARD_LABEL_KEY":"Disposición", + "CONSULTATION_BOARD_LABEL_KEY":"Consulta", + "ORDERS_BOARD_LABEL_KEY":"Órdenes", + "MEDICATIONS_BOARD_LABEL_KEY":"Prescripciones Médicas", + + + "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ pantalla de control }} para este paciente", + + "DQ_COLUMN_TITLE_ACTION": "Acción", + "DQ_COLUMN_TITLE_EMR_ID": "ID EMR", + "DQ_COLUMN_TITLE_NAME": "Nombre", + "DQ_COLUMN_TITLE_NEXT_EXECUTION_TIME": "Próxima ejecución", + "DQ_COLUMN_TITLE_NOTES": "Notas", + "DQ_COLUMN_TITLE_REG_FACILITY": "Lugar de tratamiento", + "DQ_COLUMN_TITLE_RULE_NAME": "Nombre de la regla", + "DQ_COLUMN_TITLE_TREATMENT_REG_NO": "Registro de tratamiento número", + "DQ_DASHBOARD": "Calidad de los datos del panel", + "DQ_PRINT_TITLE_DATA_QUALITY_REPORT": "Informe de calidad de la información", + + "DRUG_DETAILS_ADDITIONAL_INSTRUCTIONS_TEXT": "Instrucciones Adicionales", + "DRUG_DETAILS_DOSE_INFO": "Dosis", + "DRUG_DETAILS_DRUG_NAME": "Nombre del medicamento", + "DRUG_DETAILS_INSTRUCTIONS_TEXT": "Instrucciones ", + "DRUG_DETAILS_ORDER_REASON_CODE": "Razón para parar\n", + "DRUG_DETAILS_ORDER_REASON_TEXT": "Porque el", + "DRUG_DETAILS_QUANTITY_TEXT": "Cantidad", + "DRUG_DETAILS_ROUTE": "Via ", + "DRUG_DETAILS_START_DATE": "Fecha de inicio", + "DRUG_DETAILS_STOP_DATE": "Fecha de paro", + "DRUG_HISTORY_NONTB_DOSAGE": "Cantidad", + "DRUG_HISTORY_NONTB_DRUGNAME": "Nombre del medicamento", + "DRUG_HISTORY_NONTB_DURATION": "Duración", + "DRUG_HISTORY_NONTB_FREQUENCY": "Frecuencia", + "DRUG_HISTORY_NONTB_INSTRUCTIONS": "Razón para adminstración", + "DRUG_HISTORY_NONTB_QUANTITY": "Cantidad total", + "DRUG_HISTORY_NONTB_ROUTE": "Via ", + "DRUG_HISTORY_NONTB_STARTDATE": "Fecha de inicio", + "DRUG_HISTORY_NONTB_STOPDATE": "Fecha de paro", + "DRUG_HISTORY_NONTB_STOPREASON": "Razón para parar\n", + "DRUG_HISTORY_TB_DOSAGE": "Dosis diaria total", + "DRUG_HISTORY_TB_DRUGNAME": "Nombre del medicamento", + "DRUG_HISTORY_TB_DURATION": "Duración", + "DRUG_HISTORY_TB_FREQUENCY": "Programa", + "DRUG_HISTORY_TB_ROUTE": "Via ", + "DRUG_HISTORY_TB_STARTDATE": "Fecha de inicio", + "DRUG_HISTORY_TB_STOPDATE": "Fecha de finalización", + "DRUG_HISTORY_TB_STOPREASON": "Razón de la interrupción\n", + + "EDITITNG_DATA_FOR_ENCOUNTER_TRANSLATION_KEY": "Editando información para encuentro", + "ENTERING_DATA_FOR_TRANSLATION_KEY": "Ingresando información por", + "HOME_DASHBOARD_KEY":"Panel de Control", + "INVESTIGATION_CHART_KEY": "Carpeta de Investigación", + "LAB_INVESTIGATIONS_KEY":"Investigaciones de Laboratorio", + "LOGOUT_TRANSLATION_KEY": "Cerrar sesión", + + "MEDICATION_AS_NEEDED": "condicional", + "MEDICATION_AS_NEEDED_BUTTON_PLACEHOLDER": "condicional", + "MEDICATION_DEFAULT_DRUGS_TITLE": "Medicamentos anti-TB", + "MEDICATION_LABEL_ADDITIONAL_INSTRUCTIONS_NON_TB_TAB": "Notas", + "MEDICATION_LABEL_DOSE_NON_TB_TAB": "Cantidad", + "MEDICATION_LABEL_DOSE_TB_TAB": "Dosis diaria total", + "MEDICATION_LABEL_DOSE_UNITS_PLACEHOLDER_NON_TB_TAB": "Elija fórmula", + "MEDICATION_LABEL_DOSE_UNITS_PLACEHOLDER_TB_TAB": "Elija unidad", + "MEDICATION_LABEL_DOSING_INSTRUCTIONS_NON_TB_TAB": "Razón de la administración", + "MEDICATION_LABEL_DOSING_INSTRUCTIONS_PLACEHOLDER_NON_TB_TAB": "Elija razón", + "MEDICATION_LABEL_DRUG_NAME_PLACEHOLDER_TB_TAB": "Elija medicamento anti-TB", + "MEDICATION_LABEL_FREQUENCY_TB_TAB": "Programa", + "MEDICATION_LABEL_FREQUENCY_UNIT_TB_TAB": "Elija programa", + "MEDICATION_RECENT_TAB": "Activo", + "MEDICATION_RECENT_TAB_STOP_NOTES": "ID de EA / Otra razón", + "MEDICATION_SOS_BUTTON_TEXT": "condicional", + "MEDICATION_TAB_DOSE": "Dosis diaria total", + "MEDICATION_ADD_DRUG_FORM_TITLE":"Orden Médica", + "MEDICATION_DRUG_NAME_TITLE":"Nombre de Medicamento", + "MEDICATION_LABEL_DOSE":"Dosis", + "MEDICATION_LABEL_UNITS":"Unidades", + "MEDICATION_LABEL_FREQUENCY":"Frecuencia", + "MEDICATION_LABEL_ROUTE":"Ruta", + "MEDICATION_LABEL_START_DATE":"Fecha Inicio", + "MEDICATION_LABEL_DURATION":"Duración", + "MEDICATION_LABEL_TOTAL_QUANTITY":"Cantidad Total", + "MEDICATION_ADDITIONAL_INFORMATION_LABEL":"Información Adicional", + "MEDICATION_LABEL_AS_NEEDED":"Segun sea necesario", + "MEDICATION_LABEL_DOSING_INSTRUCTIONS":"Instrucciones", + "MEDICATION_LABEL_ADDITIONAL_INSTRUCTIONS":"Instrucciones Adicionales", + "MEDICATION_DOSE_UNIT_PLACEHOLDER":"Escoja Cantidad", + "MEDICATION_FREQUENCY_UNIT_PLACEHOLDER":"Escoja Frecuencia", + "MEDICATION_ROUTE_PLACEHOLDER":"Ruta", + "MEDICATION_DOSING_INSTRUCTIONS_PLACEHOLDER":"Escoger Instrucciones", + "MEDICATION_CHOOSE_QUANTITY_UNIT_PLACEHOLDER":"Escoger Unidades", + "MEDICATION_ADD_ORDERSET_FORM_TITLE":"Ordenar conjunto de pedidos", + + "MODULE_LABEL_ACTIVE_KEY": "Activo", + "MODULE_LABEL_ALL_KEY": "Todos los pacientes", + "MODULE_LABEL_ERROR_REPORTS_KEY": "Reporte de calidad de los datos", + "MODULE_LABEL_MY_PATIENTS_KEY": "Mis pacientes", + "MODULE_LABEL_PROGRAMS_KEY": "Tratamientos", + "MODULE_LABEL_OPD_1_KEY":"OPD-1", + "MODULE_LABEL_ACTIVE_PATIENTS_BY_LOCATION":"Pacientes por Ubicación", + + "NO_DATA_MESSAGE":"Sin detalle", + "NO_DISPOSTIONS_AVAILABLE_MESSAGE_KEY": "No tiene disposiciones disponibles", + "NO_DOCUMENTS_MESSAGE": "No hay documentos para este paciente", + "NO_LAB_ORDERS_FOR_PATIENT_MESSAGE_KEY": "Este paciente no tiene ordenes para exámenes de laboratorio", + "NO_DRUG_DETAILS_MESSAGE":"No hay detalle del medicamento", + + "OBSERVATIONS_BOARD_LABEL_KEY": "Observaciones", + "ON_BEHALF_OF_TRANSLATION_KEY": "De parte de", + "OBS_BOOLEAN_YES_KEY":"Sí", + "OBS_BOOLEAN_NO_KEY":"No", + "OBS_ABNORMAL_TRANSLATE_KEY":"Anormal", + + "ADD_NEW_OBSERVATION":"Agregar nueva Observación", + + "PATIENT_ADT_PAGE_KEY":"Página ADT del Paciente", + "PATIENT_DOCUMENT_TRANSLATION_KEY": "Documentos del paciente", + "PATIENT_DOESNT_HAVE_PREVIOUS_PROGRAMS_MESSAGE_KEY": "El paciente no tiene ningún tratamiento previo", + "PATIENT_MONITORING_ACTIVE_DRUG_REGIMEN": "Régimen activo de medicamentos", + "PATIENT_MONITORING_CONSENT_FOR_ENDTB_STUDY": "Aprobación para el estudio endtb", + "PATIENT_MONITORING_CURRENT_MONTH": "Actual mes", + "PATIENT_MONITORING_CURRENT_MONTH_OF_MDRTB_TREATMENT": "Actual mes del tratamiento MDRTB", + "PATIENT_MONITORING_CURRENT_MONTH_OF_NEW_DRUG_TREATMENT": "Mes actual del nuevo tratamiento de medicamentos", + "PATIENT_MONITORING_DATE_ADDED": "Datos añadidos", + "PATIENT_MONITORING_EMR_ID": "ID EMR del Paciente", + "PATIENT_MONITORING_END_OF_TREATMENT": "Fin del tratamiento", + "PATIENT_MONITORING_HIV_STATUS": "Estado de HIV", + "PATIENT_MONITORING_LEGENDS": "Leyendas", + "PATIENT_MONITORING_PENDING_DATA_ENTRY": "Ingreso pendiente de datos", + "PATIENT_MONITORING_PLANNED_MONITORING_SCHEDULE": "Horario previsto de seguimiento", + "PATIENT_MONITORING_REGISTRATION_NUMBER": "Número de registro", + "PATIENT_MONITORING_REPORT_DATE": "Fecha del informe", + "PATIENT_MONITORING_SCHEDULE_TOOL_TITLE": "Herramienta para programar monitoreo de paciente", + "PATIENT_MONITORING_START_DATE_OF_MDRTB_TREATMENT": "Fecha de inicio de tratamiento MDRTB", + "PATIENT_MONITORING_START_DATE_OF_NEW_DRUG_TREATMENT": "Fecha de inicio de nuevo tratamiento de medicamentos", + "PATIENT_MONITORING_XRAY_AT_MDRTB_START": "Inicie Rayos X en MDRTB", + "PATIENT_NOT_ENROLLED_TO_PROGRAMS_MESSAGE_KEY": "El Paciente no ha sido enrolado a ningún tratamiento", + "PATIENT_REGISTRATION_PAGE_KEY":"Registro", + "PATIENT_VISIT_ATTRIBUTES_PAGE_KEY":"Atributos de la Vista", + "PATIENT_VISIT_PAGE_KEY":"Página de Visita del Paciente", + + "PROGRAM_DISPLAY_CONTROL_FACILITY_OF_ENROLLMENT_KEY": "facilidad de enrolamiento", + "PROGRAM_DISPLAY_CONTROL_TREATMENT_START_DATE_KEY": "Fecha de registro de tratamiento", + "PROGRAM_DISPLAY_CONTROL_TREATMENT_STATES_KEY": "Estados del tratamiento", + "PROGRAM_DISPLAY_CONTROL_TREATMENT_STOP_DATE_KEY": "Activo", + "PROGRAM_MANAGEMENT_ACTIVE_PROGRAM_KEY": "Tratamientos activos ", + "PROGRAM_MANAGEMENT_ACTIVE_TREATMENT_KEY": "Tratamientos activos", + "PROGRAM_MANAGEMENT_ALREADY_ENROLLED_PROGRAM_MESSAGE_KEY": "Paciente ya registrado para recibir tratamiento", + "PROGRAM_MANAGEMENT_BY_KEY": "Por", + "PROGRAM_MANAGEMENT_CHANGE_STATE_KEY": "Cambio de tratamiento", + "PROGRAM_MANAGEMENT_CHOOSE_PROGRAM_KEY": "Escoja tipo de Registro de TB", + "PROGRAM_MANAGEMENT_CHOOSE_STATE_KEY": "Escoja tratamiento", + "PROGRAM_MANAGEMENT_DETAILS_KEY": "Detalles", + "PROGRAM_MANAGEMENT_DO_YOU_WANT_TO_REMOVE_KEY": "Desea eliminar", + "PROGRAM_MANAGEMENT_End_PROGRAM_KEY": "Fin del tratamiento", + "PROGRAM_MANAGEMENT_ENROLL_KEY": "Enrole", + "PROGRAM_MANAGEMENT_GENERAL_CONSULTATION_KEY": "Consulta general", + "PROGRAM_MANAGEMENT_INACTIVE_PROGRAM_KEY": "Tratamientos inactivos", + "PROGRAM_MANAGEMENT_INACTIVE_TREATMENT_KEY": "Tratamientos inactivos", + "PROGRAM_MANAGEMENT_LABEL_CHOOSE_OUTCOME": "Elija estado", + "PROGRAM_MANAGEMENT_LABEL_PROGRAM": "Registro de TB", + "PROGRAM_MANAGEMENT_LABEL_PROGRAM_OUTCOME": "Estado del tratamiento", + "PROGRAM_MANAGEMENT_LABEL_PROGRAM_STATE": "Tratamiento", + "PROGRAM_MANAGEMENT_ON_KEY": "en", + "PROGRAM_MANAGEMENT_PAGE_KEY":"Gestión de Programas", + "PROGRAM_MANAGEMENT_PAST_PROGRAM_KEY": "Tratamientos previos", + "PROGRAM_MANAGEMENT_PROGRAM_ATTRIBUTES_KEY": "Atributos del tratamiento ", + "PROGRAM_MANAGEMENT_PROGRAM_STATES_KEY": "Tratamientos", + "PROGRAM_MANAGEMENT_REGISTRATION_NUMBER_ALREADY_USED": "Numero de registro ya esta siendo utilizado en otro tratamiento", + "PROGRAM_MANAGEMENT_SELECT_PROGRAM_KEY": "Enrolamiento en nuevo tratamiento", + "PROGRAM_MANAGEMENT_SELECT_PROGRAM_MESSAGE_KEY": "Por favor seleccione un tratamiento para registrar al paciente", + "PROGRAM_MANAGEMENT_START_DATE_KEY": "Fecha de registro", + "PROGRAM_MANAGEMENT_STARTED_ON_KEY": "Registrado en ", + "PROGRAM_MANAGEMENT_STOP_DATE_KEY": "Fecha de finalización", + "PROGRAM_MANAGEMENT_TO_KEY": "Para", + + "REGISTRATION_LABEL_NUMBER": "ID de Registro Médico Electrónico (RME)", + "SAVE_ACCESS_KEY": "s", + "SEARCH_NAME_PLACEHOLDER_KEY":"Buscar por Nombre/Paciente", + "SEARCH_KEY":"BUSCAR", + + "SUMMARY_TITLE_ADVERSE_EVENTS": "Eventos Adversos", + "SUMMARY_TITLE_AUDIOMETRY_LEFT": "Audiometría oído izquierdo", + "SUMMARY_TITLE_AUDIOMETRY_RIGHT": "Audiometría oído derecho", + "SUMMARY_TITLE_BASELINE_ACUITY": "Agudeza visual basal", + "SUMMARY_TITLE_BASELINE_BPNS_LEFT": "Punto de referencia BPNS - Izquierdo", + "SUMMARY_TITLE_BASELINE_BPNS_RIGHT": "Punto de referencia BPNS - Derecho", + "SUMMARY_TITLE_BASELINE_ISHIHARA": "Punto de referencia Ishihara (Número de placas correctas)", + "SUMMARY_TITLE_CASE_DEFINITION": "Definición del caso", + "SUMMARY_TITLE_CHEST_XRAY": "Radiografía de torax", + "SUMMARY_TITLE_CULTURE_SMEAR_RESULT": "Resultados de Cultivo & Baciloscopía", + "SUMMARY_TITLE_DRUG_REGIMEN": "Régimen de medicamentos", + "SUMMARY_TITLE_DST_OTHER_RESULTS": "Otros resultados DST", + "SUMMARY_TITLE_DST_RESULTS": "Resultado de Prueba de Sensibilidad", + "SUMMARY_TITLE_DST_WITH_MIC": "Horario de verano no estándar con MIC", + "SUMMARY_TITLE_ECG_READINGS": "Lectura de ECG", + "SUMMARY_TITLE_FOLLOWUP_ACUITY": "Seguimiento agudeza visual", + "SUMMARY_TITLE_Followup_BPNS_LEFT": "Seguimiento BPNS - Izquierdo", + "SUMMARY_TITLE_Followup_BPNS_RIGHT": "Seguimiento BPNS - Derecho", + "SUMMARY_TITLE_FOLLOWUP_ISHIHARA": "Seguimiento Ishihara (Número de placas correctas)", + "SUMMARY_TITLE_HAIN_RESULTS": "HAIN", + "SUMMARY_TITLE_IMPORTANT_DATES": "Fechas Importantes", + "SUMMARY_TITLE_LAB_BIOCHEMISTRY": "Resultados Lab - Bioquímica", + "SUMMARY_TITLE_LAB_HEMATOLOGY": "Resultados de Lab - Hematología", + "SUMMARY_TITLE_LAB_OTHER_TESTS": "Resultados Lab - Otras Pruebas ", + "SUMMARY_TITLE_LAB_PREGNANCY": "Resultados Lab - Prueba de Embarazo", + "SUMMARY_TITLE_LAB_SEROLOGY": "Resultados Lab - Serología", + "SUMMARY_TITLE_PAST_TB_TREATMENT_INFO": "Información sobre previo tratamiento anti-TB", + "SUMMARY_TITLE_PATIENT_OBSERVATION_CHART": "Herramienta para programar Monitoreo de pacientes", + "SUMMARY_TITLE_PREVIOUS_TB_TREATMENT_TABLE": "Previos tratamientos anti-TB", + "SUMMARY_TITLE_SERIOUS_ADVERSE_EVENTS": "Eventos Adversos Serios", + "SUMMARY_TITLE_SEROLOGY_STATUS": "Estado Serológico ", + "SUMMARY_TITLE_TREATMENT_COMPLETENESS_RATE": "Tasa de tratamiento completado", + "SUMMARY_TITLE_TREATMENT_INFORMATION": "Información de tratamiento", + "SUMMARY_TITLE_WEIGHT_VS_BMI": "Peso vs IMC", + "SUMMARY_TITLE_XPERT_RESULTS": "Xpert", + "TREATMENTS_SUMMARY_PRESCRIPTION_KEY":"Recetas", + + "VISIT_ON_TRANSLATION_KEY": "Visita el ", + "VISIT_TITLE_ADMISSION_DETAILS_KEY": "Detalles de admisión", + "VISIT_TITLE_DIAGNOSIS_KEY": "Diagnóstico", + "VISIT_TITLE_DISPOSITION_KEY": "Disposición", + "VISIT_TITLE_DISPOSITIONS_KEY": "Disposiciones", + "VISIT_TITLE_LAB_INVESTIGATIONS_KEY": "Investigaciones de Laboratorio", + "VISIT_TITLE_OBSERVATIONS_KEY": "Observaciones", + "VISIT_TITLE_PATIENT_FILES_KEY": "Archivos del paciente", + "VISIT_TITLE_RADIOLOGY_KEY": "Radiología", + "VISIT_TITLE_TREATMENTS_KEY": "Tratamientos" + + } diff --git a/openmrs/i18n/document-upload/locale_es.json b/openmrs/i18n/document-upload/locale_es.json new file mode 100644 index 000000000..00fe83810 --- /dev/null +++ b/openmrs/i18n/document-upload/locale_es.json @@ -0,0 +1,7 @@ +{ + "MODULE_LABEL_ALL_PATIENTS_KEY": "Todos los Pacientes", + "MODULE_LABEL_ACTIVE_PATIENTS_KEY":"Pacientes Activos", + + "SEARCH_NAME_PLACEHOLDER_KEY": "Buscar Nombre/ID", + "SEARCH_KEY": "Buscar" +} diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json new file mode 100644 index 000000000..876fac440 --- /dev/null +++ b/openmrs/i18n/registration/locale_es.json @@ -0,0 +1,117 @@ +{ + "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", + "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nuevo", + "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY": "e", + "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY": "n", + "REGISTRATION_VIEW_CONFIG_KEY": "Ver", + "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", + "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Tarjeta de Reg. (Local)", + "REGISTRATION_PRINT_REG_CARD_KEY":"Imprimir Tarjeta de Registro", + "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementario", + "REGISTRATION_AGE_ERROR_KEY":"La Edad debe ser un campo positivo", + "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"El Número de Teléfono debe tener como mínimo 6 dígitos", + "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Caste should contain only alphanumeric characters", + "REGISTRATION_BRING_CARD_TEXT_KEY":"It is quite important to bring the card to the hospital.", + "REGISTRATION_TAKE_MEDICINES_TEXT_KEY": "Take medicines according to instructions of the doctor.", + "REGISTRATION_TIMINGS_TEXT_KEY":"Registration Timings are from 8:30 am to 12:00 pm.", + "REGISTRATION_OPD_DAYS_TEXT_KEY" : "OPD days are on Monday, Wednesday, Friday.", + "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Sundays are holidays.", + "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Smoking, Tobacco chewing can cause cancer, heart diseases and asthama.", + "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Jan Swasthya Sahyog", + "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)", + "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", + "FEE_INFORMATION_LOCALE_KEY": "Fee Information", + "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", + "REGISTRATION_PRINT_WITH_BARCODE": "Imprimir Código de Barra ", + + "REGISTRATION_TITLE_KEY": "Registro de Pacientes", + "REGISTRATION_LABEL_SCANNED": "Escaneada", + "REGISTRATION_LABEL_PAPER": "Papel", + "REGISTRATION_LABEL_REGISTRATION_DATE": "Fecha de Registro", + "REGISTRATION_LABEL_LOGOUT": "Cerrar sesión", + "REGISTRATION_LABEL_SYNC": "Sincronizar", + "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", + "REGISTRATION_LABEL_PATIENT_IDENTIFIER": "Identificador del paciente", + "REGISTRATION_LABEL_ENTER_ID": "Introduzca la ID", + "REGISTRATION_LABEL_NO_PRINT_LAYOUT": "No se encontró diseño de impresión", + "REGISTRATION_LABEL_FEATURE_NOT_IMPLEMENTED": "La función que está pidiendo aún no está implementado .", + "REGISTRATION_LABEL_PATIENT_NAME": "Nombre del paciente", + "REGISTRATION_LABEL_PATIENT_FIRSTNAME": "Nombre", + "REGISTRATION_LABEL_PATIENT_MIDDLE_NAME": "Segundo nombre", + "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", + "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_REGISTRATION": "Introduzca número de registro de pacientes", + "REGISTRATION_LABEL_CASTE_SAME_LAST_NAME": "Casta igual que el apellido", + "REGISTRATION_LABEL_GENDER": "Género", + "REGISTRATION_LABEL_SELECT_GENDER": "Seleccione género", + "REGISTRATION_LABEL_AGE": "Edad", + "OBS_UNKNOWN_TRANSLATE_KEY": "Desconocido ", + "REGISTRATION_LABEL_CITY": "Pueblo", + "REGISTRATION_LABEL_YEARS": "Años", + "REGISTRATION_LABEL_NUMERIC_YEARS": "Años deben ser un número", + "REGISTRATION_LABEL_MONTHS": "Meses", + "REGISTRATION_LABEL_NUMERIC_MONTHS": "Meses deben estar 0-12", + "REGISTRATION_LABEL_DAYS": "Días", + "REGISTRATION_LABEL_NUMERIC_DAYS": "Días deben estar 0-31", + "REGISTRATION_LABEL_DOB": "Fecha de nacimiento", + "REGISTRATION_LABEL_ESTIMATE": "Estimado", + "REGISTRATION_LABEL_BIRTH_TIME": "Tiempo de nacimiento", + "REGISTRATION_LABEL_ADDRESS_INFO": "Información de dirección", + "REGISTRATION_LABEL_OTHER_INFO": "Otra información", + "REGISTRATION_LABEL_DEATH_INFO": "Información de Muerte", + "REGISTRATION_LABEL_REASON_FOR_DEATH": "Razón", + "REGISTRATION_LABEL_CHOOSE_VALUE": "Escoger valor", + "REGISTRATION_LABEL_IS_DEAD": "Está muerto", + "REGISTRATION_LABEL_DATE_DEATH": "Fecha de muerte", + "REGISTRATION_LABEL_TILL": "Hasta", + "REGISTRATION_LABEL_SELECT_RELATIONSHIP_TYPE": "Seleccionar el tipo de relación", + "REGISTRATION_LABEL_ENTER_NAME_ID": "Introduzca el nombre o ID", + "REGISTRATION_LABEL_VALID_PATIENT_IDENTIFIER": "Por favor, introduzca un identificador válido paciente", + "REGISTRATION_LABEL_PROVIDER_AUTOCOMPLETE_LIST": "Por favor, seleccione un proveedor de la lista de autocompletar", + "REGISTRATION_LABEL_ENTER_NAME": "Ingrese su nombre", + "REGISTRATION_LABEL_PERSON_NOT_FOUND": "Persona que no se encuentra", + "REGISTRATION_LABEL_PATIENT_ID": "ID", + "REGISTRATION_LABEL_SEARCH": "Buscar", + "REGISTRATION_LABEL_NAME": "Nombre", + "REGISTRATION_LABEL_ID": "ID", + "REGISTRATION_LABEL_NO_RESULTS": "No hay más resultados", + "REGISTRATION_LABEL_SUMMARY": "Resumen", + "REGISTRATION_LABEL_CLOSE_VISIT": "Cerrar Visita", + "REGISTRATION_LABEL_YES": "Sí", + "REGISTRATION_LABEL_NO": "No", + "REGISTRATION_LABEL_SAVE": "Salvar", + "REGISTRATION_LABEL_BACK": "Espalda", + + "REGISTRATION_LABEL_ENTER_VISIT": "Introduzca\ndetalles de la Visita", + "REGISTRATION_TITLE_ADDITIONAL_PATIENT": "informacion Adicional del Paciente ", + "REGISTRATION_TITLE_RELATIONSHIPS": "Relaciones", + "REGISTRATION_CONTENT_ENTERING_ID": "Está ingresando ID(s) que están fuera de la secuencia. Creará una brecha en la secuencia. ¿Desea continuar?", + "REGISTRATION_LABEL_SAVED": "Salvado", + "REGISTRATION_NO_RESULTS_FOUND": "No se han encontrado resultados", + "REGISTRATION_INSUFFICIENT_PRIVILEGE": "Usted no tiene el privilegio de hacer esta acción.", + "REGISTRATION_LABEL_COULD_NOT_FIND_PATIENT": "No se pudo encontrar paciente con esa identificacion {{patientidentifier}}. Por favor verifique el ID de paciente ingresado o crear un nuevo record con este ID", + "REGISTRATION_VISIT_CANNOT_BE_CLOSED": "Visita del paciente ingresado no se puede cerrar. Dar de alta al paciente y vuelva a intentarlo.", + "REGISTRATION_CONFIRM_CLOSE_VISIT": "¿Seguro que desea cerrar esta visita?", + "REGISTRATION_LABEL_CORRECT_ERRORS": "Por favor, corrija los errores en el formulario. La información no se guardó", + "REGISTRATION_LABEL_ENTER_MANDATORY_FIELDS": "Por favor, introduzca los datos en el campo(s) obligatorio.", + "REGISTRATION_SAVE_ACCESS_KEY": "s", + "REGISTRATION_ENTER_VISIT_DETAILS_ACCESS_KEY": "v", + "REGISTRATION_ENTER_ADDITIONAL_PATIENT_DETAILS_ACCESS_KEY": "i", + "REGISTRATION_RELATIONSHIPS_ACCESS_KEY": "l", + "REGISTRATION_BACK_ACCESS_KEY": "b", + "REGISTRATON_LATEST_KEY": "Reciente", + "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ }} para este paciente", + "REGISTRATION_LABEL_NUMBER": "Número de registro", + "REGISTRATION_START_VISIT": "Empezar {{visitType}} visita ", + "MESSAGE_DIALOG_OPTION_COPY": "Copia error", + "MESSAGE_DIALOG_OPTION_OKAY": "OK", + "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", + "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", + "OBS_BOOLEAN_YES_KEY": "Yes", + "OBS_BOOLEAN_NO_KEY": "No", + + "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", + "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nevo" +} From 694d3f572d69d5226383ceb267b74dc624b2a075 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Thu, 5 Oct 2017 17:37:59 -0600 Subject: [PATCH 11/60] =?UTF-8?q?Se=20agreg=C3=B3=20el=20archivo=20de=20tr?= =?UTF-8?q?aduccion=20del=20modulo=20de=20registro=20al=20espa=C3=B1ol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/i18n/registration/locale_es.json | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 openmrs/i18n/registration/locale_es.json diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json new file mode 100644 index 000000000..ef467ea88 --- /dev/null +++ b/openmrs/i18n/registration/locale_es.json @@ -0,0 +1,88 @@ +{ + "REGISTRATION_TITLE_KEY": "Registro de Pacientes", + "REGISTRATION_LABEL_SCANNED": "Escaneada", + "REGISTRATION_LABEL_PAPER": "Papel", + "REGISTRATION_LABEL_REGISTRATION_DATE": "Fecha de Registro", + "REGISTRATION_LABEL_LOGOUT": "Cerrar sesión", + "REGISTRATION_LABEL_SYNC": "Sincronizar", + "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", + "REGISTRATION_LABEL_PATIENT_IDENTIFIER": "Identificador del paciente", + "REGISTRATION_LABEL_ENTER_ID": "Introduzca la ID", + "REGISTRATION_LABEL_NO_PRINT_LAYOUT": "No se encontró diseño de impresión", + "REGISTRATION_LABEL_FEATURE_NOT_IMPLEMENTED": "La función que está pidiendo aún no está implementado .", + "REGISTRATION_LABEL_PATIENT_NAME": "Nombre del paciente", + "REGISTRATION_LABEL_PATIENT_FIRSTNAME": "Nombre", + "REGISTRATION_LABEL_PATIENT_MIDDLE_NAME": "Segundo nombre", + "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", + "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_REGISTRATION": "Introduzca número de registro de pacientes", + "REGISTRATION_LABEL_CASTE_SAME_LAST_NAME": "Casta igual que el apellido", + "REGISTRATION_LABEL_GENDER": "Género", + "REGISTRATION_LABEL_SELECT_GENDER": "Seleccione género", + "REGISTRATION_LABEL_AGE": "Edad", + "OBS_UNKNOWN_TRANSLATE_KEY": "Desconocido ", + "REGISTRATION_LABEL_CITY": "Pueblo", + "REGISTRATION_LABEL_YEARS": "Años", + "REGISTRATION_LABEL_NUMERIC_YEARS": "Años deben ser un número", + "REGISTRATION_LABEL_MONTHS": "Meses", + "REGISTRATION_LABEL_NUMERIC_MONTHS": "Meses deben estar 0-12", + "REGISTRATION_LABEL_DAYS": "Días", + "REGISTRATION_LABEL_NUMERIC_DAYS": "Días deben estar 0-31", + "REGISTRATION_LABEL_DOB": "Fecha de nacimiento", + "REGISTRATION_LABEL_ESTIMATE": "Estimado", + "REGISTRATION_LABEL_BIRTH_TIME": "Tiempo de nacimiento", + "REGISTRATION_LABEL_ADDRESS_INFO": "Información de dirección", + "REGISTRATION_LABEL_OTHER_INFO": "Otra información", + "REGISTRATION_LABEL_DEATH_INFO": "Información de Muerte", + "REGISTRATION_LABEL_REASON_FOR_DEATH": "Razón", + "REGISTRATION_LABEL_CHOOSE_VALUE": "Escoger valor", + "REGISTRATION_LABEL_IS_DEAD": "Está muerto", + "REGISTRATION_LABEL_DATE_DEATH": "Fecha de muerte", + "REGISTRATION_LABEL_TILL": "Hasta", + "REGISTRATION_LABEL_SELECT_RELATIONSHIP_TYPE": "Seleccionar el tipo de relación", + "REGISTRATION_LABEL_ENTER_NAME_ID": "Introduzca el nombre o ID", + "REGISTRATION_LABEL_VALID_PATIENT_IDENTIFIER": "Por favor, introduzca un identificador válido paciente", + "REGISTRATION_LABEL_PROVIDER_AUTOCOMPLETE_LIST": "Por favor, seleccione un proveedor de la lista de autocompletar", + "REGISTRATION_LABEL_ENTER_NAME": "Ingrese su nombre", + "REGISTRATION_LABEL_PERSON_NOT_FOUND": "Persona que no se encuentra", + "REGISTRATION_LABEL_PATIENT_ID": "ID", + "REGISTRATION_LABEL_SEARCH": "Buscar", + "REGISTRATION_LABEL_NAME": "Nombre", + "REGISTRATION_LABEL_ID": "ID", + "REGISTRATION_LABEL_NO_RESULTS": "No hay más resultados", + "REGISTRATION_LABEL_SUMMARY": "Resumen", + "REGISTRATION_LABEL_CLOSE_VISIT": "Cerrar Visita", + "REGISTRATION_LABEL_YES": "Sí", + "REGISTRATION_LABEL_NO": "No", + "REGISTRATION_LABEL_SAVE": "Salvar", + "REGISTRATION_LABEL_BACK": "Espalda", + "REGISTRATION_LABEL_ENTER_VISIT": "Introduzca\ndetalles de la Visita", + "REGISTRATION_TITLE_ADDITIONAL_PATIENT": "informacion Adicional del Paciente ", + "REGISTRATION_TITLE_RELATIONSHIPS": "Relaciones", + "REGISTRATION_CONTENT_ENTERING_ID": "Está ingresando ID(s) que están fuera de la secuencia. Creará una brecha en la secuencia. ¿Desea continuar?", + "REGISTRATION_LABEL_SAVED": "Salvado", + "REGISTRATION_NO_RESULTS_FOUND": "No se han encontrado resultados", + "REGISTRATION_INSUFFICIENT_PRIVILEGE": "Usted no tiene el privilegio de hacer esta acción.", + "REGISTRATION_LABEL_COULD_NOT_FIND_PATIENT": "No se pudo encontrar paciente con esa identificacion {{patientidentifier}}. Por favor verifique el ID de paciente ingresado o crear un nuevo record con este ID", + "REGISTRATION_VISIT_CANNOT_BE_CLOSED": "Visita del paciente ingresado no se puede cerrar. Dar de alta al paciente y vuelva a intentarlo.", + "REGISTRATION_CONFIRM_CLOSE_VISIT": "¿Seguro que desea cerrar esta visita?", + "REGISTRATION_LABEL_CORRECT_ERRORS": "Por favor, corrija los errores en el formulario. La información no se guardó", + "REGISTRATION_LABEL_ENTER_MANDATORY_FIELDS": "Por favor, introduzca los datos en el campo(s) obligatorio.", + "REGISTRATION_SAVE_ACCESS_KEY": "s", + "REGISTRATION_ENTER_VISIT_DETAILS_ACCESS_KEY": "v", + "REGISTRATION_ENTER_ADDITIONAL_PATIENT_DETAILS_ACCESS_KEY": "i", + "REGISTRATION_RELATIONSHIPS_ACCESS_KEY": "l", + "REGISTRATION_BACK_ACCESS_KEY": "b", + "REGISTRATON_LATEST_KEY": "Reciente", + "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ }} para este paciente", + "REGISTRATION_LABEL_NUMBER": "Número de registro", + "REGISTRATION_START_VISIT": "Empezar {{tipo de visita}} visita ", + "MESSAGE_DIALOG_OPTION_COPY": "Copia error", + "MESSAGE_DIALOG_OPTION_OKAY": "OK", + "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", + "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", + "OBS_BOOLEAN_YES_KEY": "Yes", + "OBS_BOOLEAN_NO_KEY": "No" +} \ No newline at end of file From 2203cde2989c3c28ffd4a3444301a4982608895e Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Thu, 5 Oct 2017 17:52:03 -0600 Subject: [PATCH 12/60] Se agregaron 2 nuevas keys: Buscar y Crear Nuevo en el archivo de local_es.json de registro --- openmrs/i18n/registration/locale_es.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index ef467ea88..85763559c 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -1,4 +1,6 @@ { + "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", + "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nuevo", "REGISTRATION_TITLE_KEY": "Registro de Pacientes", "REGISTRATION_LABEL_SCANNED": "Escaneada", "REGISTRATION_LABEL_PAPER": "Papel", @@ -78,7 +80,7 @@ "REGISTRATON_LATEST_KEY": "Reciente", "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ }} para este paciente", "REGISTRATION_LABEL_NUMBER": "Número de registro", - "REGISTRATION_START_VISIT": "Empezar {{tipo de visita}} visita ", + "REGISTRATION_START_VISIT": "Empezar {{visit_type}} visita ", "MESSAGE_DIALOG_OPTION_COPY": "Copia error", "MESSAGE_DIALOG_OPTION_OKAY": "OK", "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", From e6d509b19c18a3cecbeb910413da32347bdb5709 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 6 Oct 2017 11:22:58 -0600 Subject: [PATCH 13/60] =?UTF-8?q?Se=20agreg=C3=B3=20etiqueta=20al=20espa?= =?UTF-8?q?=C3=B1ol=20para=20el=20campo=20Segundo=20Apellido=20de=20la=20A?= =?UTF-8?q?pp=20de=20Registro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/i18n/registration/locale_es.json | 1 + 1 file changed, 1 insertion(+) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 85763559c..0eb479eaf 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -16,6 +16,7 @@ "REGISTRATION_LABEL_PATIENT_FIRSTNAME": "Nombre", "REGISTRATION_LABEL_PATIENT_MIDDLE_NAME": "Segundo nombre", "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", + "REGISTRATION_LABEL_PATIENT_SECOND_LAST_NAME": "Segundo apellido", "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", From 9d7218df9eeda032b86f86bd2fcff6028fdc3614 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 6 Oct 2017 12:07:11 -0600 Subject: [PATCH 14/60] Se agregaron las secciones de Datos Personales con sus respectivos campos --- openmrs/apps/registration/app.json | 40 +++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index f03a43f12..9ba5a4c37 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -18,18 +18,40 @@ ], "config" : { "patientInformation": { - "additionalPatientInformation": { - "title": "Additional Patient Information", + "patientType": { + "title": "patientType", + "translationKey": "patientType", "attributes": [ - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", - "familyIncome", - "debt", - "cluster" + "patientType" ] }, + "personalInfo": { + "title": "personalInfo", + "translationKey": "personalInfo", + "attributes": [ + "maritalStatus", + "bloodType", + "ethnicGroup", + "education", + "religion", + "countryOfResidency", + "nationality" + ] + }, + "contactInfo": { + "title": "Información de contacto de paciente", + "translationKey": "Información de contacto de paciente", + "attributes": [ + "cellphone", + "telephoneHouse", + "telephoneWork", + "emailPersonal", + "emailWork" + ], + "cellphone": { + "placeholder": "meow" + } + }, "hidden": { "attributes": [ "primaryContact" From 4bc41b3e189b42ccc9be34c51d6d768ac5a1b072 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 6 Oct 2017 12:39:12 -0600 Subject: [PATCH 15/60] Se agregaron los campos obligatorios de Datos Personales --- openmrs/apps/registration/app.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 9ba5a4c37..aceac04ea 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -70,6 +70,14 @@ "Doctor":"provider", "Parent":"patient" }, + "mandatoryPersonAttributes": [ + "patientType", + "bloodType", + "maritalStatus", + "nationality", + "countryOfResidency", + "education" + ], "autoCompleteFields":["familyName", "caste"], "defaultIdentifierPrefix": "GAN", From b4ed369e46b2414242cd3948ce7ca1d8e1805a62 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 6 Oct 2017 12:53:34 -0600 Subject: [PATCH 16/60] Se agregaron los campos obligatorios --- openmrs/apps/registration/app.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index aceac04ea..04530f476 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -79,8 +79,8 @@ "education" ], - "autoCompleteFields":["familyName", "caste"], - "defaultIdentifierPrefix": "GAN", + "autoCompleteFields":["familyName"], + "defaultIdentifierPrefix": "ID", "defaultVisitType": "OPD", "searchByIdForwardUrl": "/patient/{{patientUuid}}", "showMiddleName": true, @@ -123,9 +123,9 @@ "fieldValidation" : { "primaryContact" : {"pattern" : "[0-9]{8,10}", "errorMessage" : "Should be 12 characters starting with 91 (country code)"}, "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 1 to 999 acres"}, - "familyName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "givenName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "familyName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Debe contener caracteres de letras No se permiten números"}, + "givenName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Debe contener caracteres de letras No se permiten números"}, + "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Debe contener caracteres de letras No se permiten números"}, "address1" : {"pattern" : "[a-zA-Z0-9]{3}", "errorMessage" : "Should contain 3 characters"} }, "patientSearch": { From de917c89f7366dfe08a6c31b047b23a07f5d06d8 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 6 Oct 2017 17:20:45 -0600 Subject: [PATCH 17/60] =?UTF-8?q?Se=20agreg=C3=B3=20traducci=C3=B3n=20de?= =?UTF-8?q?=20Impresi=C3=B3n=20de=20Tarjeta=20de=20Registro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/i18n/registration/locale_es.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 0eb479eaf..63773d011 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -87,5 +87,6 @@ "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", "OBS_BOOLEAN_YES_KEY": "Yes", - "OBS_BOOLEAN_NO_KEY": "No" + "OBS_BOOLEAN_NO_KEY": "No", + "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Tarjeta Reg. (Local)" } \ No newline at end of file From cdcdca6adaf80f00c57dfd60e4a2f32100ce94d5 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Sat, 7 Oct 2017 23:36:37 -0600 Subject: [PATCH 18/60] =?UTF-8?q?Se=20agreg=C3=B3=20la=20funcionalidad=20d?= =?UTF-8?q?e=20Mostrar/Ocultar=20seccion=20Datos=20de=20Servicio=20cuando?= =?UTF-8?q?=20el=20tipo=20de=20paciente=20es=20Titular,=20asi=20como=20los?= =?UTF-8?q?=20campos=20Fuerzas,=20Paciente=20Retirado=20y=20Oficial=20Auxi?= =?UTF-8?q?liar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 9 +++++++ .../apps/registration/attributesConditions.js | 24 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 openmrs/apps/registration/attributesConditions.js diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 04530f476..5906ccc39 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -38,6 +38,15 @@ "nationality" ] }, + "serviceInfo": { + "title": "Información de servicio", + "translationKey": "Información de servicio", + "attributes": [ + "retiredPatient", + "auxiliaryOfficer", + "branch" + ] + }, "contactInfo": { "title": "Información de contacto de paciente", "translationKey": "Información de contacto de paciente", diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js new file mode 100755 index 000000000..f45b5cee5 --- /dev/null +++ b/openmrs/apps/registration/attributesConditions.js @@ -0,0 +1,24 @@ +Bahmni.Registration.AttributesConditions.rules = { + 'patientType': function(patient) { + return showOrHideServiceInfoSection(patient); + } +}; + +var showOrHideServiceInfoSection = function (patient) { + var returnValues = { + show: [], + hide: [] + }; + + var patientAttribute = patient["patientType"]; + if(patientAttribute){ + if (patientAttribute.conceptUuid === "ab73372f-0148-4f1d-b91b-d4a45dc94117") { + returnValues.show.push("serviceInfo"); + } else { + returnValues.hide.push("serviceInfo"); + } + }else { + returnValues.hide.push("serviceInfo"); + } + return returnValues; +}; \ No newline at end of file From f9adbd07e8c58584532842751f09863e8261f33f Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Sat, 7 Oct 2017 23:55:09 -0600 Subject: [PATCH 19/60] Se corrigio la traduccion de la variable visitType --- openmrs/i18n/registration/locale_es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 63773d011..32831dfaa 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -81,7 +81,7 @@ "REGISTRATON_LATEST_KEY": "Reciente", "DISPLAY_CONTROL_ERROR_MESSAGE_KEY": "No {{ }} para este paciente", "REGISTRATION_LABEL_NUMBER": "Número de registro", - "REGISTRATION_START_VISIT": "Empezar {{visit_type}} visita ", + "REGISTRATION_START_VISIT": "Empezar {{visitType}} visita ", "MESSAGE_DIALOG_OPTION_COPY": "Copia error", "MESSAGE_DIALOG_OPTION_OKAY": "OK", "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", From f04b69a464d8fec5be8398a5468d3ceb4c9be5d5 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Sun, 8 Oct 2017 11:07:25 -0600 Subject: [PATCH 20/60] Se corrigio linea duplicada de REGISTRATION_LABEL_NEW_PATIENT --- openmrs/i18n/registration/locale_es.json | 1 - 1 file changed, 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index f18c24bd6..80ff3f97f 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -4,7 +4,6 @@ "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY": "e", "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY": "n", "REGISTRATION_VIEW_CONFIG_KEY": "Ver", - "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Tarjeta de Reg. (Local)", "REGISTRATION_PRINT_REG_CARD_KEY":"Imprimir Tarjeta de Registro", "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementario", From 10fa6087ce4efe03e5b856a02936d130985991d6 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Thu, 12 Oct 2017 09:51:52 -0600 Subject: [PATCH 21/60] se agrego valiadcion para identificacion de paciente y se cambio el mensaje default de error a un mensaje mas amigable a cualquier tipo de usuario --- .gitignore | 1 + openmrs/apps/registration/fieldValidation.js | 8 +++++++- .../registration/registrationCardLayout/print_local.html | 2 +- scripts/openmrs-module-bahmniapps | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 scripts/openmrs-module-bahmniapps diff --git a/.gitignore b/.gitignore index 1af676cad..19de7e3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ .tmp target +openmrs/apps/registration/attributesConditions.js diff --git a/openmrs/apps/registration/fieldValidation.js b/openmrs/apps/registration/fieldValidation.js index eafcf6296..b7f06207f 100644 --- a/openmrs/apps/registration/fieldValidation.js +++ b/openmrs/apps/registration/fieldValidation.js @@ -16,5 +16,11 @@ Bahmni.Registration.customValidator = { return value.match(/^\w+$/); }, errorMessage: "REGISTRATION_CASTE_TEXT_ERROR_KEY" - } + }, + "primaryIdentifier.identifier":{ + method: function(name,value){ + return value.match(/RE[0-9]{15}|ID[0-9]{13}|PA[0-9]+/) + }, + errorMessage : "El campo documento de Identificacion no cumple el formato adecuado" + } }; diff --git a/openmrs/apps/registration/registrationCardLayout/print_local.html b/openmrs/apps/registration/registrationCardLayout/print_local.html index bade168eb..4f4fdf74a 100644 --- a/openmrs/apps/registration/registrationCardLayout/print_local.html +++ b/openmrs/apps/registration/registrationCardLayout/print_local.html @@ -74,7 +74,7 @@

(पंजीकृत)

रजिस्ट्रेशन : - {{patient.primaryIdentifier.identifier}} + rafa{{patient.primaryIdentifier.identifier}} diff --git a/scripts/openmrs-module-bahmniapps b/scripts/openmrs-module-bahmniapps new file mode 160000 index 000000000..eb744797e --- /dev/null +++ b/scripts/openmrs-module-bahmniapps @@ -0,0 +1 @@ +Subproject commit eb744797e6246ba26186abee03396e240c842159 From 222b0b879fd423ead7f8327940e8b2663ff60034 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Thu, 12 Oct 2017 10:03:44 -0600 Subject: [PATCH 22/60] Delete wrong html --- .../apps/registration/registrationCardLayout/print_local.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/registrationCardLayout/print_local.html b/openmrs/apps/registration/registrationCardLayout/print_local.html index 4f4fdf74a..bade168eb 100644 --- a/openmrs/apps/registration/registrationCardLayout/print_local.html +++ b/openmrs/apps/registration/registrationCardLayout/print_local.html @@ -74,7 +74,7 @@

(पंजीकृत)

रजिस्ट्रेशन : - rafa{{patient.primaryIdentifier.identifier}} + {{patient.primaryIdentifier.identifier}} From f951ce0a828c00bc1d2f055a2ff92ad93919d975 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Thu, 12 Oct 2017 11:17:18 -0600 Subject: [PATCH 23/60] Added key for translations --- openmrs/apps/registration/fieldValidation.js | 2 +- openmrs/i18n/registration/locale_en.json | 3 ++- openmrs/i18n/registration/locale_es.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/registration/fieldValidation.js b/openmrs/apps/registration/fieldValidation.js index b7f06207f..6d298c3aa 100644 --- a/openmrs/apps/registration/fieldValidation.js +++ b/openmrs/apps/registration/fieldValidation.js @@ -21,6 +21,6 @@ Bahmni.Registration.customValidator = { method: function(name,value){ return value.match(/RE[0-9]{15}|ID[0-9]{13}|PA[0-9]+/) }, - errorMessage : "El campo documento de Identificacion no cumple el formato adecuado" + errorMessage : "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" } }; diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 23c92870f..599be54a0 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -21,5 +21,6 @@ "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", "FEE_INFORMATION_LOCALE_KEY": "Fee Information", "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", - "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print" + "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", + "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "The ID document field does not comply with the appropriate format" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 80ff3f97f..e5a9b58ac 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -108,5 +108,6 @@ "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", "OBS_BOOLEAN_YES_KEY": "Yes", - "OBS_BOOLEAN_NO_KEY": "No" + "OBS_BOOLEAN_NO_KEY": "No", + "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "El campo documento de Identificacion no cumple el formato adecuado" } From 5b4f8de6f8748eabaf25a1c597bcdddbddfab2d9 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Fri, 13 Oct 2017 16:31:59 -0600 Subject: [PATCH 24/60] delete useles file --- scripts/openmrs-module-bahmniapps | 1 - 1 file changed, 1 deletion(-) delete mode 160000 scripts/openmrs-module-bahmniapps diff --git a/scripts/openmrs-module-bahmniapps b/scripts/openmrs-module-bahmniapps deleted file mode 160000 index eb744797e..000000000 --- a/scripts/openmrs-module-bahmniapps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb744797e6246ba26186abee03396e240c842159 From 2a6c2efb4133ca2e480e5698815f38f3ea8fcab3 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 18 Oct 2017 09:49:48 -0600 Subject: [PATCH 25/60] Se eliminaron lineas duplicadas --- openmrs/i18n/adt/locale_es.json | 1 - openmrs/i18n/clinical/locale_es.json | 1 - 2 files changed, 2 deletions(-) diff --git a/openmrs/i18n/adt/locale_es.json b/openmrs/i18n/adt/locale_es.json index 4ac62a572..90a271662 100644 --- a/openmrs/i18n/adt/locale_es.json +++ b/openmrs/i18n/adt/locale_es.json @@ -23,7 +23,6 @@ "DASHBOARD_TITLE_DIAGNOSIS_KEY":"Diagnostico", "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalles de Admisión", "DASHBOARD_TITLE_DISPOSITION_KEY":"Dispociciones", - "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalles de Admisión", "HOME_DASHBOARD_KEY":"Panel de Control", "PATIENT_VISIT_PAGE_KEY":"Pagina Visita del Paciente", diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json index c9a858f88..8f1609edb 100644 --- a/openmrs/i18n/clinical/locale_es.json +++ b/openmrs/i18n/clinical/locale_es.json @@ -42,7 +42,6 @@ "CONDITION_LIST_DISPLAY_CONTROL_TITLE":"Condiciones", "CONDITION_LIST_NO_CONDITIONS":"No hay Condiciones disponibles", - "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_PATIENT_DOCUMENTS_KEY": "Documentos", "DASHBOARD_TAB_PATIENT_MONITORING_DRUGS_START_DATE_KEY": "Monitoreo de Paciente (D)", From a6a75b41561a06caf1d1b407fff5a5adc6734d62 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Thu, 19 Oct 2017 11:52:39 -0600 Subject: [PATCH 26/60] =?UTF-8?q?Se=20agreg=C3=B3=20la=20seccion=20de=20In?= =?UTF-8?q?formacion=20de=20Contacto=20y=20sus=20respectivos=20campos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 5906ccc39..0df264601 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -22,7 +22,8 @@ "title": "patientType", "translationKey": "patientType", "attributes": [ - "patientType" + "patientType", + "identifierDocument" ] }, "personalInfo": { From 771df03db468823f3c0af2bb8ae90a8a70f8b50d Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 20 Oct 2017 09:17:01 -0600 Subject: [PATCH 27/60] =?UTF-8?q?Se=20agregaron=20validaciones=20para=20lo?= =?UTF-8?q?s=20campos=20de=20Informaci=C3=B3n=20de=20Contacto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 1 + .../apps/registration/attributesConditions.js | 3 ++ openmrs/apps/registration/fieldValidation.js | 36 ++++++++++++------- openmrs/i18n/registration/locale_en.json | 5 ++- openmrs/i18n/registration/locale_es.json | 5 ++- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 0df264601..3c8537976 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -82,6 +82,7 @@ }, "mandatoryPersonAttributes": [ "patientType", + "identifierDocument", "bloodType", "maritalStatus", "nationality", diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index f45b5cee5..37c5bd7f0 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -1,9 +1,11 @@ Bahmni.Registration.AttributesConditions.rules = { 'patientType': function(patient) { + console.log(patient); return showOrHideServiceInfoSection(patient); } }; + var showOrHideServiceInfoSection = function (patient) { var returnValues = { show: [], @@ -11,6 +13,7 @@ var showOrHideServiceInfoSection = function (patient) { }; var patientAttribute = patient["patientType"]; + if(patientAttribute){ if (patientAttribute.conceptUuid === "ab73372f-0148-4f1d-b91b-d4a45dc94117") { returnValues.show.push("serviceInfo"); diff --git a/openmrs/apps/registration/fieldValidation.js b/openmrs/apps/registration/fieldValidation.js index 6d298c3aa..c7cedc745 100644 --- a/openmrs/apps/registration/fieldValidation.js +++ b/openmrs/apps/registration/fieldValidation.js @@ -5,22 +5,34 @@ Bahmni.Registration.customValidator = { }, errorMessage: "REGISTRATION_AGE_ERROR_KEY" }, - "Telephone Number": { + "cellphone": { method: function (name, value, personAttributeDetails) { - return value && value.length> 6; + return value.match(/\(?([0-9]{3})\)?([ .-]?)([0-9]{4})-([0-9]{4})/); }, - errorMessage: "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY" + errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" }, - "caste": { + "telephoneHouse": { method: function (name, value, personAttributeDetails) { - return value.match(/^\w+$/); + return value.match(/[0-9]{4}-[0-9]{4}/); }, - errorMessage: "REGISTRATION_CASTE_TEXT_ERROR_KEY" + errorMessage: "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY" }, - "primaryIdentifier.identifier":{ - method: function(name,value){ - return value.match(/RE[0-9]{15}|ID[0-9]{13}|PA[0-9]+/) - }, - errorMessage : "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" - } + "telephoneWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/[0-9]{4}-[0-9]{4}/); + }, + errorMessage: "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY" + }, + "emailPersonal": { + method: function (name, value, personAttributeDetails) { + return value.match(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/); + }, + errorMessage: "REGISTRATION_EMAIL_TEXT_ERROR_KEY" + }, + "emailWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/); + }, + errorMessage: "REGISTRATION_EMAIL_TEXT_ERROR_KEY" + } }; diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 599be54a0..d99749914 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -22,5 +22,8 @@ "FEE_INFORMATION_LOCALE_KEY": "Fee Information", "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", - "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "The ID document field does not comply with the appropriate format" + "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "ID number not valid", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Cellphone number not valid +504 0000-0000", + "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Telephone number not valid 0000-0000", + "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "Email account not valid email@domain.com" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index e5a9b58ac..e0e0e2d7f 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -109,5 +109,8 @@ "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", "OBS_BOOLEAN_YES_KEY": "Yes", "OBS_BOOLEAN_NO_KEY": "No", - "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "El campo documento de Identificacion no cumple el formato adecuado" + "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Número de celular no tiene el formato válido +504 0000-0000", + "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Número de teléfono no tiene el formato válido 0000-0000", + "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "La cuenta de correo electrónico no tiene el formato válido correo@dominio.com" } From 25b3314098f0447a01e997e1284c2a038127b710 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 20 Oct 2017 09:33:01 -0600 Subject: [PATCH 28/60] =?UTF-8?q?Se=20elimin=C3=B3=20un=20console.log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/attributesConditions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 37c5bd7f0..29b0d3cc9 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -1,6 +1,5 @@ Bahmni.Registration.AttributesConditions.rules = { 'patientType': function(patient) { - console.log(patient); return showOrHideServiceInfoSection(patient); } }; From 2b22138f579879780b69768c2af4dd429c422920 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Fri, 20 Oct 2017 21:33:18 -0600 Subject: [PATCH 29/60] Added reports Json File --- openmrs/i18n/reports/locale_es.json | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 openmrs/i18n/reports/locale_es.json diff --git a/openmrs/i18n/reports/locale_es.json b/openmrs/i18n/reports/locale_es.json new file mode 100644 index 000000000..f2b6b9341 --- /dev/null +++ b/openmrs/i18n/reports/locale_es.json @@ -0,0 +1,32 @@ +{ + "userName": "Nombre de usuario", + "password": "Contraseña", + "location": "Ubicación", + "login": "Iniciar sesión", + "selectLocation": "Seleccionar ubicación", + "clinical_key": "Clínico", + "REPORTS_NAME_HEADER_KEY": "Nombre", + "REPORTS_START_DATE_HEADER_KEY": "Fecha de inicio", + "REPORTS_END_DATE_HEADER_KEY": "Fecha final", + "RUN_NOW_BUTTON_KEY": "Ejecutar ahora", + "RUN_REPORT_BUTTON_KEY": "Ejecutar informe", + "QUEUE_BUTTON_KEY": "Fila", + "REPORT_FORMAT_KEY": "Formato", + "REPORTS_TITLE_KEY": "Informes", + "REPORTS_TITLE_WITHOUT_DATE_RANGE_KEY": "Informes sin intervalo de fechas", + "REPORTS_MISSING_WARNING_MESSAGE_KEY": "Los nuevos informes se pueden configurar en un archivo JSON dentro OpenMRS / aplicaciones / informes / reports.json . Por favor, consulte la documentación para obtener más información sobre la configuración de los informes enlatados", + "MESSAGE_DIALOG_OPTION_COPY": "Error de copia", + "MESSAGE_DIALOG_OPTION_OKAY": "OK", + "REPORTS_QUEUE": "Cola de Informes", + "REPORTS_SEARCH_PLACEHOLDER": "Buscar por Nombre de informe", + "REPORT_STATUS": "Estado", + "REPORT_REQUEST_TIME": "Tiempo requerido", + "REPORT_DELETE_SUCCESSFUL": "Informe eliminado exitosamente", + "REPORT_DELETE_ERROR": "Error al eliminar informe", + "REPORT_DELETE_DIALOG": "¿Desea eliminar este informe?", + "REPORT_DOWNLOAD": "Descarga", + "REPORT_ERROR": "Error", + "REPORT_DELETE": "Eliminar", + "REPORTS_HEADER_REPORTS": "Informes", + "REPORTS_HEADER_MY_REPORTS": "Mis Informes" +} \ No newline at end of file From 25f900f22e352e667196d68b832d31ee295f18bc Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Sat, 21 Oct 2017 11:19:26 -0600 Subject: [PATCH 30/60] =?UTF-8?q?Se=20agreg=C3=B3=20validaci=C3=B3n=20para?= =?UTF-8?q?=20el=20Numero=20de=20Identificaci=C3=B3n=20del=20Paciente=20ya?= =?UTF-8?q?=20sea=20Tarjeta=20de=20Identidad,=20Residencia=20o=20Pasaporte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/registration/attributesConditions.js | 41 ++++++++++++++++++- openmrs/i18n/registration/locale_en.json | 5 ++- openmrs/i18n/registration/locale_es.json | 5 ++- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 29b0d3cc9..768ce58ed 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -1,10 +1,49 @@ Bahmni.Registration.AttributesConditions.rules = { 'patientType': function(patient) { return showOrHideServiceInfoSection(patient); + }, + 'identifierDocument': function(patient) { + if (patient['identifierDocument']) { + switch (patient['identifierDocument'].conceptUuid) { + case "c74c7f3b-954f-41e1-ba26-b595906020b5": + Bahmni.Registration.customValidator = { + "primaryIdentifier.registrationNumber": { + method: function (name, value) { + return value.match(/[0-9]{13}/); + }, + errorMessage: "REGISTRATION_ID_TEXT_ERROR_KEY" + } + }; + break; + + case "dafa2194-f468-4b6e-9b3f-97fbb181de55": + Bahmni.Registration.customValidator = { + "primaryIdentifier.registrationNumber": { + method: function (name, value) { + return value.match(/[0-9]{15}/); + }, + errorMessage: "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY" + } + }; + break; + + default: + Bahmni.Registration.customValidator = { + "primaryIdentifier.registrationNumber": { + method: function (name, value) { + return value.match(/[a-zA-Z\-0-9]+/); + }, + errorMessage: "REGISTRATION_PASSPORT_TEXT_ERROR_KEY" + } + }; + break; + } + } + + return true; } }; - var showOrHideServiceInfoSection = function (patient) { var returnValues = { show: [], diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index d99749914..b55aa01e4 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -25,5 +25,8 @@ "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "ID number not valid", "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Cellphone number not valid +504 0000-0000", "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Telephone number not valid 0000-0000", - "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "Email account not valid email@domain.com" + "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "Email account not valid email@domain.com", + "REGISTRATION_ID_TEXT_ERROR_KEY": "Invalid ID number the correct format has 13 numbers => 0000000000000", + "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "Invalid Residence number the correct format has 15 numbers => 000000000000000", + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Error trying to save the Passport number" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index e0e0e2d7f..889156795 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -112,5 +112,8 @@ "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Número de celular no tiene el formato válido +504 0000-0000", "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Número de teléfono no tiene el formato válido 0000-0000", - "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "La cuenta de correo electrónico no tiene el formato válido correo@dominio.com" + "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "La cuenta de correo electrónico no tiene el formato válido correo@dominio.com", + "REGISTRATION_ID_TEXT_ERROR_KEY": "El numero de identidad ingresado es inválido el formato correcto contiene 13 números => 0000000000000", + "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El numero de residencia ingresado es inválido el formato correcto contiene 15 números => 000000000000000", + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte" } From cc0681326af190a24529ee943f0b6b2d56841f22 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Tue, 24 Oct 2017 10:15:39 -0600 Subject: [PATCH 31/60] Se actualizo la validacion de Tipo de Documento Tarjeta de Identidad, Residencia o Pasaporte --- .../apps/registration/attributesConditions.js | 44 +++++++++++++++++++ openmrs/apps/registration/fieldValidation.js | 38 ---------------- openmrs/i18n/registration/locale_es.json | 6 ++- 3 files changed, 48 insertions(+), 40 deletions(-) delete mode 100644 openmrs/apps/registration/fieldValidation.js diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 768ce58ed..2f9b9a090 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -1,3 +1,44 @@ +var fieldValidations = function () { + Bahmni.Registration.customValidator = { + "age.days": { + method: function (name, value) { + return value >= 0; + }, + errorMessage: "REGISTRATION_AGE_ERROR_KEY" + }, + "cellphone": { + method: function (name, value, personAttributeDetails) { + return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); + }, + errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" + }, + "telephoneHouse": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage: "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY" + }, + "telephoneWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage: "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY" + }, + "emailPersonal": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY" + }, + "emailWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY" + } + }; +} + Bahmni.Registration.AttributesConditions.rules = { 'patientType': function(patient) { return showOrHideServiceInfoSection(patient); @@ -14,6 +55,7 @@ Bahmni.Registration.AttributesConditions.rules = { errorMessage: "REGISTRATION_ID_TEXT_ERROR_KEY" } }; + fieldValidations(); break; case "dafa2194-f468-4b6e-9b3f-97fbb181de55": @@ -25,6 +67,7 @@ Bahmni.Registration.AttributesConditions.rules = { errorMessage: "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY" } }; + fieldValidations(); break; default: @@ -36,6 +79,7 @@ Bahmni.Registration.AttributesConditions.rules = { errorMessage: "REGISTRATION_PASSPORT_TEXT_ERROR_KEY" } }; + fieldValidations(); break; } } diff --git a/openmrs/apps/registration/fieldValidation.js b/openmrs/apps/registration/fieldValidation.js deleted file mode 100644 index c7cedc745..000000000 --- a/openmrs/apps/registration/fieldValidation.js +++ /dev/null @@ -1,38 +0,0 @@ -Bahmni.Registration.customValidator = { - "age.days": { - method: function (name, value) { - return value >= 0; - }, - errorMessage: "REGISTRATION_AGE_ERROR_KEY" - }, - "cellphone": { - method: function (name, value, personAttributeDetails) { - return value.match(/\(?([0-9]{3})\)?([ .-]?)([0-9]{4})-([0-9]{4})/); - }, - errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" - }, - "telephoneHouse": { - method: function (name, value, personAttributeDetails) { - return value.match(/[0-9]{4}-[0-9]{4}/); - }, - errorMessage: "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY" - }, - "telephoneWork": { - method: function (name, value, personAttributeDetails) { - return value.match(/[0-9]{4}-[0-9]{4}/); - }, - errorMessage: "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY" - }, - "emailPersonal": { - method: function (name, value, personAttributeDetails) { - return value.match(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/); - }, - errorMessage: "REGISTRATION_EMAIL_TEXT_ERROR_KEY" - }, - "emailWork": { - method: function (name, value, personAttributeDetails) { - return value.match(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/); - }, - errorMessage: "REGISTRATION_EMAIL_TEXT_ERROR_KEY" - } -}; diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 889156795..ae240b097 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -111,8 +111,10 @@ "OBS_BOOLEAN_NO_KEY": "No", "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Número de celular no tiene el formato válido +504 0000-0000", - "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Número de teléfono no tiene el formato válido 0000-0000", - "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "La cuenta de correo electrónico no tiene el formato válido correo@dominio.com", + "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "Número de teléfono de domicilio no tiene el formato válido 0000-0000", + "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "Número de teléfono de trabajo no tiene el formato válido 0000-0000", + "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "La cuenta de correo electrónico personal no tiene el formato válido correo@dominio.com", + "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "La cuenta de correo electrónico de trabajo no tiene el formato válido correo@dominio.com", "REGISTRATION_ID_TEXT_ERROR_KEY": "El numero de identidad ingresado es inválido el formato correcto contiene 13 números => 0000000000000", "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El numero de residencia ingresado es inválido el formato correcto contiene 15 números => 000000000000000", "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte" From c54aefddd95cffb3d54012b069126bcb7cf3152e Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Tue, 24 Oct 2017 11:02:37 -0600 Subject: [PATCH 32/60] Se actualizaron los mensajes de error para Informacion de contacto --- openmrs/i18n/registration/locale_en.json | 14 ++++++++------ openmrs/i18n/registration/locale_es.json | 14 +++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index b55aa01e4..463e9d5e4 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -23,10 +23,12 @@ "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "ID number not valid", - "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Cellphone number not valid +504 0000-0000", - "REGISTRATION_TELEPHONE_TEXT_ERROR_KEY": "Telephone number not valid 0000-0000", - "REGISTRATION_EMAIL_TEXT_ERROR_KEY": "Email account not valid email@domain.com", - "REGISTRATION_ID_TEXT_ERROR_KEY": "Invalid ID number the correct format has 13 numbers => 0000000000000", - "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "Invalid Residence number the correct format has 15 numbers => 000000000000000", - "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Error trying to save the Passport number" + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "The field 'Teléfono móvil' doesn't have a valid format +5040000-0000", + "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "The field 'Teléfono casa' doesn't have a valid format 0000-0000", + "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "The field 'Teléfono trabajo' doesn't have a valid format 0000-0000", + "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "The field 'Correo electrónico personal' doesn't have a valid format email@domain.com", + "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "The field 'Correo electrónico trabajo' doesn't have a valid format email@domain.com", + "REGISTRATION_ID_TEXT_ERROR_KEY": "The field 'Numero de identificacion' doesn't have a valid format for Card Id. Valid format is 13 numbers without spaces", + "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "The field 'Numero de identificacion' doesn't have a valid format for Residence number. Valid format is 15 numbers without spaces", + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "The field 'Numero de identificacion' can't be blank" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index ae240b097..f7e6e9b87 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -110,12 +110,12 @@ "OBS_BOOLEAN_YES_KEY": "Yes", "OBS_BOOLEAN_NO_KEY": "No", "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", - "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "Número de celular no tiene el formato válido +504 0000-0000", - "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "Número de teléfono de domicilio no tiene el formato válido 0000-0000", - "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "Número de teléfono de trabajo no tiene el formato válido 0000-0000", - "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "La cuenta de correo electrónico personal no tiene el formato válido correo@dominio.com", - "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "La cuenta de correo electrónico de trabajo no tiene el formato válido correo@dominio.com", - "REGISTRATION_ID_TEXT_ERROR_KEY": "El numero de identidad ingresado es inválido el formato correcto contiene 13 números => 0000000000000", - "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El numero de residencia ingresado es inválido el formato correcto contiene 15 números => 000000000000000", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "El campo 'Teléfono móvil' no tiene el formato válido +5040000-0000", + "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "El campo 'Teléfono casa' no tiene el formato válido 0000-0000", + "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "El campo 'Teléfono trabajo' no tiene el formato válido 0000-0000", + "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal' no tiene el formato válido correo@dominio.com", + "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "El campo 'Correo electrónico trabajo' no tiene el formato válido correo@dominio.com", + "REGISTRATION_ID_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Tarjeta de identidad'. Deben ser 13 números sin espacios.", + "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Numero de Residencia'. Deben ser 15 números sin espacios.", "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte" } From e0f68e997bc18b2384196f7d88adf5b366a830d1 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Tue, 24 Oct 2017 15:10:33 -0600 Subject: [PATCH 33/60] Se actualizaron las validaciones de Datos Personales, se mejoro el codigo --- .../apps/registration/attributesConditions.js | 114 +++++++----------- 1 file changed, 46 insertions(+), 68 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 2f9b9a090..5b1b94c1e 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -1,87 +1,65 @@ -var fieldValidations = function () { - Bahmni.Registration.customValidator = { - "age.days": { - method: function (name, value) { - return value >= 0; - }, - errorMessage: "REGISTRATION_AGE_ERROR_KEY" - }, - "cellphone": { - method: function (name, value, personAttributeDetails) { - return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); - }, - errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" - }, - "telephoneHouse": { - method: function (name, value, personAttributeDetails) { - return value.match(/^[0-9]{4}-[0-9]{4}$/); - }, - errorMessage: "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY" - }, - "telephoneWork": { - method: function (name, value, personAttributeDetails) { - return value.match(/^[0-9]{4}-[0-9]{4}$/); - }, - errorMessage: "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY" - }, - "emailPersonal": { - method: function (name, value, personAttributeDetails) { - return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); - }, - errorMessage: "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY" - }, - "emailWork": { - method: function (name, value, personAttributeDetails) { - return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); - }, - errorMessage: "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY" - } - }; -} - Bahmni.Registration.AttributesConditions.rules = { 'patientType': function(patient) { return showOrHideServiceInfoSection(patient); }, 'identifierDocument': function(patient) { if (patient['identifierDocument']) { + var regex, error_msg = ""; switch (patient['identifierDocument'].conceptUuid) { case "c74c7f3b-954f-41e1-ba26-b595906020b5": - Bahmni.Registration.customValidator = { - "primaryIdentifier.registrationNumber": { - method: function (name, value) { - return value.match(/[0-9]{13}/); - }, - errorMessage: "REGISTRATION_ID_TEXT_ERROR_KEY" - } - }; - fieldValidations(); + regex = /[0-9]{13}/; + error_msg = "REGISTRATION_ID_TEXT_ERROR_KEY"; break; case "dafa2194-f468-4b6e-9b3f-97fbb181de55": - Bahmni.Registration.customValidator = { - "primaryIdentifier.registrationNumber": { - method: function (name, value) { - return value.match(/[0-9]{15}/); - }, - errorMessage: "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY" - } - }; - fieldValidations(); + regex = /[0-9]{15}/; + error_msg = "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY"; break; default: - Bahmni.Registration.customValidator = { - "primaryIdentifier.registrationNumber": { - method: function (name, value) { - return value.match(/[a-zA-Z\-0-9]+/); - }, - errorMessage: "REGISTRATION_PASSPORT_TEXT_ERROR_KEY" - } - }; - fieldValidations(); + regex = /[a-zA-Z\-0-9]+/; + error_msg = "REGISTRATION_PASSPORT_TEXT_ERROR_KEY"; break; } + + Bahmni.Registration.customValidator = { + "primaryIdentifier.registrationNumber": { + method: function (name, value) { + return value.match(regex); + }, + errorMessage: error_msg + }, + "cellphone": { + method: function (name, value, personAttributeDetails) { + return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); + }, + errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" + }, + "telephoneHouse": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage: "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY" + }, + "telephoneWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage: "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY" + }, + "emailPersonal": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY" + }, + "emailWork": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY" + } + }; } return true; From 2a308caca76b63d5d900f799095819ce3fb3e48a Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Tue, 24 Oct 2017 17:29:45 -0600 Subject: [PATCH 34/60] added ^ and $ in regex to only allow one match --- openmrs/apps/registration/attributesConditions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 5b1b94c1e..cac95db8d 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -7,12 +7,12 @@ Bahmni.Registration.AttributesConditions.rules = { var regex, error_msg = ""; switch (patient['identifierDocument'].conceptUuid) { case "c74c7f3b-954f-41e1-ba26-b595906020b5": - regex = /[0-9]{13}/; + regex = /^[0-9]{13}$/; error_msg = "REGISTRATION_ID_TEXT_ERROR_KEY"; break; case "dafa2194-f468-4b6e-9b3f-97fbb181de55": - regex = /[0-9]{15}/; + regex = /^[0-9]{15}$/; error_msg = "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY"; break; From a535981ac7360b72b8e6dd3fad86e232c25c6266 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 25 Oct 2017 12:16:10 -0600 Subject: [PATCH 35/60] =?UTF-8?q?Se=20agreg=C3=B3=20la=20funcionalidad=20d?= =?UTF-8?q?e=20Mostrar/Ocultar=20Grados=20de=20acuerdo=20a=20la=20Fuerza?= =?UTF-8?q?=20seleccionada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 37 +++++++++++- .../apps/registration/attributesConditions.js | 56 ++++++++++++++++++- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 3c8537976..2eaad3dc2 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -45,7 +45,7 @@ "attributes": [ "retiredPatient", "auxiliaryOfficer", - "branch" + "force" ] }, "contactInfo": { @@ -62,6 +62,41 @@ "placeholder": "meow" } }, + "gradoFuerzaEjercito": { + "title": "Grado", + "translationKey": "gradoFuerzaEjercito", + "attributes": [ + "gradoFuerzaEjercito" + ] + }, + "gradoFuerzaNaval": { + "title": "Grado", + "translationKey": "gradoFuerzaNaval", + "attributes": [ + "gradoFuerzaNaval" + ] + }, + "gradoFuerzaAerea": { + "title": "Grado", + "translationKey": "gradoFuerzaAerea", + "attributes": [ + "gradoFuerzaAerea" + ] + }, + "gradoPoliciaNacional": { + "title": "Grado", + "translationKey": "gradoPoliciaNacional", + "attributes": [ + "gradoPoliciaNacional" + ] + }, + "gradoDireccionNacionalInvestigacion": { + "title": "Grado", + "translationKey": "gradoDireccionNacionalInvestigacion", + "attributes": [ + "gradoDireccionNacionalInvestigacion" + ] + }, "hidden": { "attributes": [ "primaryContact" diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index cac95db8d..84316504c 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -63,6 +63,9 @@ Bahmni.Registration.AttributesConditions.rules = { } return true; + }, + 'force': function(patient) { + return showOrHideGradoSection(patient); } }; @@ -84,4 +87,55 @@ var showOrHideServiceInfoSection = function (patient) { returnValues.hide.push("serviceInfo"); } return returnValues; -}; \ No newline at end of file +}; + +var showOrHideGradoSection = function (patient) { + var returnValues = { + show: [], + hide: [] + }; + + var patientAttribute = patient["force"]; + if(patientAttribute){ + if (patientAttribute.conceptUuid === "6a5ed660-284a-4369-b986-76dae3e95b4b") + { + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaEjercito"); + } + else if (patientAttribute.conceptUuid === "ba54570b-ee77-43b9-9a15-9ce175f84022") + { + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaNaval"); + } + else if (patientAttribute.conceptUuid === "d99b2f70-ad6a-4c76-87fe-a824e90c27e6") + { + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaAerea"); + } + else if (patientAttribute.conceptUuid === "f8ad6a17-9b17-4c66-8089-a0f15dfe2c2f") + { + returnValues = hideShowGrado(patient, returnValues, "gradoPoliciaNacional"); + } + else if (patientAttribute.conceptUuid === "a7d26ea3-f686-4e3a-9b9a-7998b8998e03") + { + returnValues = hideShowGrado(patient, returnValues, "gradoDireccionNacionalInvestigacion"); + } + }else { + returnValues = hideShowGrado(patient, returnValues, ""); + + } + + return returnValues; +}; + +var hideShowGrado = function(patient, returnValues, branchUsed) { + var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval']; + + var selectedGrado = allGradoSections.indexOf(branchUsed); + if (selectedGrado >= 0) { + allGradoSections.splice(selectedGrado, 1); + } + returnValues.hide = allGradoSections; + if (branchUsed !== "") { + returnValues.show.push(branchUsed); + } + + return returnValues; +} \ No newline at end of file From 7226ed169b06b1b2e61c9be8ca1599990b43ce2e Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 27 Oct 2017 16:44:27 -0600 Subject: [PATCH 36/60] =?UTF-8?q?Se=20agregaron=20Fuerzas,=20Grados=20y=20?= =?UTF-8?q?Unidades=20extras,=20as=C3=AD=20como=20la=20funcionalidad=20par?= =?UTF-8?q?a=20el=20Checkbox=20de=20Paciente=20Retirado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 70 ++++++++++ .../apps/registration/attributesConditions.js | 125 ++++++++++++++++-- 2 files changed, 182 insertions(+), 13 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 2eaad3dc2..2baeed11b 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -97,6 +97,76 @@ "gradoDireccionNacionalInvestigacion" ] }, + "gradoSecretariaDefensaNacional": { + "title": "Grado", + "translationKey": "gradoSecretariaDefensaNacional", + "attributes": [ + "gradoSecretariaDefensaNacional" + ] + }, + "gradoDependenciasFFAA": { + "title": "Grado", + "translationKey": "gradoDependenciasFFAA", + "attributes": [ + "gradoDependenciasFFAA" + ] + }, + "unidadSecretariaDefensaNacional": { + "title": "Grado", + "translationKey": "unidadSecretariaDefensaNacional", + "attributes": [ + "unidadSecretariaDefensaNacional" + ] + }, + "unidadDependenciasFFAA": { + "title": "Grado", + "translationKey": "unidadDependenciasFFAA", + "attributes": [ + "unidadDependenciasFFAA" + ] + }, + "unidadFuerzaEjercito": { + "title": "Grado", + "translationKey": "unidadFuerzaEjercito", + "attributes": [ + "unidadFuerzaEjercito" + ] + }, + "unidadFuerzaNaval": { + "title": "Grado", + "translationKey": "unidadFuerzaNaval", + "attributes": [ + "unidadFuerzaNaval" + ] + }, + "unidadFuerzaAerea": { + "title": "Grado", + "translationKey": "unidadFuerzaAerea", + "attributes": [ + "unidadFuerzaAerea" + ] + }, + "unidadPMOP": { + "title": "Grado", + "translationKey": "unidadPMOP", + "attributes": [ + "unidadPMOP" + ] + }, + "unidadPoliciaNacional": { + "title": "Grado", + "translationKey": "unidadPoliciaNacional", + "attributes": [ + "unidadPoliciaNacional" + ] + }, + "unidadDNI": { + "title": "Grado", + "translationKey": "unidadDNI", + "attributes": [ + "unidadDNI" + ] + }, "hidden": { "attributes": [ "primaryContact" diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 84316504c..c387e1ab1 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -66,6 +66,9 @@ Bahmni.Registration.AttributesConditions.rules = { }, 'force': function(patient) { return showOrHideGradoSection(patient); + }, + 'retiredPatient': function(patient) { + return hideSections(patient); } }; @@ -99,43 +102,139 @@ var showOrHideGradoSection = function (patient) { if(patientAttribute){ if (patientAttribute.conceptUuid === "6a5ed660-284a-4369-b986-76dae3e95b4b") { - returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaEjercito"); + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaEjercito", "unidadFuerzaEjercito"); } else if (patientAttribute.conceptUuid === "ba54570b-ee77-43b9-9a15-9ce175f84022") { - returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaNaval"); + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaNaval", "unidadFuerzaNaval"); } else if (patientAttribute.conceptUuid === "d99b2f70-ad6a-4c76-87fe-a824e90c27e6") { - returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaAerea"); + returnValues = hideShowGrado(patient, returnValues, "gradoFuerzaAerea", "unidadFuerzaAerea"); } else if (patientAttribute.conceptUuid === "f8ad6a17-9b17-4c66-8089-a0f15dfe2c2f") { - returnValues = hideShowGrado(patient, returnValues, "gradoPoliciaNacional"); + returnValues = hideShowGrado(patient, returnValues, "gradoPoliciaNacional", "unidadPoliciaNacional"); } else if (patientAttribute.conceptUuid === "a7d26ea3-f686-4e3a-9b9a-7998b8998e03") { - returnValues = hideShowGrado(patient, returnValues, "gradoDireccionNacionalInvestigacion"); + returnValues = hideShowGrado(patient, returnValues, "gradoDireccionNacionalInvestigacion", "unidadDNI"); } - }else { + else if (patientAttribute.conceptUuid === "d771e63e-7ff1-47cd-b2df-98739d6e6118") + { + returnValues = hideShowGrado(patient, returnValues, "gradoSecretariaDefensaNacional", "unidadSecretariaDefensaNacional"); + } + else if (patientAttribute.conceptUuid === "66de2a62-0e27-4375-91b1-057dad32a1ce") + { + returnValues = hideShowGrado(patient, returnValues, "gradoDependenciasFFAA", "unidadDependenciasFFAA"); + } + } else { returnValues = hideShowGrado(patient, returnValues, ""); - } return returnValues; }; -var hideShowGrado = function(patient, returnValues, branchUsed) { - var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval']; +var hideShowGrado = function(patient, returnValues, branchUsed, unitUsed) { + var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval', 'gradoSecretariaDefensaNacional', 'gradoDependenciasFFAA']; + + var allUnitSection = ['unidadFuerzaEjercito', 'unidadFuerzaAerea', 'unidadPoliciaNacional', 'unidadDNI', 'unidadFuerzaNaval', 'unidadSecretariaDefensaNacional', 'unidadDependenciasFFAA', 'unidadPMOP']; var selectedGrado = allGradoSections.indexOf(branchUsed); + var selectedUnit = allUnitSection.indexOf(unitUsed); if (selectedGrado >= 0) { allGradoSections.splice(selectedGrado, 1); } - returnValues.hide = allGradoSections; - if (branchUsed !== "") { - returnValues.show.push(branchUsed); + if (selectedUnit >= 0) { + allUnitSection.splice(selectedUnit, 1); + } + + var branchUnit = []; + if (branchUsed !== "" && unitUsed !== "") { + branchUnit.push(branchUsed); + branchUnit.push(unitUsed); + returnValues.show = branchUnit; } + var allSectionsBranch = allGradoSections.concat(allUnitSection); + returnValues.hide = allSectionsBranch; + + return returnValues; +}; + +var hideSections = function (patient) { + var returnValues = { + show: [], + hide: [] + }; + + var retiredPatient = patient["retiredPatient"]; + var force = patient["force"]; + + if(retiredPatient){ + var checkbox = document.getElementById("retiredPatient"); + checkbox.addEventListener( 'change', function() { + if(this.checked) { + document.getElementById("auxiliaryOfficer").disabled = true; + document.getElementById("force").disabled = true; + if (force.conceptUuid === "6a5ed660-284a-4369-b986-76dae3e95b4b") { + document.getElementById("gradoFuerzaEjercito").disabled = true; + document.getElementById("unidadFuerzaEjercito").disabled = true; + } else if (force.conceptUuid === "ba54570b-ee77-43b9-9a15-9ce175f84022") { + document.getElementById("gradoFuerzaNaval").disabled = true; + document.getElementById("unidadFuerzaNaval").disabled = true; + } else if (force.conceptUuid === "d99b2f70-ad6a-4c76-87fe-a824e90c27e6") { + document.getElementById("gradoFuerzaAerea").disabled = true; + document.getElementById("unidadFuerzaAerea").disabled = true; + } else if (force.conceptUuid === "f8ad6a17-9b17-4c66-8089-a0f15dfe2c2f") + { + document.getElementById("gradoPoliciaNacional").disabled = true; + document.getElementById("unidadPoliciaNacional").disabled = true; + } else if (force.conceptUuid === "a7d26ea3-f686-4e3a-9b9a-7998b8998e03") + { + document.getElementById("gradoDireccionNacionalInvestigacion").disabled = true; + document.getElementById("unidadDNI").disabled = true; + } else if (force.conceptUuid === "d771e63e-7ff1-47cd-b2df-98739d6e6118") + { + document.getElementById("gradoSecretariaDefensaNacional").disabled = true; + document.getElementById("unidadSecretariaDefensaNacional").disabled = true; + } else if (force.conceptUuid === "66de2a62-0e27-4375-91b1-057dad32a1ce") + { + document.getElementById("gradoDependenciasFFAA").disabled = true; + document.getElementById("unidadDependenciasFFAA").disabled = true; + } + } else { + document.getElementById("auxiliaryOfficer").disabled = false; + document.getElementById("force").disabled = false; + if (force.conceptUuid === "6a5ed660-284a-4369-b986-76dae3e95b4b") { + document.getElementById("gradoFuerzaEjercito").disabled = false; + document.getElementById("unidadFuerzaEjercito").disabled = false; + } else if (force.conceptUuid === "ba54570b-ee77-43b9-9a15-9ce175f84022") { + document.getElementById("gradoFuerzaNaval").disabled = false; + document.getElementById("unidadFuerzaNaval").disabled = false; + } else if (force.conceptUuid === "d99b2f70-ad6a-4c76-87fe-a824e90c27e6") { + document.getElementById("gradoFuerzaAerea").disabled = false; + document.getElementById("unidadFuerzaAerea").disabled = false; + } else if (force.conceptUuid === "f8ad6a17-9b17-4c66-8089-a0f15dfe2c2f") + { + document.getElementById("gradoPoliciaNacional").disabled = false; + document.getElementById("unidadPoliciaNacional").disabled = false; + } else if (force.conceptUuid === "a7d26ea3-f686-4e3a-9b9a-7998b8998e03") + { + document.getElementById("gradoDireccionNacionalInvestigacion").disabled = false; + document.getElementById("unidadDNI").disabled = false; + } else if (force.conceptUuid === "d771e63e-7ff1-47cd-b2df-98739d6e6118") + { + document.getElementById("gradoSecretariaDefensaNacional").disabled = false; + document.getElementById("unidadSecretariaDefensaNacional").disabled = false; + } else if (force.conceptUuid === "66de2a62-0e27-4375-91b1-057dad32a1ce") + { + document.getElementById("gradoDependenciasFFAA").disabled = false; + document.getElementById("unidadDependenciasFFAA").disabled = false; + } + } + }); + } + return returnValues; -} \ No newline at end of file +}; \ No newline at end of file From 71f4e5a1a9794b723eb1cfba47b3b7d64b90218f Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 1 Nov 2017 13:34:56 -0600 Subject: [PATCH 37/60] =?UTF-8?q?Se=20agreg=C3=B3=20el=20grado=20de=20PMOP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 7 +++++++ openmrs/apps/registration/attributesConditions.js | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 2baeed11b..187163804 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -111,6 +111,13 @@ "gradoDependenciasFFAA" ] }, + "gradoPMOP": { + "title": "Grado", + "translationKey": "gradoPMOP", + "attributes": [ + "gradoPMOP" + ] + }, "unidadSecretariaDefensaNacional": { "title": "Grado", "translationKey": "unidadSecretariaDefensaNacional", diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index c387e1ab1..8a53ecd38 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -128,6 +128,10 @@ var showOrHideGradoSection = function (patient) { { returnValues = hideShowGrado(patient, returnValues, "gradoDependenciasFFAA", "unidadDependenciasFFAA"); } + else if (patientAttribute.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") + { + returnValues = hideShowGrado(patient, returnValues, "gradoPMOP", "unidadDependenciasFFAA"); + } } else { returnValues = hideShowGrado(patient, returnValues, ""); } From 9c508961d2e7634ac601e89bad52d3f7ae245e1c Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 1 Nov 2017 13:42:15 -0600 Subject: [PATCH 38/60] =?UTF-8?q?Se=20agreg=C3=B3=20funcionalidad=20de=20s?= =?UTF-8?q?how/hide=20para=20Grado=20y=20Unidad=20PMOP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/attributesConditions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 8a53ecd38..d77831605 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -130,7 +130,7 @@ var showOrHideGradoSection = function (patient) { } else if (patientAttribute.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") { - returnValues = hideShowGrado(patient, returnValues, "gradoPMOP", "unidadDependenciasFFAA"); + returnValues = hideShowGrado(patient, returnValues, "gradoPMOP", "unidadPMOP"); } } else { returnValues = hideShowGrado(patient, returnValues, ""); @@ -140,7 +140,7 @@ var showOrHideGradoSection = function (patient) { }; var hideShowGrado = function(patient, returnValues, branchUsed, unitUsed) { - var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval', 'gradoSecretariaDefensaNacional', 'gradoDependenciasFFAA']; + var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval', 'gradoSecretariaDefensaNacional', 'gradoDependenciasFFAA', 'gradoPMOP']; var allUnitSection = ['unidadFuerzaEjercito', 'unidadFuerzaAerea', 'unidadPoliciaNacional', 'unidadDNI', 'unidadFuerzaNaval', 'unidadSecretariaDefensaNacional', 'unidadDependenciasFFAA', 'unidadPMOP']; From 2eb0089353b607c7a05e747a2dd412f58dc08c9a Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 1 Nov 2017 13:47:39 -0600 Subject: [PATCH 39/60] =?UTF-8?q?Se=20deshabilit=C3=B3=20el=20Grado=20PMOP?= =?UTF-8?q?=20y=20su=20Unidad=20al=20activar=20checkbox=20de=20Paciente=20?= =?UTF-8?q?Retirado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/attributesConditions.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index d77831605..03479d88a 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -206,6 +206,10 @@ var hideSections = function (patient) { { document.getElementById("gradoDependenciasFFAA").disabled = true; document.getElementById("unidadDependenciasFFAA").disabled = true; + } else if (force.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") + { + document.getElementById("gradoPMOP").disabled = true; + document.getElementById("unidadPMOP").disabled = true; } } else { document.getElementById("auxiliaryOfficer").disabled = false; @@ -235,6 +239,10 @@ var hideSections = function (patient) { { document.getElementById("gradoDependenciasFFAA").disabled = false; document.getElementById("unidadDependenciasFFAA").disabled = false; + } else if (force.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") + { + document.getElementById("gradoPMOP").disabled = false; + document.getElementById("unidadPMOP").disabled = false; } } }); From a9bc209442a5354c3e78fb09408f90917d1a0716 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Wed, 1 Nov 2017 15:15:08 -0600 Subject: [PATCH 40/60] Se corrigieron los grados y unidades para PMOP anexandolos como Dependencia de Secretaria de Defensa Nacional --- openmrs/apps/registration/app.json | 14 -------------- .../apps/registration/attributesConditions.js | 16 ++-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 187163804..df2a95998 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -111,13 +111,6 @@ "gradoDependenciasFFAA" ] }, - "gradoPMOP": { - "title": "Grado", - "translationKey": "gradoPMOP", - "attributes": [ - "gradoPMOP" - ] - }, "unidadSecretariaDefensaNacional": { "title": "Grado", "translationKey": "unidadSecretariaDefensaNacional", @@ -153,13 +146,6 @@ "unidadFuerzaAerea" ] }, - "unidadPMOP": { - "title": "Grado", - "translationKey": "unidadPMOP", - "attributes": [ - "unidadPMOP" - ] - }, "unidadPoliciaNacional": { "title": "Grado", "translationKey": "unidadPoliciaNacional", diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 03479d88a..2fba8b70f 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -128,10 +128,6 @@ var showOrHideGradoSection = function (patient) { { returnValues = hideShowGrado(patient, returnValues, "gradoDependenciasFFAA", "unidadDependenciasFFAA"); } - else if (patientAttribute.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") - { - returnValues = hideShowGrado(patient, returnValues, "gradoPMOP", "unidadPMOP"); - } } else { returnValues = hideShowGrado(patient, returnValues, ""); } @@ -140,9 +136,9 @@ var showOrHideGradoSection = function (patient) { }; var hideShowGrado = function(patient, returnValues, branchUsed, unitUsed) { - var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval', 'gradoSecretariaDefensaNacional', 'gradoDependenciasFFAA', 'gradoPMOP']; + var allGradoSections = ['gradoFuerzaEjercito', 'gradoFuerzaAerea', 'gradoPoliciaNacional', 'gradoDireccionNacionalInvestigacion', 'gradoFuerzaNaval', 'gradoSecretariaDefensaNacional', 'gradoDependenciasFFAA']; - var allUnitSection = ['unidadFuerzaEjercito', 'unidadFuerzaAerea', 'unidadPoliciaNacional', 'unidadDNI', 'unidadFuerzaNaval', 'unidadSecretariaDefensaNacional', 'unidadDependenciasFFAA', 'unidadPMOP']; + var allUnitSection = ['unidadFuerzaEjercito', 'unidadFuerzaAerea', 'unidadPoliciaNacional', 'unidadDNI', 'unidadFuerzaNaval', 'unidadSecretariaDefensaNacional', 'unidadDependenciasFFAA']; var selectedGrado = allGradoSections.indexOf(branchUsed); var selectedUnit = allUnitSection.indexOf(unitUsed); @@ -206,10 +202,6 @@ var hideSections = function (patient) { { document.getElementById("gradoDependenciasFFAA").disabled = true; document.getElementById("unidadDependenciasFFAA").disabled = true; - } else if (force.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") - { - document.getElementById("gradoPMOP").disabled = true; - document.getElementById("unidadPMOP").disabled = true; } } else { document.getElementById("auxiliaryOfficer").disabled = false; @@ -239,10 +231,6 @@ var hideSections = function (patient) { { document.getElementById("gradoDependenciasFFAA").disabled = false; document.getElementById("unidadDependenciasFFAA").disabled = false; - } else if (force.conceptUuid === "c1c99ee0-81de-4ed4-8d59-fc1e011a799b") - { - document.getElementById("gradoPMOP").disabled = false; - document.getElementById("unidadPMOP").disabled = false; } } }); From a4ac0dec36754692c27599ad0c7a9877ac25361a Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Wed, 1 Nov 2017 22:21:52 -0600 Subject: [PATCH 41/60] Agregamos json file actualizado para form clinico --- openmrs/i18n/clinical/locale_es.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json index 8f1609edb..3aa034725 100644 --- a/openmrs/i18n/clinical/locale_es.json +++ b/openmrs/i18n/clinical/locale_es.json @@ -35,13 +35,17 @@ "CLINICAL_ACCEPT":"Aceptar", "CONCEPT_SET_GROUP_COLLAPSE_ALL_KEY": "Desplegar todo", + "CONCEPT_SET_GROUP_SEARCH_LABEL":"Busqueda Formulario de Observación", "CONCEPT_SET_GROUP_EXPAND_ALL_KEY": "Expandir todo", + "CONCEPT_SET_GROUP_REMOVE_KEY":"Remover", + "CONCEPT_SET_GROUP_PIN_UNPIN_KEY":"Anclar/Desanclar", "CONSULTATION_PAGE_KEY": "Consulta", "CONSULTATION_TAB_KEY": "Consulta", "CONDITION_LIST_DISPLAY_CONTROL_TITLE":"Condiciones", "CONDITION_LIST_NO_CONDITIONS":"No hay Condiciones disponibles", + "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_PATIENT_DOCUMENTS_KEY": "Documentos", "DASHBOARD_TAB_PATIENT_MONITORING_DRUGS_START_DATE_KEY": "Monitoreo de Paciente (D)", @@ -86,7 +90,7 @@ "DASHBOARD_TITLE_TREATMENTS_KEY": "Tratamientos", "NO_TREATMENTS_MESSAGE": "Sin tratamientos para este paciente.", "DASHBOARD_TITLE_VISITS_KEY": "Visitas", - "DASHBOARD_TITLE_VITALS_KEY":"Valores Nutricionales", + "DASHBOARD_TITLE_VITALS_KEY":"Vitales", "DIAGNOSIS_BOARD_LABEL_KEY":"Diagnóstico", "DISPOSITION_BOARD_LABEL_KEY":"Disposición", @@ -180,6 +184,8 @@ "MEDICATION_DOSING_INSTRUCTIONS_PLACEHOLDER":"Escoger Instrucciones", "MEDICATION_CHOOSE_QUANTITY_UNIT_PLACEHOLDER":"Escoger Unidades", "MEDICATION_ADD_ORDERSET_FORM_TITLE":"Ordenar conjunto de pedidos", + "MESSAGE_DIALOG_OPTION_COPY":"COPIAR", + "MESSAGE_DIALOG_OPTION_OKAY":"OKAY", "MODULE_LABEL_ACTIVE_KEY": "Activo", "MODULE_LABEL_ALL_KEY": "Todos los pacientes", From 4d426401a8e60ebd3e28144ca69af6cdae2f04a2 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Wed, 1 Nov 2017 23:06:57 -0600 Subject: [PATCH 42/60] se remplazo el json file exxtension.json , se agregaron nuevas traduciones --- openmrs/apps/clinical/extension.json | 98 ++++++++++++++-------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json index 8dd401c45..314a6af34 100644 --- a/openmrs/apps/clinical/extension.json +++ b/openmrs/apps/clinical/extension.json @@ -3,7 +3,7 @@ "id": "bahmni.clinical.consultation.observations", "extensionPointId": "org.bahmni.clinical.consultation.board", "type": "link", - "label": "Observations", + "label": "Historia Clínica", "translationKey":"OBSERVATIONS_BOARD_LABEL_KEY", "url": "concept-set-group/observations", "default": true, @@ -11,6 +11,17 @@ "order": 1, "requiredPrivilege": "app:clinical:observationTab" }, + "bahmniClinicalConsultationOrders": { + "id": "bahmni.clinical.consultation.orders", + "extensionPointId": "org.bahmni.clinical.consultation.board", + "type": "link", + "label": "Orders", + "translationKey":"ORDERS_BOARD_LABEL_KEY", + "url": "orders", + "icon": "icon-user-md", + "order": 2, + "requiredPrivilege": "app:clinical:ordersTab" + }, "diagnosis": { "id": "bahmni.clinical.consultation.diagnosis", "extensionPointId": "org.bahmni.clinical.consultation.board", @@ -19,19 +30,22 @@ "translationKey":"DIAGNOSIS_BOARD_LABEL_KEY", "url": "diagnosis", "icon": "fa-user-md", - "order": 2, + "order": 3, "requiredPrivilege": "app:clinical:diagnosisTab" }, - "disposition": { - "id": "bahmni.clinical.consultation.disposition", + "bahmniClinicalBillingTreatment": { + "id": "bahmni.clinical.billing.treatment", "extensionPointId": "org.bahmni.clinical.consultation.board", "type": "link", - "label": "Disposition", - "translationKey":"DISPOSITION_BOARD_LABEL_KEY", - "url": "disposition", + "label": "Medications", + "translationKey":"MEDICATIONS_BOARD_LABEL_KEY", + "extensionParams":{ + "tabConfigName": "allMedicationTabConfig" + }, + "url": "treatment", "icon": "fa-user-md", - "order": 3, - "requiredPrivilege": "app:clinical:dispositionTab" + "order": 4, + "requiredPrivilege": "app:clinical:treatmentTab" }, "consultationSummary": { "id": "bahmni.clinical.consultation.summary", @@ -44,6 +58,17 @@ "order": 5, "requiredPrivilege": "app:clinical:consultationTab" }, + "disposition": { + "id": "bahmni.clinical.consultation.disposition", + "extensionPointId": "org.bahmni.clinical.consultation.board", + "type": "link", + "label": "Disposition", + "translationKey":"DISPOSITION_BOARD_LABEL_KEY", + "url": "disposition", + "icon": "fa-user-md", + "order": 6, + "requiredPrivilege": "app:clinical:dispositionTab" + }, "bahmniClinicalOrdersPending": { "id": "bahmni.clinical.orders.pending", "extensionPointId": "org.bahmni.clinical.orders", @@ -142,17 +167,28 @@ "order": 1, "requiredPrivilege": "app:clinical:history" }, - "bahmniClinicalConceptSetGroupObservationsVitals": { - "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "bahmniClinicalConceptSetGroupObservationsCurrent": { + "id": "bahmni.clinical.conceptSetGroup.observations.current", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", "type": "config", "extensionParams": { "default": true, - "conceptName": "Vitals" + "conceptName": "Current History" }, "order": 2, "requiredPrivilege": "app:clinical" }, + "bahmniClinicalConceptSetGroupObservationsPhysicalExam": { + "id": "bahmni.clinical.conceptSetGroup.observations.physical_exam", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "Physical Examination" + }, + "order": 3, + "requiredPrivilege": "app:clinical" + }, "bahmniClinicalConceptSetGroupObservationsSecondVitals": { "id": "bahmni.clinical.conceptSetGroup.observations.secondVitals", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", @@ -198,41 +234,5 @@ }, "order": 6, "requiredPrivilege": "Discharge Summary" - }, - "bahmniClinicalBillingTreatment": { - "id": "bahmni.clinical.billing.treatment", - "extensionPointId": "org.bahmni.clinical.consultation.board", - "type": "link", - "label": "Medications", - "translationKey":"MEDICATIONS_BOARD_LABEL_KEY", - "extensionParams":{ - "tabConfigName": "allMedicationTabConfig" - }, - "url": "treatment", - "icon": "fa-user-md", - "order": 7, - "requiredPrivilege": "app:clinical:treatmentTab" - }, - "bahmniClinicalConsultationOrders": { - "id": "bahmni.clinical.consultation.orders", - "extensionPointId": "org.bahmni.clinical.consultation.board", - "type": "link", - "label": "Orders", - "translationKey":"ORDERS_BOARD_LABEL_KEY", - "url": "orders", - "icon": "icon-user-md", - "order": 6, - "requiredPrivilege": "app:clinical:ordersTab" - }, - "bahmniClinicalConsultationBacteriology": { - "id": "bahmni.clinical.consultation.bacteriology", - "extensionPointId": "org.bahmni.clinical.consultation.board", - "type": "link", - "label": "Bacteriology", - "translationKey":"BACTERIOLOGY_BOARD_LABEL_KEY", - "url": "bacteriology", - "icon": "icon-user-md", - "order": 7, - "requiredPrivilege": "app:clinical:bacteriologyTab" } -} \ No newline at end of file +} From eea68a1342a9d499654a0a7c5018c6684ee9e5e4 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Wed, 1 Nov 2017 23:36:50 -0600 Subject: [PATCH 43/60] Se agregaron nuevas traducciones --- openmrs/i18n/clinical/locale_es.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json index 3aa034725..d6baee357 100644 --- a/openmrs/i18n/clinical/locale_es.json +++ b/openmrs/i18n/clinical/locale_es.json @@ -8,6 +8,7 @@ "BACTERIOLOGY_BUTTON_ADD_SAMPLE_KEY":"Agregar muestra", "BACTERIOLOGY_BUTTON_CLEAR_KEY":"Borrar", + "BAHMNI_HOME_TRANSLATION_KEY": "Sitio Bahmni", "CLINICAL_DAYS_TRANSLATION_KEY": "días ", @@ -21,7 +22,6 @@ "CLINICAL_DIAGNOSIS_ORDER_PRIMARY":"Primario", "CLINICAL_DIAGNOSIS_ORDER_SECONDARY":"Secundario", "CLINICAL_DIAGNOSIS_CERTAINTY_CONFIRMED":"Confirmado", - "CLINICAL_DIAGNOSIS_CERTAINTY_PRESUMED":"Presunto", "CLINICAL_SAVE_SUCCESS_MESSAGE_KEY":"Guardado", "CONDITION_LIST_NO_RETRO_MODE":"Lista de Condiciones", @@ -41,6 +41,15 @@ "CONCEPT_SET_GROUP_PIN_UNPIN_KEY":"Anclar/Desanclar", "CONSULTATION_PAGE_KEY": "Consulta", "CONSULTATION_TAB_KEY": "Consulta", + "CONCEPT_SET_GROUP_SEARCH_LABEL":"Búsqueda Formulario de Historia Clínica", + "OBSERVATIONS_BOARD_LABEL_KEY": "Historia Clínica", + "ORDERS_BOARD_LABEL_KEY":"Estudios y Peticiones", + "MEDICATIONS_BOARD_LABEL_KEY":"Tratamiento", + "CONSULTATION_BOARD_LABEL_KEY":"Notas de Consulta", + "EMPTY_TEMPLATE_MESSAGE":"Lista de Formularios de Historia Clínica Vacía", + "DISPOSITION_BOARD_LABEL_KEY":"Remisiones", + "CLINICAL_DIAGNOSIS_CERTAINTY_PRESUMED":"Probable", + "CONDITION_LIST_DISPLAY_CONTROL_TITLE":"Condiciones", "CONDITION_LIST_NO_CONDITIONS":"No hay Condiciones disponibles", From 07fa2aa7b0618e6c77ac6b5068e3c827eb26f727 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Thu, 2 Nov 2017 14:45:50 -0600 Subject: [PATCH 44/60] Se arreglo conflicto de merge --- openmrs/i18n/clinical/locale_es.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json index d6baee357..2658e264b 100644 --- a/openmrs/i18n/clinical/locale_es.json +++ b/openmrs/i18n/clinical/locale_es.json @@ -8,7 +8,6 @@ "BACTERIOLOGY_BUTTON_ADD_SAMPLE_KEY":"Agregar muestra", "BACTERIOLOGY_BUTTON_CLEAR_KEY":"Borrar", - "BAHMNI_HOME_TRANSLATION_KEY": "Sitio Bahmni", "CLINICAL_DAYS_TRANSLATION_KEY": "días ", @@ -33,7 +32,6 @@ "CONDITION_LIST_INACTIVE":"Inactivo", "CONDITION_LIST_HISTORY_OF":"Historia de", "CLINICAL_ACCEPT":"Aceptar", - "CONCEPT_SET_GROUP_COLLAPSE_ALL_KEY": "Desplegar todo", "CONCEPT_SET_GROUP_SEARCH_LABEL":"Busqueda Formulario de Observación", "CONCEPT_SET_GROUP_EXPAND_ALL_KEY": "Expandir todo", @@ -41,20 +39,13 @@ "CONCEPT_SET_GROUP_PIN_UNPIN_KEY":"Anclar/Desanclar", "CONSULTATION_PAGE_KEY": "Consulta", "CONSULTATION_TAB_KEY": "Consulta", - "CONCEPT_SET_GROUP_SEARCH_LABEL":"Búsqueda Formulario de Historia Clínica", - "OBSERVATIONS_BOARD_LABEL_KEY": "Historia Clínica", - "ORDERS_BOARD_LABEL_KEY":"Estudios y Peticiones", - "MEDICATIONS_BOARD_LABEL_KEY":"Tratamiento", - "CONSULTATION_BOARD_LABEL_KEY":"Notas de Consulta", "EMPTY_TEMPLATE_MESSAGE":"Lista de Formularios de Historia Clínica Vacía", - "DISPOSITION_BOARD_LABEL_KEY":"Remisiones", "CLINICAL_DIAGNOSIS_CERTAINTY_PRESUMED":"Probable", "CONDITION_LIST_DISPLAY_CONTROL_TITLE":"Condiciones", "CONDITION_LIST_NO_CONDITIONS":"No hay Condiciones disponibles", - "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_GENERAL_KEY": "General", "DASHBOARD_TAB_PATIENT_DOCUMENTS_KEY": "Documentos", "DASHBOARD_TAB_PATIENT_MONITORING_DRUGS_START_DATE_KEY": "Monitoreo de Paciente (D)", From 3a16851fdbaf9701a1273c2637466ee2d4872e68 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Thu, 2 Nov 2017 19:17:02 -0600 Subject: [PATCH 45/60] =?UTF-8?q?Se=20actualiz=C3=B3=20el=20AddressHierarc?= =?UTF-8?q?hy=20para=20usar=20el=20Auto=20Completaci=C3=B3n=20en=20base=20?= =?UTF-8?q?a=20la=20Ciudad,=20se=20modific=C3=B3=20la=20etiqueta=20de=20Lu?= =?UTF-8?q?gar=20de=20Residencia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 2 +- openmrs/i18n/registration/locale_es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index df2a95998..ee98c30f4 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -172,7 +172,7 @@ }, "addressHierarchy": { "showAddressFieldsTopDown": false, - "strictAutocompleteFromLevel": "stateProvince" + "strictAutocompleteFromLevel": "cityVillage" }, "relationshipTypeMap": { "Doctor":"provider", diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index f7e6e9b87..2817b064e 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -57,7 +57,7 @@ "REGISTRATION_LABEL_DOB": "Fecha de nacimiento", "REGISTRATION_LABEL_ESTIMATE": "Estimado", "REGISTRATION_LABEL_BIRTH_TIME": "Tiempo de nacimiento", - "REGISTRATION_LABEL_ADDRESS_INFO": "Información de dirección", + "REGISTRATION_LABEL_ADDRESS_INFO": "Lugar de Residencia", "REGISTRATION_LABEL_OTHER_INFO": "Otra información", "REGISTRATION_LABEL_DEATH_INFO": "Información de Muerte", "REGISTRATION_LABEL_REASON_FOR_DEATH": "Razón", From 985650f40c1240a65e4b5afd9a58176d63348a5f Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 3 Nov 2017 10:07:57 -0600 Subject: [PATCH 46/60] =?UTF-8?q?Se=20agreg=C3=B3=20la=20secci=C3=B3n=20de?= =?UTF-8?q?=20Lugar=20de=20Trabajo=20con=20sus=20respectivos=20campos.=20Y?= =?UTF-8?q?=20se=20agreg=C3=B3=20la=20validacion=20para=20dichos=20campos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 15 ++++++ .../apps/registration/attributesConditions.js | 54 +++++++++++++++++++ openmrs/i18n/registration/locale_en.json | 13 ++++- openmrs/i18n/registration/locale_es.json | 13 ++++- 4 files changed, 93 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index ee98c30f4..c10e3ebd9 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -160,6 +160,21 @@ "unidadDNI" ] }, + "workPlaceAddress": { + "title": "Lugar de Trabajo", + "translationKey": "Lugar de Trabajo", + "attributes": [ + "residenceWork", + "houseNoWork", + "streetWork", + "blockWork", + "cityWork", + "municipalityWork", + "departmentWork", + "countryWork", + "addressWork" + ] + }, "hidden": { "attributes": [ "primaryContact" diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 2fba8b70f..91326cec9 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -58,6 +58,60 @@ Bahmni.Registration.AttributesConditions.rules = { return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); }, errorMessage: "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY" + }, + "residenceWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY" + }, + "houseNoWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY" + }, + "streetWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY" + }, + "blockWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_BLOCK_NUMBER_WORK_TEXT_ERROR_KEY" + }, + "cityWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_CITY_WORK_TEXT_ERROR_KEY" + }, + "municipalityWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_MUNICIPALITY_WORK_TEXT_ERROR_KEY" + }, + "departmentWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY" + }, + "countryWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY" + }, + "addressWork": { + method: function (name, value, personAttributeDetails) { + return value.length <= 50; + }, + errorMessage: "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY" } }; } diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 463e9d5e4..cd9b52a98 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -30,5 +30,16 @@ "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "The field 'Correo electrónico trabajo' doesn't have a valid format email@domain.com", "REGISTRATION_ID_TEXT_ERROR_KEY": "The field 'Numero de identificacion' doesn't have a valid format for Card Id. Valid format is 13 numbers without spaces", "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "The field 'Numero de identificacion' doesn't have a valid format for Residence number. Valid format is 15 numbers without spaces", - "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "The field 'Numero de identificacion' can't be blank" + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "The field 'Numero de identificacion' can't be blank", + + "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY": "The field 'Residencia, Colonia, o Barrio' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY": "The field 'Número de Casa' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY": "The field 'Calle' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_BLOCK_NUMBER_WORK_TEXT_ERROR_KEY": "The field 'Bloque' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_CITY_WORK_TEXT_ERROR_KEY": "The field 'Ciudad' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_MUNICIPALITY_WORK_TEXT_ERROR_KEY": "The field 'Municipalidad' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "The field 'Departamento' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "The field 'País' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "The field 'Dirección Descriptiva' from Work of Place exceeds the limit of allowed characters (50)", + "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Work Place" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 2817b064e..5e02a3a62 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -117,5 +117,16 @@ "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "El campo 'Correo electrónico trabajo' no tiene el formato válido correo@dominio.com", "REGISTRATION_ID_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Tarjeta de identidad'. Deben ser 13 números sin espacios.", "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Numero de Residencia'. Deben ser 15 números sin espacios.", - "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte" + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte", + + "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY": "El campo 'Residencia, Colonia, o Barrio' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Número de Casa' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Calle' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_BLOCK_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Bloque' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_CITY_WORK_TEXT_ERROR_KEY": "El campo 'Ciudad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_MUNICIPALITY_WORK_TEXT_ERROR_KEY": "El campo 'Municipalidad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo" } From 4e905eb2f1593ad881ffbde51cd4ec3b339ffe86 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Fri, 3 Nov 2017 13:36:28 -0600 Subject: [PATCH 47/60] =?UTF-8?q?Se=20agreg=C3=B3=20llave=20para=20el=20ti?= =?UTF-8?q?tulo=20de=20Domicilio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 4 ++++ openmrs/i18n/registration/locale_en.json | 3 ++- openmrs/i18n/registration/locale_es.json | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index c10e3ebd9..06aa5d153 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -160,6 +160,10 @@ "unidadDNI" ] }, + "patientHomeAddress": { + "title": "Domicilio", + "translationKey": "Domicilio" + }, "workPlaceAddress": { "title": "Lugar de Trabajo", "translationKey": "Lugar de Trabajo", diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index cd9b52a98..de9186786 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -41,5 +41,6 @@ "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "The field 'Departamento' from Work of Place exceeds the limit of allowed characters (50)", "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "The field 'País' from Work of Place exceeds the limit of allowed characters (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "The field 'Dirección Descriptiva' from Work of Place exceeds the limit of allowed characters (50)", - "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Work Place" + "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Work Place", + "REGISTRATION_TITLE_ADDRESS_PATIENT": "Address" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 5e02a3a62..fe2d16190 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -128,5 +128,6 @@ "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo" + "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", + "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio" } From 3f9f854b7b4af5e0ea824897128c8335c74c2b7f Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Sat, 4 Nov 2017 17:17:39 -0600 Subject: [PATCH 48/60] Se agregaron validaciones de telefono1,2,3 en contacto de emergencia, expresiones regulares para los campos en atrtributeCondition y se crearon las label de traducion en locales y localen --- openmrs/apps/registration/app.json | 17 ++++++++++++++ .../apps/registration/attributesConditions.js | 23 +++++++++++++++++++ openmrs/i18n/registration/locale_en.json | 7 +++++- openmrs/i18n/registration/locale_es.json | 7 +++++- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 06aa5d153..16a8d1f27 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -164,6 +164,23 @@ "title": "Domicilio", "translationKey": "Domicilio" }, + "emergencyContact":{ + "title": "Contacto de Emergencia", + "translationKey": "Contacto de emergencia", + "attributes" :[ + "emergencyContactFirstName", + "emergencyContactSecondName", + "emergencyContactFirstLastname", + "emergencyContactSecondLastname", + "emergencyContactPhone1", + "emergencyContactPhone2", + "emergencyContactPhone3", + "emergencyContactKin", + "emergencyContactEmail" + ] + + } + , "workPlaceAddress": { "title": "Lugar de Trabajo", "translationKey": "Lugar de Trabajo", diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 91326cec9..00bed3ab3 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -112,6 +112,29 @@ Bahmni.Registration.AttributesConditions.rules = { return value.length <= 50; }, errorMessage: "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY" + }, + "emergencyContactPhone1": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" + }, + "emergencyContactPhone2": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" + }, + "emergencyContactPhone3": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" + },"emergencyContactEmail": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" } }; } diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index de9186786..1c93a4b7a 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -42,5 +42,10 @@ "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "The field 'País' from Work of Place exceeds the limit of allowed characters (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "The field 'Dirección Descriptiva' from Work of Place exceeds the limit of allowed characters (50)", "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Work Place", - "REGISTRATION_TITLE_ADDRESS_PATIENT": "Address" + "REGISTRATION_TITLE_ADDRESS_PATIENT": "Address", + "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Emergency contact", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia' doesn't have a valid format email@domain.com" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index fe2d16190..a6b1fcecb 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -128,6 +128,11 @@ "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", - "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio" + "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", + "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com" } From 110732c576f4e1dbe0e742835a2c5442a02c833a Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Sat, 4 Nov 2017 17:57:45 -0600 Subject: [PATCH 49/60] Se corrijieron mensaje de traduccion --- openmrs/apps/registration/app.json | 4 +--- openmrs/i18n/registration/locale_es.json | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 16a8d1f27..8b9565fe8 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -178,9 +178,7 @@ "emergencyContactKin", "emergencyContactEmail" ] - - } - , + }, "workPlaceAddress": { "title": "Lugar de Trabajo", "translationKey": "Lugar de Trabajo", diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index a6b1fcecb..e0e84410f 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -128,9 +128,9 @@ "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono móvil en contacto de emergencia' no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia no tiene el formato válido +5040000-0000", "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", From ad9b7e168ddff6608e99eb8fa0d37d4dd9b1d749 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Mon, 6 Nov 2017 11:24:02 -0600 Subject: [PATCH 50/60] Se agregaron nuevas traducciones en el json file de espaniol de registro --- openmrs/i18n/registration/locale_es.json | 57 ++++++++---------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index e0e84410f..fcb7ad667 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -4,24 +4,26 @@ "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY": "e", "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY": "n", "REGISTRATION_VIEW_CONFIG_KEY": "Ver", + "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Tarjeta de Reg. (Local)", "REGISTRATION_PRINT_REG_CARD_KEY":"Imprimir Tarjeta de Registro", "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementario", "REGISTRATION_AGE_ERROR_KEY":"La Edad debe ser un campo positivo", "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"El Número de Teléfono debe tener como mínimo 6 dígitos", - "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Caste should contain only alphanumeric characters", - "REGISTRATION_BRING_CARD_TEXT_KEY":"It is quite important to bring the card to the hospital.", - "REGISTRATION_TAKE_MEDICINES_TEXT_KEY": "Take medicines according to instructions of the doctor.", - "REGISTRATION_TIMINGS_TEXT_KEY":"Registration Timings are from 8:30 am to 12:00 pm.", - "REGISTRATION_OPD_DAYS_TEXT_KEY" : "OPD days are on Monday, Wednesday, Friday.", - "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Sundays are holidays.", - "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Smoking, Tobacco chewing can cause cancer, heart diseases and asthama.", + "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta solo debe contener caracteres alfanuméricos", + "REGISTRATION_BRING_CARD_TEXT_KEY":"Es muy importante llevar la tarjeta al hospital.", + "REGISTRATION_TAKE_MEDICINES_TEXT_KEY": "Tome los medicamentos de acuerdo con las indicaciones del médico..", + "REGISTRATION_TIMINGS_TEXT_KEY":"Los horarios de registro son de 8:30 a.m. a 12:00 p.m.", + "REGISTRATION_OPD_DAYS_TEXT_KEY" : "Los días de OPD son los lunes, miércoles y viernes.", + "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Los domingos son feriados.", + "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Fumar, masticar tabaco puede causar cáncer, enfermedades del corazón y asthama.", "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Jan Swasthya Sahyog", "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)", "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", - "FEE_INFORMATION_LOCALE_KEY": "Fee Information", - "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", + "FEE_INFORMATION_LOCALE_KEY": "Información de Tarifa", + "NUTRITIONAL_VALUES_LOCALE_KEY": "Valores Nutricionales", "REGISTRATION_PRINT_WITH_BARCODE": "Imprimir Código de Barra ", + "REGISTRATION_TITLE_KEY": "Registro de Pacientes", "REGISTRATION_LABEL_SCANNED": "Escaneada", "REGISTRATION_LABEL_PAPER": "Papel", @@ -37,7 +39,6 @@ "REGISTRATION_LABEL_PATIENT_FIRSTNAME": "Nombre", "REGISTRATION_LABEL_PATIENT_MIDDLE_NAME": "Segundo nombre", "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", - "REGISTRATION_LABEL_PATIENT_SECOND_LAST_NAME": "Segundo apellido", "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", @@ -57,7 +58,7 @@ "REGISTRATION_LABEL_DOB": "Fecha de nacimiento", "REGISTRATION_LABEL_ESTIMATE": "Estimado", "REGISTRATION_LABEL_BIRTH_TIME": "Tiempo de nacimiento", - "REGISTRATION_LABEL_ADDRESS_INFO": "Lugar de Residencia", + "REGISTRATION_LABEL_ADDRESS_INFO": "Información de dirección", "REGISTRATION_LABEL_OTHER_INFO": "Otra información", "REGISTRATION_LABEL_DEATH_INFO": "Información de Muerte", "REGISTRATION_LABEL_REASON_FOR_DEATH": "Razón", @@ -81,7 +82,8 @@ "REGISTRATION_LABEL_YES": "Sí", "REGISTRATION_LABEL_NO": "No", "REGISTRATION_LABEL_SAVE": "Salvar", - "REGISTRATION_LABEL_BACK": "Espalda", + "REGISTRATION_LABEL_BACK": "Regresar", + "REGISTRATION_LABEL_ENTER_VISIT": "Introduzca\ndetalles de la Visita", "REGISTRATION_TITLE_ADDITIONAL_PATIENT": "informacion Adicional del Paciente ", "REGISTRATION_TITLE_RELATIONSHIPS": "Relaciones", @@ -106,33 +108,10 @@ "MESSAGE_DIALOG_OPTION_COPY": "Copia error", "MESSAGE_DIALOG_OPTION_OKAY": "OK", "NO_LOCATION_TAGGED_TO_VISIT_LOCATION": "No hay ubicación puesta para la Ubicacion de la Visita Encontrada", - "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Please enter a value in the mandatory fields or correct the value in the highlighted fields to proceed", - "OBS_BOOLEAN_YES_KEY": "Yes", + "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Ingrese un valor en los campos obligatorios o corrija el valor en los campos resaltados para continuar.", + "OBS_BOOLEAN_YES_KEY": "Sí", "OBS_BOOLEAN_NO_KEY": "No", - "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", - "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "El campo 'Teléfono móvil' no tiene el formato válido +5040000-0000", - "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "El campo 'Teléfono casa' no tiene el formato válido 0000-0000", - "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "El campo 'Teléfono trabajo' no tiene el formato válido 0000-0000", - "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal' no tiene el formato válido correo@dominio.com", - "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "El campo 'Correo electrónico trabajo' no tiene el formato válido correo@dominio.com", - "REGISTRATION_ID_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Tarjeta de identidad'. Deben ser 13 números sin espacios.", - "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Numero de Residencia'. Deben ser 15 números sin espacios.", - "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte", - "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY": "El campo 'Residencia, Colonia, o Barrio' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Número de Casa' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Calle' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_BLOCK_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Bloque' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_CITY_WORK_TEXT_ERROR_KEY": "El campo 'Ciudad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_MUNICIPALITY_WORK_TEXT_ERROR_KEY": "El campo 'Municipalidad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia no tiene el formato válido +5040000-0000", - "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", - "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", - "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", - "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com" + "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", + "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nevo" } From f834474f76c545643264158385082b2465b47539 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Mon, 6 Nov 2017 11:58:39 -0600 Subject: [PATCH 51/60] Se arreglo conflictos en el json file locales --- openmrs/i18n/registration/locale_es.json | 53 +++++++++++++++++------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index fcb7ad667..5fbdf20b8 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -1,22 +1,21 @@ { "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", - "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nuevo", + "REGISTRATION_CREATE_NEW_CONFIG_KEY": "Crear Nuevo", "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY": "e", "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY": "n", "REGISTRATION_VIEW_CONFIG_KEY": "Ver", - "REGISTRATION_LABEL_NEW_PATIENT": "NUEVO PACIENTE", - "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Tarjeta de Reg. (Local)", - "REGISTRATION_PRINT_REG_CARD_KEY":"Imprimir Tarjeta de Registro", - "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementario", - "REGISTRATION_AGE_ERROR_KEY":"La Edad debe ser un campo positivo", - "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"El Número de Teléfono debe tener como mínimo 6 dígitos", - "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta solo debe contener caracteres alfanuméricos", - "REGISTRATION_BRING_CARD_TEXT_KEY":"Es muy importante llevar la tarjeta al hospital.", + "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY": "Imprimir Tarjeta de Reg. (Local)", + "REGISTRATION_PRINT_REG_CARD_KEY": "Imprimir Tarjeta de Registro", + "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER": "Imprimir Papel Suplementario", + "REGISTRATION_AGE_ERROR_KEY": "La Edad debe ser un campo positivo", + "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY": "El Número de Teléfono debe tener como mínimo 6 dígitos", + "REGISTRATION_CASTE_TEXT_ERROR_KEY": "Casta solo debe contener caracteres alfanuméricos", + "REGISTRATION_BRING_CARD_TEXT_KEY": "Es muy importante llevar la tarjeta al hospital.", "REGISTRATION_TAKE_MEDICINES_TEXT_KEY": "Tome los medicamentos de acuerdo con las indicaciones del médico..", - "REGISTRATION_TIMINGS_TEXT_KEY":"Los horarios de registro son de 8:30 a.m. a 12:00 p.m.", - "REGISTRATION_OPD_DAYS_TEXT_KEY" : "Los días de OPD son los lunes, miércoles y viernes.", + "REGISTRATION_TIMINGS_TEXT_KEY": "Los horarios de registro son de 8:30 a.m. a 12:00 p.m.", + "REGISTRATION_OPD_DAYS_TEXT_KEY": "Los días de OPD son los lunes, miércoles y viernes.", "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Los domingos son feriados.", - "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Fumar, masticar tabaco puede causar cáncer, enfermedades del corazón y asthama.", + "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY": "Fumar, masticar tabaco puede causar cáncer, enfermedades del corazón y asthama.", "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Jan Swasthya Sahyog", "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)", "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", @@ -39,6 +38,7 @@ "REGISTRATION_LABEL_PATIENT_FIRSTNAME": "Nombre", "REGISTRATION_LABEL_PATIENT_MIDDLE_NAME": "Segundo nombre", "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", + "REGISTRATION_LABEL_PATIENT_SECOND_LAST_NAME": "Segundo apellido", "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", @@ -111,7 +111,30 @@ "REGISTRATION_FORM_ERRORS_MESSAGE_KEY": "Ingrese un valor en los campos obligatorios o corrija el valor en los campos resaltados para continuar.", "OBS_BOOLEAN_YES_KEY": "Sí", "OBS_BOOLEAN_NO_KEY": "No", + "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "El campo 'Teléfono móvil' no tiene el formato válido +5040000-0000", + "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "El campo 'Teléfono casa' no tiene el formato válido 0000-0000", + "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "El campo 'Teléfono trabajo' no tiene el formato válido 0000-0000", + "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal' no tiene el formato válido correo@dominio.com", + "REGISTRATION_EMAIL_WORK_TEXT_ERROR_KEY": "El campo 'Correo electrónico trabajo' no tiene el formato válido correo@dominio.com", + "REGISTRATION_ID_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Tarjeta de identidad'. Deben ser 13 números sin espacios.", + "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Numero de Residencia'. Deben ser 15 números sin espacios.", + "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte", - "REGISTRATION_SEARCH_CONFIG_KEY": "Buscar", - "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Crear Nevo" -} + "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY": "El campo 'Residencia, Colonia, o Barrio' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Número de Casa' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Calle' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_BLOCK_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Bloque' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_CITY_WORK_TEXT_ERROR_KEY": "El campo 'Ciudad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_MUNICIPALITY_WORK_TEXT_ERROR_KEY": "El campo 'Municipalidad' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 1' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 2' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 3' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", + "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", + "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY": "Contacto de emergencia", + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com" +} \ No newline at end of file From 71a8c4650441dd549f8cbf3b7bd3cbf577986006 Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Mon, 6 Nov 2017 12:11:41 -0600 Subject: [PATCH 52/60] =?UTF-8?q?De=20agreg=C3=B3=20secion=20nueva=20para?= =?UTF-8?q?=20Contacto=20de=20Emergencia=20Adicional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openmrs/apps/registration/app.json | 15 +++++++++++++++ openmrs/i18n/registration/locale_en.json | 3 ++- openmrs/i18n/registration/locale_es.json | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 8b9565fe8..e67783c36 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -179,6 +179,21 @@ "emergencyContactEmail" ] }, + "secundaryEmergencyContact":{ + "title": "Contacto de Emergencia Adicional", + "translationKey": "Contacto de Emergencia Adicional", + "attributes" :[ + "scundaryEmergencyContactFirstName", + "secundaryEmergencyContactSecondName", + "secundaryEmergencyContactFirstLastname", + "secundaryEmergencyContactSecondLastname", + "secundaryEmergencyContactPhone1", + "secundaryEmergencyContactPhone2", + "secundaryEmergencyContactPhone3", + "secundaryEmergencyContactKin", + "secundaryEmergencyContactEmail" + ] + }, "workPlaceAddress": { "title": "Lugar de Trabajo", "translationKey": "Lugar de Trabajo", diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 1c93a4b7a..d000da0be 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -47,5 +47,6 @@ "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", - "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia' doesn't have a valid format email@domain.com" + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia' doesn't have a valid format email@domain.com", + "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Additional Emergency Contact (Optional)" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index e0e84410f..da6e1f089 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -134,5 +134,6 @@ "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", - "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com" + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com", + "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Contacto de Emergencia Adicional (Opcional)" } From 3c3e9b801d85d41a4ae4615f1381e5b1912ad915 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Mon, 6 Nov 2017 12:26:50 -0600 Subject: [PATCH 53/60] Se modificaron algunas traducciones --- openmrs/i18n/registration/locale_es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 5fbdf20b8..f20c4be63 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -40,7 +40,7 @@ "REGISTRATION_LABEL_PATIENT_LAST_NAME": "Apellido", "REGISTRATION_LABEL_PATIENT_SECOND_LAST_NAME": "Segundo apellido", "REGISTRATION_LABEL_PATIENT_ENTER_NAME": "Introduzca el nombre del paciente.", - "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el medio nombre del paciente.", + "REGISTRATION_LABEL_PATIENT_ENTER_MIDDLE_NAME": "Ingrese el segundo nombre del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_LAST_NAME": "Ingrese el apellido del paciente.", "REGISTRATION_LABEL_PATIENT_ENTER_REGISTRATION": "Introduzca número de registro de pacientes", "REGISTRATION_LABEL_CASTE_SAME_LAST_NAME": "Casta igual que el apellido", @@ -136,5 +136,5 @@ "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY": "Contacto de emergencia", - "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com" + "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY": "El campo 'Correo Electrónico Personal' en contacto de emergencia no tiene el formato válido correo@dominio.com" } \ No newline at end of file From 803c1cb8c0896c221814bdaa65cefb576f213b8d Mon Sep 17 00:00:00 2001 From: Cristian Echeverria Date: Mon, 6 Nov 2017 13:53:38 -0600 Subject: [PATCH 54/60] Updates seccion de contacto de emergencia --- openmrs/apps/registration/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index e67783c36..61e886a80 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -183,7 +183,7 @@ "title": "Contacto de Emergencia Adicional", "translationKey": "Contacto de Emergencia Adicional", "attributes" :[ - "scundaryEmergencyContactFirstName", + "secundaryEmergencyContactFirstName", "secundaryEmergencyContactSecondName", "secundaryEmergencyContactFirstLastname", "secundaryEmergencyContactSecondLastname", From b190bb4761c004fd83ce2aa0a35ff367c70f3c32 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Mon, 6 Nov 2017 22:38:31 -0600 Subject: [PATCH 55/60] Se agrego nuevas secciones para contantos de emergencia adicional --- openmrs/apps/registration/app.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 61e886a80..090f37a96 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -180,7 +180,7 @@ ] }, "secundaryEmergencyContact":{ - "title": "Contacto de Emergencia Adicional", + "title": "Contacto de Emergencia Adicional 1", "translationKey": "Contacto de Emergencia Adicional", "attributes" :[ "secundaryEmergencyContactFirstName", @@ -194,6 +194,21 @@ "secundaryEmergencyContactEmail" ] }, + "thirdEmergencyContact":{ + "titlle": "Contacto de Emergencia Adicional 2", + "translationKey": "Contacto de Emergencia Adicional", + "attributes" :[ + "thirdEmergencyContactFirstName", + "thirdEmergencyContactSecondName", + "thirdEmergencyContactFirstLastname", + "thirdEmergencyContactSecondLastname", + "thirdEmergencyContactPhone1", + "thirdEmergencyContactPhone2", + "thirdEmergencyContactPhone3", + "thirdEmergencyContactKin", + "thirdEmergencyContactEmail" + ] + }, "workPlaceAddress": { "title": "Lugar de Trabajo", "translationKey": "Lugar de Trabajo", From cdf276811be77b16aa0ffaec4c72e29c4c4ac571 Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Tue, 7 Nov 2017 15:15:25 -0600 Subject: [PATCH 56/60] Se agregaron las validaciones y traducciones para los campos adiciones --- .../apps/registration/attributesConditions.js | 52 +++++++++++++++++++ openmrs/i18n/registration/locale_en.json | 15 ++++-- openmrs/i18n/registration/locale_es.json | 9 +++- 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 00bed3ab3..f32251704 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -29,6 +29,12 @@ Bahmni.Registration.AttributesConditions.rules = { }, errorMessage: error_msg }, + "patient.givenName":{ + method: function (name, value, personAttributeDetails) { + return value && value.legnth > 0; + }, + errorMessage: "Error personalizado" + }, "cellphone": { method: function (name, value, personAttributeDetails) { return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); @@ -135,6 +141,52 @@ Bahmni.Registration.AttributesConditions.rules = { return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); }, errorMessage: "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" + }, + "secundaryEmergencyContactPhone1": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_SECUNDARY_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" + }, + "secundaryEmergencyContactPhone2": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_SECUNDARY_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" + }, + "secundaryEmergencyContactPhone3": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_SECUNDARY_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" + },"secundaryEmergencyContactEmail": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_SECUNDARY_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" + }, + "thirdEmergencyContactPhone1": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_THIRD_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" + }, + "thirdEmergencyContactPhone2": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_THIRD_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" + }, + "thirdEmergencyContactPhone3": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[0-9]{4}-[0-9]{4}$/); + }, + errorMessage:"REGISTRATION_THIRD_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" + },"thirdEmergencyContactEmail": { + method: function (name, value, personAttributeDetails) { + return value.match(/^[a-zA-Z0-9_.+-]{3,244}@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]{2,5}$/); + }, + errorMessage: "REGISTRATION_THIRD_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" } }; } diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index d000da0be..27d1d92bd 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -44,9 +44,16 @@ "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Work Place", "REGISTRATION_TITLE_ADDRESS_PATIENT": "Address", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Emergency contact", - "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", - "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", - "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil en contacto de emergencia' doesn't have a valid format 0000-0000", - "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia' doesn't have a valid format email@domain.com", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 1 en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 2 en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 3 en contacto de emergencia' doesn't have a valid format 0000-0000", + "REGISTRATION_SECUNDARY_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 1 en contacto de emergencia adicional #1' doesn't have a valid format 0000-0000", + "REGISTRATION_SECUNDARY_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 2 en contacto de emergencia adicional #1' doesn't have a valid format 0000-0000", + "REGISTRATION_SECUNDARY_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 3 en contacto de emergencia adicional #1' doesn't have a valid format 0000-0000", + "REGISTRATION_SECUNDARY_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia adicional #1' doesn't have a valid format email@domain.com", + "REGISTRATION_THIRD_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 1 en contacto de emergencia adicional #2' doesn't have a valid format 0000-0000", + "REGISTRATION_THIRD_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 2 en contacto de emergencia adicional #2' doesn't have a valid format 0000-0000", + "REGISTRATION_THIRD_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "The field 'Teléfono móvil 3 en contacto de emergencia adicional #2' doesn't have a valid format 0000-0000", + "REGISTRATION_THIRD_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "The field 'Correo electrónico personal en contacto de emergencia adicional #2' doesn't have a valid format email@domain.com", "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Additional Emergency Contact (Optional)" } \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index da6e1f089..b72f1ae61 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -118,7 +118,6 @@ "REGISTRATION_ID_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Tarjeta de identidad'. Deben ser 13 números sin espacios.", "REGISTRATION_RESIDENCE_TEXT_ERROR_KEY": "El campo 'Numero de identificacion' no tiene un formato válido para el tipo 'Numero de Residencia'. Deben ser 15 números sin espacios.", "REGISTRATION_PASSPORT_TEXT_ERROR_KEY": "Existe un error al momento de guardar el número de Pasaporte", - "REGISTRATION_RESIDENCE_WORK_TEXT_ERROR_KEY": "El campo 'Residencia, Colonia, o Barrio' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_HOUSE_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Número de Casa' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_STREET_NUMBER_WORK_TEXT_ERROR_KEY": "El campo 'Calle' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", @@ -135,5 +134,11 @@ "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com", - "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Contacto de Emergencia Adicional (Opcional)" + "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Contacto de Emergencia Adicional (Opcional)", + "REGISTRATION_SECUNDARY_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", + "REGISTRATION_SECUNDARY_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", + "REGISTRATION_SECUNDARY_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", + "REGISTRATION_THIRD_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000", + "REGISTRATION_THIRD_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000", + "REGISTRATION_THIRD_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000" } From a8d6d8f8e6f71b9845790df1f8cc95383b4b69bb Mon Sep 17 00:00:00 2001 From: Sequeiros Date: Tue, 7 Nov 2017 16:04:35 -0600 Subject: [PATCH 57/60] quick fix --- openmrs/apps/registration/attributesConditions.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index f32251704..766b7b93e 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -29,12 +29,6 @@ Bahmni.Registration.AttributesConditions.rules = { }, errorMessage: error_msg }, - "patient.givenName":{ - method: function (name, value, personAttributeDetails) { - return value && value.legnth > 0; - }, - errorMessage: "Error personalizado" - }, "cellphone": { method: function (name, value, personAttributeDetails) { return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); From d84684ba36be6133ad543421c9482ba792a9a720 Mon Sep 17 00:00:00 2001 From: "LAPTOP-O1P5B9D9\\Sequeirios" Date: Wed, 8 Nov 2017 12:36:11 -0600 Subject: [PATCH 58/60] Quick Fix of labels +504 deleted --- openmrs/i18n/registration/locale_en.json | 2 +- openmrs/i18n/registration/locale_es.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 27d1d92bd..9d54ecec9 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -23,7 +23,7 @@ "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY" : "ID number not valid", - "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "The field 'Teléfono móvil' doesn't have a valid format +5040000-0000", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "The field 'Teléfono móvil' doesn't have a valid format 0000-0000", "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "The field 'Teléfono casa' doesn't have a valid format 0000-0000", "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "The field 'Teléfono trabajo' doesn't have a valid format 0000-0000", "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "The field 'Correo electrónico personal' doesn't have a valid format email@domain.com", diff --git a/openmrs/i18n/registration/locale_es.json b/openmrs/i18n/registration/locale_es.json index 5ffb5343f..96b41e0aa 100644 --- a/openmrs/i18n/registration/locale_es.json +++ b/openmrs/i18n/registration/locale_es.json @@ -112,7 +112,7 @@ "OBS_BOOLEAN_YES_KEY": "Sí", "OBS_BOOLEAN_NO_KEY": "No", "REGISTRATION_PATIENT_IDENTIFIER_ERROR_KEY": "Número de ID no válido", - "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "El campo 'Teléfono móvil' no tiene el formato válido +5040000-0000", + "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY": "El campo 'Teléfono móvil' no tiene el formato válido 0000-0000", "REGISTRATION_TELEPHONE_HOUSE_TEXT_ERROR_KEY": "El campo 'Teléfono casa' no tiene el formato válido 0000-0000", "REGISTRATION_TELEPHONE_WORK_TEXT_ERROR_KEY": "El campo 'Teléfono trabajo' no tiene el formato válido 0000-0000", "REGISTRATION_EMAIL_PERSONAL_TEXT_ERROR_KEY": "El campo 'Correo electrónico personal' no tiene el formato válido correo@dominio.com", @@ -129,20 +129,20 @@ "REGISTRATION_DEPARTMENT_WORK_TEXT_ERROR_KEY": "El campo 'Departamento' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_COUNTRY_WORK_TEXT_ERROR_KEY": "El campo 'País' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", "REGISTRATION_ADDRESS_WORK_TEXT_ERROR_KEY": "El campo 'Dirección Descriptiva' de Lugar de Trabajo supera el límite de caracteres permitidos (50)", - "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 1' de Contacto de Emergencia no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 2' de Contacto de Emergencia no tiene el formato válido +5040000-0000", - "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 3' de Contacto de Emergencia no tiene el formato válido +5040000-0000", + "REGISTRATION_PHONE1_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 1' de Contacto de Emergencia no tiene el formato válido 0000-0000", + "REGISTRATION_PHONE2_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 2' de Contacto de Emergencia no tiene el formato válido 0000-0000", + "REGISTRATION_PHONE3_EMERGENCY_CONTACT_TEXT_KEY": "El campo 'Teléfono 3' de Contacto de Emergencia no tiene el formato válido 0000-0000", "REGISTRATION_LABEL_ADDRESS_WORK_INFO": "Lugar de Trabajo", "REGISTRATION_TITLE_ADDRESS_PATIENT": "Domicilio", "REGISTRATION_TITLE_EMERGENCY_CONTACT_KEY" : "Contacto de emergencia", "REGISTRATION_EMAIL_EMERGENCY_CONTACT_TEXT_ERROR_KEY" : "El campo 'Correo electrónico personal en contacto de emergencia' no tiene el formato válido correo@dominio.com", "REGISTRATION_TITLE_SECUNDARY_EMERGENCY_CONTACT_KEY": "Contacto de Emergencia Adicional (Opcional)", - "REGISTRATION_SECUNDARY_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", - "REGISTRATION_SECUNDARY_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", - "REGISTRATION_SECUNDARY_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #1 no tiene el formato válido +5040000-0000", - "REGISTRATION_THIRD_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000", - "REGISTRATION_THIRD_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000", - "REGISTRATION_THIRD_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #2 no tiene el formato válido +5040000-0000" + "REGISTRATION_SECUNDARY_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #1 no tiene el formato válido 0000-0000", + "REGISTRATION_SECUNDARY_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #1 no tiene el formato válido 0000-0000", + "REGISTRATION_SECUNDARY_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #1 no tiene el formato válido 0000-0000", + "REGISTRATION_THIRD_PHONE1_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 1' de Contacto de Emergencia opcional #2 no tiene el formato válido 0000-0000", + "REGISTRATION_THIRD_PHONE2_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 2' de Contacto de Emergencia opcional #2 no tiene el formato válido 0000-0000", + "REGISTRATION_THIRD_PHONE3_EMERGENCY_CONTACT_TEXT_KEY" : "El campo 'Teléfono 3' de Contacto de Emergencia opcional #2 no tiene el formato válido 0000-0000" } From 577e3e7b5581b94dd2d0895215d9f5a23b256965 Mon Sep 17 00:00:00 2001 From: "LAPTOP-O1P5B9D9\\Sequeirios" Date: Wed, 8 Nov 2017 14:58:30 -0600 Subject: [PATCH 59/60] Se modifico el formato de numero de telefono --- openmrs/apps/registration/attributesConditions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index 766b7b93e..ad30e6252 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -31,7 +31,7 @@ Bahmni.Registration.AttributesConditions.rules = { }, "cellphone": { method: function (name, value, personAttributeDetails) { - return value.match(/^\+?([0-9]{3})\)?[-. ]?([0-9]{4})[-. ]?([0-9]{4})$/); + return value.match(/^[0-9]{4}-[0-9]{4})$/); }, errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" }, From 730531b5c9999bcd2eccd612e31ae5d59f7b5e18 Mon Sep 17 00:00:00 2001 From: "LAPTOP-O1P5B9D9\\Sequeirios" Date: Wed, 8 Nov 2017 15:09:32 -0600 Subject: [PATCH 60/60] ( deleted --- openmrs/apps/registration/attributesConditions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js index ad30e6252..b51b15fdc 100755 --- a/openmrs/apps/registration/attributesConditions.js +++ b/openmrs/apps/registration/attributesConditions.js @@ -31,7 +31,7 @@ Bahmni.Registration.AttributesConditions.rules = { }, "cellphone": { method: function (name, value, personAttributeDetails) { - return value.match(/^[0-9]{4}-[0-9]{4})$/); + return value.match(/^[0-9]{4}-[0-9]{4}$/); }, errorMessage: "REGISTRATION_CELLPHONE_TEXT_ERROR_KEY" },