-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Bahmni-IPD-master
- Loading branch information
Showing
15 changed files
with
170 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.0.0 | ||
| 1.1.1 |
Empty file.
1 change: 1 addition & 0 deletions
1
package/docker/openmrs/templates/appointment.properties.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| set +e | ||
|
|
||
| run_sql() { | ||
| mysql -N -s --host="${OMRS_DB_HOSTNAME}" --user="${OMRS_DB_USERNAME}" --password="${OMRS_DB_PASSWORD}" "${OMRS_DB_NAME}" -e "$1" | ||
| } | ||
|
|
||
| if [ $(run_sql "select count(*) from information_schema.tables where table_schema='${OMRS_DB_NAME}' and table_name='markers';") -gt 0 ] | ||
| then | ||
| echo "Updating OpenELIS Host Port in markers and failed_events table" | ||
| run_sql "update markers set feed_uri_for_last_read_entry = concat('http://${OPENELIS_HOST}:${OPENELIS_PORT}/openelis/ws/feed/patient',substring(feed_uri_for_last_read_entry, (LENGTH(feed_uri_for_last_read_entry) - LOCATE('/', REVERSE(feed_uri_for_last_read_entry)))+1) ) where feed_uri like '%openelis/ws/feed/patient/recent';" | ||
| run_sql "update markers set feed_uri = 'http://${OPENELIS_HOST}:${OPENELIS_PORT}/openelis/ws/feed/patient/recent' where feed_uri like '%openelis/ws/feed/patient/recent';" | ||
| run_sql "update failed_events set feed_uri = 'http://${OPENELIS_HOST}:${OPENELIS_PORT}/openelis/ws/feed/patient/recent' where feed_uri like '%openelis/ws/feed/patient/recent';" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
package/helm/openmrs/templates/volumes/bahmni-uploaded-files.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| labels: | ||
| app: {{ .Chart.Name }} | ||
| environment: {{ .Values.metadata.labels.environment }} | ||
| name: bahmni-uploaded-files-pvc | ||
| spec: | ||
| storageClassName: {{ .Values.global.storageClass }} | ||
| accessModes: | ||
| - ReadWriteMany | ||
| resources: | ||
| requests: | ||
| storage: {{ .Values.volumes.uploadedFiles.capacity }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| sed '/module.allow_web_admin/a\ | ||
| c3p0.max_size=${OMRS_C3P0_MAX_SIZE}' ./startup-init.sh > ./startup-init-temp.sh | ||
|
|
||
| rm ./startup-init.sh | ||
| mv ./startup-init-temp.sh ./startup-init.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "resources": { | ||
| "patient": [ | ||
| { | ||
| "fieldName": "id", | ||
| "method": "correlate" | ||
| }, | ||
| { | ||
| "fieldName": "identifier", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "address", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "name", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "telecom", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "birthDate", | ||
| "method": "firstOfMonth" | ||
| }, | ||
| { | ||
| "fieldName": "deceasedDateTime", | ||
| "method": "firstOfMonth" | ||
| } | ||
| ], | ||
| "condition": [ | ||
| { | ||
| "fieldName": "subject", | ||
| "method": "correlate" | ||
| }, | ||
| { | ||
| "fieldName": "encounter", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "recorder", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "recordedDate", | ||
| "method": "redact" | ||
| } | ||
| ], | ||
| "medicationRequest": [ | ||
| { | ||
| "fieldName": "subject", | ||
| "method": "correlate" | ||
| }, | ||
| { | ||
| "fieldName": "priority", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "authoredOn", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "requester", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "dosageInstruction", | ||
| "method": "redact" | ||
| }, | ||
| { | ||
| "fieldName": "encounter", | ||
| "method": "redact" | ||
| } | ||
| ], | ||
| "serviceRequest": [ | ||
| { | ||
| "fieldName": "subject", | ||
| "method": "correlate" | ||
| }, | ||
| { | ||
| "fieldName": "encounter", | ||
| "method": "redact" | ||
| } | ||
| ] | ||
| }, | ||
| "parameters": { | ||
| "oneWayHashSalt": "Bahmni123" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters