Skip to content
Snippets Groups Projects
Commit 26c42848 authored by Tom Käsler's avatar Tom Käsler
Browse files

fix typos, removed some bugs

parent 72bd8f7e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+ 7
− 7
View file @ 26c42848
......@@ -428,7 +428,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,
......@@ -437,10 +437,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
......@@ -448,7 +448,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,
......@@ -457,15 +457,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
src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+ 18
− 21
View file @ 26c42848
......@@ -1395,13 +1395,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;
}
......@@ -1413,14 +1413,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;
}
......@@ -1446,14 +1446,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;
}
......@@ -1465,14 +1465,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;
}
......@@ -1987,11 +1987,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);
......@@ -1999,7 +1995,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
......@@ -2044,5 +2040,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
questions.add(tempQuestion);
}
}
return questions;
}
}
src/main/java/de/thm/arsnova/entities/SortOrder.java
+ 2
− 2
View file @ 26c42848
......@@ -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() {
......
src/main/java/de/thm/arsnova/services/IQuestionService.java
+ 1
− 1
View file @ 26c42848
......@@ -139,5 +139,5 @@ public interface IQuestionService {
String getSubjectSortType(String sessionkey, String isPreparation);
String getQuestionSortType(String sessionkey, String isPreparation);
String getQuestionSortType(String sessionkey, String isPreparation, String subject);
}
src/main/java/de/thm/arsnova/services/QuestionService.java
+ 5
− 5
View file @ 26c42848
......@@ -138,12 +138,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);
}
}
......@@ -793,12 +793,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();
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment