exclude deleted trait observations from obs counts

PhenoApps · Mar 26, 2024 · 8b38623 · 8b38623
1 parent e6d0ea8
commit 8b38623
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/fieldbook/tracker/database/dao/StudyDao.kt b/app/src/main/java/com/fieldbook/tracker/database/dao/StudyDao.kt
@@ -200,7 +200,7 @@ class StudyDao {
                     Studies.*,
                     (SELECT COUNT(*) FROM observation_units_attributes WHERE study_id = Studies.${Study.PK}) AS attribute_count,
                     (SELECT COUNT(DISTINCT observation_variable_name) FROM observations WHERE study_id = Studies.${Study.PK}) AS trait_count,
-                    (SELECT COUNT(*) FROM observations WHERE study_id = Studies.${Study.PK}) AS observation_count
+                    (SELECT COUNT(*) FROM observations WHERE study_id = Studies.${Study.PK} AND observation_variable_db_id > 0) AS observation_count
                 FROM ${Study.tableName} AS Studies
             """
             db.rawQuery(query, null).use { cursor ->
@@ -260,7 +260,7 @@ class StudyDao {
                     count,
                     (SELECT COUNT(*) FROM observation_units_attributes WHERE study_id = Studies.${Study.PK}) AS attribute_count,
                     (SELECT COUNT(DISTINCT observation_variable_name) FROM observations WHERE study_id = Studies.${Study.PK}) AS trait_count,
-                    (SELECT COUNT(*) FROM observations WHERE study_id = Studies.${Study.PK}) AS observation_count
+                    (SELECT COUNT(*) FROM observations WHERE study_id = Studies.${Study.PK} AND observation_variable_db_id > 0) AS observation_count
                 FROM ${Study.tableName} AS Studies
                 WHERE ${Study.PK} = ?
                 """
@@ -298,7 +298,7 @@ class StudyDao {
                 val cursor = db.rawQuery("""
             SELECT observation_variable_name, observation_variable_field_book_format, COUNT(*) as count
             FROM observations
-            WHERE study_id = ?
+            WHERE study_id = ? AND observation_variable_db_id > 0
             GROUP BY observation_variable_name
         """, arrayOf(studyId.toString()))