Feature/storetimeinminutes

pom.xml

@@ -217,6 +217,9 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
+				<configuration>
+					<offline>true</offline>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>

src/main/java/org/tb/auth/AfterLogin.java

@@ -7,6 +7,7 @@
 import static org.tb.common.util.TimeFormatUtils.timeFormatMinutes;
 import static org.tb.common.util.UrlUtils.absoluteUrl;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +17,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.struts.util.MessageResources;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tb.common.GlobalConstants;
 import org.tb.common.Warning;
@@ -35,7 +35,7 @@
 
 @Component
 @Slf4j
-@RequiredArgsConstructor(onConstructor_ = { @Autowired})
+@RequiredArgsConstructor
 public class AfterLogin {
 
     private final TimereportHelper timereportHelper;
@@ -210,25 +210,19 @@ private void addWarnings(Employeecontract employeecontract, MessageResources res
     }
 
     public void handleOvertime(Employeecontract employeecontract, HttpSession session) {
-        double overtimeStatic = employeecontract.getOvertimeStatic();
-        int otStaticMinutes = (int) (overtimeStatic * 60);
+        Duration overtimeStatic = employeecontract.getOvertimeStatic();
+        long otStaticMinutes = overtimeStatic.toMinutes();
 
-        int overtime;
-        if (employeecontract.getUseOvertimeOld() != null && !employeecontract.getUseOvertimeOld()) {
-            //use new overtime computation with static + dynamic overtime
-            //need the LocalDate from the day after reportAcceptanceDate, so the latter is not used twice in overtime computation:
-            LocalDate dynamicDate;
-            if (employeecontract.getReportAcceptanceDate() == null || employeecontract.getReportAcceptanceDate().equals(employeecontract.getValidFrom())) {
-                dynamicDate = employeecontract.getValidFrom();
-            } else {
-                dynamicDate = addDays(employeecontract.getReportAcceptanceDate(), 1);
-            }
-            int overtimeDynamic = timereportHelper.calculateOvertime(dynamicDate, today(), employeecontract, true);
-            overtime = otStaticMinutes + overtimeDynamic;
-            // if after SALAT-Release 1.83, no Release was accepted yet, use old overtime computation
+        //use new overtime computation with static + dynamic overtime
+        //need the LocalDate from the day after reportAcceptanceDate, so the latter is not used twice in overtime computation:
+        LocalDate dynamicDate;
+        if (employeecontract.getReportAcceptanceDate() == null || employeecontract.getReportAcceptanceDate().equals(employeecontract.getValidFrom())) {
+            dynamicDate = employeecontract.getValidFrom();
         } else {
-            overtime = timereportHelper.calculateOvertimeTotal(employeecontract);
+            dynamicDate = addDays(employeecontract.getReportAcceptanceDate(), 1);
         }
+        long overtimeDynamic = timereportHelper.calculateOvertime(dynamicDate, today(), employeecontract, true);
+        long overtime = otStaticMinutes + overtimeDynamic;
 
         boolean overtimeIsNegative = overtime < 0;
 
@@ -249,7 +243,7 @@ public void handleOvertime(Employeecontract employeecontract, HttpSession sessio
         if (validUntil != null && validUntil.isBefore(currentDate) && !validUntil.isBefore(start)) {
             currentDate = validUntil;
         }
-        int monthlyOvertime = 0;
+        long monthlyOvertime = 0;
         if (!(validUntil != null && validUntil.isBefore(start) || validFrom.isAfter(currentDate))) {
             monthlyOvertime = timereportHelper.calculateOvertime(start, currentDate, employeecontract, false);
         }

src/main/java/org/tb/auth/LoginEmployeeAction.java

@@ -258,10 +258,9 @@ private void generateEmployeeOrders(LocalDate today, Employeecontract employeeco
                     }
                     if (suborder.getCustomerorder().getSign().equals(GlobalConstants.CUSTOMERORDER_SIGN_VACATION)
                         && !suborder.getSign().equalsIgnoreCase(GlobalConstants.SUBORDER_SIGN_OVERTIME_COMPENSATION)) {
-                        employeeorder.setDebithours(employeecontract
-                            .getDailyWorkingTime()
-                            * employeecontract
-                            .getVacationEntitlement());
+                        // TODO reduce VacationEntitlement if contract is not running the whole year
+                        var vacationBudget = employeecontract.getDailyWorkingTime().multipliedBy(employeecontract.getVacationEntitlement());
+                        employeeorder.setDebithours(vacationBudget);
                         employeeorder.setDebithoursunit(GlobalConstants.DEBITHOURS_UNIT_TOTALTIME);
                     } else {
                         // not decided yet

src/main/java/org/tb/common/AuditedEntity.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDateTime;
 import java.util.Objects;
+import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -14,6 +15,7 @@
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.domain.Persistable;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
  * Contains information about creation edits made to database columns common to
@@ -24,6 +26,7 @@
 @Getter
 @Setter
 @MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
 abstract public class AuditedEntity implements Persistable<Long> {
 
     @Id

src/main/java/org/tb/common/DataValidation.java

@@ -18,12 +18,6 @@ public static void isTrue(boolean expression, ErrorCode errorCode) {
     }
   }
 
-  public static void isInRange(double value, double min, double max, ErrorCode errorCode) {
-    if(value < min || value > max) {
-      throw new InvalidDataException(errorCode);
-    }
-  }
-
   public static void lengthIsInRange(String value, int min, int max, ErrorCode errorCode) {
     if(value == null || value.length() < min || value.length() > max) {
       throw new InvalidDataException(errorCode);

src/main/java/org/tb/common/DurationMinutesConverter.java

@@ -0,0 +1,22 @@
+package org.tb.common;
+
+import java.time.Duration;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+public class DurationMinutesConverter implements AttributeConverter<Duration, Integer> {
+
+  @Override
+  public Integer convertToDatabaseColumn(Duration duration) {
+    if(duration == null) return null;
+    return (int) duration.toMinutes();
+  }
+
+  @Override
+  public Duration convertToEntityAttribute(Integer minutes) {
+    if(minutes == null) return null;
+    return Duration.ofMinutes(minutes);
+  }
+
+}

src/main/java/org/tb/common/GlobalConstants.java

@@ -13,11 +13,7 @@ public class GlobalConstants {
 
     public static final int STARTING_YEAR = 2007;
 
-    public static final double MAX_HOURS_PER_DAY = 10.0;
-
-    public static final double MAX_DEBITHOURS = 10000.0;
-    public static final double MAX_OVERTIME = 10000.0;
-    public static final double MIN_OVERTIME = -10000.0;
+    public static final int MAX_HOURS_PER_DAY = 10;
 
     public static final int COMMENT_MAX_LENGTH = 32000;
 

src/main/java/org/tb/common/jsptags/FormatDurationTag.java

@@ -0,0 +1,31 @@
+package org.tb.common.jsptags;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDate;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+import lombok.Setter;
+import org.tb.common.util.DurationUtils;
+
+@Setter
+public class FormatDurationTag extends TagSupport {
+
+  private Duration value;
+
+  @Override
+  public int doStartTag() throws JspException {
+    if(value != null) {
+      JspWriter out = pageContext.getOut();
+      try {
+        out.print(DurationUtils.format(value));
+        return super.doStartTag();
+      } catch (IOException e) {
+        throw new JspException(e);
+      }
+    }
+    return SKIP_BODY;
+  }
+
+}

src/main/java/org/tb/common/util/DateUtils.java

@@ -11,7 +11,6 @@
 import static org.tb.common.GlobalConstants.DEFAULT_DATE_FORMAT;
 import static org.tb.common.GlobalConstants.DEFAULT_LOCALE;
 import static org.tb.common.GlobalConstants.DEFAULT_TIMEZONE_ID;
-import static org.tb.common.GlobalConstants.MINUTES_PER_HOUR;
 import static org.tb.common.GlobalConstants.STARTING_YEAR;
 
 import java.text.ParseException;
@@ -304,26 +303,6 @@ public static int getLastDayOfMonth(LocalDate date) {
         return date.getMonthValue();
     }
 
-    /**
-     * calculates worktime from begin/end times in a form
-     *
-     * @return double - decimal hours
-     */
-    public static double calculateTime(int hrbegin, int minbegin, int hrend, int minend) {
-        double worktime;
-
-        int hours = hrend - hrbegin;
-        int minutes = minend - minbegin;
-
-        if (minutes < 0) {
-            hours -= 1;
-            minutes += MINUTES_PER_HOUR;
-        }
-        worktime = hours * 1. + minutes / 60.;
-
-        return worktime;
-    }
-
     /**
      * Takes a LocalDate and a number of days. Changes the LocalDate by adding (amount is positive) or subtracting (amount is negative)
      * the number of days to it. For example, you have some LocalDate and need the next day: input parameters are (date, 1).

src/main/java/org/tb/common/util/DurationUtils.java

@@ -0,0 +1,124 @@
+package org.tb.common.util;
+
+import static java.lang.Math.abs;
+import static org.tb.common.GlobalConstants.MINUTES_PER_HOUR;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class DurationUtils {
+
+  public static String format(Duration duration) {
+    if(duration == null) {
+      return "";
+    }
+    if(duration.isZero()) {
+      return "0:00";
+    }
+    StringBuilder sb = new StringBuilder();
+    if(duration.isNegative()) {
+      sb.append('-');
+    }
+    sb.append(abs(duration.toHours())).append(':');
+    sb.append(String.format("%02d", abs(duration.toMinutesPart())));
+    return sb.toString();
+  }
+
+  public static Duration parseDuration(String value) {
+    if(value == null || value.trim().isEmpty()) {
+      return Duration.ZERO;
+    }
+    boolean negative = value.startsWith("-");
+    if(negative) {
+      value = value.substring(1);
+    }
+    int minutes = 0;
+    if(value.contains(":")) {
+      String[] split = value.split(":");
+      if(!split[0].isEmpty()) {
+        minutes = Integer.parseInt(split[0]) * MINUTES_PER_HOUR;
+      }
+      if(split.length > 1 && !split[1].isEmpty()) {
+        minutes += Integer.parseInt(split[1]);
+      }
+    } else {
+      minutes = Integer.parseInt(value) * MINUTES_PER_HOUR;
+    }
+    if(negative) {
+      minutes = minutes * -1;
+    }
+
+    return Duration.ofMinutes(minutes);
+  }
+
+  public static boolean validateDuration(String value) {
+    if(value == null || value.trim().isEmpty()) {
+      return true;
+    }
+    // cut leading minues
+    if(value.startsWith("-")) {
+      value = value.substring(1);
+    }
+    try {
+      // check if hours:minutes
+      if(value.contains(":")) {
+        String[] split = value.split(":");
+        if(split.length > 2) {
+          return false;
+        }
+        if(!split[0].isEmpty()) {
+          int hours = Integer.parseInt(split[0]);
+          // negative value is not allowed. Minues sign must be present at the very start of the value, which was already cut
+          if(hours < 0) {
+            return false;
+          }
+        }
+        if(split.length == 2 && !split[1].isEmpty()) {
+          int minutes = Integer.parseInt(split[1]);
+          // negative value is not allowed. Minues sign must be present at the very start of the value, which was already cut
+          if(minutes < 0) {
+            return false;
+          }
+          // minutes may be no more than 59
+          if(minutes > 59) {
+            return false;
+          }
+        }
+      // check hours only as no ":" in value
+      } else {
+        int hours = Integer.parseInt(value);
+        // negative value is not allowed. Minues sign must be present at the very start of the value, which was already cut
+        if(hours < 0) {
+          return false;
+        }
+      }
+      return true;
+    } catch (NumberFormatException e) {
+      return false;
+    }
+  }
+
+  public static String decimalFormat(Duration duration) {
+    if(duration == null) {
+      return "";
+    }
+    if(duration.isZero()) {
+      return "0,00";
+    }
+    StringBuilder sb = new StringBuilder();
+    if(duration.isNegative()) {
+      sb.append('-');
+    }
+    sb.append(abs(duration.toHours())).append(',');
+    int minutesDecimal = BigDecimal.valueOf(duration.toMinutesPart())
+        .multiply(BigDecimal.valueOf(100))
+        .divide(BigDecimal.valueOf(MINUTES_PER_HOUR), RoundingMode.HALF_UP)
+        .intValueExact();
+    sb.append(String.format("%02d", abs(minutesDecimal)));
+    return sb.toString();
+  }
+
+}

src/main/java/org/tb/common/util/ExcelArchivierer.java

@@ -4,6 +4,8 @@
 import static org.tb.common.GlobalConstants.DEFAULT_TIMEZONE_ID;
 
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.HashMap;
@@ -148,7 +150,7 @@ private static Workbook createInvoiceExcel(ShowInvoiceForm showInvoiceForm, Http
                     // ab hier ggf. Timereports ausgeben
                     List<InvoiceTimereportHelper> invoiceTimereportViewHelpers = invoiceSuborderViewHelper.getInvoiceTimereportViewHelperList();
                     if (request.getSession().getAttribute("timereportsbox") != null && ((Boolean) request.getSession().getAttribute("timereportsbox"))
-                            && invoiceTimereportViewHelpers.size() > 0) {
+                        && !invoiceTimereportViewHelpers.isEmpty()) {
                         for (InvoiceTimereportHelper invoiceTimereportViewHelper : invoiceTimereportViewHelpers) {
                             if (invoiceTimereportViewHelper.isVisible()) {
                                 rowIndex = addTimereportDataRow(workbook, rowIndex, invoiceTimereportViewHelper, request, factory);
@@ -258,7 +260,7 @@ private static int addSuborderDataRow(Workbook workbook, int rowIndex, InvoiceSu
         if (request.getSession().getAttribute("targethoursbox") != null && ((Boolean) request.getSession().getAttribute("targethoursbox"))) {
             cell = row.createCell(colIndex, Cell.CELL_TYPE_NUMERIC);
             if (invoiceSuborderViewHelper.getDebithours() != null) {
-                cell.setCellValue(invoiceSuborderViewHelper.getDebithours() / 24);
+                cell.setCellValue((double) invoiceSuborderViewHelper.getDebithours().toMinutes() / 24);
             } else {
                 cell.setCellValue(0L);
             }