Merge development branch

Apromore-Calendar/src/main/java/org/apromore/calendar/service/CalendarService.java

@@ -36,6 +36,8 @@ public interface CalendarService {
 	public CalendarModel createGenericCalendar(String description, boolean weekendsOff, String zoneId)
 			throws CalendarAlreadyExistsException;
 
+	CalendarModel getGenericCalendar();
+
 	public CalendarModel createBusinessCalendar(String description, boolean weekendsOff, String zoneId)
 			throws CalendarAlreadyExistsException;
 

Apromore-Calendar/src/main/java/org/apromore/calendar/service/CustomCalendarService.java

@@ -83,9 +83,23 @@ public CalendarModel createGenericCalendar(String description, boolean weekendsO
     return calendarModel;
   }
 
-  @Override
-  public CalendarModel createBusinessCalendar(String description, boolean weekendsOff,
-      String zoneId) throws CalendarAlreadyExistsException {
+    @Override
+    public CalendarModel getGenericCalendar() {
+
+        OffsetTime startTime =
+                OffsetTime.of(LocalTime.MIN, ZoneId.of("UTC").getRules().getOffset(Instant.now()));
+
+        OffsetTime endTime =
+                OffsetTime.of(LocalTime.MAX, ZoneId.of("UTC").getRules().getOffset(Instant.now()));
+
+        CustomCalendar customCalendar = createGenericCalendar(startTime, endTime);
+
+        return modelMapper.getMapper().map(customCalendar, CalendarModel.class);
+    }
+
+    @Override
+    public CalendarModel createBusinessCalendar(String description, boolean weekendsOff, String zoneId)
+            throws CalendarAlreadyExistsException {
 
     OffsetTime startTime =
         OffsetTime.of(LocalTime.of(9, 0), ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
@@ -134,7 +148,17 @@ private CustomCalendar createCalendar(String description, boolean weekendsOff, O
 
   }
 
-  private List<WorkDay> getWorkDays(OffsetTime start, OffsetTime end, boolean weekendOff) {
+    private CustomCalendar createGenericCalendar(OffsetTime start, OffsetTime end) {
+
+        final CustomCalendar calendar = new CustomCalendar("Generic 24/7");
+        for (WorkDay workDay : getWorkDays(start, end, false)) {
+            calendar.addWorkDay(workDay);
+        }
+        return calendar;
+
+    }
+
+    private List<WorkDay> getWorkDays(OffsetTime start, OffsetTime end, boolean weekendOff) {
 
     Predicate<DayOfWeek> isWeekendOff = CalendarUtil.getWeekendOffPRedicate(weekendOff);
     List<WorkDay> workDaysList = new ArrayList<WorkDay>();
@@ -155,9 +179,9 @@ private void validateCalendarExists(CustomCalendar calendar)
 
   }
 
-  public void updateHoliday(Long id, List<HolidayModel> holidayModels)
-      throws CalendarNotExistsException {
-    CustomCalendar calendar = getExistingCalendar(id);
+    @Override
+    public void updateHoliday(Long id, List<HolidayModel> holidayModels) throws CalendarNotExistsException {
+        CustomCalendar calendar = getExistingCalendar(id);
 
     List<Holiday> holidays = new ArrayList<Holiday>();
     for (HolidayModel h : holidayModels) {

Apromore-Core-Components/Apromore-BPMNEditor/src/main/resources/static/bpmneditor/editor/bpmnio/bpmn-modeler.development.js

@@ -1777,8 +1777,9 @@ ValidationErrorHelper.validateGatewayProbabilities = function(bpmnFactory, eleme
         (el.executionProbability === '' || el.executionProbability === undefined || isNaN(el.executionProbability));
     });
 
+    var EPSILON = 0.01;
     if (gateway.$type === 'bpmn:ExclusiveGateway' && nanProbabilityFlows.length === 0 &&
-      (probabilitySum > 100 || probabilitySum + parseFloat(probability) !== 100)) {
+      (probabilitySum - 100 > EPSILON || Math.abs(probabilitySum + parseFloat(probability) - 100) > EPSILON)) {
       errorMessage = translate('probability.invalid.sum');
     }
   }

Apromore-Core-Components/Apromore-Portal/src/main/webapp/themes/ap/common/css/zk.css

@@ -894,11 +894,6 @@ tr.z-row-disabled td.z-row-inner .z-slider-area {
     display: none;
 }
 
-.z-timebox-button {
-    font-size: 16px !important;
-    line-height: 18px !important;
-}
-
 /* Make pagination index input wider */
 .z-paging-input {
     width: 60px;

Apromore-Custom-Plugins/Calendar-Portal/src/main/resources/calendar/zul/calendar.zul

@@ -29,7 +29,7 @@
           client:onBind="Ap.calendar.syncRows()"
           title="${labels.calendar_title_text}" apply="org.apromore.plugin.portal.calendar.controllers.Calendar">
     <div id="actionBridge" visible="false" />
-    <vbox height="100%" hflex="1" spacing="0">    
+    <vbox vflex="1" hflex="1" spacing="0">
       <hbox hflex="1" vflex="1">
         <vbox id="daysOfWeekWrapper" hflex="1" vflex="1" spacing="0">
           <hbox sclass="ap-window-header-actions" hflex="1" align="center" pack="start" spacing="0"

Apromore-Custom-Plugins/Log-Logic/src/main/java/org/apromore/logman/attribute/log/AttributeLog.java

@@ -47,7 +47,7 @@
 
 /**
  * An AttributeLog is a view of ALog based on an attribute. This log extracts the traces with the chosen attribute only,
- * each trace is an AttributeTrace. Since it is based on a specific attribute, the trace sequence is specific to the 
+ * each trace is an AttributeTrace. Since it is based on a specific attribute, the trace sequence is specific to the
  * chosen attribute (e.g. some original events may not contain values of the attribute), and thus the timing and duration
  * also vary to the attribute. Note that AttributeTrace is created based on the aggregated activities of ATrace.
  * 
@@ -81,8 +81,6 @@ public class AttributeLog {
     private BitSet originalTraceStatus;
     private MutableList<AttributeTrace> activeTraces = Lists.mutable.empty();
 
-    private boolean dataStatusChanged = false; // true if this log has been changed (filtered) but not visualized
-
     // Sequence view of the log
     private AttributeLogVariantView variantView;
 
@@ -104,7 +102,7 @@ public AttributeLog(ALog log, IndexableAttribute attribute) {
             originalTraces.add(attTrace);
             originalTraceIdMap.put(trace.getTraceId(), attTrace);
             variantView.addOriginalTrace(attTrace);
-            if (originalTraceStatus.get(i) && !attTrace.isEmpty()) { 
+            if (originalTraceStatus.get(i) && !attTrace.isEmpty()) {
                 activeTraces.add(attTrace);
                 variantView.addActiveTrace(attTrace);
                 graphView.addTraceGraph(attTrace.getActiveGraph());
@@ -115,6 +113,11 @@ public AttributeLog(ALog log, IndexableAttribute attribute) {
         graphView.finalUpdate();
 	}
 
+	public void clear() {
+	    variantView.reset();
+	    graphView.clear();
+	}
+
     public IndexableAttribute getAttribute() {
         return this.attribute;
     }
@@ -140,18 +143,9 @@ public void setAttribute(IndexableAttribute newAttribute) {
 
     	    variantView.finalUpdate();
     	    graphView.finalUpdate();
-    	    dataStatusChanged = true;
 	    }
 	}
 
-	public boolean isDataStatusChanged() {
-	    return dataStatusChanged;
-	}
-
-	public void resetDataStatus() {
-	    dataStatusChanged = false;
-	}
-
 	public BitSet getOriginalTraceStatus() {
 	    return originalTraceStatus;
 	}
@@ -179,15 +173,13 @@ public void updateLogStatus(LogBitMap logBitMap) throws Exception {
 
             if (!logBitMap.getTraceBitSet().equals(this.getOriginalTraceStatus())) {
                 originalTraceStatus = logBitMap.getTraceBitSet();
-                dataStatusChanged = true;
             }
 
             for (int i=0;i<getOriginalTraces().size();i++) {
                 AttributeTrace trace = getOriginalTraceFromIndex(i);
                 if (logBitMap.getEventBitSetSizeAtIndex(i) == trace.getOriginalValueTrace().size()) {
                     if (!logBitMap.getEventBitSetAtIndex(i).equals(trace.getOriginalEventStatus())) {
                         trace.updateOriginalEventStatus(logBitMap.getEventBitSetAtIndex(i));
-                        dataStatusChanged = true;
                     }
                     if (originalTraceStatus.get(i) && !trace.isEmpty()) {
                         activeTraces.add(trace);
@@ -196,7 +188,7 @@ public void updateLogStatus(LogBitMap logBitMap) throws Exception {
                     }
                 }
                 else {
-                    throw new InvalidAttributeLogStatusUpdateException("Invalid update of AttributeTrace at traceIndex=" + i + 
+                    throw new InvalidAttributeLogStatusUpdateException("Invalid update of AttributeTrace at traceIndex=" + i +
                                                                     ", traceId=" + trace.getTraceId() +
                                                                     ": different bitset size");
                 }
@@ -216,7 +208,7 @@ public void refresh() throws Exception {
 
     public ALog getFullLog() {
         return fullLog;
-    }	
+    }
 
     public long getOriginalNumberOfEvents() {
         return originalTraces.sumOfLong(trace -> trace.getOriginalValueTrace().size()-2);
@@ -269,7 +261,7 @@ public int getStartEvent() {
 
     public int getEndEvent() {
         return attribute.getArtificialEndIndex();
-    }	
+    }
 
 	public boolean isArtificialStart(int value) {
 	    return (value == attribute.getMatrixGraph().getSource());
@@ -328,14 +320,14 @@ public AttributeLogSummary getOriginalLogSummary() {
         }
         DescriptiveStatistics traceDurationStats = new DescriptiveStatistics(caseDurations.toArray());
         return new AttributeLogSummary(
-                            fullLog.getOriginalNumberOfEvents(), 
-                            this.getOriginalAttributeValues().size()-2, 
-                            this.getOriginalTraces().size(), 
+                            fullLog.getOriginalNumberOfEvents(),
+                            this.getOriginalAttributeValues().size()-2,
+                            this.getOriginalTraces().size(),
                             variantView.getOriginalVariants().size(),
-                            startTime, endTime, 
-                            traceDurationStats.getMin(), 
-                            traceDurationStats.getMax(), 
-                            traceDurationStats.getMean(), 
+                            startTime, endTime,
+                            traceDurationStats.getMin(),
+                            traceDurationStats.getMax(),
+                            traceDurationStats.getMean(),
                             traceDurationStats.getPercentile(50));
     }
 
@@ -352,14 +344,14 @@ public AttributeLogSummary getLogSummary() {
         }
         DescriptiveStatistics traceDurationStats = new DescriptiveStatistics(caseDurations.toArray());
         return new AttributeLogSummary(
-                            fullLog.getNumberOfEvents(), 
-                            this.getAttributeValues().size()-2, 
-                            this.getTraces().size(), 
+                            fullLog.getNumberOfEvents(),
+                            this.getAttributeValues().size()-2,
+                            this.getTraces().size(),
                             variantView.getActiveVariants().size(),
-                            startTime, endTime, 
-                            traceDurationStats.getMin(), 
-                            traceDurationStats.getMax(), 
-                            traceDurationStats.getMean(), 
+                            startTime, endTime,
+                            traceDurationStats.getMin(),
+                            traceDurationStats.getMax(),
+                            traceDurationStats.getMean(),
                             traceDurationStats.getPercentile(50));
     }
 
@@ -370,8 +362,8 @@ public ListIterable<CaseInfo> getCaseInfoList() {
             IntList variant = getVariantFromTraceIndex(i);
             cases.add(new CaseInfo(
                     this.getTraceFromIndex(i).getTraceId(),
-                    variant.size()-2, 
-                    variantView.getActiveVariants().getRankOf(variant), 
+                    variant.size()-2,
+                    variantView.getActiveVariants().getRankOf(variant),
                     variantView.getActiveVariants().getVariantRelativeFrequency(variant)));
         }
         return cases;

Apromore-Custom-Plugins/Process-Discoverer-Logic/pom.xml

@@ -104,6 +104,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>