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:41:33 +02:00
parent 9ccc8e83b3
commit 5e778d2ba6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,14 +178,14 @@ 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) {
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,7 +195,7 @@ 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)
ticketNotes.add( ticketNotes.add(
GeneralItem( GeneralItem(
text = "${item.ticketFk}:${item.description}", code = "" text = "${item.ticketFk}:${item.description}", code = ""

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

@ -57,9 +57,13 @@ data class Ticket(
data class TicketObservation data class TicketObservation
( (
var ticketFk: Long, var ticketFk: Long,
var description: String var description: String,
var observationType:ObservationType?=null
) )
data class ObservationType(
var code:String?
)
@Entity(tableName = "signedPending") @Entity(tableName = "signedPending")
data class SignedTickets( data class SignedTickets(
@TypeConverters(MapTypeConverter::class) val queryMapList: MutableMap<String?, String?>, @TypeConverters(MapTypeConverter::class) val queryMapList: MutableMap<String?, String?>,