Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mpoc 260 new #30

Draft
wants to merge 103 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
61f2152
BAH-621 | updated IPD ward list view search handler - wardListSqlSear…
angshu Aug 30, 2018
e6bb1ec
Bindu | BAH-621 | Removed patientWardDetails.sql as this migration al…
binduak Aug 31, 2018
5c7938f
removing unused extensions, correcting typo and invalid URL for link
angshu Aug 31, 2018
44a7fb8
Amol | Removed marathi patient search configuration
amolbch Oct 15, 2018
240786a
Amol | Kept Rural Ward as it is
amolbch Oct 15, 2018
906adbb
Amol | Added Bahmni config changes
amolbch Jan 28, 2019
0f68230
Amol | Updated order sequence of Program patient queue
amolbch Jan 31, 2019
6eb54a8
Changeg the logo and title text on landing and login page of Bahmni
joaomachiana Feb 19, 2019
aed0633
MPOC-85-Add Patient Address Details
amolbch Feb 26, 2019
0dcf582
.
joaomachiana Feb 26, 2019
1b90a0a
MPOC-96 Fixed the words not being displayed correctly
joaomachiana Feb 26, 2019
d374a59
MPOC-78-Remove fields from Registration Forms
amolbch Feb 27, 2019
4b7daf5
Fixed header text under the request of BA team
joaomachiana Feb 27, 2019
3e1cf75
added the Mozambique flag, and the footer logos
joaomachiana Feb 28, 2019
53090c5
mpoc-94 removed jembi logo, fixed the login page title
joaomachiana Mar 7, 2019
de0fe8e
Amol | Hide the ability to capture the photo during patient registration
amolbch Mar 13, 2019
22e2314
Merge pull request #10 from esaude/MPOC-132
joaomachiana Mar 14, 2019
93e7289
mpoc-123 Changed the text of the footer, and added a link to MISAU
joaomachiana Mar 15, 2019
75decbf
Amol | Must automatically flag the patient as Pre TARV
amolbch Mar 18, 2019
80e091d
Amol | Added quick fixes
amolbch Mar 18, 2019
ee562fa
Krishnan | MPOC-154 Remove NID as per feedback on ticket 103
krishnanspace Mar 19, 2019
cca3b39
Merge pull request #12 from esaude/MPOC-148-New
joaomachiana Mar 19, 2019
f89ec8e
Merge pull request #13 from esaude/quick-fix
joaomachiana Mar 19, 2019
c524462
Merge pull request #14 from esaude/MPOC_154
joaomachiana Mar 19, 2019
9f445b7
Krishnan | MPOC-106 Search Results List
krishnanspace Mar 20, 2019
197c61f
Krishnan | MPOC-110 Update section Teste de HIV
krishnanspace Mar 20, 2019
69e3b61
Krishnan | MPOC-110 Hide the test result field
krishnanspace Mar 20, 2019
a652f1a
Amol | MPOC-128 Update the patient registration fields
amolbch Mar 20, 2019
1e05a51
Merge pull request #11 from esaude/mpoc-123
joaomachiana Mar 20, 2019
069064f
Merge pull request #15 from esaude/MPOC_106
joaomachiana Mar 20, 2019
311017c
Update locale_en.json
joaomachiana Mar 21, 2019
80b1c0e
Merge pull request #17 from esaude/MPOC-128
joaomachiana Mar 21, 2019
f02c9c8
Amol | MPOC-129
amolbch Mar 22, 2019
d8656a7
Merge pull request #16 from esaude/MPOC-110
Mar 22, 2019
eaa2b98
Amol | MPOC-129 - updated Patient Status to PATIENT_STATUS
amolbch Mar 22, 2019
53ea783
Merge branch 'release-0.91' into MPOC-129
amolbch Mar 22, 2019
a99be1c
Merge pull request #18 from esaude/MPOC-129
joaomachiana Mar 22, 2019
c897249
Krishnan | MPOC-164 Changed the translation for Nutritional Values an…
krishnanspace Mar 26, 2019
7b53219
Update locale_pt_BR.json
joaomachiana Mar 26, 2019
166288c
Merge pull request #19 from esaude/MPOC-164
joaomachiana Mar 26, 2019
b00a05a
Krishnan | Added the config to use only Autocomplete values
krishnanspace Apr 2, 2019
76bb9fd
Amol | MPOC-85 - Add Patient Address Details
amolbch Apr 8, 2019
e7ec25d
Krishnan | MPOC-116 Move Patient Contact Section
krishnanspace Apr 9, 2019
e7240ef
Merge pull request #20 from esaude/MPOC-168
amolbch Apr 9, 2019
61822f6
Merge pull request #23 from esaude/MPOC-116
joaomachiana Apr 15, 2019
b80eb6c
Krishnan | MPOC-143 Allow the appointment to be made in one of 4 time…
krishnanspace Apr 16, 2019
0255dae
Krishnan | MPOC-160 Placement of Patient Marital Status, Occupation a…
krishnanspace Apr 23, 2019
ef34b73
Merge pull request #24 from esaude/MPOC-143
joaomachiana Apr 24, 2019
381ef6f
Amol | Done changes as per new requirement
amolbch Apr 24, 2019
6ff4b5b
Merge pull request #25 from esaude/MPOC-160
joaomachiana Apr 25, 2019
ad55387
Merge pull request #22 from esaude/MPOC-85
joaomachiana Apr 25, 2019
2f231c7
Amol | Quick fix
amolbch Apr 25, 2019
76397ee
Merge pull request #26 from esaude/85-new
krishnanspace Apr 25, 2019
78834b5
Change Label Localidade to Localidade/Bairro
simaomazive May 6, 2019
8fbbbf9
Change No to Nº
simaomazive May 6, 2019
dcc777a
Merge pull request #28 from esaude/MPOC-225
krishnanspace May 8, 2019
a6ef7b8
Merge pull request #29 from esaude/MPOC-227
joaomachiana May 8, 2019
7e6e9e2
MPOC-239 Allow to Capture special character Name Fields
simaomazive May 10, 2019
4225649
Merge pull request #30 from esaude/MPOC-239
May 10, 2019
3300ec5
Amol | Updated clinical module files for clinical Demo
amolbch May 13, 2019
e24468b
Merge pull request #32 from esaude/Clinical_Module_Demo
amolbch May 13, 2019
883813a
Amol | Implemented clinical module translation
amolbch May 13, 2019
6eab081
Merge pull request #33 from esaude/MPOC-49-New
amolbch May 14, 2019
8435633
Amos | MPOC 248
amosh101 May 15, 2019
7bb4209
Merge pull request #34 from esaude/MPOC-248
amolbch May 15, 2019
e856c54
Amol | Added form condition for MPOC-252
amolbch May 16, 2019
687d0c1
Amos | MPOC 222 add search attribute field (#36)
amosh101 May 16, 2019
e01772f
Sushant Patil | MPOC-16 Observation Form Anamnesis
sushantpatil1214 May 20, 2019
e61e1ba
Amol | Added Conduct obs form condition for Family planning
amolbch May 20, 2019
970b7d1
Removes Address Fields Validation
Edgencio May 21, 2019
f3cfd62
Sushant Patil | MPOC-260 Observation Form Anamnesis
sushantpatil1214 May 22, 2019
0f121c1
Amol | Upadetd formConditions.js format
amolbch May 22, 2019
543c19e
Amol | Upadetd formConditions.js format
amolbch May 22, 2019
c8b6fd8
Amol | Upadetd formConditions.js format
amolbch May 22, 2019
fea2993
Amol | Upadetd formConditions.js format
amolbch May 22, 2019
45fc602
Improves validation rules (allows special characters input)
Edgencio May 22, 2019
fae2ffb
Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis
sushantpatil1214 May 22, 2019
d7bcf7f
Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis
sushantpatil1214 May 22, 2019
41a732c
Allows semi-colon and colons
Edgencio May 22, 2019
27ff63a
Merge pull request #35 from esaude/MPOC-252
krishnanspace May 22, 2019
c2b2a04
Merge pull request #37 from esaude/MPOC-260
krishnanspace May 22, 2019
95091f4
Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis
sushantpatil1214 May 22, 2019
c42b03c
Merge branch 'develop' into MPOC-236
sushantpatil1214 May 22, 2019
1603b2e
Puts back the validation pattern for address6
Edgencio May 23, 2019
625c40e
Merge pull request #41 from esaude/MPOC-274
joaomachiana May 23, 2019
b3981ef
Krishnan | MPOC-265 Observation form Group IX-Reference
krishnanspace May 23, 2019
c5e9271
Krishnan | Corrected the codacy errors
krishnanspace May 23, 2019
1d79ae3
Merge pull request #44 from esaude/MPOC-265-New
sushantpatil1214 May 23, 2019
ece1d19
MPOC-279 Update approach for Visit Details
simaomazive May 23, 2019
a4f72b6
Amol | Formated form Conditions js
amolbch May 23, 2019
ffaf929
Merge pull request #46 from esaude/Formated_formConditions_js
krishnanspace May 23, 2019
a3bc9cd
Merge pull request #45 from esaude/MPOC-279
amolbch May 23, 2019
989248c
MPOC-209 fixed translations for clinical module
joaomachiana May 23, 2019
5324e7a
MPOC-209 fixed translations
joaomachiana May 23, 2019
29e7405
MPOC-209 fixed translations
joaomachiana May 23, 2019
6e07014
fixed translations
joaomachiana May 24, 2019
779eceb
Merge branch 'develop' into MPOC-264
amolbch May 24, 2019
b42c565
Merge pull request #40 from esaude/MPOC-264
May 24, 2019
61beb4e
Merge branch 'develop' into MPOC-236
sushantpatil1214 May 24, 2019
c16e27e
Merge pull request #43 from esaude/MPOC-236
krishnanspace May 24, 2019
9be2e83
Merge pull request #49 from esaude/MPOC-49
joaomachiana May 24, 2019
57be2b5
Amol | Removed Add Notes from the Group II-Priority Population
amolbch May 27, 2019
84b95b8
Merge pull request #52 from esaude/MPOC-252-New
sushantpatil1214 May 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .tx/config
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions LICENSE
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Bahmni OpenMRS Apps
Copyright 2014 ThoughtWorks, Inc
Bahmni application configuration for default demo setup

Copyright (C) 2018 OpenMRS, Inc

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified offline/openmrs/apps/clinical/.extension.json.swp
100644 → 100755
Empty file.
Empty file modified openelis/images/labLogo.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified openelis/migrations/liquibase.xml
100644 → 100755
Empty file.
Empty file modified openmrs/apps/JsBarcode.all.min.js
100644 → 100755
Empty file.
Empty file modified openmrs/apps/admin/app.json
100644 → 100755
Empty file.
Empty file modified openmrs/apps/admin/extension.json
100644 → 100755
Empty file.
Empty file modified openmrs/apps/adt/app.json
100644 → 100755
Empty file.
Empty file modified openmrs/apps/adt/extension.json
100644 → 100755
Empty file.
8 changes: 7 additions & 1 deletion openmrs/apps/appointments/app.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"config": {
"minCharLengthToTriggerPatientSearch": 3,
"enableSpecialities": true,
"enableSpecialities": false,
"startOfWeek": 2,
"weekStart": "isoWeek",
"calendarSlotDuration": "00:30",
Expand Down Expand Up @@ -42,6 +42,12 @@
"#FF1493",
"#00BFFF"
],
"appointmentBlocks":[
{"name":"APP_BLOCK_1","startTime":"12:00 am","endTime":"08:59 am"},
{"name":"APP_BLOCK_2","startTime":"09:00 am","endTime":"11:59 am"},
{"name":"APP_BLOCK_3","startTime":"12:00 pm","endTime":"03:29 pm"},
{"name":"APP_BLOCK_4","startTime":"03:30 pm","endTime":"11:59 pm"}
],
"allowedActions": ["CheckedIn", "Completed", "Missed", "Cancelled"],
"allowedActionsByStatus": {
"Scheduled": ["CheckedIn", "Missed", "Cancelled"],
Expand Down
Empty file modified openmrs/apps/appointments/extension.json
100644 → 100755
Empty file.
Empty file modified openmrs/apps/appointments/printListView.html
100644 → 100755
Empty file.
120 changes: 101 additions & 19 deletions openmrs/apps/clinical/app.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
],
"config": {
"hideConditions": false,
"enableRadiologyOrderOptions":["Urgent","NeedsPrint"],
"enableLabOrderOptions":["Urgent", "NeedsPrint"],
"quickPrints":false,
"networkConnectivity" : {
Expand All @@ -36,7 +35,7 @@
{ "locale" : "pt", "css": "offline-language-portuguese-brazil"}
]
},
"diagnosisStatus": "Inactive",
"diagnosisStatus": "Inactive",
"program": {
"patientInformation": {
"ageLimit": 100
Expand All @@ -52,29 +51,26 @@
}
},
"patientContext": {
"programAttributes": [
"Id_Number",
"Doctor",
"Stage"
],
"personAttributes": [
"class",
"caste"
],
"additionalPatientIdentifiers": [
"National ID"
],
"preferredIdentifier": "Id_Number"
},
"programAttributes": [
"Id_Number",
"Doctor",
"Stage"
],
"personAttributes": [

],
"additionalPatientIdentifiers": [

],
"preferredIdentifier": "Id_Number"
},
"obsIgnoreList": [
"REGISTRATION FEES",
"COMMENTS",
"Patient file"
],
"otherInvestigationsMap": {
"Radiology": "Radiology Order",
"Endoscopy": "Endoscopy Order"
},
},
"allowConsultationWhenNoOpenVisit": false,
"defaultVisitType": "OPD",
"visitTypeForRetrospectiveEntries": "Special OPD",
Expand All @@ -87,6 +83,92 @@
"nonCodedConceptName":"Non-Coded Chief Complaint",
"durationRequired": false,
"allowAddMore": true
},
"PP_Key_population": {
"disableAddNotes": true
},
"PP_If_Key_population_yes": {
"disableAddNotes": true
},
"PP_Vulnerable_Population": {
"disableAddNotes": true
},
"PP_IF_Vulnerable_Population_Yes": {
"disableAddNotes": true
},
"Probable delivery date": {
"allowFutureDates":true
},
"Probable delivery date": {
"allowFutureDates":true
},
"Symptoms_Prophylaxis": {
"required": true,
"dropdown": true
},
"Symptoms Prophylaxis_New": {
"required": true
},
"Date of Diagnosis": {
"required": true
},
"Treatment End Date": {
"buttonSelect": true
},
"Has STI Symptoms": {
"required": true
},
"TB Type is Extrapulmonary": {
"required": true,
"buttonSelect": true
},
"TInfants Odema_Prophylaxis": {
"required": true,
"buttonSelect": true
},
"Nutrition Supplement": {
"buttonSelect": true
},
"Quantity of Nutritional Supplement": {
"required": true
},
"Type_Prophylaxis": {
"multiSelect" : true
},
"State_Prophylaxis": {
"required": true,
"buttonSelect": true
},
"State_Prophylaxis_CTZ": {
"required": true,
"buttonSelect": true
},
"State_Prophylaxis_Fluconazol": {
"required": true,
"buttonSelect": true
},
"Start Date_Prophylaxis": {
"required": true
},
"Start Date_Prophylaxis_CTZ": {
"required": true
},
"Start Date_Prophylaxis_Fluconazol": {
"required": true
},
"Received nutritional support": {
"required": true
},
"STI Diagnosis_Prophylaxis": {
"required": true,
"buttonSelect": true
},
"Syndromic Approach_STI": {
"required": true,
"buttonSelect": true
},
"TB Type": {
"dropdown": true
},
"Tuberculosis, Adverse Effects" :{
"multiSelect" : true,
Expand Down
116 changes: 10 additions & 106 deletions openmrs/apps/clinical/dashboard.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,11 @@
"home",
"visit",
"registration",
"inpatient",
"enrolment",
"visitAttribute"
"enrolment"
]
},
"tuberculosis": {
"title": "Tuberculosis Follow Up",
"type": "tuberculosis",
"isObservation": true,
"dashboardConfig": {
"conceptNames": [
"Tuberculosis Followup Template"
],
"numberOfVisits": 2
}
},
"disposition":{
"translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
"showDetailsButton":true,
"type":"disposition",
"numberOfVisits":1,
"displayOrder":7
},


