fix(#122): bunch of fixes...

occtax/src/main/java/fr/geonature/occtax/features/nomenclature/presentation/EditableFieldAdapter.kt

@@ -851,15 +851,7 @@ class EditableFieldAdapter(private val listener: OnEditableFieldAdapter) :
             }
 
             override fun afterTextChanged(s: Editable?) {
-                editableField?.run {
-                    value = PropertyValue.Text(
-                        code,
-                        s?.toString()
-                            ?.ifEmpty { null }
-                            ?.ifBlank { null }
-                    )
-                    listener.onUpdate(this)
-                }
+                this@TextSimpleViewHolder.afterTextChanged(s)
             }
         }
 
@@ -875,6 +867,18 @@ class EditableFieldAdapter(private val listener: OnEditableFieldAdapter) :
             }
         }
 
+        internal open fun afterTextChanged(s: Editable?) {
+            editableField?.run {
+                value = PropertyValue.Text(
+                    code,
+                    s?.toString()
+                        ?.ifEmpty { null }
+                        ?.ifBlank { null }
+                )
+                listener.onUpdate(this)
+            }
+        }
+
         override fun onBind(editableField: EditableField) {
             if (!lockDefaultValues) {
                 editableField.locked = false
@@ -901,15 +905,20 @@ class EditableFieldAdapter(private val listener: OnEditableFieldAdapter) :
             }
 
             editableField.value
-                .takeIf { it is PropertyValue.Text && !it.isEmpty() }
+                ?.takeIf { it is PropertyValue.Text && !it.isEmpty() }
                 ?.let { it as PropertyValue.Text }
+                ?.value
                 ?.also {
-                    edit.editText?.removeTextChangedListener(textWatcher)
-                    edit.editText?.text = Editable.Factory.getInstance()
-                        .newEditable(it.value)
-                    edit.editText?.addTextChangedListener(textWatcher)
+                    setText(it)
                 }
         }
