refs #6107 feat: refactor fields
This commit is contained in:
parent
3b35907547
commit
1feb2b2db2
|
@ -22,7 +22,7 @@ import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
||||||
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
||||||
import es.verdnatura.presentation.view.feature.delivery.activity.SignedActivity
|
import es.verdnatura.presentation.view.feature.delivery.activity.SignedActivity
|
||||||
import es.verdnatura.presentation.view.feature.delivery.adapters.ExpeditionLoadUnloadAdapter
|
import es.verdnatura.presentation.view.feature.delivery.adapters.ExpeditionLoadUnloadAdapter
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicket
|
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLoadUnload
|
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLoadUnload
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoPending
|
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoPending
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionSalix
|
import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionSalix
|
||||||
|
@ -38,7 +38,7 @@ class LoadUnloadFragment(
|
||||||
private var title: String = "",
|
private var title: String = "",
|
||||||
private var state: String = "",
|
private var state: String = "",
|
||||||
private var entryPoint: String,
|
private var entryPoint: String,
|
||||||
private var clientTicketList: ArrayList<ClientTicket>?
|
private var clientTicketList: ArrayList<ClientTicketSalix>?
|
||||||
|
|
||||||
) : BaseFragment<FragmentExpeditionLoadunloadDeliveryBinding, DeliveryViewModel>(
|
) : BaseFragment<FragmentExpeditionLoadunloadDeliveryBinding, DeliveryViewModel>(
|
||||||
DeliveryViewModel::class
|
DeliveryViewModel::class
|
||||||
|
@ -59,7 +59,7 @@ class LoadUnloadFragment(
|
||||||
title: String,
|
title: String,
|
||||||
state: String,
|
state: String,
|
||||||
entryPoint: String,
|
entryPoint: String,
|
||||||
clientTicketList: ArrayList<ClientTicket>? = null
|
clientTicketList: ArrayList<ClientTicketSalix>? = null
|
||||||
) = LoadUnloadFragment(title, state, entryPoint, clientTicketList)
|
) = LoadUnloadFragment(title, state, entryPoint, clientTicketList)
|
||||||
|
|
||||||
fun scanning(scan: Boolean) {
|
fun scanning(scan: Boolean) {
|
||||||
|
|
|
@ -249,6 +249,7 @@ class RoutesFragment(
|
||||||
|
|
||||||
responseLoadList.observe(viewLifecycleOwner) {
|
responseLoadList.observe(viewLifecycleOwner) {
|
||||||
ma.messageWithSound(getString(R.string.offline), false, false, "", true)
|
ma.messageWithSound(getString(R.string.offline), false, false, "", true)
|
||||||
|
ma.onApplicationEventAnimation(View.INVISIBLE)
|
||||||
createListRoutes(mutableListOf(), getSaved = true)
|
createListRoutes(mutableListOf(), getSaved = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,33 +10,6 @@ class ClientTicketList(
|
||||||
var list: MutableList<ClientTicketSalix> = mutableListOf()
|
var list: MutableList<ClientTicketSalix> = mutableListOf()
|
||||||
)
|
)
|
||||||
|
|
||||||
@Entity(tableName = "clientTickets")
|
|
||||||
data class ClientTicket(
|
|
||||||
@PrimaryKey var Id: Long,
|
|
||||||
var Client: Int,
|
|
||||||
var ClientName: String,
|
|
||||||
var Address: Int,
|
|
||||||
var Packages: Int,
|
|
||||||
var AddressName: String,
|
|
||||||
var PostalCode: String,
|
|
||||||
var City: String,
|
|
||||||
var Warehouse: String?,
|
|
||||||
var SalePersonPhone: String?,
|
|
||||||
var Note: String?,
|
|
||||||
@TypeConverters(MapTypeConverter::class) var Phones: List<String>?,
|
|
||||||
@TypeConverters(MapTypeConverter::class) var Location: MyLocation?,
|
|
||||||
var Signed: Int,
|
|
||||||
var Latitude: Double?,
|
|
||||||
var Longitude: Double?,
|
|
||||||
var Polizon: String?,
|
|
||||||
var PackingType: String?,
|
|
||||||
@TypeConverters(MapTypeConverter::class) var tickets: MutableList<Ticket>,
|
|
||||||
//Tarea 5996, falta mostrar o no si no es null
|
|
||||||
var cmrFk: Int? = null,
|
|
||||||
var route: Long? = null,
|
|
||||||
var email: String? = null
|
|
||||||
) : Serializable
|
|
||||||
|
|
||||||
//Tarea 6275
|
//Tarea 6275
|
||||||
@Entity(tableName = "clientTickets")
|
@Entity(tableName = "clientTickets")
|
||||||
data class ClientTicketSalix(
|
data class ClientTicketSalix(
|
||||||
|
|
|
@ -54,7 +54,7 @@ import es.verdnatura.presentation.view.feature.delivery.fragments.LogExpeditionF
|
||||||
import es.verdnatura.presentation.view.feature.delivery.fragments.RoutesFragment
|
import es.verdnatura.presentation.view.feature.delivery.fragments.RoutesFragment
|
||||||
import es.verdnatura.presentation.view.feature.delivery.fragments.SummaryFragment
|
import es.verdnatura.presentation.view.feature.delivery.fragments.SummaryFragment
|
||||||
import es.verdnatura.presentation.view.feature.delivery.fragments.TicketsFragment
|
import es.verdnatura.presentation.view.feature.delivery.fragments.TicketsFragment
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicket
|
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix
|
||||||
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment
|
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment
|
||||||
import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment
|
import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment
|
||||||
import es.verdnatura.presentation.view.feature.historicoshelving.fragment.ItemShelvingLogFragment
|
import es.verdnatura.presentation.view.feature.historicoshelving.fragment.ItemShelvingLogFragment
|
||||||
|
@ -735,7 +735,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
addFragmentOnTop(
|
addFragmentOnTop(
|
||||||
LoadUnloadFragment.newInstance(
|
LoadUnloadFragment.newInstance(
|
||||||
item.title, "DELIVERED", entryPoint, if (param != null) {
|
item.title, "DELIVERED", entryPoint, if (param != null) {
|
||||||
param as ArrayList<ClientTicket>
|
param as ArrayList<ClientTicketSalix>
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue