Ignore Null value when building summary in pending action list fix #19

for that null must be detectable in action map info
4d · May 21, 2024 · 723477a · 723477a
1 parent b17030a
commit 723477a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...i/src/main/java/com/qmobile/qmobileui/action/actionparameters/ActionParametersFragment.kt b/...i/src/main/java/com/qmobile/qmobileui/action/actionparameters/ActionParametersFragment.kt
@@ -101,7 +101,7 @@ class ActionParametersFragment : BaseFragment(), ActionProvider, MenuProvider {
     override lateinit var actionActivity: ActionActivity
 
     internal var errorsByParameter = HashMap<String, String>()
-    internal var paramsToSubmit = HashMap<String, Any>()
+    internal var paramsToSubmit = HashMap<String, Any?>()
     private val metaDataToSubmit = HashMap<String, String>()
     internal var validationMap = linkedMapOf<String, Boolean>()
     internal var imagesToUpload = HashMap<String, Uri>()

diff --git a/...c/main/java/com/qmobile/qmobileui/action/actionparameters/ActionsParametersListAdapter.kt b/...c/main/java/com/qmobile/qmobileui/action/actionparameters/ActionsParametersListAdapter.kt
@@ -44,7 +44,7 @@ class ActionsParametersListAdapter(
     private val context: Context,
     val allParameters: JSONArray,
     // contains data of the failed action, this data will be used for pre-fill form to edit pending task
-    private val paramsToSubmit: HashMap<String, Any>,
+    private val paramsToSubmit: HashMap<String, Any?>,
     private val imagesToUpload: HashMap<String, Uri>,
     private val paramsError: HashMap<String, String>,
     private val inputControlFormatHolders: Map<Int, InputControlFormatHolder>,

diff --git a/...c/main/java/com/qmobile/qmobileui/action/pendingtasks/viewholder/PendingTaskViewHolder.kt b/...c/main/java/com/qmobile/qmobileui/action/pendingtasks/viewholder/PendingTaskViewHolder.kt
@@ -50,9 +50,10 @@ class PendingTaskViewHolder(
         index: Int,
         format: String?,
         type: String?,
-        value: Any,
+        value: Any?,
         sb: StringBuilder
     ): StringBuilder {
+        if (value == null) return sb
         val stringToAppend = when {
             format == "password" -> "" // We don't display password fields
             type == "date" -> FormatterUtils.applyFormat("shortDate", value.toString())

diff --git a/qmobileui/src/main/java/com/qmobile/qmobileui/action/utils/ActionHelper.kt b/qmobileui/src/main/java/com/qmobile/qmobileui/action/utils/ActionHelper.kt
@@ -36,7 +36,7 @@ object ActionHelper {
         tableName: String,
         actionUUID: String,
         itemId: String = "",
-        parameters: HashMap<String, Any>? = null,
+        parameters: HashMap<String, Any?>? = null,
         metaData: HashMap<String, String>? = null,
         parentItemId: String = "",
         relation: Relation? = null
@@ -88,7 +88,7 @@ object ActionHelper {
     }
 
     fun updateActionContent(actionContent:  MutableMap<String, Any>?,
-                            parameters: HashMap<String, Any>? = null,
+                            parameters: HashMap<String, Any?>? = null,
                             metaData: HashMap<String, String>? = null) {
 
         parameters?.let { actionContent?.put("parameters", parameters) }