preTheater form added

merovingienne · Jul 10, 2017 · f349145 · f349145
1 parent 51cf300
commit f349145
Show file tree

Hide file tree

Showing 7 changed files with 495 additions and 297 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -161,38 +161,7 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr-runtime</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4</artifactId>
-            <version>4.7</version>
-            <scope>test</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>4.7</version>
-            <scope>compile</scope>
-        </dependency>
 
 
         <!--&lt;!&ndash; https://mvnrepository.com/artifact/org.hsqldb/hsqldb &ndash;&gt;-->

diff --git a/api/src/main/java/org/openmrs/module/operationtheater/scheduler/domain/PlannedSurgery.java b/api/src/main/java/org/openmrs/module/operationtheater/scheduler/domain/PlannedSurgery.java
@@ -88,8 +88,13 @@ public boolean isOutsideAvailableTimes() {
 
 		Interval available = otService.getLocationAvailableTime(location, start.toLocalDate());
 		Interval scheduled = Interval.of(start.toInstant(), end.toInstant());
-		Interval overlap = scheduled.intersection(available);
+		Interval overlap = null;
-		return !scheduled.equals(overlap);
+		if (available.isConnected(scheduled)){
+			overlap = scheduled.intersection(available);
+			return !scheduled.equals(overlap);
+		}
+
+		return true;
 	}
 
 	public Surgery getSurgery() {

diff --git a/api/src/main/resources/scheduler/scoreRules.drl b/api/src/main/resources/scheduler/scoreRules.drl
@@ -79,7 +79,7 @@ rule "firstComeFirstServed"
         $surgery: PlannedSurgery($start : start, start != null, location != null)
     then
         ZonedDateTime $created = ZonedDateTime.ofInstant($surgery.getSurgery().getDateCreated().toInstant(), ZoneId.systemDefault());
-        int hours = Duration.between($created, $start).toHours();
+        int hours = (int) Duration.between($created, $start).toHours();
 
         scoreHolder.addSoftConstraintMatch(kcontext, -hours);
 end