feat claimObservation refs #7541

app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt

@@ -488,7 +488,7 @@ class ItemCardFragment(
             }
 
             "itemStockUpdateRemove" -> {
-                viewModel.getAddress()
+                viewModel.getAddressNew()
                 quantityToDiscard = value
             }
 

app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt

@@ -214,9 +214,9 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
                     _addressLosesList.value = response.body()?.let { AddressLosesList(it) }
                 }
 
-                override fun onError(t: Throwable) {
+              /*  override fun onError(t: Throwable) {
                     getAddressNew()
-                }
+                }*/
             })
     }
     //Tarea 7622 retroCompatible, borrar getAddress y renombra getAddressNew a getAddress.
@@ -226,6 +226,9 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
                 override fun onSuccess(response: Response<List<AddressLoses>>) {
                     _addressLosesList.value = response.body()?.let { AddressLosesList(it) }
                 }
+                override fun onError(t: Throwable) {
+                    getAddress()
+                }
             })
     }
 }

app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt

@@ -56,7 +56,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
     private lateinit var clientTicket: ClientTicketSalix
     private lateinit var db: DeliveryDatabase
     private lateinit var deliveryViewModel: DeliveryViewModel
-    private lateinit var listClaimTicketObservations : List<TicketObservation>
+    private lateinit var listClaimTicketObservations: List<TicketObservation>
 
     override fun init() {
         deliveryViewModel = DeliveryViewModel(application as MobileApplication)
@@ -79,7 +79,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
     }
 
     private fun setToolBar() {
-       // binding.mainToolbar.toolbarIcons.visibility = View.GONE
+        // binding.mainToolbar.toolbarIcons.visibility = View.GONE
 
         val listIcons: ArrayList<ImageView> = ArrayList()
         val iconObservation = ImageView(this)
@@ -137,18 +137,18 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
 
                 val customDialogDistance = CustomDialog(this)
                 customDialogDistance.setTitle(getString(R.string.confirm)).setDescription(
-                        getString(R.string.locationDiferent) + getString(R.string.distance) + locationCurrent.distanceTo(
-                            locationClient
-                        )
-                    ).setOkButton(getString(R.string.keep)) {
+                    getString(R.string.locationDiferent) + getString(R.string.distance) + locationCurrent.distanceTo(
+                        locationClient
+                    )
+                ).setOkButton(getString(R.string.keep)) {
 
-                        uploadImage(MyLocation(locationClient.longitude, locationClient.latitude))
-                        customDialogDistance.dismiss()
+                    uploadImage(MyLocation(locationClient.longitude, locationClient.latitude))
+                    customDialogDistance.dismiss()
 
-                    }.setKoButton(getString(R.string.modify)) {
-                        uploadImage(lastLocationCurrent)
-                        customDialogDistance.dismiss()
-                    }.show()
+                }.setKoButton(getString(R.string.modify)) {
+                    uploadImage(lastLocationCurrent)
+                    customDialogDistance.dismiss()
+                }.show()
             } else {
                 uploadImage(MyLocation(locationClient.longitude, locationClient.latitude))
             }
@@ -180,12 +180,12 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
 
         deliveryViewModel.getTicketObservations(ticketsSet.toList())
         deliveryViewModel.responseObservations.observe(this) {
-             listClaimTicketObservations = it
-             if (it.isNotEmpty()) {
-                 showNotes(it)
-                 setToolBar()
-             }
-         }
+            listClaimTicketObservations = it
+            if (it.isNotEmpty()) {
+                showNotes(it)
+                setToolBar()
+            }
+        }
         binding.idTickets.text = ticketsSet.toList().toString()
         binding.totalPackages.text = sum.toString()
 
@@ -195,12 +195,12 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
         val ticketNotes: MutableList<GeneralItem> = mutableListOf()
         //Tarea 6275
         for (item in listClaimObservations) {
-            if (item.observationType !=null)
-            ticketNotes.add(
-                GeneralItem(
-                    text = "${item.ticketFk}:${item.description}", code = ""
+            if (item.observationType != null)
+                ticketNotes.add(
+                    GeneralItem(
+                        text = "${item.ticketFk}:${item.description}", code = ""
+                    )
                 )
-            )
         }
         val customDialogList = CustomDialogList(this)
 

app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt

@@ -95,8 +95,10 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
 
     ) {
         salix.getTicketObservations(
-            filter = """{ "where": { "observationTypeFk": 11,"ticketFk": { "inq": $listTickets } }, 
-                | "fields":["description", "ticketFk"]}""".trimMargin()
+            filter = """{ "where": { "ticketFk": { "inq": $listTickets } }, 
+                |"fields": ["description", "ticketFk", "observationTypeFk"], 
+                |"include": [ { "relation": "observationType", 
+                |"scope": { "where": { "code": "claim" } } } ] }""".trimMargin()
         ).enqueue(object : SalixCallback<List<TicketObservation>>(context) {
             override fun onSuccess(response: Response<List<TicketObservation>>) {
                 _responseObservations.value = response.body()