From efc9a225ddc6a694661f6032ca9e2e159a4f4b23 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 4 Sep 2014 21:02:00 +0200
Subject: [PATCH] Remove obsolete special handling of CAS users
This is no longer needed since the "released for" per question setting
has been removed.
---
.../java/de/thm/arsnova/dao/CouchDBDao.java | 45 +++----------------
1 file changed, 7 insertions(+), 38 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 01dcc9de..bff641da 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -134,11 +134,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.getCreator().equals(user.getUsername())) {
viewName = "skill_question/by_session_sorted_by_subject_and_text";
} else {
- if (user.getType().equals(User.THM)) {
- viewName = "skill_question/by_session_for_thm_full";
- } else {
- viewName = "skill_question/by_session_for_all_full";
- }
+ viewName = "skill_question/by_session_for_all_full";
}
return getQuestions(new NovaView(viewName), session);
}
@@ -453,12 +449,7 @@ public class CouchDBDao implements IDatabaseDao {
@Override
public final List<String> getQuestionIds(final Session session, final User user) {
- NovaView view;
- if (user.getType().equals("thm")) {
- view = new NovaView("skill_question/by_session_only_id_for_thm");
- } else {
- view = new NovaView("skill_question/by_session_only_id_for_all");
- }
+ NovaView view = new NovaView("skill_question/by_session_only_id_for_all");
view.setKey(session.get_id());
return collectQuestionIds(view);
}
@@ -1131,11 +1122,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) {
viewName = "skill_question/lecture_question_by_session";
} else {
- if (user.getType().equals(User.THM)) {
- viewName = "skill_question/lecture_question_by_session_for_thm";
- } else {
- viewName = "skill_question/lecture_question_by_session_for_all";
- }
+ viewName = "skill_question/lecture_question_by_session_for_all";
}
return getQuestions(new NovaView(viewName), session);
}
@@ -1146,11 +1133,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) {
viewName = "skill_question/flashcard_by_session";
} else {
- if (user.getType().equals(User.THM)) {
- viewName = "skill_question/flashcard_by_session_for_thm";
- } else {
- viewName = "skill_question/flashcard_by_session_for_all";
- }
+ viewName = "skill_question/flashcard_by_session_for_all";
}
return getQuestions(new NovaView(viewName), session);
}
@@ -1161,11 +1144,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) {
viewName = "skill_question/preparation_question_by_session";
} else {
- if (user.getType().equals(User.THM)) {
- viewName = "skill_question/preparation_question_by_session_for_thm";
- } else {
- viewName = "skill_question/preparation_question_by_session_for_all";
- }
+ viewName = "skill_question/preparation_question_by_session_for_all";
}
return getQuestions(new NovaView(viewName), session);
@@ -1275,12 +1254,7 @@ public class CouchDBDao implements IDatabaseDao {
}
private List<String> getLectureQuestionIds(final Session session, final User user) {
- NovaView view;
- if (user.getType().equals("thm")) {
- view = new NovaView("skill_question/lecture_question_by_session_for_thm");
- } else {
- view = new NovaView("skill_question/lecture_question_by_session_for_all");
- }
+ NovaView view = new NovaView("skill_question/lecture_question_by_session_for_all");
view.setStartKeyArray(session.get_id());
view.setEndKeyArray(session.get_id(), "{}");
return collectQuestionIds(view);
@@ -1294,12 +1268,7 @@ public class CouchDBDao implements IDatabaseDao {
}
private List<String> getPreparationQuestionIds(final Session session, final User user) {
- NovaView view;
- if (user.getType().equals("thm")) {
- view = new NovaView("skill_question/preparation_question_by_session_for_thm");
- } else {
- view = new NovaView("skill_question/preparation_question_by_session_for_all");
- }
+ NovaView view = new NovaView("skill_question/preparation_question_by_session_for_all");
view.setStartKeyArray(session.get_id());
view.setEndKeyArray(session.get_id(), "{}");
return collectQuestionIds(view);
--
GitLab