summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java
diff options
context:
space:
mode:
authorJonathan Bauer2016-09-19 12:55:56 +0200
committerJonathan Bauer2016-09-19 12:55:56 +0200
commit03d172af550ade3ff81abfad8ca9c2a3f85aca7a (patch)
tree937bc4f09df05d30572a0e2998d9dc10635de4ed /dozentenmodulserver/src/main/java
parent[client] publish error: give the user a hint about a potential cause of the p... (diff)
parent[client] Formatting/Wording/Layout of lecture details and netrules improved (diff)
downloadtutor-module-03d172af550ade3ff81abfad8ca9c2a3f85aca7a.tar.gz
tutor-module-03d172af550ade3ff81abfad8ca9c2a3f85aca7a.tar.xz
tutor-module-03d172af550ade3ff81abfad8ca9c2a3f85aca7a.zip
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodulserver/src/main/java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
index adbf1c12..1204c2a2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
@@ -72,8 +72,8 @@ public class SendExpireWarning implements Runnable {
final long now = Util.unixTime();
for (LectureSummary lecture : lectures) {
final int days = (int) ((lecture.endTime - now) / 86400);
- LOGGER.debug(lecture.lectureName + " expires in " + days);
if ((lecture.isEnabled && (days == 14 || days == 1)) || (days == 7)) {
+ LOGGER.debug(lecture.lectureName + " expires in " + days);
MailGenerator.sendLectureExpiringReminder(lecture, days);
}
}
@@ -101,6 +101,7 @@ public class SendExpireWarning implements Runnable {
|| (!version.isValid && days == 3);
boolean mailForced = version.isValid && days == 1;
if (mailNormal || mailForced) {
+ LOGGER.debug(version.imageVersionId + " expires in " + days);
MailGenerator.sendImageDeletionReminder(version, days, mailForced);
}
}