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

Merge branch 'patch-1.0.2' into development

Browse source
This commit is contained in:
anhefti 2020-07-15 08:57:38 +02:00
commit e5879f7809
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientEvent.java
View file

@ -103,7 +103,7 @@ public class ClientEvent implements Entity, IndicatorValueHolder {
this.clientTime = (clientTime != null) ? clientTime : 0;
this.serverTime = (serverTime != null) ? serverTime : Utils.getMillisecondsNow();
this.numValue = numValue;
this.text = text;
this.text = Utils.truncateText(text, 512);
}
@Override

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java
View file

@ -44,7 +44,7 @@ public class MoodleCourseAccess extends CourseAccess {
private static final Logger log = LoggerFactory.getLogger(MoodleCourseAccess.class);
private static final String MOODLE_QUIZ_START_URL_PATH = "/mod/quiz/view.php?id=";
private static final String MOODLE_QUIZ_START_URL_PATH = "mod/quiz/view.php?id=";
private static final String MOODLE_COURSE_API_FUNCTION_NAME = "core_course_get_courses";
private static final String MOODLE_QUIZ_API_FUNCTION_NAME = "mod_quiz_get_quizzes_by_courses";
private static final String MOODLE_COURSE_API_COURSE_IDS = "courseids";
@ -187,7 +187,7 @@ public class MoodleCourseAccess extends CourseAccess {
return courseData.quizzes
.stream()
.map(courseQuizData -> {
final String startURI = uriPrefix + courseData.id;
final String startURI = uriPrefix + courseQuizData.id;
additionalAttrs.put(QuizData.ATTR_ADDITIONAL_TIME_LIMIT, String.valueOf(courseQuizData.time_limit));
return new QuizData(
courseQuizData.id,

19
src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java
View file

@ -520,6 +520,7 @@ public class SEBClientBot {
private final String eventBodyTemplate =
"{ \"type\": \"%s\", \"timestamp\": %s, \"text\": \"some error " + UUID.randomUUID() + " \" }";
private boolean first = true;
private long timestamp = 0;
private final String eventType;
@ -534,7 +535,23 @@ public class SEBClientBot {
@Override
public String getBody() {
return String.format(this.eventBodyTemplate, this.eventType, this.timestamp);
if (this.first) {
this.first = false;
final String longText =
"DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"
+ "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT";
final String template =
"{ \"type\": \"%s\", \"timestamp\": %s, \"text\": \"some error " + longText + " \" }";
return String.format(template, this.eventType, this.timestamp);
} else {
return String.format(this.eventBodyTemplate, this.eventType, this.timestamp);
}
}
@Override