Fixed to support 1.9.0

Swapped <openmrs:message with <spring:message
openmrs · Dec 18, 2012 · 4f9fb40 · 4f9fb40
1 parent e5c20cb
commit 4f9fb40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/org/openmrs/module/appointment/api/db/hibernate/HibernateTimeSlotDAO.java b/api/src/main/java/org/openmrs/module/appointment/api/db/hibernate/HibernateTimeSlotDAO.java
@@ -43,7 +43,7 @@ else if (fromDate != null && toDate != null && !fromDate.before(toDate))
 			        + " FROM AppointmentBlock WHERE :appointmentType IN elements(types)) AND voided = 0 AND startDate >= :startDate";
 
 			if (toDate != null)
-				stringQuery += " AND endDate < :endDate";
+				stringQuery += " AND endDate <= :endDate";
 			if (provider != null)
 				stringQuery += " AND timeSlot.appointmentBlock.provider = :provider";
 

diff --git a/omod/src/main/webapp/appointmentForm.jsp b/omod/src/main/webapp/appointmentForm.jsp
@@ -42,15 +42,15 @@
    }
    function addPatientLink(patientObj){
            if(patientObj!=null){
-                   var genderImg = "<img src='${pageContext.request.contextPath}/images/male.gif' alt='<openmrs:message code='Person.gender.male'/>'/>";
+                   var genderImg = "<img src='${pageContext.request.contextPath}/images/male.gif' alt='<spring:message code='Person.gender.male'/>'/>";
                    if(patientObj.gender != 'M')
-                   	genderImg = "<img src='${pageContext.request.contextPath}/images/female.gif' alt='<openmrs:message code='Person.gender.female'/>'/>";
+                   	genderImg = "<img src='${pageContext.request.contextPath}/images/female.gif' alt='<spring:message code='Person.gender.female'/>'/>";
                    var age = "";
                    if(patientObj.age == 0)
                    	age+="1";
                    else
                    	age += patientObj.age.toString();
-                   age += " <openmrs:message code='Person.age.year' />";
+                   age += " <spring:message code='Person.age.year' />";
         	   	   var detailsText = "<table><tr><td>";
                    detailsText+= genderImg +" ("+ age +")<br/></td><td>";
                    var message = "<spring:message code='appointment.Appointment.create.link.viewPatient'/>";