"treatments":{
"translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY",
"type":"treatment",
Expand All @@ -82,39 +64,14 @@
"showDetailsButton":true
}
},
"radiology":{
"translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY",
"type":"radiology",
"showDetailsButton":true,
"displayOrder":5
},

"programs":{
"translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY",
"type":"programs",
"displayOrder":10
},
"radiologyOrders":{
"orderType":"Radiology Order",
"type":"ordersControl",
"translationKey":"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY",
"displayOrder":17,
"dashboardConfig":{
"conceptNames":[
"Summary"
],
"numberOfVisits":4
}
},
"pacs":{
"orderType":"Radiology Order",
"type":"pacsOrders",
"translationKey":"DASHBOARD_TITLE_PACS_KEY",
"displayOrder":8,
"dashboardConfig":{
"pacsImageUrl":"/oviyam2/viewer.html?patientID={{patientID}}&accessionNumber={{orderNumber}}",
"numberOfVisits":4
}
},


"labOrdersDisplayControl":{
"translationKey":"DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY",
"type":"ordersControl",
Expand All @@ -139,17 +96,7 @@
"showDetailsButton":true
}
},
"bacteriologyResults":{
"translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY",
"type":"bacteriologyResultsControl",
"scope":"All",
"orderType":"",
"dashboardConfig":{
"conceptNames":[
"BACTERIOLOGY CONCEPT SET"
]
}
},

