diff --git a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java index 1770a49ce6aa053705e6f1786d710bc940d529d4..e4961a792d04dad10b99c9d1dc709fc56bbcce41 100644 --- a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java +++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java @@ -60,7 +60,6 @@ public class AudienceQuestionController extends PaginationController { private IQuestionService questionService; @ApiOperation(value = "Count all the questions in current session", - //parameters {( deprecated = "true" )} nickname = "getAudienceQuestionCount", notes = "getInterposedCount(String sessionkey, String user)") @RequestMapping(value = "/count", method = RequestMethod.GET) diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java index 47141335e180e38a555cf3d4c9be1cfa92f7de80..d89cddc0ac39e7456d3ef37c67219ffa34e0f110 100644 --- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java +++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java @@ -378,7 +378,7 @@ public class LecturerQuestionController extends PaginationController { } } - @ApiOperation(value = "Get the am ount of skill questions by the sessionkey", + @ApiOperation(value = "Get the amount of skill questions by the sessionkey", nickname = "getSkillQuestionCount", notes = "getSkillQuestionCount(" + "@RequestParam final String sessionkey," + diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index 0b4e168b9019a8c31d28dbe47d99dfe518867d8d..15fd8a52760cbb5907003c7d8e52e04d0ee9a786 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -304,8 +304,8 @@ public class SessionController extends PaginationController { @RequestMapping(value = "/{sessionkey}/learningprogress", method = RequestMethod.GET) public LearningProgressValues learningProgress( @ApiParam(value = "session-key from current session", required = true) @PathVariable final String sessionkey, - @ApiParam(value = "progress type", required = true) @RequestParam(value = "type", defaultValue = "questions") final String progressType, - @ApiParam(value = "question variant", required = true) @RequestParam(value = "questionVariant", required = false) final String questionVariant, + @ApiParam(value = "progress type", required = false) @RequestParam(value = "type", defaultValue = "questions") final String progressType, + @ApiParam(value = "question variant", required = false) @RequestParam(value = "questionVariant", required = false) final String questionVariant, @ApiParam(value = "http servlet response", required = true) final HttpServletResponse response ) { return sessionService.getLearningProgress(sessionkey, progressType, questionVariant); diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java index f4ea32b6ce49acba91f3e26cbfedd441f3791993..d95a074f4f6ad4fe7ce7b2e00f3b0eb8b399be18 100644 --- a/src/main/java/de/thm/arsnova/entities/Answer.java +++ b/src/main/java/de/thm/arsnova/entities/Answer.java @@ -53,7 +53,7 @@ public class Answer { this.type = "skill_question_answer"; } - @ApiModelProperty(position = 1, required = true, value = "used to display _id") + @ApiModelProperty(required = true, value = "used to display _id") public final String get_id() { return _id; } @@ -62,7 +62,7 @@ public class Answer { this._id = _id; } - @ApiModelProperty(position = 2, required = true, value = "used to display _rev") + @ApiModelProperty(required = true, value = "used to display _rev") public final String get_rev() { return _rev; } @@ -71,7 +71,7 @@ public class Answer { this._rev = _rev; } - @ApiModelProperty(position = 3, required = true, value = "used to display type") + @ApiModelProperty(required = true, value = "used to display type") public final String getType() { return type; } @@ -80,7 +80,7 @@ public class Answer { this.type = type; } - @ApiModelProperty(position = 4, required = true, value = "used to display session id") + @ApiModelProperty(required = true, value = "used to display session id") public final String getSessionId() { return sessionId; } @@ -89,7 +89,7 @@ public class Answer { this.sessionId = sessionId; } - @ApiModelProperty(position = 5, required = true, value = "used to display question id") + @ApiModelProperty(required = true, value = "used to display question id") public final String getQuestionId() { return questionId; } @@ -98,7 +98,7 @@ public class Answer { this.questionId = questionId; } - @ApiModelProperty(position = 6, required = true, value = "used to display answer text") + @ApiModelProperty(required = true, value = "used to display answer text") public final String getAnswerText() { return answerText; } @@ -107,7 +107,7 @@ public class Answer { this.answerText = answerText; } - @ApiModelProperty(position = 7, required = true, value = "used to display answer subject") + @ApiModelProperty(required = true, value = "used to display answer subject") public final String getAnswerSubject() { return answerSubject; } @@ -116,7 +116,7 @@ public class Answer { this.answerSubject = answerSubject; } - @ApiModelProperty(position = 8, required = true, value = "used to displaypi round ") + @ApiModelProperty(required = true, value = "used to displaypi round ") public int getPiRound() { return piRound; } @@ -128,13 +128,13 @@ public class Answer { /* TODO: use JsonViews instead of JsonIgnore when supported by Spring (4.1) * http://wiki.fasterxml.com/JacksonJsonViews * https://jira.spring.io/browse/SPR-7156 */ - @ApiModelProperty(position = 9, required = true, value = "used to display user") + @ApiModelProperty(required = true, value = "used to display user") @JsonIgnore public final String getUser() { return user; } - @ApiModelProperty(position = 10, required = true, value = "used to display answer image") + @ApiModelProperty(required = true, value = "used to display answer image") @JsonIgnore public String getAnswerImage() { return answerImage; @@ -144,7 +144,7 @@ public class Answer { this.answerImage = answerImage; } - @ApiModelProperty(position = 11, required = true, value = "used to display answer thumbnail image") + @ApiModelProperty(required = true, value = "used to display answer thumbnail image") public String getAnswerThumbnailImage() { return answerThumbnailImage; } @@ -157,7 +157,7 @@ public class Answer { this.user = user; } - @ApiModelProperty(position = 12, required = true, value = "used to display timestamp") + @ApiModelProperty(required = true, value = "used to display timestamp") public long getTimestamp() { return timestamp; } @@ -166,7 +166,7 @@ public class Answer { this.timestamp = timestamp; } - @ApiModelProperty(position = 13, required = true, value = "read") + @ApiModelProperty(required = true, value = "read") public boolean isRead() { return read; } @@ -175,7 +175,7 @@ public class Answer { this.read = read; } - @ApiModelProperty(position = 14, required = true, value = "used to display answer count") + @ApiModelProperty(required = true, value = "used to display answer count") public final int getAnswerCount() { return answerCount; } @@ -184,7 +184,7 @@ public class Answer { this.answerCount = answerCount; } - @ApiModelProperty(position = 15, required = true, value = "used to display abstention") + @ApiModelProperty(required = true, value = "used to display abstention") public boolean isAbstention() { return abstention; } @@ -193,7 +193,7 @@ public class Answer { this.abstention = abstention; } - @ApiModelProperty(position = 16, required = true, value = "used to display abtention count ") + @ApiModelProperty(required = true, value = "used to display abtention count ") public int getAbstentionCount() { return abstentionCount; } @@ -202,7 +202,7 @@ public class Answer { this.abstentionCount = abstentionCount; } - @ApiModelProperty(position = 17, required = true, value = "used to display question variant") + @ApiModelProperty(required = true, value = "used to display question variant") public String getQuestionVariant() { return questionVariant; } @@ -211,7 +211,7 @@ public class Answer { this.questionVariant = questionVariant; } - @ApiModelProperty(position = 18, required = true, value = "used to display question value") + @ApiModelProperty(required = true, value = "used to display question value") public int getQuestionValue() { return questionValue; } diff --git a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java index e3f6a7781a60884f1cbf894daaf1dbfa025e7127..c046e13534a7fdcbf02eb93ff738e1cf8e8ddedf 100644 --- a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java +++ b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java @@ -42,14 +42,14 @@ public class InterposedQuestion { private boolean read; private String creator; - @ApiModelProperty(position = 1, required = true, value = "used to display question id") + @ApiModelProperty(required = true, value = "used to display question id") public String get_id() { return _id; } public void set_id(String _id) { this._id = _id; } - @ApiModelProperty(position = 2, required = true, value = "used to display rev") + @ApiModelProperty(required = true, value = "used to display rev") public String get_rev() { return _rev; } @@ -57,7 +57,7 @@ public class InterposedQuestion { this._rev = _rev; } - @ApiModelProperty(position = 3, required = true, value = "is read") + @ApiModelProperty(required = true, value = "is read") public boolean isRead() { return read; } @@ -65,7 +65,7 @@ public class InterposedQuestion { this.read = read; } - @ApiModelProperty(position = 4, required = true, value = "used to display The type") + @ApiModelProperty(required = true, value = "used to display The type") public String getType() { return type; } @@ -73,7 +73,7 @@ public class InterposedQuestion { this.type = type; } - @ApiModelProperty(position = 5, required = true, value = "used to display Subject") + @ApiModelProperty(required = true, value = "used to display Subject") public String getSubject() { return subject; } @@ -81,7 +81,7 @@ public class InterposedQuestion { this.subject = subject; } - @ApiModelProperty(position = 6, required = true, value = "used to display Text") + @ApiModelProperty(required = true, value = "used to display Text") public String getText() { return text; } @@ -89,7 +89,7 @@ public class InterposedQuestion { this.text = text; } - @ApiModelProperty(position = 7, required = true, value = "used to display Session id") + @ApiModelProperty(required = true, value = "used to display Session id") public String getSessionId() { return sessionId; } @@ -97,7 +97,7 @@ public class InterposedQuestion { this.sessionId = sessionId; } - @ApiModelProperty(position = 8, required = true, value = "used to display Timetamp") + @ApiModelProperty(required = true, value = "used to display Timetamp") public long getTimestamp() { return timestamp; } diff --git a/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java b/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java index 43279913b746fcbc27162417f401b6167fe04915..bb6d36bc3e802825d2cda800b10c6f4fa441ae9c 100644 --- a/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java +++ b/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java @@ -39,7 +39,7 @@ public class InterposedReadingCount { this.unread = 0; } - @ApiModelProperty(position = 1, required = true, value = "used to display read interposed questions") + @ApiModelProperty(required = true, value = "used to display read interposed questions") public int getRead() { return read; } @@ -48,7 +48,7 @@ public class InterposedReadingCount { this.read = read; } - @ApiModelProperty(position = 2, required = true, value = "used to display unread interposed questions") + @ApiModelProperty(required = true, value = "used to display unread interposed questions") public int getUnread() { return unread; } @@ -57,7 +57,7 @@ public class InterposedReadingCount { this.unread = unread; } - @ApiModelProperty(position = 3, required = true, value = "used to display Total questions") + @ApiModelProperty(required = true, value = "used to display Total questions") public int getTotal() { return getRead() + getUnread(); } diff --git a/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java b/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java index aa489e9aef53f8c77c8398b4af6811fda5e4022d..d5340d70f0e37dd40b45f7ce73790c42a0c9979e 100644 --- a/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java +++ b/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java @@ -37,7 +37,7 @@ public class LearningProgressOptions { public LearningProgressOptions() {} - @ApiModelProperty(position = 1, required = true, value = "used to display the Type") + @ApiModelProperty(required = true, value = "used to display the Type") public String getType() { return type; } @@ -46,7 +46,7 @@ public class LearningProgressOptions { this.type = learningProgressType; } - @ApiModelProperty(position = 2, required = true, value = "used to display question variant") + @ApiModelProperty(required = true, value = "used to display question variant") public String getQuestionVariant() { return questionVariant; } diff --git a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java index 4fff16d1a8670f2a7b45ba985a2812669e4103b3..bb79c6a477c2492d1fdf037023eefae4b16e1cde 100644 --- a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java +++ b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java @@ -31,7 +31,7 @@ public class PossibleAnswer { private boolean correct; private int value; - @ApiModelProperty(position = 1, required = true, value = "used to display id") + @ApiModelProperty(required = true, value = "used to display id") public String getId() { return this.id; } @@ -40,7 +40,7 @@ public class PossibleAnswer { this.id = id; } - @ApiModelProperty(position = 3, required = true, value = "used to display text") + @ApiModelProperty(required = true, value = "used to display text") public String getText() { return text; } @@ -49,7 +49,7 @@ public class PossibleAnswer { this.text = text; } - @ApiModelProperty(position = 4, required = true, value = "correct") + @ApiModelProperty(required = true, value = "correct") public boolean isCorrect() { return correct; } @@ -58,7 +58,7 @@ public class PossibleAnswer { this.correct = correct; } - @ApiModelProperty(position = 5, required = true, value = "used to display value") + @ApiModelProperty(required = true, value = "used to display value") public int getValue() { return value; } diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java index a004f1f1f8b0eae8c1a490d87ad6390c791793c8..e2cec59775f8c4917fc4616cdc4bb54fc9c12f6d 100644 --- a/src/main/java/de/thm/arsnova/entities/Question.java +++ b/src/main/java/de/thm/arsnova/entities/Question.java @@ -83,7 +83,7 @@ public class Question { private String hint; private String solution; - @ApiModelProperty(position = 1, required = true, value = "used to display type") + @ApiModelProperty(required = true, value = "used to display type") public final String getType() { return type; } @@ -92,7 +92,7 @@ public class Question { this.type = type; } - @ApiModelProperty(position = 2, required = true, value = "used to display the question type") + @ApiModelProperty(required = true, value = "used to display the question type") public final String getQuestionType() { return questionType; } @@ -101,7 +101,7 @@ public class Question { this.questionType = questionType; } - @ApiModelProperty(position = 3, required = true, value = "used to display question variant") + @ApiModelProperty(required = true, value = "used to display question variant") public final String getQuestionVariant() { return questionVariant; } @@ -109,7 +109,7 @@ public class Question { public final void setQuestionVariant(final String questionVariant) { this.questionVariant = questionVariant; } - @ApiModelProperty(position = 4, required = true, value = "used to display subject") + @ApiModelProperty(required = true, value = "used to display subject") public final String getSubject() { return subject; } @@ -118,7 +118,7 @@ public class Question { this.subject = subject; } - @ApiModelProperty(position = 5, required = true, value = "used to display text") + @ApiModelProperty(required = true, value = "used to display text") public final String getText() { return text; } @@ -127,7 +127,7 @@ public class Question { this.text = text; } - @ApiModelProperty(position = 6, required = true, value = "active") + @ApiModelProperty(required = true, value = "active") public final boolean isActive() { return active; } @@ -136,7 +136,7 @@ public class Question { this.active = active; } - @ApiModelProperty(position = 7, required = true, value = "used to display released for") + @ApiModelProperty(required = true, value = "used to display released for") public final String getReleasedFor() { return releasedFor; } @@ -145,7 +145,7 @@ public class Question { this.releasedFor = releasedFor; } - @ApiModelProperty(position = 8, required = true, value = "used to display possible answers") + @ApiModelProperty(required = true, value = "used to display possible answers") public final List<PossibleAnswer> getPossibleAnswers() { return possibleAnswers; } @@ -154,7 +154,7 @@ public class Question { this.possibleAnswers = possibleAnswers; } - @ApiModelProperty(position = 9, required = true, value = "no correct") + @ApiModelProperty(required = true, value = "no correct") public final boolean isNoCorrect() { return noCorrect; } @@ -163,7 +163,7 @@ public class Question { this.noCorrect = noCorrect; } - @ApiModelProperty(position = 10, required = true, value = "used to display session id") + @ApiModelProperty(required = true, value = "used to display session id") public final String getSessionId() { return sessionId; } @@ -172,7 +172,7 @@ public class Question { this.sessionId = sessionId; } - @ApiModelProperty(position = 11, required = true, value = "used to display session id") + @ApiModelProperty(required = true, value = "used to display session id") public final String getSession() { return sessionId; } @@ -181,7 +181,7 @@ public class Question { sessionId = session; } - @ApiModelProperty(position = 12, required = true, value = "used to display session keyword") + @ApiModelProperty(required = true, value = "used to display session keyword") public final String getSessionKeyword() { return sessionKeyword; } @@ -190,7 +190,7 @@ public class Question { sessionKeyword = keyword; } - @ApiModelProperty(position = 13, required = true, value = "used to display timestamp") + @ApiModelProperty(required = true, value = "used to display timestamp") public final long getTimestamp() { return timestamp; } @@ -199,7 +199,7 @@ public class Question { this.timestamp = timestamp; } - @ApiModelProperty(position = 14, required = true, value = "used to display number") + @ApiModelProperty(required = true, value = "used to display number") public final int getNumber() { return number; } @@ -208,12 +208,12 @@ public class Question { this.number = number; } - @ApiModelProperty(position = 15, required = true, value = "used to display duration") + @ApiModelProperty(required = true, value = "used to display duration") public final int getDuration() { return duration; } - @ApiModelProperty(position = 16, required = true, value = "used to display image Question") + @ApiModelProperty(required = true, value = "used to display image Question") public final boolean isImageQuestion() { return imageQuestion; } @@ -226,7 +226,7 @@ public class Question { this.duration = duration; } - @ApiModelProperty(position = 17, required = true, value = "used to display pi Round") + @ApiModelProperty(required = true, value = "used to display pi Round") public int getPiRound() { return piRound; } @@ -235,7 +235,7 @@ public class Question { this.piRound = piRound; } - @ApiModelProperty(position = 18, required = true, value = "used to display pi round end time") + @ApiModelProperty(required = true, value = "used to display pi round end time") public long getPiRoundEndTime() { return piRoundEndTime; } @@ -244,7 +244,7 @@ public class Question { this.piRoundEndTime = piRoundEndTime; } - @ApiModelProperty(position = 19, required = true, value = "used to display pi round start time") + @ApiModelProperty(required = true, value = "used to display pi round start time") public long getPiRoundStartTime() { return piRoundStartTime; } @@ -253,7 +253,7 @@ public class Question { this.piRoundStartTime = piRoundStartTime; } - @ApiModelProperty(position = 20, required = true, value = "piRoundActive ") + @ApiModelProperty(required = true, value = "piRoundActive ") public boolean isPiRoundActive() { return piRoundActive; } @@ -262,7 +262,7 @@ public class Question { this.piRoundActive = piRoundActive; } - @ApiModelProperty(position = 21, required = true, value = "piRoundFinished ") + @ApiModelProperty(required = true, value = "piRoundFinished ") public boolean isPiRoundFinished() { return piRoundFinished; } @@ -271,7 +271,7 @@ public class Question { this.piRoundFinished = piRoundFinished; } - @ApiModelProperty(position = 22, required = true, value = "used to display showStatistic") + @ApiModelProperty(required = true, value = "used to display showStatistic") public boolean isShowStatistic() { return showStatistic; } @@ -280,7 +280,7 @@ public class Question { this.showStatistic = showStatistic; } - @ApiModelProperty(position = 23, required = true, value = "used to display cvIsColored") + @ApiModelProperty(required = true, value = "used to display cvIsColored") public boolean getCvIsColored() { return cvIsColored; } @@ -289,7 +289,7 @@ public class Question { this.cvIsColored = cvIsColored; } - @ApiModelProperty(position = 24, required = true, value = "used to display showAnswer") + @ApiModelProperty(required = true, value = "used to display showAnswer") public boolean isShowAnswer() { return showAnswer; } @@ -298,7 +298,7 @@ public class Question { this.showAnswer = showAnswer; } - @ApiModelProperty(position = 25, required = true, value = "used to display abstention") + @ApiModelProperty(required = true, value = "used to display abstention") public boolean isAbstention() { return abstention; } @@ -307,7 +307,7 @@ public class Question { this.abstention = abstention; } - @ApiModelProperty(position = 26, required = true, value = "used to display _id") + @ApiModelProperty(required = true, value = "used to display _id") public final String get_id() { return _id; } @@ -316,7 +316,7 @@ public class Question { this._id = _id; } - @ApiModelProperty(position = 27, required = true, value = "used to display _rev") + @ApiModelProperty(required = true, value = "used to display _rev") public final String get_rev() { return _rev; } @@ -325,7 +325,7 @@ public class Question { this._rev = _rev; } - @ApiModelProperty(position = 28, required = true, value = "used to display image") + @ApiModelProperty(required = true, value = "used to display image") public String getImage() { return image; } @@ -334,7 +334,7 @@ public class Question { this.image = image; } - @ApiModelProperty(position = 29, required = true, value = "used to display fcImage") + @ApiModelProperty(required = true, value = "used to display fcImage") public String getFcImage() { return fcImage; } @@ -343,7 +343,7 @@ public class Question { this.fcImage = fcImage; } - @ApiModelProperty(position = 30, required = true, value = "used to display gridSize") + @ApiModelProperty(required = true, value = "used to display gridSize") public int getGridSize() { return gridSize; } @@ -352,7 +352,7 @@ public class Question { this.gridSize = gridSize; } - @ApiModelProperty(position = 31, required = true, value = "used to display offsetX") + @ApiModelProperty(required = true, value = "used to display offsetX") public int getOffsetX() { return offsetX; } @@ -361,7 +361,7 @@ public class Question { this.offsetX = offsetX; } - @ApiModelProperty(position = 32, required = true, value = "used to display offsetY") + @ApiModelProperty(required = true, value = "used to display offsetY") public int getOffsetY() { return offsetY; } @@ -370,7 +370,7 @@ public class Question { this.offsetY = offsetY; } - @ApiModelProperty(position = 33, required = true, value = "used to display zoomLvl") + @ApiModelProperty(required = true, value = "used to display zoomLvl") public int getZoomLvl() { return zoomLvl; } @@ -379,7 +379,7 @@ public class Question { this.zoomLvl = zoomLvl; } - @ApiModelProperty(position = 34, required = true, value = "used to display gridOffsetX") + @ApiModelProperty(required = true, value = "used to display gridOffsetX") public int getGridOffsetX() { return gridOffsetX; } @@ -388,7 +388,7 @@ public class Question { this.gridOffsetX = gridOffsetX; } - @ApiModelProperty(position = 35, required = true, value = "used to display gridOffsetY") + @ApiModelProperty(required = true, value = "used to display gridOffsetY") public int getGridOffsetY() { return gridOffsetY; } @@ -397,7 +397,7 @@ public class Question { this.gridOffsetY = gridOffsetY; } - @ApiModelProperty(position = 36, required = true, value = "used to display grid zoom lvl") + @ApiModelProperty(required = true, value = "used to display grid zoom lvl") public int getGridZoomLvl() { return gridZoomLvl; } @@ -406,7 +406,7 @@ public class Question { this.gridZoomLvl = gridZoomLvl; } - @ApiModelProperty(position = 37, required = true, value = "used to display grid size X") + @ApiModelProperty(required = true, value = "used to display grid size X") public int getGridSizeX() { return gridSizeX; } @@ -415,7 +415,7 @@ public class Question { this.gridSizeX = gridSizeX; } - @ApiModelProperty(position = 38, required = true, value = "used to display grid size Y ") + @ApiModelProperty(required = true, value = "used to display grid size Y ") public int getGridSizeY() { return gridSizeY; } @@ -424,7 +424,7 @@ public class Question { this.gridSizeY = gridSizeY; } - @ApiModelProperty(position = 39, required = true, value = "grid is hidden") + @ApiModelProperty(required = true, value = "grid is hidden") public boolean getGridIsHidden() { return gridIsHidden; } @@ -433,7 +433,7 @@ public class Question { this.gridIsHidden = gridIsHidden; } - @ApiModelProperty(position = 40, required = true, value = "used to display image rotation") + @ApiModelProperty(required = true, value = "used to display image rotation") public int getImgRotation() { return imgRotation; } @@ -442,7 +442,7 @@ public class Question { this.imgRotation = imgRotation; } - @ApiModelProperty(position = 41, required = true, value = "used to display toggel fields left") + @ApiModelProperty(required = true, value = "used to display toggel fields left") public boolean getToggleFieldsLeft() { return toggleFieldsLeft; } @@ -451,7 +451,7 @@ public class Question { this.toggleFieldsLeft = toggleFieldsLeft; } - @ApiModelProperty(position = 42, required = true, value = "used to display number clickable fields") + @ApiModelProperty(required = true, value = "used to display number clickable fields") public int getNumClickableFields() { return numClickableFields; } @@ -460,7 +460,7 @@ public class Question { this.numClickableFields = numClickableFields; } - @ApiModelProperty(position = 43, required = true, value = "used to display threshold correct answers") + @ApiModelProperty(required = true, value = "used to display threshold correct answers") public int getThresholdCorrectAnswers() { return thresholdCorrectAnswers; } @@ -469,7 +469,7 @@ public class Question { this.thresholdCorrectAnswers = thresholdCorrectAnswers; } - @ApiModelProperty(position = 44, required = true, value = "used to display grid line color") + @ApiModelProperty(required = true, value = "used to display grid line color") public String getGridLineColor() { return gridLineColor; } @@ -478,7 +478,7 @@ public class Question { this.gridLineColor = gridLineColor; } - @ApiModelProperty(position = 45, required = true, value = "used to display number of dots") + @ApiModelProperty(required = true, value = "used to display number of dots") public int getNumberOfDots() { return numberOfDots; } @@ -487,7 +487,7 @@ public class Question { this.numberOfDots = numberOfDots; } - @ApiModelProperty(position = 46, required = true, value = "used to display the grid type") + @ApiModelProperty(required = true, value = "used to display the grid type") public String getGridType() { return gridType; } @@ -500,7 +500,7 @@ public class Question { this.scaleFactor = scaleFactor; } - @ApiModelProperty(position = 47, required = true, value = "used to display scale factor") + @ApiModelProperty(required = true, value = "used to display scale factor") public String getScaleFactor() { return this.scaleFactor; } @@ -509,12 +509,12 @@ public class Question { this.gridScaleFactor = scaleFactor; } - @ApiModelProperty(position = 48, required = true, value = "used to display grid scale factor") + @ApiModelProperty(required = true, value = "used to display grid scale factor") public String getGridScaleFactor() { return this.gridScaleFactor; } - @ApiModelProperty(position = 49, required = true, value = "enabled text nswer") + @ApiModelProperty(required = true, value = "enabled text nswer") public boolean isTextAnswerEnabled() { return this.textAnswerEnabled; } @@ -523,7 +523,7 @@ public class Question { this.textAnswerEnabled = textAnswerEnabled; } - @ApiModelProperty(position = 50, required = true, value = "voting disabled") + @ApiModelProperty(required = true, value = "voting disabled") public boolean isVotingDisabled() { return votingDisabled; } diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java index 1d2c3362f9def4205cef1897df72af55709c34e9..9601de4e9cc460aafef904425361836dd06dc143 100644 --- a/src/main/java/de/thm/arsnova/entities/Session.java +++ b/src/main/java/de/thm/arsnova/entities/Session.java @@ -96,7 +96,7 @@ public class Session implements Serializable { return copy; } - @ApiModelProperty(position = 1, required = true, value = "used to display the Type") + @ApiModelProperty(required = true, value = "used to display the Type") public String getType() { return type; } @@ -105,7 +105,7 @@ public class Session implements Serializable { this.type = type; } - @ApiModelProperty(position = 2, required = true, value = "used to display name") + @ApiModelProperty(required = true, value = "used to display name") public String getName() { return name; } @@ -114,7 +114,7 @@ public class Session implements Serializable { this.name = name; } - @ApiModelProperty(position = 3, required = true, value = "used to display short name") + @ApiModelProperty(required = true, value = "used to display short name") public String getShortName() { return shortName; } @@ -123,7 +123,7 @@ public class Session implements Serializable { this.shortName = shortName; } - @ApiModelProperty(position = 4, required = true, value = "used to display keyword") + @ApiModelProperty(required = true, value = "used to display keyword") public String getKeyword() { return keyword; } @@ -132,7 +132,7 @@ public class Session implements Serializable { this.keyword = keyword; } - @ApiModelProperty(position = 5, required = true, value = "used to display creator") + @ApiModelProperty(required = true, value = "used to display creator") public String getCreator() { return creator; } @@ -141,7 +141,7 @@ public class Session implements Serializable { this.creator = creator; } - @ApiModelProperty(position = 6, required = true, value = "is active") + @ApiModelProperty(required = true, value = "is active") public boolean isActive() { return active; } @@ -150,7 +150,7 @@ public class Session implements Serializable { this.active = active; } - @ApiModelProperty(position = 7, required = true, value = "used to display the last owner activity") + @ApiModelProperty(required = true, value = "used to display the last owner activity") public long getLastOwnerActivity() { return lastOwnerActivity; } @@ -163,7 +163,7 @@ public class Session implements Serializable { _id = id; } - @ApiModelProperty(position = 8, required = true, value = "used to display id") + @ApiModelProperty(required = true, value = "used to display id") public String get_id() { return _id; } @@ -172,7 +172,7 @@ public class Session implements Serializable { _rev = rev; } - @ApiModelProperty(position = 9, required = true, value = "used to display rev") + @ApiModelProperty(required = true, value = "used to display rev") public String get_rev() { return _rev; } @@ -181,7 +181,7 @@ public class Session implements Serializable { _conflicts = conflicts; } - @ApiModelProperty(position = 10, required = true, value = "used to display conflicts") + @ApiModelProperty(required = true, value = "used to display conflicts") public List<String> get_conflicts() { return _conflicts; } @@ -190,7 +190,7 @@ public class Session implements Serializable { return user.getUsername().equals(creator); } - @ApiModelProperty(position = 11, required = true, value = "used to display course type") + @ApiModelProperty(required = true, value = "used to display course type") public String getCourseType() { return courseType; } @@ -199,7 +199,7 @@ public class Session implements Serializable { this.courseType = courseType; } - @ApiModelProperty(position = 12, required = true, value = "used to display coures id") + @ApiModelProperty(required = true, value = "used to display coures id") public String getCourseId() { return courseId; } @@ -213,7 +213,7 @@ public class Session implements Serializable { return getCourseId() != null && !getCourseId().isEmpty(); } - @ApiModelProperty(position = 13, required = true, value = "used to display the creation time") + @ApiModelProperty(required = true, value = "used to display the creation time") public long getCreationTime() { return creationTime; } @@ -222,7 +222,7 @@ public class Session implements Serializable { this.creationTime = creationTime; } - @ApiModelProperty(position = 14, required = true, value = "used to display learnin progress options") + @ApiModelProperty(required = true, value = "used to display learnin progress options") public LearningProgressOptions getLearningProgressOptions() { return learningProgressOptions; } @@ -231,7 +231,7 @@ public class Session implements Serializable { this.learningProgressOptions = learningProgressOptions; } - @ApiModelProperty(position = 15, required = true, value = "used to display features") + @ApiModelProperty(required = true, value = "used to display features") public SessionFeature getFeatures() { return features; } @@ -240,7 +240,7 @@ public class Session implements Serializable { this.features = features; } - @ApiModelProperty(position = 16, required = true, value = "used to display author name") + @ApiModelProperty(required = true, value = "used to display author name") public String getPpAuthorName() { return ppAuthorName; } @@ -249,7 +249,7 @@ public class Session implements Serializable { this.ppAuthorName = ppAuthorName; } - @ApiModelProperty(position = 17, required = true, value = "used to display author mail") + @ApiModelProperty(required = true, value = "used to display author mail") public String getPpAuthorMail() { return ppAuthorMail; } @@ -258,7 +258,7 @@ public class Session implements Serializable { this.ppAuthorMail = ppAuthorMail; } - @ApiModelProperty(position = 18, required = true, value = "used to display university") + @ApiModelProperty(required = true, value = "used to display university") public String getPpUniversity() { return ppUniversity; } @@ -267,7 +267,7 @@ public class Session implements Serializable { this.ppUniversity = ppUniversity; } - @ApiModelProperty(position = 19, required = true, value = "used to display logo") + @ApiModelProperty(required = true, value = "used to display logo") public String getPpLogo() { return ppLogo; } @@ -276,7 +276,7 @@ public class Session implements Serializable { this.ppLogo = ppLogo; } - @ApiModelProperty(position = 20, required = true, value = "used to display subject") + @ApiModelProperty(required = true, value = "used to display subject") public String getPpSubject() { return ppSubject; } @@ -285,7 +285,7 @@ public class Session implements Serializable { this.ppSubject = ppSubject; } - @ApiModelProperty(position = 21, required = true, value = "used to display license") + @ApiModelProperty(required = true, value = "used to display license") public String getPpLicense() { return ppLicense; } @@ -294,7 +294,7 @@ public class Session implements Serializable { this.ppLicense = ppLicense; } - @ApiModelProperty(position = 22, required = true, value = "used to display description") + @ApiModelProperty(required = true, value = "used to display description") public String getPpDescription() { return ppDescription; } @@ -303,7 +303,7 @@ public class Session implements Serializable { this.ppDescription = ppDescription; } - @ApiModelProperty(position = 23, required = true, value = "used to display faculty") + @ApiModelProperty(required = true, value = "used to display faculty") public String getPpFaculty() { return ppFaculty; } @@ -312,7 +312,7 @@ public class Session implements Serializable { this.ppFaculty = ppFaculty; } - @ApiModelProperty(position = 24, required = true, value = "used to display level") + @ApiModelProperty(required = true, value = "used to display level") public String getPpLevel() { return ppLevel; } @@ -321,7 +321,7 @@ public class Session implements Serializable { this.ppLevel = ppLevel; } - @ApiModelProperty(position = 25, required = true, value = "used to display the session type") + @ApiModelProperty(required = true, value = "used to display the session type") public String getSessionType() { return sessionType; } diff --git a/src/main/java/de/thm/arsnova/entities/SessionFeature.java b/src/main/java/de/thm/arsnova/entities/SessionFeature.java index 06bcaf33fede556c10e077fbdec7187c99378485..a1dca40c55dda52141f414b7699a825fb0c5e0af 100644 --- a/src/main/java/de/thm/arsnova/entities/SessionFeature.java +++ b/src/main/java/de/thm/arsnova/entities/SessionFeature.java @@ -54,7 +54,7 @@ public class SessionFeature { this.lecture = lecture; } - @ApiModelProperty(position = 1, required = true, value = "jitt") + @ApiModelProperty(required = true, value = "jitt") public boolean isJitt() { return jitt; } @@ -63,7 +63,7 @@ public class SessionFeature { this.jitt = jitt; } - @ApiModelProperty(position = 2, required = true, value = "feedback") + @ApiModelProperty(required = true, value = "feedback") public boolean isFeedback() { return feedback; } @@ -72,7 +72,7 @@ public class SessionFeature { this.feedback = feedback; } - @ApiModelProperty(position = 3, required = true, value = "interposed") + @ApiModelProperty(required = true, value = "interposed") public boolean isInterposed() { return interposed; } @@ -81,7 +81,7 @@ public class SessionFeature { this.interposed = interposed; } - @ApiModelProperty(position = 4, required = true, value = "pi") + @ApiModelProperty(required = true, value = "pi") public boolean isPi() { return pi; } @@ -90,7 +90,7 @@ public class SessionFeature { this.pi = pi; } - @ApiModelProperty(position = 5, required = true, value = "learning progress") + @ApiModelProperty(required = true, value = "learning progress") public boolean isLearningProgress() { return learningProgress; } diff --git a/src/main/java/de/thm/arsnova/entities/SessionInfo.java b/src/main/java/de/thm/arsnova/entities/SessionInfo.java index e8354326fa6c45b74490c7ecaf20e45aada30631..14d95a048353046fd0b2d535f7a8f9ca40a61288 100644 --- a/src/main/java/de/thm/arsnova/entities/SessionInfo.java +++ b/src/main/java/de/thm/arsnova/entities/SessionInfo.java @@ -67,7 +67,7 @@ public class SessionInfo { return infos; } - @ApiModelProperty(position = 1, required = true, value = "used to display name") + @ApiModelProperty(required = true, value = "used to display name") public String getName() { return name; } @@ -76,7 +76,7 @@ public class SessionInfo { this.name = name; } - @ApiModelProperty(position = 2, required = true, value = "used to display short name") + @ApiModelProperty(required = true, value = "used to display short name") public String getShortName() { return shortName; } @@ -85,7 +85,7 @@ public class SessionInfo { this.shortName = shortName; } - @ApiModelProperty(position = 3, required = true, value = "used to display keyword") + @ApiModelProperty(required = true, value = "used to display keyword") public String getKeyword() { return keyword; } @@ -94,7 +94,7 @@ public class SessionInfo { this.keyword = keyword; } - @ApiModelProperty(position = 4, required = true, value = "active") + @ApiModelProperty(required = true, value = "active") public boolean isActive() { return active; } @@ -103,7 +103,7 @@ public class SessionInfo { this.active = active; } - @ApiModelProperty(position = 5, required = true, value = "used to display the course type") + @ApiModelProperty(required = true, value = "used to display the course type") public String getCourseType() { return courseType; } @@ -112,7 +112,7 @@ public class SessionInfo { this.courseType = courseType; } - @ApiModelProperty(position = 6, required = true, value = "used to display the session type") + @ApiModelProperty(required = true, value = "used to display the session type") public String getSessionType() { return sessionType; } @@ -121,7 +121,7 @@ public class SessionInfo { this.sessionType = sessionType; } - @ApiModelProperty(position = 7, required = true, value = "used to display level") + @ApiModelProperty(required = true, value = "used to display level") public String getPpLevel() { return ppLevel; } @@ -130,7 +130,7 @@ public class SessionInfo { this.ppLevel = ppLevel; } - @ApiModelProperty(position = 8, required = true, value = "used to display subject") + @ApiModelProperty(required = true, value = "used to display subject") public String getPpSubject() { return ppSubject; } @@ -139,7 +139,7 @@ public class SessionInfo { this.ppSubject = ppSubject; } - @ApiModelProperty(position = 9, required = true, value = "used to display questions number") + @ApiModelProperty(required = true, value = "used to display questions number") public int getNumQuestions() { return numQuestions; } @@ -148,7 +148,7 @@ public class SessionInfo { this.numQuestions = numQuestions; } - @ApiModelProperty(position = 10, required = true, value = "used to display answers number") + @ApiModelProperty(required = true, value = "used to display answers number") public int getNumAnswers() { return numAnswers; } @@ -157,7 +157,7 @@ public class SessionInfo { this.numAnswers = numAnswers; } - @ApiModelProperty(position = 11, required = true, value = "used to display interposed number") + @ApiModelProperty(required = true, value = "used to display interposed number") public int getNumInterposed() { return numInterposed; } @@ -166,7 +166,7 @@ public class SessionInfo { this.numInterposed = numInterposed; } - @ApiModelProperty(position = 12, required = true, value = "used to display unanswered number") + @ApiModelProperty(required = true, value = "used to display unanswered number") public int getNumUnanswered() { return numUnanswered; } @@ -175,7 +175,7 @@ public class SessionInfo { this.numUnanswered = numUnanswered; } - @ApiModelProperty(position = 13, required = true, value = "used to display creation time") + @ApiModelProperty(required = true, value = "used to display creation time") public long getCreationTime() { return creationTime; } @@ -184,7 +184,7 @@ public class SessionInfo { this.creationTime = creationTime; } - @ApiModelProperty(position = 14, required = true, value = "used to display unread interposed number") + @ApiModelProperty(required = true, value = "used to display unread interposed number") public int getNumUnredInterposed() { return numUnredInterposed; } diff --git a/src/main/java/de/thm/arsnova/entities/Statistics.java b/src/main/java/de/thm/arsnova/entities/Statistics.java index 44ad24ecadfeb44dbacf6dcc5a00ef0854fce047..572a9819cb4b55a377477969e2859f91d7cbec84 100644 --- a/src/main/java/de/thm/arsnova/entities/Statistics.java +++ b/src/main/java/de/thm/arsnova/entities/Statistics.java @@ -38,7 +38,7 @@ public class Statistics { private int interposedQuestions; private int conceptQuestions; - @ApiModelProperty(position = 1, required = true, notes = "used to display Answers") + @ApiModelProperty(required = true, notes = "used to display Answers") public int getAnswers() { return answers; } @@ -47,7 +47,7 @@ public class Statistics { this.answers = answers; } - @ApiModelProperty(position = 2, required = true, notes = "used to display Lecture Questions") + @ApiModelProperty(required = true, notes = "used to display Lecture Questions") public int getLectureQuestions() { return lectureQuestions; } @@ -56,7 +56,7 @@ public class Statistics { this.lectureQuestions = questions; } - @ApiModelProperty(position = 3, required = true, notes = "used to display prepartion Questions") + @ApiModelProperty(required = true, notes = "used to display prepartion Questions") public int getPreparationQuestions() { return preparationQuestions; } @@ -65,12 +65,12 @@ public class Statistics { this.preparationQuestions = questions; } - @ApiModelProperty(position = 4, required = true, notes = "used to display Questions") + @ApiModelProperty(required = true, notes = "used to display Questions") public int getQuestions() { return getLectureQuestions() + getPreparationQuestions(); } - @ApiModelProperty(position = 5, required = true, notes = "used to display open Sessions") + @ApiModelProperty(required = true, notes = "used to display open Sessions") public int getOpenSessions() { return openSessions; } @@ -79,7 +79,7 @@ public class Statistics { this.openSessions = openSessions; } - @ApiModelProperty(position = 6, required = true, notes = "used to display closed Sessions") + @ApiModelProperty(required = true, notes = "used to display closed Sessions") public int getClosedSessions() { return closedSessions; } @@ -88,12 +88,12 @@ public class Statistics { this.closedSessions = closedSessions; } - @ApiModelProperty(position = 7, required = true, notes = "used to display Sessions") + @ApiModelProperty(required = true, notes = "used to display Sessions") public int getSessions() { return getOpenSessions() + getClosedSessions(); } - @ApiModelProperty(position = 8, required = true, notes = "used to display Active Users") + @ApiModelProperty(required = true, notes = "used to display Active Users") public int getActiveUsers() { return activeUsers; } @@ -102,7 +102,7 @@ public class Statistics { this.activeUsers = activeUsers; } - @ApiModelProperty(position = 9, required = true, notes = "used to display logged in Users") + @ApiModelProperty(required = true, notes = "used to display logged in Users") public int getLoggedinUsers() { return loggedinUsers; } @@ -111,7 +111,7 @@ public class Statistics { this.loggedinUsers = loggedinUsers; } - @ApiModelProperty(position = 10, required = true, notes = "used to display interposed Questions") + @ApiModelProperty(required = true, notes = "used to display interposed Questions") public int getInterposedQuestions() { return interposedQuestions; } @@ -120,7 +120,7 @@ public class Statistics { this.interposedQuestions = interposedQuestions; } - @ApiModelProperty(position = 11, required = true, notes = "used to display creators") + @ApiModelProperty(required = true, notes = "used to display creators") public int getCreators() { return creators; } @@ -129,7 +129,7 @@ public class Statistics { this.creators = creators; } - @ApiModelProperty(position = 12, required = true, notes = "used to display concept Questions") + @ApiModelProperty(required = true, notes = "used to display concept Questions") public int getConceptQuestions() { return conceptQuestions; } @@ -138,7 +138,7 @@ public class Statistics { this.conceptQuestions = conceptQuestions; } - @ApiModelProperty(position = 13, required = true, notes = "used to display active Students") + @ApiModelProperty(required = true, notes = "used to display active Students") public int getActiveStudents() { return activeStudents; } diff --git a/src/main/java/de/thm/arsnova/entities/transport/Answer.java b/src/main/java/de/thm/arsnova/entities/transport/Answer.java index 6acc2aebb2d2e02291a73396dddf10fcc84a83e3..3875c414404c144e41f4e29de94fd0145042ce69 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/Answer.java +++ b/src/main/java/de/thm/arsnova/entities/transport/Answer.java @@ -41,7 +41,7 @@ public class Answer { private boolean abstention; - @ApiModelProperty(position = 1, required = true, value = "used to display text answer") + @ApiModelProperty(required = true, value = "used to display text answer") public String getAnswerText() { return answerText; } @@ -49,7 +49,7 @@ public class Answer { public void setAnswerText(String answerText) { this.answerText = answerText; } - @ApiModelProperty(position = 2, required = true, value = "used to display subject answer") + @ApiModelProperty(required = true, value = "used to display subject answer") public String getAnswerSubject() { return answerSubject; } @@ -58,7 +58,7 @@ public class Answer { this.answerSubject = answerSubject; } - @ApiModelProperty(position = 3, required = true, value = "abstention") + @ApiModelProperty(required = true, value = "abstention") public boolean isAbstention() { return abstention; } @@ -92,7 +92,7 @@ public class Answer { return theAnswer; } - @ApiModelProperty(position = 4, required = true, value = "used to display image answer") + @ApiModelProperty(required = true, value = "used to display image answer") public String getAnswerImage() { return answerImage; } diff --git a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java index 10fcec883af6f7f33de50fe5ef670bb0746afcbb..390787f9024d49e26f42e84b639c3b8f10873495 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java +++ b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java @@ -38,7 +38,7 @@ public class ImportExportSession { private List<InterposedQuestion> feedbackQuestions; - @ApiModelProperty(position = 1, required = true, value = "used to display session") + @ApiModelProperty(required = true, value = "used to display session") public ImportExportSesssion getSession() { return session; } @@ -47,7 +47,7 @@ public class ImportExportSession { this.session = session; } - @ApiModelProperty(position = 2, required = true, value = "used to display questions") + @ApiModelProperty(required = true, value = "used to display questions") public List<ImportExportQuestion> getQuestions() { return questions; } @@ -56,7 +56,7 @@ public class ImportExportSession { this.questions = questions; } - @ApiModelProperty(position = 3, required = true, value = "used to display questions feedback") + @ApiModelProperty(required = true, value = "used to display questions feedback") public List<InterposedQuestion> getFeedbackQuestions() { return feedbackQuestions; } @@ -100,7 +100,7 @@ public class ImportExportSession { private List<Answer> answers; - @ApiModelProperty(position = 4, required = true, value = " used to display answers") + @ApiModelProperty(required = true, value = " used to display answers") public List<Answer> getAnswers() { return answers; } @@ -120,7 +120,7 @@ public class ImportExportSession { private PublicPool publicPool; - @ApiModelProperty(position = 19, required = true, value = "used to display short name") + @ApiModelProperty(required = true, value = "used to display short name") public String getName() { return name; } @@ -129,7 +129,7 @@ public class ImportExportSession { this.name = name; } - @ApiModelProperty(position = 5, required = true, value = "used to display short name") + @ApiModelProperty(required = true, value = "used to display short name") public String getShortName() { return shortName; } @@ -138,7 +138,7 @@ public class ImportExportSession { this.shortName = shortName; } - @ApiModelProperty(position = 6, required = true, value = "active") + @ApiModelProperty(required = true, value = "active") public boolean isActive() { return active; } @@ -147,7 +147,7 @@ public class ImportExportSession { this.active = active; } - @ApiModelProperty(position = 7, required = true, value = "used to display public pool") + @ApiModelProperty(required = true, value = "used to display public pool") public PublicPool getPublicPool() { return publicPool; } @@ -181,7 +181,7 @@ public class ImportExportSession { private String shortName; - @ApiModelProperty(position = 8, required = true, value = "used to display author name") + @ApiModelProperty(required = true, value = "used to display author name") public String getPpAuthorName() { return ppAuthorName; } @@ -190,7 +190,7 @@ public class ImportExportSession { this.ppAuthorName = ppAuthorName; } - @ApiModelProperty(position = 9, required = true, value = "used to display author mail") + @ApiModelProperty(required = true, value = "used to display author mail") public String getPpAuthorMail() { return ppAuthorMail; } @@ -199,7 +199,7 @@ public class ImportExportSession { this.ppAuthorMail = ppAuthorMail; } - @ApiModelProperty(position = 10, required = true, value = "used to display university") + @ApiModelProperty( required = true, value = "used to display university") public String getPpUniversity() { return ppUniversity; } @@ -208,7 +208,7 @@ public class ImportExportSession { this.ppUniversity = ppUniversity; } - @ApiModelProperty(position = 11, required = true, value = "used to display logo") + @ApiModelProperty(required = true, value = "used to display logo") public String getPpLogo() { return ppLogo; } @@ -217,7 +217,7 @@ public class ImportExportSession { this.ppLogo = ppLogo; } - @ApiModelProperty(position = 12, required = true, value = "used to display subject") + @ApiModelProperty(required = true, value = "used to display subject") public String getPpSubject() { return ppSubject; } @@ -226,7 +226,7 @@ public class ImportExportSession { this.ppSubject = ppSubject; } - @ApiModelProperty(position = 13, required = true, value = "used to display license") + @ApiModelProperty(required = true, value = "used to display license") public String getPpLicense() { return ppLicense; } @@ -235,7 +235,7 @@ public class ImportExportSession { this.ppLicense = ppLicense; } - @ApiModelProperty(position = 14, required = true, value = "used to display level") + @ApiModelProperty(required = true, value = "used to display level") public String getPpLevel() { return ppLevel; } @@ -244,7 +244,7 @@ public class ImportExportSession { this.ppLevel = ppLevel; } - @ApiModelProperty(position = 15, required = true, value = "used to display description") + @ApiModelProperty(required = true, value = "used to display description") public String getPpDescription() { return ppDescription; } @@ -253,7 +253,7 @@ public class ImportExportSession { this.ppDescription = ppDescription; } - @ApiModelProperty(position = 16, required = true, value = "used to display faculty") + @ApiModelProperty(required = true, value = "used to display faculty") public String getPpFaculty() { return ppFaculty; } @@ -262,7 +262,7 @@ public class ImportExportSession { this.ppFaculty = ppFaculty; } - @ApiModelProperty(position = 17, required = true, value = "used to display name") + @ApiModelProperty(required = true, value = "used to display name") public String getName() { return name; } @@ -271,7 +271,7 @@ public class ImportExportSession { this.name = name; } - @ApiModelProperty(position = 18, required = true, value = "used to display short name") + @ApiModelProperty(required = true, value = "used to display short name") public String getShortName() { return shortName; } diff --git a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java index 188d3fb85bf511c96d555eaad10f2ae9a973332e..da14011e9f3208055e0640fe4fad38c3b03d813a 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java +++ b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java @@ -57,7 +57,7 @@ public class InterposedQuestion { public InterposedQuestion() {} - @ApiModelProperty(position = 1, required = true, value = "used to display Id") + @ApiModelProperty(required = true, value = "used to display Id") public String getId() { return id; } @@ -66,7 +66,7 @@ public class InterposedQuestion { this.id = id; } - @ApiModelProperty(position = 2, required = true, value = "used to display Subject") + @ApiModelProperty(required = true, value = "used to display Subject") public String getSubject() { return subject; } @@ -75,7 +75,7 @@ public class InterposedQuestion { this.subject = subject; } - @ApiModelProperty(position = 3, required = true, value = "used to display Text") + @ApiModelProperty(required = true, value = "used to display Text") public String getText() { return text; } @@ -84,7 +84,7 @@ public class InterposedQuestion { this.text = text; } - @ApiModelProperty(position = 4, required = true, value = "used to display Timetamp") + @ApiModelProperty(required = true, value = "used to display Timetamp") public long getTimestamp() { return timestamp; } @@ -93,7 +93,7 @@ public class InterposedQuestion { this.timestamp = timestamp; } - @ApiModelProperty(position = 5, required = true, value = "is read") + @ApiModelProperty(required = true, value = "is read") public boolean isRead() { return read; } diff --git a/src/main/java/de/thm/arsnova/entities/transport/LearningProgressValues.java b/src/main/java/de/thm/arsnova/entities/transport/LearningProgressValues.java index fcf2660e6f7e45f96ed6d8e05f85e68560801def..8b641b996768adeb51e99e5a5edf2c19c9c61927 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/LearningProgressValues.java +++ b/src/main/java/de/thm/arsnova/entities/transport/LearningProgressValues.java @@ -38,7 +38,7 @@ public class LearningProgressValues { private int numUsers; - @ApiModelProperty(position = 1, required = true, value = "used to display course progress") + @ApiModelProperty(required = true, value = "used to display course progress") public int getCourseProgress() { return courseProgress; } @@ -47,7 +47,7 @@ public class LearningProgressValues { this.courseProgress = courseProgress; } - @ApiModelProperty(position = 2, required = true, value = "used to display my progress") + @ApiModelProperty(required = true, value = "used to display my progress") public int getMyProgress() { return myProgress; } @@ -56,7 +56,7 @@ public class LearningProgressValues { this.myProgress = myProgress; } - @ApiModelProperty(position = 3, required = true, value = "used to display questions number") + @ApiModelProperty(required = true, value = "used to display questions number") public int getNumQuestions() { return numQuestions; } @@ -81,7 +81,7 @@ public class LearningProgressValues { this.denominator = denominator; } - @ApiModelProperty(position = 4, required = true, value = "used to display user number") + @ApiModelProperty(required = true, value = "used to display user number") public int getNumUsers() { return numUsers; }