Implemented questionnaire editor

Author: BitFlaker

README.md

@@ -16,6 +16,7 @@
 * Alarms
 * Statistics
 * Backup / Export
+
 Everything is supposed to be as customizable as possible
 
 ## 🛡️ Privacy

app/src/main/java/com/bitflaker/lucidsourcekit/MainActivity.java

@@ -195,14 +195,14 @@ private void addDebugQuestionnaire(MainDatabase db) {
         int q5 = qd.insert(new Question("Anything else?", 4, id, null, null, false)).blockingGet().intValue();
 
         QuestionOptionsDao qo = db.getQuestionOptionsDao();
-        qo.insert(new QuestionOptions(q2, 1, "Option 1", null)).blockingSubscribe();
-        qo.insert(new QuestionOptions(q2, 2, "Option 2", null)).blockingSubscribe();
-        qo.insert(new QuestionOptions(q2, 3, "Option 3", null)).blockingSubscribe();
-
-        qo.insert(new QuestionOptions(q3, 1, "Option 1", null)).blockingSubscribe();
-        qo.insert(new QuestionOptions(q3, 2, "Option 2", null)).blockingSubscribe();
-        qo.insert(new QuestionOptions(q3, 3, "Option 3", null)).blockingSubscribe();
-        qo.insert(new QuestionOptions(q3, 4, "Option 4", null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q2, 1, "Option 1", 1, false, null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q2, 2, "Option 2", 2, false, null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q2, 3, "Option 3", 3, false, null)).blockingSubscribe();
+
+        qo.insert(new QuestionOptions(q3, 1, "Option 1", 1, false, null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q3, 2, "Option 2", 2, false, null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q3, 3, "Option 3", 3, false, null)).blockingSubscribe();
+        qo.insert(new QuestionOptions(q3, 4, "Option 4", 4, false, null)).blockingSubscribe();
     }
 
     private void applicationLogin() {

app/src/main/java/com/bitflaker/lucidsourcekit/database/MainDatabase.java

@@ -81,7 +81,7 @@
         Weekdays.class, ActiveAlarm.class, StoredAlarm.class, NotificationObfuscations.class,
         NotificationMessage.class, NotificationCategory.class, ShuffleTransaction.class,
         Questionnaire.class, Question.class, QuestionType.class, CompletedQuestionnaire.class,
-        QuestionnaireAnswer.class, QuestionOptions.class, SelectedOptions.class}, version = 17, exportSchema = false)
+        QuestionnaireAnswer.class, QuestionOptions.class, SelectedOptions.class}, version = 18, exportSchema = false)
 @TypeConverters({Converters.class})
 public abstract class MainDatabase extends RoomDatabase {
 
@@ -161,6 +161,7 @@ private static MainDatabase create(final Context context) {
                 .addMigrations(MainDatabaseMigrations.MIGRATION_14_15)
                 .addMigrations(MainDatabaseMigrations.MIGRATION_15_16)
                 .addMigrations(MainDatabaseMigrations.MIGRATION_16_17)
+                .addMigrations(MainDatabaseMigrations.MIGRATION_17_18)
                 .build();
     }
 

app/src/main/java/com/bitflaker/lucidsourcekit/database/MainDatabaseMigrations.java

@@ -296,4 +296,12 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
             database.execSQL("ALTER TABLE CompletedQuestionnaire ADD answerDuration INTEGER DEFAULT 0 NOT NULL;");
         }
     };
+
+    public static final Migration MIGRATION_17_18 = new Migration(17, 18) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE QuestionOptions ADD orderNr INTEGER DEFAULT 0 NOT NULL;");
+            database.execSQL("ALTER TABLE QuestionOptions ADD isHidden INTEGER DEFAULT 0 NOT NULL;");
+        }
+    };
 }

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/daos/QuestionDao.kt

