From b470f44bcff3da2e6c8b58feb2a6e00e865d7b53 Mon Sep 17 00:00:00 2001 From: Stephan Schwaer Date: Tue, 6 Oct 2015 16:21:31 +0200 Subject: [client] Allow saving of lecture changes if date period is invalid but dates haven't changed. --- .../org/openslx/dozmod/gui/window/LectureDetailsWindow.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index 071697cd..70cdc6ad 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -543,6 +543,16 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements return false; } + /** + * Check whether the date has been changed + * + * @return true if it has changed, false otherwise + */ + private boolean dateHasChanged() { + return (DateTimeHelper.getDateFrom(startDate, startTime).getTime() / 1000L) != lecture.getStartTime() + || (DateTimeHelper.getDateFrom(endDate, endTime).getTime() / 1000L) != lecture.getEndTime(); + } + /** * Checks whether the user changed any fields of the image details and * enables the save button if so. @@ -581,7 +591,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements // Date stuff Date start = DateTimeHelper.getDateFrom(startDate, startTime); Date end = DateTimeHelper.getDateFrom(endDate, endTime); - if (!isPeriodValid(start, end, false)) { + if (!isPeriodValid(start, end, false) && dateHasChanged()) { lblError.setText("Ungültiger Zeitraum!"); return false; } -- cgit v1.2.3-55-g7522