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

feat issues refs #7636

This commit is contained in:
Sergio De la torre 2024-07-24 13:32:52 +02:00
parent 1410eec595
commit f5bc472f53
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import android.content.pm.PackageManager
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.location.Location import android.location.Location
import android.os.Build
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
@ -65,7 +66,15 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
"ticket" -> { "ticket" -> {
binding.mainToolbar.toolbarTitle.text = getString(R.string.sign) binding.mainToolbar.toolbarTitle.text = getString(R.string.sign)
clientTicket = clientTicket =
intent.extras!!.getSerializable("clientTicketList") as ClientTicketSalix if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) (
intent.extras?.getSerializable(
"clientTicketList",
ClientTicketSalix::class.java
)
)!! else (
@Suppress("DEPRECATED")
intent.extras!!.getSerializable("clientTicketList") as? ClientTicketSalix
)!!
setViews(clientTicket) setViews(clientTicket)
setLocation() setLocation()
} }
@ -84,7 +93,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
val listIcons: ArrayList<ImageView> = ArrayList() val listIcons: ArrayList<ImageView> = ArrayList()
val iconObservation = ImageView(this) val iconObservation = ImageView(this)
iconObservation.setImageResource(R.drawable.ic_claim_ui) iconObservation.setImageResource(R.drawable.ic_claim_ui)
iconObservation.tooltipText = "Muestra las observaciones de reclamaciones" iconObservation.tooltipText = getString(R.string.showClaimObservation)
listIcons.add(iconObservation) listIcons.add(iconObservation)
@ -179,11 +188,13 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
//Tarea 7541 //Tarea 7541
deliveryViewModel.getTicketObservations(ticketsSet.toList()) deliveryViewModel.getTicketObservations(ticketsSet.toList())
deliveryViewModel.responseObservations.observe(this) { deliveryViewModel.responseObservations.observe(this) { itList ->
listClaimTicketObservations = it listClaimTicketObservations = itList
if (it.isNotEmpty()) { if (itList.isNotEmpty()) {
showNotes(it) if (itList.count { it.observationType != null } > 0) {
setToolBar() showNotes(itList)
setToolBar()
}
} }
} }
binding.idTickets.text = ticketsSet.toList().toString() binding.idTickets.text = ticketsSet.toList().toString()
@ -211,7 +222,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
) )
) { ) {
customDialogList.dismiss() customDialogList.dismiss()
}.hideDialog().show() }.show()
val listObservationsAdapter = val listObservationsAdapter =
GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener { GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener {