From 6dd9e09f778d7efed15db61b9880fa411678c797 Mon Sep 17 00:00:00 2001
From: tekay <tom.kaesler@mni.thm.de>
Date: Thu, 12 Mar 2015 10:45:09 +0100
Subject: [PATCH] fix typos, removed some bugs
---
.../LecturerQuestionController.java | 14 +++----
.../java/de/thm/arsnova/dao/CouchDBDao.java | 39 +++++++++----------
.../de/thm/arsnova/entities/SortOrder.java | 4 +-
.../arsnova/services/IQuestionService.java | 2 +-
.../thm/arsnova/services/QuestionService.java | 10 ++---
5 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index e7d55df05..c6ff1aa5e 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -415,7 +415,7 @@ public class LecturerQuestionController extends AbstractController {
}
}
- @RequestMapping(value = "/setsort", method = RequestMethod.POST)
+ @RequestMapping(value = "/setsubjectsort", method = RequestMethod.POST)
public void setSubjectSortOrder(
@PathVariable final String questionId,
@RequestParam(required = false) final Boolean publish,
@@ -424,10 +424,10 @@ public class LecturerQuestionController extends AbstractController {
if (publish != null) {
question.setActive(publish);
}
- questionService.update(question);
+ //whaat?
}
- @RequestMapping(value = "/getsort", method = RequestMethod.GET)
+ @RequestMapping(value = "/getsubjectsort", method = RequestMethod.GET)
public String getSubjectSortType(
@RequestParam(required = true) final String sessionkey,
@RequestParam(required = true) final String isPreparation
@@ -435,7 +435,7 @@ public class LecturerQuestionController extends AbstractController {
return questionService.getSubjectSortType(sessionkey, isPreparation);
}
- @RequestMapping(value = "/setsort", method = RequestMethod.POST)
+ @RequestMapping(value = "/setquestionsort", method = RequestMethod.POST)
public void setQuestionSortOrder(
@PathVariable final String questionId,
@RequestParam(required = false) final Boolean publish,
@@ -444,15 +444,15 @@ public class LecturerQuestionController extends AbstractController {
if (publish != null) {
question.setActive(publish);
}
- questionService.update(question);
+ //whaat?
}
- @RequestMapping(value = "/getsort", method = RequestMethod.GET)
+ @RequestMapping(value = "/getquestionsort", method = RequestMethod.GET)
public String getQuestionSortType(
@RequestParam(required = true) final String sessionkey,
@RequestParam(required = true) final String subject,
@RequestParam(required = true) final String isPreparation
) {
- return questionService.getQuestionSortType(sessionkey, subject, isPreparation);
+ return questionService.getQuestionSortType(sessionkey, isPreparation, subject);
}
}
\ No newline at end of file
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 5d8c7a14b..24015ee2f 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1382,13 +1382,13 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
@Override
public List<Question> getLectureQuestionsForUsers(final Session session) {
SortOrder subjectSortOrder = getSortOrder(session.get_id(), "lecture", "");
- if (sortOrder != null) {
+ if (subjectSortOrder != null) {
List<Question> questions = new ArrayList<Question>();
- if ("alphabet".equals(sortOrder.getSortType())) {
+ if ("alphabet".equals(subjectSortOrder.getSortType())) {
// i srsly dunno, lol
}
else {
- questions = getQuestionsBySortOrder(sortOrder, true);
+ questions = getQuestionsBySortOrder(subjectSortOrder, true);
}
return questions;
}
@@ -1400,14 +1400,14 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
@Override
public List<Question> getLectureQuestionsForTeachers(final Session session) {
- SortOrder subjectSortOrder = getSortOrder(session, "lecture", "");
- if (sortOrder != null) {
+ SortOrder subjectSortOrder = getSortOrder(session.get_id(), "lecture", "");
+ if (subjectSortOrder != null) {
List<Question> questions = new ArrayList<Question>();
- if ("alphabet".equals(sortOrder.getSortType())) {
+ if ("alphabet".equals(subjectSortOrder.getSortType())) {
// i srsly dunno, lol
}
else {
- questions = getQuestionsBySortOrder(sortOrder, false);
+ questions = getQuestionsBySortOrder(subjectSortOrder, false);
}
return questions;
}
@@ -1433,14 +1433,14 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
@Cacheable("preparationquestions")
@Override
public List<Question> getPreparationQuestionsForUsers(final Session session) {
- SortOrder subjectSortOrder = getSortOrder(session, "preparation", "");
- if (sortOrder != null) {
+ SortOrder subjectSortOrder = getSortOrder(session.get_id(), "preparation", "");
+ if (subjectSortOrder != null) {
List<Question> questions = new ArrayList<Question>();
- if ("alphabet".equals(sortOrder.getSortType())) {
+ if ("alphabet".equals(subjectSortOrder.getSortType())) {
// i srsly dunno, lol
}
else {
- questions = getQuestionsBySortOrder(sortOrder, true);
+ questions = getQuestionsBySortOrder(subjectSortOrder, true);
}
return questions;
}
@@ -1452,14 +1452,14 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
@Override
public List<Question> getPreparationQuestionsForTeachers(final Session session) {
- SortOrder sortOrder = getSortOrder(session, "preparation");
- if (sortOrder != null) {
+ SortOrder subjectSortOrder = getSortOrder(session.get_id(), "preparation", "");
+ if (subjectSortOrder != null) {
List<Question> questions = new ArrayList<Question>();
- if ("alphabet".equals(sortOrder.getSortType())) {
+ if ("alphabet".equals(subjectSortOrder.getSortType())) {
// i srsly dunno, lol
}
else {
- questions = getQuestionsBySortOrder(sortOrder, false);
+ questions = getQuestionsBySortOrder(subjectSortOrder, false);
}
return questions;
}
@@ -1974,11 +1974,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
NovaView view = new NovaView(viewString);
view.setKey(sessionId);
- if(subject.isempty() == false) {
- String suffix = "_and_subject";
- viewString = viewString.concat(suffix);
- view.setKey(subject);
- }
+ view.setKey(subject);
ViewResults results = this.getDatabase().view(view);
@@ -1986,7 +1982,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
return null;
}
- return (SortOrder) JSONObject.toBean(results.getJSONObject(), Question.class);
+ return (SortOrder) JSONObject.toBean(results.getJSONObject(), SortOrder.class);
}
@Override
@@ -2031,5 +2027,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
questions.add(tempQuestion);
}
}
+ return questions;
}
}
diff --git a/src/main/java/de/thm/arsnova/entities/SortOrder.java b/src/main/java/de/thm/arsnova/entities/SortOrder.java
index c69e8552a..01d87ebf1 100644
--- a/src/main/java/de/thm/arsnova/entities/SortOrder.java
+++ b/src/main/java/de/thm/arsnova/entities/SortOrder.java
@@ -41,11 +41,11 @@ public class SortOrder {
}
public String getSortType() {
- return this.SortType;
+ return this.sortType;
}
public void setQuestionVariant(final String questionVariant) {
- this.sortVariant = sortVariant;
+ this.questionVariant = questionVariant;
}
public String getQuestionVariant() {
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index c37a08133..ce370a020 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -131,5 +131,5 @@ public interface IQuestionService {
String getSubjectSortType(String sessionkey, String isPreparation);
- String getQuestionSortType(String sessionkey, String isPreparation);
+ String getQuestionSortType(String sessionkey, String isPreparation, String subject);
}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index a9f9def28..6a2614ec1 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -131,12 +131,12 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
SortOrder sortOrder = databaseDao.getSortOrder(session.get_id(), question.getQuestionVariant(), question.getSubject());
if (sortOrder != null) {
- if("alphabet____work".equals(sortOrder.getSortType())) {
+ if("alphabet".equals(sortOrder.getSortType())) {
}
else {
String[] tmp = sortOrder.getSortOrder();
- tmp.add(question.get_id());
+ tmp.append(question.get_id());
sortOrder.setSortOrder(tmp);
}
}
@@ -725,12 +725,12 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
@Override
public String getSubjectSortType(String sessionkey, String isPreparation) {
SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, isPreparation, "");
- return SortOrder.getSortType();
+ return sortOrder.getSortType();
}
@Override
- public String getQuestionSortType(String session, String subject, String isPreparation) {
+ public String getQuestionSortType(String sessionkey, String isPreparation, String subject) {
SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, isPreparation, subject);
- return SortOrder.getSortType();
+ return sortOrder.getSortType();
}
}
--
GitLab