Merge pull request Bahmni#25 from palladiumkenya/came-early-filter

KHP3-4123 Clients who came early appear in both not arrived and came …

Author: ojwanganto

api/src/main/java/org/openmrs/module/appointments/dao/impl/AppointmentDaoImpl.java

@@ -84,6 +84,8 @@ public List<Appointment> getPendingAppointments(Date forDate) {
          */
         Session session = sessionFactory.getCurrentSession();
         Criteria criteria = session.createCriteria(Appointment.class);
+        // Add a check for date_honored being null
+        criteria.add(Restrictions.isNull("dateHonored"));
         Date maxDate = new Date(forDate.getTime() + TimeUnit.DAYS.toMillis(1));
         criteria.add(Restrictions.ge("startDateTime", forDate));
         criteria.add(Restrictions.lt("startDateTime", maxDate));
@@ -110,6 +112,8 @@ public List<Appointment> getHonouredAppointments(Date forDate) {
          */
         Session session = sessionFactory.getCurrentSession();
         Criteria criteria = session.createCriteria(Appointment.class);
+        // Add a check for date_honored being null
+        criteria.add(Restrictions.isNull("dateHonored"));
         Date maxDate = new Date(forDate.getTime() + TimeUnit.DAYS.toMillis(1));
         criteria.add(Restrictions.ge("startDateTime", forDate));
         criteria.add(Restrictions.lt("startDateTime", maxDate));
@@ -136,6 +140,9 @@ public List<Appointment> getCameEarlyAppointments(Date forDate) {
          */
         Session session = sessionFactory.getCurrentSession();
         Criteria criteria = session.createCriteria(Appointment.class);
+        // Add a check for date_honored not being null
+        criteria.add(Restrictions.isNotNull("dateHonored"));
+
         Date maxDate = new Date(forDate.getTime() + TimeUnit.DAYS.toMillis(1));
         criteria.add(Restrictions.ge("startDateTime", forDate));
         criteria.add(Restrictions.lt("startDateTime", maxDate));