88 1 contacto de emergencia rework1

.buildkite/deploy.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eo pipefail
+echo "--- Copying config files from $BUILDKITE_BRANCH" | tee bk-pipeline.log
+if [[ "$BUILDKITE_BRANCH" == "develop"  ]]; then
+  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
+  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
+  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

.buildkite/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"

.buildkite/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'

.gitignore

@@ -8,3 +8,4 @@
 .tmp
 target
 
+openmrs/apps/registration/attributesConditions.js

openmrs/apps/clinical/extension.json

@@ -3,14 +3,25 @@
     "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,
     "icon": "fa-user-md",
     "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"
   }
-}
+}

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"}]
 }