Skip to content

Empt64 #141

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Empt64 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71957ea
Added console logs
Parth59 Mar 13, 2021
7dc3345
Merge with master
Parth59 Mar 13, 2021
4bc7d86
Added Fix in openmrsSearch.js for EMPT64
Parth59 Mar 13, 2021
594c869
Added Fix in openmrsSearch.js for EMPT64
Parth59 Mar 13, 2021
ba42f5c
Merge branch 'EMPT64' of https://github.com/Parth59/openmrs-module-le…
Parth59 Mar 13, 2021
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
7 changes: 7 additions & 0 deletions api/license-header.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This Source Code Form is subject to the terms of the Mozilla Public License,
v. 2.0. If a copy of the MPL was not distributed with this file, You can
obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
the terms of the Healthcare Disclaimer located at http://openmrs.org/license.

Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
graphic logo is a trademark of OpenMRS Inc.
7 changes: 7 additions & 0 deletions omod/license-header.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This Source Code Form is subject to the terms of the Mozilla Public License,
v. 2.0. If a copy of the MPL was not distributed with this file, You can
obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
the terms of the Healthcare Disclaimer located at http://openmrs.org/license.

Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
graphic logo is a trademark of OpenMRS Inc.
1 change: 1 addition & 0 deletions omod/src/main/webapp/admin/programs/conversionForm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<openmrs:htmlInclude file="/dwr/util.js" />

<form method="post" id="theForm">

<table>
<tr>
<td><openmrs:message code="Program.conversion.programWorkflow"/>:<span class="required">*</span></td>
Expand Down
7 changes: 4 additions & 3 deletions omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,14 +851,15 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
attributeValue = rowData.attributes[a.name];
if(attributeValue == null)
attributeValue = '';

rRowData.push(attributeValue);
});
}

for (k in rRowData)
{
rRowData[k] = $j("<div>").text(rRowData[k]).html();
}
return rRowData;
},

_fireEvent: function(eventType, data) {
//TODO also pass 'this'
},
Expand Down