#1333 - DQA - support for new flag - single subject in observation

inaturalist · Feb 23, 2024 · e25a7ef · e25a7ef
1 parent 470445d
commit e25a7ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/iNaturalist/src/main/AndroidManifest.xml b/iNaturalist/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="602"
-    android:versionName="1.30.9">
+    android:versionCode="603"
+    android:versionName="1.30.10">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/DataQualityAssessment.java b/iNaturalist/src/main/java/org/inaturalist/android/DataQualityAssessment.java
@@ -316,8 +316,10 @@ private void refreshMetrics() {
         metrics.add(new DataQualityItem(R.drawable.wild, R.string.organism_is_wild, "wild", true));
         metrics.add(new DataQualityItem(R.drawable.magnifying_glass, R.string.evidence_of_organism, "evidence", true));
         metrics.add(new DataQualityItem(R.drawable.clock_o, R.string.recent_evidence_of_an_organism, "recent", true));
+        metrics.add(new DataQualityItem(R.drawable.subject, R.string.evidence_related_to_single_subject, "subject", true));
         metrics.add(new DataQualityItem(R.drawable.leaf, R.string.community_id_at_species_level_or_lower, "community_id", false));
 
+        Logger.tag("AAA").error(mMetricsVotes);
         for (int i = 0; i < mMetricsVotes.length(); i++) {
             JSONObject vote = mMetricsVotes.optJSONObject(i);
 
@@ -338,6 +340,9 @@ private void refreshMetrics() {
                 case "recent":
                     index = 8;
                     break;
+                case "subject":
+                    index = 9;
+                    break;
             }
 
 
@@ -389,9 +394,9 @@ private void refreshMetrics() {
         }
 
         if ((mObservation.getJSONObject("community_taxon") != null) && (mObservation.getJSONObject("community_taxon").optInt("rank_level") <= 10)) {
-            metrics.get(9).agreeCount = 1;
+            metrics.get(10).agreeCount = 1;
         } else {
-            metrics.get(9).disagreeCount = 1;
+            metrics.get(10).disagreeCount = 1;
         }
 
         mDataQualityList.setAdapter(new DataQualityAdapter(this, this, metrics));

diff --git a/iNaturalist/src/main/res/values/strings.xml b/iNaturalist/src/main/res/values/strings.xml
@@ -732,6 +732,7 @@
     <string name="community_id_at_species_level_or_lower">Community ID at species level or lower</string>
     <string name="based_on_evidence_can_community_id_be_confirmed">Based on the evidence, can the Community ID still be confirmed or improved?</string>
     <string name="no_as_good_as_it_can_be">No, it\'s as good as it can be</string>
+    <string name="evidence_related_to_single_subject">Evidence related to a single subject</string>
     <string name="seasonality">Seasonality</string>
     <string name="verifiable">Verifiable</string>
     <string name="no_annotation">No Annotation</string>