Merge branch 'master' of https://github.com/Zahrun/Soprapp

Author: Zorrander

webapp/src/java/service/RoomsFacadeREST.java

@@ -217,10 +217,16 @@ public List<Rooms> badSearchGET(@PathParam("searchParams") String searchParams)
         listRooms.retainAll(listRoomsCapacite);
 
         ReservationsFacadeREST rfREST = new ReservationsFacadeREST(em);
-        List<Reservations> listReservations = rfREST.filterReservations("&&"+startDate.getTime()+"&"+endDate.getTime());
+        List<Reservations> listReservations = rfREST.findAll();
 
+        long start= startDate.getTime();
+        long end= endDate.getTime();
         for (Reservations res : listReservations){
-            listRooms.remove(res.getRoomRef());
+            long rs = res.getStart().getTime();
+            long re = res.getEnd().getTime();
+            if(rs<=start && re >start || rs>start && rs<end){
+                listRooms.remove(res.getRoomRef());
+            }
         }
 
         return listRooms;