Merge branch 'Feature#14773' of...

Merge branch 'Feature#14773' of scm.thm.de:arsnova/swtp2015-text-checker-setuptool into Feature#14773

src/main/resources/views/skill_question

@@ -76,6 +76,18 @@
 		},
 		"lecture_question_ids_by_session_for_all": {
 			"map": "function(doc) { if (doc.type == 'skill_question' && doc.questionVariant == 'lecture' && doc.active == 1) { emit([doc.sessionId, doc.subject, doc.text], {}); }}"
+		},
+		"lecture_question_subjects_by_session": {
+			"map": "function(doc) { if (doc.type == 'skill_question' && doc.questionVariant == 'lecture') { emit(doc.sessionId, doc.subject); }}"
+		},
+		"preparation_question_subjects_by_session": {
+			"map": "function(doc) { if (doc.type == 'skill_question' && doc.questionVariant == 'preparation') { emit(doc.sessionId, doc.subject); }}"
+		},
+		"lecture_question_ids_by_session_and_subject": {
+			"map": "function(doc) { if (doc.type == 'skill_question' && doc.questionVariant == 'lecture') { emit([doc.sessionId, doc.subject], doc._id); }}"
+		},
+		"preparation_question_ids_by_session_and_subject": {
+			"map": "function(doc) { if (doc.type == 'skill_question' && doc.questionVariant == 'preparation') { emit([doc.sessionId, doc.subject], doc._id); }}"
 		}
 	}
 }

src/main/resources/views/sort_order

+{
+	"_id": "_design/sort_order",
+	"language": "javascript",
+	"views": {
+		"lecture_question_sort_order_by_sessionid_and_subject": {
+			"map": "function(doc) { if (doc.type == 'sort_order' && doc.questionVariant == 'lecture') { emit([doc.sessionId, doc.subject], doc); } }"
+		},
+		"preparation_question_sort_order_by_sessionid_and_subject": {
+			"map": "function(doc) { if (doc.type == 'sort_order' && doc.questionVariant == 'preparation') { emit([doc.sessionId, doc.subject], doc); } }"
+		}
+	}
+}