@@ -14,12 +14,15 @@ interface QuestionDao {
     @Query("SELECT * FROM Question ORDER BY id")
     fun getAll(): Single<List<Question>>
 
-    @Query("SELECT * FROM Question WHERE questionnaireId = :id ORDER BY orderNr, id")
+    @Query("SELECT * FROM Question WHERE questionnaireId = :id AND isHidden = 0 ORDER BY orderNr, id")
     fun getAllForQuestionnaire(id: Int): Single<List<Question>>
 
     @Query("SELECT * FROM Question WHERE id = :id")
     fun getById(id: Int): Single<Question>
 
+    @Query("SELECT (SELECT COUNT(*) FROM QuestionnaireAnswer WHERE questionId = :id) + (SELECT COUNT(*) FROM SelectedOptions WHERE questionId = :id) > 0")
+    fun isQuestionReferenced(id: Int): Single<Boolean>
+
     @Update
     fun update(entry: Question): Completable
 

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/daos/QuestionOptionsDao.kt

@@ -14,12 +14,18 @@ interface QuestionOptionsDao {
     @Query("SELECT * FROM QuestionOptions ORDER BY questionId, id")
     fun getAll(): Single<List<QuestionOptions>>
 
-    @Query("SELECT * FROM QuestionOptions WHERE questionId = :questionId ORDER BY id")
+    @Query("SELECT * FROM QuestionOptions WHERE questionId = :questionId AND isHidden = 0 ORDER BY orderNr, id")
     fun getAllForQuestion(questionId: Int): Single<List<QuestionOptions>>
 
+    @Query("SELECT MAX(id) + 1 FROM QuestionOptions WHERE questionId = :questionId")
+    fun getNextId(questionId: Int): Single<Int>
+
     @Query("SELECT * FROM QuestionOptions WHERE questionId = :questionId AND id = :optionId")
     fun getById(questionId: Int, optionId: Int): Single<QuestionOptions>
 
+    @Query("SELECT COUNT(*) > 0 FROM SelectedOptions WHERE questionId = :questionId AND optionId = :optionId")
+    fun isReferenced(questionId: Int, optionId: Int): Single<Boolean>
+
     @Update
     fun update(entry: QuestionOptions): Completable
 

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/daos/QuestionnaireDao.kt

@@ -17,14 +17,31 @@ interface QuestionnaireDao {
 
     @Query("""SELECT fq.*, COUNT(cq.id) AS completedCount, AVG(cq.answerDuration) AS averageDuration 
             FROM (
-                SELECT q.id, q.title, q.description, q.isCompact, q.isHidden, Count(Question.id) AS questionCount 
+                SELECT q.id, q.title, q.description, q.isCompact, q.colorCode, Count(*) AS questionCount 
                 FROM Questionnaire q 
                 LEFT JOIN Question ON q.id = Question.questionnaireId 
-                GROUP BY q.id, q.title, q.description, q.isCompact, q.isHidden 
+                GROUP BY q.id, q.title, q.description, q.isCompact, q.colorCode
+                HAVING q.isHidden = 0 AND Question.isHidden = 0
+                ORDER BY q.id
+            ) fq
+            LEFT JOIN CompletedQuestionnaire cq ON fq.id = cq.questionnaireId
+            GROUP BY fq.id, fq.title, fq.description, fq.isCompact, fq.colorCode, fq.questionCount""")
+    fun getAllDetails(): Single<List<QuestionnaireDetails>>
+
+    @Query("""SELECT fq.*, COUNT(cq.id) AS completedCount, AVG(cq.answerDuration) AS averageDuration 
+            FROM (
+                SELECT q.id, q.title, q.description, q.isCompact, q.colorCode, Count(Question.id) AS questionCount 
+                FROM Questionnaire q 
+                LEFT JOIN Question ON q.id = Question.questionnaireId 
+                GROUP BY q.id, q.title, q.description, q.isCompact, q.colorCode
+                HAVING q.id = :questionnaireId AND q.isHidden = 0 AND Question.isHidden = 0
                 ORDER BY q.id
             ) fq
             LEFT JOIN CompletedQuestionnaire cq ON fq.id = cq.questionnaireId""")
-    fun getAllMore(): Single<List<QuestionnaireDetails>>
+    fun getDetailsById(questionnaireId: Int): Single<QuestionnaireDetails>
+
+    @Query("SELECT (SELECT COUNT(*) FROM Question WHERE questionnaireId = :id) + (SELECT COUNT(*) FROM CompletedQuestionnaire WHERE questionnaireId = :id) > 0")
+    fun isReferenced(id: Int): Single<Boolean>
 
     @Query("SELECT * FROM Questionnaire WHERE id = :id")
     fun getById(id: Int): Single<Questionnaire>

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/entities/Question.kt

@@ -24,17 +24,20 @@ import androidx.room.PrimaryKey
     indices = [Index("questionTypeId"), Index("questionnaireId")]
 )
 data class Question(
-    @PrimaryKey(autoGenerate = true) val id: Int,
+    @PrimaryKey(autoGenerate = true) var id: Int,
     val question: String,
     val questionTypeId: Int,
-    val questionnaireId: Int,
-    val orderNr: Int,
-    val valueFrom: Int?,
-    val valueTo: Int?,
+    var questionnaireId: Int,
+    var orderNr: Int,
+    var valueFrom: Int?,
+    var valueTo: Int?,
     val autoContinue: Boolean,
-    val isHidden: Boolean
+    var isHidden: Boolean
 ) {
     @Ignore
     constructor(question: String, questionTypeId: Int, questionnaireId: Int, valueFrom: Int?, valueTo: Int?, autoContinue: Boolean):
             this(0, question, questionTypeId, questionnaireId, 0, valueFrom, valueTo, autoContinue, false)
+
+    @Ignore
+    var options: MutableList<QuestionOptions>? = null
 }

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/entities/QuestionOptions.kt

@@ -2,6 +2,7 @@ package com.bitflaker.lucidsourcekit.database.questionnaire.entities
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.Ignore
 import androidx.room.Index
 
 @Entity(primaryKeys = ["questionId", "id"],
@@ -17,8 +18,13 @@ import androidx.room.Index
     indices = [Index("questionId")]
 )
 data class QuestionOptions(
-    val questionId: Int,
-    val id: Int,
-    val text: String,
+    var questionId: Int,
+    var id: Int,
+    var text: String,
+    var orderNr: Int,
+    var isHidden: Boolean,
     val description: String?
-)
+) {
+    @Ignore
+    constructor(questionId: Int) : this(questionId, -1, "", 0, false, null)
+}

app/src/main/java/com/bitflaker/lucidsourcekit/database/questionnaire/entities/Questionnaire.kt

@@ -7,13 +7,16 @@ import androidx.room.PrimaryKey
 @Entity
 data class Questionnaire(
     @PrimaryKey(autoGenerate = true) val id: Int,
-    val title: String,
-    val description: String?,
-    val orderNr: Int,
-    val colorCode: String?,
-    val isHidden: Boolean,
-    val isCompact: Boolean
+    var title: String,
+    var description: String?,
+    var orderNr: Int,
+    var colorCode: String?,
+    var isHidden: Boolean,
+    var isCompact: Boolean
 ) {
     @Ignore
     constructor(title: String, description: String?, colorCode: String?, isCompact: Boolean) : this(0, title, description, -1, colorCode, false, isCompact)
+
+    @Ignore
+    constructor() : this(0, "", null, -1, null, false, false)
 }