verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat claimObservation refs #7541

This commit is contained in:
Sergio De la torre 2024-07-23 08:45:51 +02:00
parent 3ed094444b
commit 401d062115
4 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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()
}
})
}
}

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

@ -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)
@ -195,7 +195,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
val ticketNotes: MutableList<GeneralItem> = mutableListOf()
//Tarea 6275
for (item in listClaimObservations) {
if (item.observationType !=null)
if (item.observationType != null)
ticketNotes.add(
GeneralItem(
text = "${item.ticketFk}:${item.description}", code = ""

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

@ -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()