Skip to content

Commit

Permalink
#434 fix illegal daily report day on month change
Browse files Browse the repository at this point in the history
  • Loading branch information
haininghu committed Nov 1, 2024
1 parent 0929817 commit f8887ca
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Steps to start Salat locally:
2. Run docker-compose: `docker-compose up`
3. Open in browser: `http://localhost:8080?employee-sign=<sign>`
4. Valid signs in the test-dataset are: admin, bm, tt
5. http://localhost:8080?employee-sign=bm
6. http://localhost:8080?employee-sign=tt

Shutdown:
1. Stop docker-compose: CTRL+C
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<guava.version>33.3.1-jre</guava.version>
<jettison.version>1.5.4</jettison.version>
<commons-email.version>1.6.0</commons-email.version>
<opencsv.version>5.9</opencsv.version>
<poi.version>5.3.0</poi.version>
<struts-weblegacy.version>1.5.0-RC2</struts-weblegacy.version>
<jstl-api.version>3.0.2</jstl-api.version>
Expand Down Expand Up @@ -175,6 +176,11 @@
<version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>${opencsv.version}</version>
</dependency>

<!-- web jars -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,7 @@
import static org.tb.common.DateTimeViewHelper.getTimeReportHoursOptions;
import static org.tb.common.DateTimeViewHelper.getTimeReportMinutesOptions;
import static org.tb.common.DateTimeViewHelper.getYearsToDisplay;
import static org.tb.common.util.DateUtils.format;
import static org.tb.common.util.DateUtils.formatDayOfMonth;
import static org.tb.common.util.DateUtils.formatMonth;
import static org.tb.common.util.DateUtils.formatYear;
import static org.tb.common.util.DateUtils.getDateAsStringArray;
import static org.tb.common.util.DateUtils.getDateFormStrings;
import static org.tb.common.util.DateUtils.getYearString;
import static org.tb.common.util.DateUtils.today;
import static org.tb.common.util.DateUtils.*;
import static org.tb.common.util.TimeFormatUtils.timeFormatMinutes;

import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -446,6 +439,7 @@ private ActionForward doRefreshTimereports(ActionMapping mapping, HttpServletReq
}
reportForm.setMonth(getShortstringFromMonthMM(beginDate.getMonthValue()));
reportForm.setYear(getYearString(beginDate));
reportForm.setDay(getDayString(beginDate));
}

// monthly view -> create date and synchronize with end-/lastdate-fields
Expand Down

0 comments on commit f8887ca

Please sign in to comment.