+
+        internal fun setText(charSequence: CharSequence) {
+            edit.editText?.removeTextChangedListener(textWatcher)
+            edit.editText?.text = Editable.Factory.getInstance()
+                .newEditable(charSequence)
+            edit.editText?.addTextChangedListener(textWatcher)
+        }
     }
 
     inner class TextMultipleViewHolder(parent: ViewGroup) : TextSimpleViewHolder(parent) {
@@ -927,9 +936,32 @@ class EditableFieldAdapter(private val listener: OnEditableFieldAdapter) :
     inner class NumberViewHolder(parent: ViewGroup) : TextSimpleViewHolder(parent) {
         init {
             edit.editText?.apply {
-                inputType = InputType.TYPE_CLASS_NUMBER
+                inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL
             }
         }
+
+        override fun afterTextChanged(s: Editable?) {
+            editableField?.run {
+                value = PropertyValue.Number(
+                    code,
+                    s?.toString()
+                        ?.toDoubleOrNull()
+                )
+                listener.onUpdate(this)
+            }
+        }
+
+        override fun onBind(editableField: EditableField) {
+            super.onBind(editableField)
+
+            editableField.value
+                ?.takeIf { it is PropertyValue.Number && !it.isEmpty() }
+                ?.let { it as PropertyValue.Number }
+                ?.value
+                ?.also {
+                    setText(it.toString())
+                }
+        }
     }
 
     inner class MinMaxViewHolder(parent: ViewGroup) : AbstractViewHolder(

occtax/src/main/java/fr/geonature/occtax/features/nomenclature/usecase/GetEditableFieldsUseCase.kt

@@ -9,6 +9,7 @@ import fr.geonature.occtax.features.nomenclature.repository.IAdditionalFieldRepo
 import fr.geonature.occtax.features.nomenclature.repository.IDefaultPropertyValueRepository
 import fr.geonature.occtax.features.nomenclature.repository.INomenclatureRepository
 import fr.geonature.occtax.features.settings.domain.PropertySettings
+import org.tinylog.Logger
 import javax.inject.Inject
 
 /**
@@ -23,6 +24,8 @@ class GetEditableFieldsUseCase @Inject constructor(
 ) :
     BaseResultUseCase<List<EditableField>, GetEditableFieldsUseCase.Params>() {
     override suspend fun run(params: Params): Result<List<EditableField>> {
+        Logger.info { "loading editable fields of type '${params.type.name}'${if (params.withAdditionalFields) " with additional fields" else ""}${params.datasetId?.let { " matching dataset ID $it" } ?: ""}..." }
+
         val editableNomenclatures = (nomenclatureRepository.getEditableFields(
             params.type,
             *params.settings.toTypedArray()

occtax/src/main/java/fr/geonature/occtax/features/record/data/ObservationRecordLocalDataSourceImpl.kt

@@ -69,7 +69,11 @@ class ObservationRecordLocalDataSourceImpl(
                 preferenceManager.all
                     .filterKeys { it.startsWith("${KEY_PREFERENCE_INPUT}_") }
                     .values
-                    .mapNotNull { if (it is String && it.isNotBlank()) runCatching { observationRecordJsonReader.read(it) }.getOrNull() else null } + exportedObservationRecords
+                    .mapNotNull {
+                        if (it is String && it.isNotBlank()) runCatching { observationRecordJsonReader.read(it) }
+                            .onFailure { throwable -> Logger.error(throwable) { "failed to load observation record" } }
+                            .getOrNull() else null
+                    } + exportedObservationRecords
                 ).distinctBy { it.internalId }
                 .sortedByDescending { it.dates.start }
         }

occtax/src/main/java/fr/geonature/occtax/features/record/domain/CountingRecord.kt

@@ -22,7 +22,12 @@ data class CountingRecord(
     /**
      * The main properties of this taxon counting record.
      */
-    val properties: SortedMap<String, PropertyValue> = sortedMapOf()
+    val properties: SortedMap<String, PropertyValue> = sortedMapOf(
+        ADDITIONAL_FIELDS_KEY to PropertyValue.AdditionalFields(
+            ADDITIONAL_FIELDS_KEY,
+            mapOf()
+        )
+    )
 ) : Parcelable {
 
     /**
@@ -73,11 +78,11 @@ data class CountingRecord(
     @IgnoredOnParcel
     var additionalFields: List<PropertyValue>
         get() = properties[ADDITIONAL_FIELDS_KEY]
-            ?.takeIf { it is PropertyValue.AdditionalField }
-            ?.let { it as PropertyValue.AdditionalField }?.value?.values?.toList()
+            ?.takeIf { it is PropertyValue.AdditionalFields }
+            ?.let { it as PropertyValue.AdditionalFields }?.value?.values?.toList()
             ?: emptyList()
         set(value) {
-            PropertyValue.AdditionalField(
+            PropertyValue.AdditionalFields(
                 ADDITIONAL_FIELDS_KEY,
                 value.associate { it.toPair() }
             )

occtax/src/main/java/fr/geonature/occtax/features/record/domain/ObservationRecord.kt

@@ -39,25 +39,25 @@ data class ObservationRecord(
     /**
      * The main properties of this observation record
      */
-    val properties: SortedMap<String, PropertyValue> = sortedMapOf(),
+    val properties: SortedMap<String, PropertyValue> = sortedMapOf(
+        PropertyValue.Text(
+            "meta_device_entry",
+            "mobile"
+        )
+            .toPair(),
+        PropertyValue.AdditionalFields(
+            ADDITIONAL_FIELDS_KEY,
+            mapOf()
+        )
+            .toPair()
+    ),
 
     /**
      * The current status of this observation record.
      */
     val status: Status = Status.DRAFT
 ) : Parcelable {
 
-    init {
-        PropertyValue.Text(
-            "meta_device_entry",
-            "mobile"
-        )
-            .toPair()
-            .also {
-                properties[it.first] = it.second
-            }
-    }
-
     @IgnoredOnParcel
     val comment = CommentRecord(properties)
 
@@ -89,6 +89,10 @@ data class ObservationRecord(
         SYNC_ERROR,
         SYNC_SUCCESSFUL
     }
+
+    companion object {
+        const val ADDITIONAL_FIELDS_KEY = "additional_fields"
+    }
 }
 
 /**

occtax/src/main/java/fr/geonature/occtax/features/record/domain/PropertyValue.kt

@@ -22,7 +22,7 @@ sealed class PropertyValue : Parcelable {
             is NumberArray -> value.isEmpty()
             is Dataset -> datasetId == null
             is Nomenclature -> value == null
-            is AdditionalField -> value.all { it.value.isEmpty() }
+            is AdditionalFields -> value.all { it.value.isEmpty() }
             is Taxa -> value.all { taxon -> taxon.properties.all { it.value.isEmpty() } }
             is Counting -> value.all { counting -> counting.properties.all { it.value.isEmpty() } }
             is Media -> value.isEmpty()
@@ -40,7 +40,7 @@ sealed class PropertyValue : Parcelable {
         is NumberArray -> code
         is Dataset -> code
         is Nomenclature -> code
-        is AdditionalField -> code
+        is AdditionalFields -> code
         is Taxa -> code
         is Counting -> code
         is Media -> code
@@ -129,10 +129,10 @@ sealed class PropertyValue : Parcelable {
         PropertyValue()
 
     /**
-     * As additional field.
+     * As additional fields.
      */
     @Parcelize
-    data class AdditionalField(val code: String, val value: Map<String, PropertyValue>) :
+    data class AdditionalFields(val code: String, val value: Map<String, PropertyValue>) :
         PropertyValue()
 
     /**

occtax/src/main/java/fr/geonature/occtax/features/record/domain/TaxonRecord.kt

@@ -36,7 +36,12 @@ data class TaxonRecord(
     /**
      * The main properties of this taxon record
      */
-    val properties: SortedMap<String, PropertyValue> = sortedMapOf()
+    val properties: SortedMap<String, PropertyValue> = sortedMapOf(
+        ADDITIONAL_FIELDS_KEY to PropertyValue.AdditionalFields(
+            ADDITIONAL_FIELDS_KEY,
+            mapOf()
+        )
+    )
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -52,11 +57,11 @@ data class TaxonRecord(
     @IgnoredOnParcel
     var additionalFields: List<PropertyValue>
         get() = properties[ADDITIONAL_FIELDS_KEY]
-            ?.takeIf { it is PropertyValue.AdditionalField }
-            ?.let { it as PropertyValue.AdditionalField }?.value?.values?.toList()
+            ?.takeIf { it is PropertyValue.AdditionalFields }
+            ?.let { it as PropertyValue.AdditionalFields }?.value?.values?.toList()
             ?: emptyList()
         set(value) {
-            PropertyValue.AdditionalField(
+            PropertyValue.AdditionalFields(
                 ADDITIONAL_FIELDS_KEY,
                 value.associate { it.toPair() }
             )

occtax/src/main/java/fr/geonature/occtax/features/record/io/ObservationRecordJsonWriter.kt

@@ -180,6 +180,14 @@ class ObservationRecordJsonWriter {
                     }
                 }
 
+                is PropertyValue.AdditionalFields -> {
+                    writer.name(propertyValue.code)
+                    writeAdditionalFields(
+                        writer,
+                        propertyValue
+                    )
+                }
+
                 is PropertyValue.Taxa -> {
                     writer.name(propertyValue.code)
                         .beginArray()
@@ -249,4 +257,42 @@ class ObservationRecordJsonWriter {
                 )
         }
     }
+
+    private fun writeAdditionalFields(
+        writer: JsonWriter,
+        additionalFields: PropertyValue.AdditionalFields
+    ) {
+        writer.beginObject()
+
+        additionalFields.value.values.forEach {
+            when (it) {
+                is PropertyValue.Nomenclature -> writer.name(it.code)
+                    .value(it.value)
+
+                is PropertyValue.Number -> writer.name(it.code)
+                    .value(it.value)
+
+                is PropertyValue.NumberArray -> {
+                    writer.name(it.code)
+                        .beginArray()
+                    it.value.forEach { value -> writer.value(value) }
+                    writer.endArray()
+                }
+
+                is PropertyValue.StringArray -> {
+                    writer.name(it.code)
+                        .beginArray()
+                    it.value.forEach { value -> writer.value(value) }
+                    writer.endArray()
+                }
+
+                is PropertyValue.Text -> writer.name(it.code)
+                    .value(it.value)
+
+                else -> {}
+            }
+        }
+
+        writer.endObject()
+    }
 }

occtax/src/main/java/fr/geonature/occtax/features/record/io/TaxonRecordJsonReader.kt

@@ -4,6 +4,7 @@ import android.util.JsonReader
 import android.util.JsonToken
 import fr.geonature.commons.data.entity.Taxon
 import fr.geonature.commons.data.entity.Taxonomy
+import fr.geonature.commons.util.nextLongOrNull
 import fr.geonature.commons.util.nextStringOrNull
 import fr.geonature.occtax.features.record.domain.CountingRecord
 import fr.geonature.occtax.features.record.domain.ObservationRecord
@@ -284,7 +285,8 @@ class TaxonRecordJsonReader {
                         JsonToken.NUMBER -> additionalFields.add(
                             PropertyValue.Number(
                                 keyName,
-                                reader.nextLong()
+                                runCatching { reader.nextLongOrNull() }.getOrNull()
+                                    ?: reader.nextDouble()
                             )
                         )
 

occtax/src/main/java/fr/geonature/occtax/features/record/io/TaxonRecordJsonWriter.kt

@@ -146,7 +146,7 @@ class TaxonRecordJsonWriter {
                     }
                 }
 
-                is PropertyValue.AdditionalField -> {
+                is PropertyValue.AdditionalFields -> {
                     writer.name(propertyValue.code)
                     writeAdditionalFields(
                         writer,
@@ -208,7 +208,7 @@ class TaxonRecordJsonWriter {
                     }
                 }
 
-                is PropertyValue.AdditionalField -> {
+                is PropertyValue.AdditionalFields -> {
                     writer.name(propertyValue.code)
                     writeAdditionalFields(
                         writer,
@@ -278,11 +278,11 @@ class TaxonRecordJsonWriter {
 
     private fun writeAdditionalFields(
         writer: JsonWriter,
-        additionalField: PropertyValue.AdditionalField
+        additionalFields: PropertyValue.AdditionalFields
     ) {
         writer.beginObject()
 
-        additionalField.value.values.forEach {
+        additionalFields.value.values.forEach {
             when (it) {
                 is PropertyValue.Nomenclature -> writer.name(it.code)
                     .value(it.value)

occtax/src/main/java/fr/geonature/occtax/features/record/usecase/SetDefaultNomenclatureValuesUseCase.kt

@@ -121,8 +121,8 @@ class SetDefaultNomenclatureValuesUseCase @Inject constructor(
     ): List<PropertyValue> {
         return propertyValues.map {
             when (it) {
-                is PropertyValue.AdditionalField -> {
-                    PropertyValue.AdditionalField(
+                is PropertyValue.AdditionalFields -> {
+                    PropertyValue.AdditionalFields(
                         it.code,
                         mapPropertyValuesFromNomenclature(
                             taxonomy,

occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt

@@ -373,7 +373,7 @@ class EditCountingMetadataFragment : Fragment() {
             *((countingRecord?.properties?.values
                 ?.filterNotNull()
                 ?.filterNot { it.isEmpty() }
-                ?.filterNot { it is PropertyValue.AdditionalField }
+                ?.filterNot { it is PropertyValue.AdditionalFields }
                 ?: emptyList()) + (countingRecord?.additionalFields ?: emptyList())).toTypedArray()
         )
     }