Better managing of null values in input control

do not display "null" do not forget to fill if nothing
4d · Mar 19, 2024 · e5b2058 · e5b2058
1 parent 3c528ca
commit e5b2058
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/...java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseInputLessViewHolder.kt b/...java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseInputLessViewHolder.kt
@@ -87,7 +87,8 @@ abstract class BaseInputLessViewHolder(itemView: View, format: String) : BaseVie
     }
 
     override fun fill(value: Any) {
-        input.setText(formatToDisplay(value.toString()))
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        input.setText(formatToDisplay(string))
     }
 
     override fun getInputType(format: String): Int {

diff --git a/...main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseTextViewHolder.kt b/...main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseTextViewHolder.kt
@@ -95,7 +95,8 @@ abstract class BaseTextViewHolder(itemView: View, private val format: String) :
     }
 
     override fun fill(value: Any) {
-        input.setText(formattedValue(value.toString()))
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        input.setText(formattedValue(string))
     }
 
     abstract fun onTextChanged(s: CharSequence)

diff --git a/...src/main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseViewHolder.kt b/...src/main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/BaseViewHolder.kt
@@ -61,9 +61,9 @@ abstract class BaseViewHolder(itemView: View, format: String) : RecyclerView.Vie
             itemJsonObject.getSafeString("defaultField")?.let { defaultField ->
                 ReflectionUtils.getInstanceProperty(entity, defaultField)?.let { value ->
                     valueCallback(value)
-                }
-            }
-        }
+                } ?: valueCallback(JSONObject.NULL)
+            } ?: valueCallback(JSONObject.NULL)
+        } ?: valueCallback(JSONObject.NULL)
     }
 
     fun isMandatory() = itemJsonObject.getSafeArray("rules")?.getStringList()?.contains("mandatory") ?: false

diff --git a/...src/main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/DateViewHolder.kt b/...src/main/java/com/qmobile/qmobileui/action/actionparameters/viewholders/DateViewHolder.kt
@@ -105,7 +105,8 @@ class DateViewHolder(
         FormatterUtils.applyFormat(dateFormat, input)
 
     override fun fill(value: Any) {
-        updatePickerDate(value.toString())
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        updatePickerDate(string)
         super.fill(value)
     }
 }
diff --git a/...obile/qmobileui/action/actionparameters/viewholders/inputcontrols/CustomViewViewHolder.kt b/...obile/qmobileui/action/actionparameters/viewholders/inputcontrols/CustomViewViewHolder.kt
@@ -97,7 +97,8 @@ abstract class CustomViewViewHolder(
     }
 
     override fun fill(value: Any) {
-        if (value.toString().isNotEmpty()) {
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        if (string.isNotEmpty()) {
             currentEditEntityValue = value
         }
     }

diff --git a/...com/qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/MenuViewHolder.kt b/...com/qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/MenuViewHolder.kt
@@ -172,7 +172,8 @@ class MenuViewHolder(
     }
 
     override fun fill(value: Any) {
-        if (value.toString().isNotEmpty()) {
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        if (string.isNotEmpty()) {
             currentEditEntityValue = value
         }
     }

diff --git a/.../qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/PopoverViewHolder.kt b/.../qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/PopoverViewHolder.kt
@@ -134,7 +134,8 @@ class PopoverViewHolder(
 
     override fun fill(value: Any) {
         super.fill(value)
-        if (value.toString().isNotEmpty()) {
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        if (string.isNotEmpty()) {
             currentEditEntityValue = value
         }
     }

diff --git a/...com/qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/PushViewHolder.kt b/...com/qmobile/qmobileui/action/actionparameters/viewholders/inputcontrols/PushViewHolder.kt
@@ -59,7 +59,8 @@ class PushViewHolder(
 
     override fun fill(value: Any) {
         super.fill(value)
-        if (value.toString().isNotEmpty()) {
+        val string = if (value == JSONObject.NULL) "" else value.toString()
+        if (string.isNotEmpty()) {
             currentEditEntityValue = value
         }
     }