Skip to content
Snippets Groups Projects
Commit efc9a225 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Remove obsolete special handling of CAS users

This is no longer needed since the "released for" per question setting
has been removed.
parent bc2b718a
No related merge requests found
...@@ -134,11 +134,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -134,11 +134,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.getCreator().equals(user.getUsername())) { if (session.getCreator().equals(user.getUsername())) {
viewName = "skill_question/by_session_sorted_by_subject_and_text"; viewName = "skill_question/by_session_sorted_by_subject_and_text";
} else { } else {
if (user.getType().equals(User.THM)) { viewName = "skill_question/by_session_for_all_full";
viewName = "skill_question/by_session_for_thm_full";
} else {
viewName = "skill_question/by_session_for_all_full";
}
} }
return getQuestions(new NovaView(viewName), session); return getQuestions(new NovaView(viewName), session);
} }
...@@ -453,12 +449,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -453,12 +449,7 @@ public class CouchDBDao implements IDatabaseDao {
@Override @Override
public final List<String> getQuestionIds(final Session session, final User user) { public final List<String> getQuestionIds(final Session session, final User user) {
NovaView view; NovaView view = new NovaView("skill_question/by_session_only_id_for_all");
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");
}
view.setKey(session.get_id()); view.setKey(session.get_id());
return collectQuestionIds(view); return collectQuestionIds(view);
} }
...@@ -1131,11 +1122,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -1131,11 +1122,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) { if (session.isCreator(user)) {
viewName = "skill_question/lecture_question_by_session"; viewName = "skill_question/lecture_question_by_session";
} else { } else {
if (user.getType().equals(User.THM)) { viewName = "skill_question/lecture_question_by_session_for_all";
viewName = "skill_question/lecture_question_by_session_for_thm";
} else {
viewName = "skill_question/lecture_question_by_session_for_all";
}
} }
return getQuestions(new NovaView(viewName), session); return getQuestions(new NovaView(viewName), session);
} }
...@@ -1146,11 +1133,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -1146,11 +1133,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) { if (session.isCreator(user)) {
viewName = "skill_question/flashcard_by_session"; viewName = "skill_question/flashcard_by_session";
} else { } else {
if (user.getType().equals(User.THM)) { viewName = "skill_question/flashcard_by_session_for_all";
viewName = "skill_question/flashcard_by_session_for_thm";
} else {
viewName = "skill_question/flashcard_by_session_for_all";
}
} }
return getQuestions(new NovaView(viewName), session); return getQuestions(new NovaView(viewName), session);
} }
...@@ -1161,11 +1144,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -1161,11 +1144,7 @@ public class CouchDBDao implements IDatabaseDao {
if (session.isCreator(user)) { if (session.isCreator(user)) {
viewName = "skill_question/preparation_question_by_session"; viewName = "skill_question/preparation_question_by_session";
} else { } else {
if (user.getType().equals(User.THM)) { viewName = "skill_question/preparation_question_by_session_for_all";
viewName = "skill_question/preparation_question_by_session_for_thm";
} else {
viewName = "skill_question/preparation_question_by_session_for_all";
}
} }
return getQuestions(new NovaView(viewName), session); return getQuestions(new NovaView(viewName), session);
...@@ -1275,12 +1254,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -1275,12 +1254,7 @@ public class CouchDBDao implements IDatabaseDao {
} }
private List<String> getLectureQuestionIds(final Session session, final User user) { private List<String> getLectureQuestionIds(final Session session, final User user) {
NovaView view; NovaView view = new NovaView("skill_question/lecture_question_by_session_for_all");
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");
}
view.setStartKeyArray(session.get_id()); view.setStartKeyArray(session.get_id());
view.setEndKeyArray(session.get_id(), "{}"); view.setEndKeyArray(session.get_id(), "{}");
return collectQuestionIds(view); return collectQuestionIds(view);
...@@ -1294,12 +1268,7 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -1294,12 +1268,7 @@ public class CouchDBDao implements IDatabaseDao {
} }
private List<String> getPreparationQuestionIds(final Session session, final User user) { private List<String> getPreparationQuestionIds(final Session session, final User user) {
NovaView view; NovaView view = new NovaView("skill_question/preparation_question_by_session_for_all");
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");
}
view.setStartKeyArray(session.get_id()); view.setStartKeyArray(session.get_id());
view.setEndKeyArray(session.get_id(), "{}"); view.setEndKeyArray(session.get_id(), "{}");
return collectQuestionIds(view); return collectQuestionIds(view);
......
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