"labResults":{
"translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY",
"type":"labOrders",
Expand Down Expand Up @@ -232,29 +179,7 @@
}
}
},
"secondVitals":{
"translationKey":"DASHBOARD_TITLE_SECOND_VITALS_KEY",
"type":"second vitals",
"isObservation":true,
"displayOrder":13,
"dashboardConfig":{
"showDetailsButton":true,
"conceptNames":[
"Second Vitals"
],
"numberOfVisits":2
},
"expandedViewConfig":{
"conceptNames":[
"Second Vitals"
],
"numberOfVisits":2,
"showDetailsButton":true,
"pivotTable":{

}
}
},

"historyAndExaminations":{
"translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY",
"type":"vitals",
Expand Down Expand Up @@ -373,12 +298,7 @@
}
}
},
"admissionDetails":{
"translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
"type":"admissionDetails",
"displayOrder":19,
"showDetailsButton":true
},

"conditions": {
"translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
"type": "conditionsList",
Expand Down Expand Up @@ -534,23 +454,7 @@
"translationKey":"DASHBOARD_TAB_PATIENT_SUMMARY_KEY",
"maxRecentlyViewedPatients":10,
"sections":{
"Bacteriology Concept Set":{
"displayType":"Full-Page",
"translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY",
"type":"obsToObsFlowSheet",
"dashboardConfig":{
"numberOfVisits":1,
"templateName":"BACTERIOLOGY CONCEPT SET",
"groupByConcept":"Specimen Collection Date",
"conceptNames":[
"Specimen Id"
]
},
"expandedViewConfig":{
"templateName":"BACTERIOLOGY CONCEPT SET",
"groupByConcept":"Specimen Collection Date"
}
},

"HistoryAndExamination":{
"type":"historyAndExamination",
"isObservation":true,
Expand Down
14 changes: 1 addition & 13 deletions openmrs/apps/clinical/extension-programs.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
{
"bahmniClinicalPatientsSearchActivePatientsForPrograms": {
"id": "bahmni.clinical.patients.search.activePatients",
"extensionPointId": "org.bahmni.patient.search",
"type": "config",
"extensionParams": {
"searchHandler": "emrapi.sqlSearch.activePatients",
"translationKey": "MODULE_LABEL_PROGRAMS_KEY",
"forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext"
},
"label": "Active",
"order": 1,
"requiredPrivilege": "app:clinical"
},

"bahmniClinicalPatientsSearchAllPatients": {
"id": "bahmni.clinical.patients.search.allPatients",
"extensionPointId": "org.bahmni.patient.search",
Expand Down
Loading