Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9542a04806a8
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f757782c4908
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 31, 2013

  1. Retired Visit types should be available for selection on the New Visi… 

    …t form - TRUNK-3370
    @sindur @wluyima
    sindur authored and wluyima committed May 31, 2013
    Copy the full SHA
    3509391 View commit details

  2. Retired Visit types should be available for selection on the New Visi… 

    …t form - TRUNK-3370
    @wluyima
    wluyima committed May 31, 2013
    Copy the full SHA
    8e3096c View commit details

  3. Applying auto format changes

    @wluyima
    wluyima committed May 31, 2013

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f757782 View commit details
2 changes: 1 addition & 1 deletion web/src/main/java/org/openmrs/web/Listener.java
View file
Original file line number Diff line number Diff line change
@@ -571,7 +571,7 @@ public static void performWebStartOfModules(ServletContext servletContext) throw
catch (Throwable t) {
Throwable rootCause = getActualRootCause(t, true);
if (rootCause != null)
log.fatal("Unable to refresh the spring application context. Root Cause was:", rootCause);
log.fatal("Unable to refresh the spring application context. Root Cause was:", rootCause);
else
log.fatal("Unable to refresh the spring application context. Unloading all modules, Error was:", t);

1 change: 1 addition & 0 deletions webapp/src/main/webapp/WEB-INF/messages.properties
View file
Original file line number Diff line number Diff line change
@@ -2414,6 +2414,7 @@ Visit.noVisitAssigned=No visit assigned
Visit.cannotPurgeVisitWithEncounters=Can't purge a visit that has encounters associated to it
Visit.encounter.search.placeholder=Enter encounter id, provider identifier, location, form, encounter type or provider name

Visit.type.retired=Retired
Visit.configure.startCloseVisitsTask=Start auto close visits task
Visit.configure.closeVisitsTask.failedToStart=Failed to start task
Visit.configure.closeVisitsTask.failedToStop=Failed to stop task
8 changes: 8 additions & 0 deletions webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -198,13 +198,21 @@ $j(document).ready( function() {
<th><openmrs:message code="Visit.visitType"/><span class="required"> *</span></th>
<td>
<spring:bind path="visitType">
<c:set var="groupOpen" value="false" />
<select name="${status.expression}">
<option value=""></option>
<c:forEach items="${visitTypes}" var="visitType">
<c:if test="${visitType.retired && !groupOpen}">
<optgroup label="<openmrs:message code="Visit.type.retired"/>">
<c:set var="groupOpen" value="true" />
</c:if>
<option value="${visitType.visitTypeId}" <c:if test="${visitType.visitTypeId == status.value}">selected="selected"</c:if>>
${visitType.name}
</option>
</c:forEach>
<c:if test="${groupOpen}">
</optgroup>
</c:if>
</select>
<c:if test="${status.errorMessage != ''}"><span class="error">${status.errorMessage}</span></c:if>
</spring:bind>