Merge pull request #1443 from PhenoApps/photo-names-export

Photo Names Export

Author: trife

.gitignore

@@ -23,7 +23,6 @@ gradlew.bat
 
 # Local configuration file (sdk path, etc)
 local.properties
-gradle.properties
 
 # Log Files
 *.log

app/src/main/java/com/fieldbook/tracker/database/dao/ObservationUnitPropertyDao.kt

@@ -20,6 +20,7 @@ import com.fieldbook.tracker.database.withDatabase
 import com.fieldbook.tracker.objects.RangeObject
 import com.fieldbook.tracker.objects.TraitObject
 import com.fieldbook.tracker.preferences.GeneralKeys
+import com.fieldbook.tracker.traits.formats.presenters.UriPresenter
 import com.fieldbook.tracker.utilities.CategoryJsonUtil
 import com.fieldbook.tracker.utilities.export.ValueProcessorFormatAdapter
 
@@ -141,7 +142,7 @@ class ObservationUnitPropertyDao {
 
                 Log.d("getExportDbData", "Final Query: $query")
                 val table = db.rawQuery(query, null).toTable()
-
+                val attachedMediaUriPresenter = UriPresenter()
                 table.forEach { row ->
                     cursor.addRow(fieldList.map { row[it] } + traitRequiredFields.map {
                         when (it) {
@@ -158,9 +159,9 @@ class ObservationUnitPropertyDao {
                             "person" -> row["collector"]
                             "location" -> row["geo_coordinates"]
                             "rep" -> row["rep"]
-                            "photo_uri" -> row["photo_uri"]
-                            "video_uri" -> row["video_uri"]
-                            "audio_uri" -> row["audio_uri"]
+                            "photo_uri" -> (row["photo_uri"] as? String)?.takeIf { it.isNotEmpty() }?.let { attachedMediaUriPresenter.represent(context, it) } ?: ""
+                            "video_uri" -> (row["video_uri"] as? String)?.takeIf { it.isNotEmpty() }?.let { attachedMediaUriPresenter.represent(context, it) } ?: ""
+                            "audio_uri" -> (row["audio_uri"] as? String)?.takeIf { it.isNotEmpty() }?.let { attachedMediaUriPresenter.represent(context, it) } ?: ""
                             else -> String()
                         }
                     })

app/src/main/java/com/fieldbook/tracker/utilities/export/ValueProcessorFormatAdapter.kt

@@ -22,23 +22,23 @@ class ValueProcessorFormatAdapter @Inject constructor(
     }
 
     fun processValue(value: String, trait: TraitObject): String? {
-        return when (trait.format) {
+        return when {
 
-            in setOf(Formats.DATE.getDatabaseName()) -> {
+            trait.format in setOf(Formats.DATE.getDatabaseName()) -> {
 
                 val dateValue = DateJsonUtil.decode(value)
 
                 return (Formats.DATE.getTraitFormatDefinition() as ValuePresenter).represent(context, dateValue, trait)
             }
 
-            in CategoricalTraitLayout.POSSIBLE_VALUES -> return CategoryJsonUtil.processValue(
+            trait.format in CategoricalTraitLayout.POSSIBLE_VALUES -> return CategoryJsonUtil.processValue(
                 buildMap {
                     put("value", value)
                     put("observation_variable_field_book_format", trait.format)
                     put("categoryDisplayValue", trait.categoryDisplayValue)
                 })
 
-            in Formats.getSpectralFormats().map { it.getDatabaseName() } -> {
+            trait.format in Formats.getSpectralFormats().map { it.getDatabaseName() } -> {
                 spectralFileProcessor.processValue(value)
                     .onSuccess { value ->
                         val presentable = UriPresenter().represent(context, value)
@@ -52,6 +52,10 @@ class ValueProcessorFormatAdapter @Inject constructor(
                     }
             }
 
+            Formats.isCameraTrait(trait.format) -> {
+                if (value.isEmpty()) "" else UriPresenter().represent(context, value, trait)
+            }
+
             else -> value
 
         }.toString()

gradle.properties

@@ -13,5 +13,4 @@
 #Fri Aug 20 09:12:17 CDT 2021
 org.gradle.jvmargs=-Xmx2048m -Dkotlin.daemon.jvm.options\="-Xmx2048m" -XX:+UseParallelGC
 android.useAndroidX=true
-android.enableJetifier=true
-
+android.enableJetifier=true