zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/patch-1.0.2' into development

Browse source 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
This commit is contained in:
anhefti 2020-10-21 14:19:47 +02:00
commit 44452640fd
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
View file

@ -167,6 +167,10 @@ public class ExamDAOImpl implements ExamDAO {
}
if (from != null && exam.startTime != null) {
// always show exams that has not ended yet
if (exam.endTime == null || exam.endTime.isAfter(from)) {
return true;
}
if (exam.startTime.isBefore(from)) {
return false;
}
@ -905,7 +909,7 @@ public class ExamDAOImpl implements ExamDAO {
try {
status = ExamStatus.valueOf(record.getStatus());
} catch (final Exception e) {
log.error("Missing exam status form data base. Set ExamStatus.UP_COMING as fallback ", e);
log.error("Missing exam status from data base. Set ExamStatus.UP_COMING as fallback ", e);
status = ExamStatus.UP_COMING;
}
@ -916,7 +920,7 @@ public class ExamDAOImpl implements ExamDAO {
record.getExternalId(),
(quizData != null) ? quizData.name : FAILED_TO_LOAD_QUIZ_DATA_MARK,
(quizData != null) ? quizData.description : FAILED_TO_LOAD_QUIZ_DATA_MARK,
(quizData != null) ? quizData.startTime : null,
(quizData != null) ? quizData.startTime : new DateTime(0),
(quizData != null) ? quizData.endTime : null,
(quizData != null) ? quizData.startURL : Constants.EMPTY_NOTE,
ExamType.valueOf(record.getType()),

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java
View file

@ -109,7 +109,7 @@ public interface LmsAPIService {
final boolean nameFilter = StringUtils.isBlank(name) || (q.name != null && q.name.contains(name));
final boolean startTimeFilter =
(from == null) || (q.startTime != null && (q.startTime.isEqual(from) || q.startTime.isAfter(from)));
final boolean currentlyRunning = DateTime.now(DateTimeZone.UTC).isBefore(q.endTime);
final boolean currentlyRunning = q.endTime == null || DateTime.now(DateTimeZone.UTC).isBefore(q.endTime);
return nameFilter && (startTimeFilter || currentlyRunning);
};
}