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" -> { "itemStockUpdateRemove" -> {
viewModel.getAddress() viewModel.getAddressNew()
quantityToDiscard = value 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) } _addressLosesList.value = response.body()?.let { AddressLosesList(it) }
} }
override fun onError(t: Throwable) { /* override fun onError(t: Throwable) {
getAddressNew() getAddressNew()
} }*/
}) })
} }
//Tarea 7622 retroCompatible, borrar getAddress y renombra getAddressNew a getAddress. //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>>) { override fun onSuccess(response: Response<List<AddressLoses>>) {
_addressLosesList.value = response.body()?.let { AddressLosesList(it) } _addressLosesList.value = response.body()?.let { AddressLosesList(it) }
} }
override fun onError(t: Throwable) {
getAddress()
}
}) })
} }
} }

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

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( salix.getTicketObservations(
filter = """{ "where": { "observationTypeFk": 11,"ticketFk": { "inq": $listTickets } }, filter = """{ "where": { "ticketFk": { "inq": $listTickets } },
| "fields":["description", "ticketFk"]}""".trimMargin() |"fields": ["description", "ticketFk", "observationTypeFk"],
|"include": [ { "relation": "observationType",
|"scope": { "where": { "code": "claim" } } } ] }""".trimMargin()
).enqueue(object : SalixCallback<List<TicketObservation>>(context) { ).enqueue(object : SalixCallback<List<TicketObservation>>(context) {
override fun onSuccess(response: Response<List<TicketObservation>>) { override fun onSuccess(response: Response<List<TicketObservation>>) {
_responseObservations.value = response.body() _responseObservations.value = response.body()