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

feat: refactorResponse Delivery, Inventary,historical refs #7827

This commit is contained in:
Sergio De la torre 2024-08-14 12:04:46 +02:00
parent bcecf2ed6c
commit 6dc39d6611
9 changed files with 40 additions and 78 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/controlvehiculo/fragment/ControlVehiculoViewModel.kt
View File

@ -69,7 +69,6 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
.enqueue(object : SalixCallback<List<DeviceId>>(context) { .enqueue(object : SalixCallback<List<DeviceId>>(context) {
override fun onSuccess(response: Response<List<DeviceId>>) { override fun onSuccess(response: Response<List<DeviceId>>) {
if (response.body() != null) {
_responseMachine.value = _responseMachine.value =
ResponseItemMachineControl( ResponseItemMachineControl(
@ -80,7 +79,6 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
}, },
type = "getnameDevice" type = "getnameDevice"
) )
}
} }

32
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
View File

@ -32,7 +32,7 @@ class SummaryFragment(
var route: Int = 0, var route: Int = 0,
) : BaseFragment<FragmentExpeditionSummaryBinding, DeliveryViewModel>( ) : BaseFragment<FragmentExpeditionSummaryBinding, DeliveryViewModel>(
DeliveryViewModel::class DeliveryViewModel::class
) , AdapterCallback { ), AdapterCallback {
private var adapter: ExpeditionSummaryAdapter? = null private var adapter: ExpeditionSummaryAdapter? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
@ -47,9 +47,10 @@ class SummaryFragment(
private var isScanning = false private var isScanning = false
private var positionSelected = -1 private var positionSelected = -1
override fun getPosition():Int { override fun getPosition(): Int {
return positionSelected return positionSelected
} }
companion object { companion object {
fun newInstance(title: String, state: String, route: Int) = fun newInstance(title: String, state: String, route: Int) =
SummaryFragment(title, state, route) SummaryFragment(title, state, route)
@ -62,13 +63,12 @@ class SummaryFragment(
setEvents() setEvents()
setToolBar() setToolBar()
binding.scanInput.requestFocus() binding.scanInput.requestFocus()
callBack(viewModel.routeGetExpeditionSummary(route)) viewModel.routeGetExpeditionSummary(route)
routeSelected = route routeSelected = route
setViews() setViews()
} }
override fun onResume() { override fun onResume() {
if (binding.mainToolbar.toolbarTitle.text != getString(R.string.titleDeliverySummary)) { if (binding.mainToolbar.toolbarTitle.text != getString(R.string.titleDeliverySummary)) {
binding.scanInput.isEnabled = true binding.scanInput.isEnabled = true
@ -79,10 +79,6 @@ class SummaryFragment(
} }
private fun callBack(routeGetexpeditionsummary: Unit) {
return routeGetexpeditionsummary
}
private fun setViews() { private fun setViews() {
binding.expeditionSummaryRecyclerview.addOnScrollListener(object : binding.expeditionSummaryRecyclerview.addOnScrollListener(object :
RecyclerView.OnScrollListener() { RecyclerView.OnScrollListener() {
@ -168,10 +164,8 @@ class SummaryFragment(
if (list.filter { it.addressFk == address } if (list.filter { it.addressFk == address }
.filter { it.code == state }.size == list.filter { it.addressFk == address }.size) { .filter { it.code == state }.size == list.filter { it.addressFk == address }.size) {
counterCalls = 1 counterCalls = 1
callBack( viewModel.expeditionStateAddSalix(
viewModel.expeditionStateAddSalix( hashMapOf("expeditions" to listExpedition.filter { it.stateCode == state })
hashMapOf("expeditions" to listExpedition.filter { it.stateCode == state })
)
) )
isScanning = false isScanning = false
@ -212,7 +206,9 @@ class SummaryFragment(
event != null && event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER event != null && event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
try { try {
markExpedition( markExpedition(
binding.scanInput.text.toString().toInt(), state, if (isScanned) 1 else 0 binding.scanInput.text.toString().toInt(),
state,
if (isScanned) 1 else 0
) )
} catch (ex: Exception) { } catch (ex: Exception) {
@ -228,7 +224,7 @@ class SummaryFragment(
} }
private fun markExpedition(expedNumber: Int, state: String, isScanned : Int) { private fun markExpedition(expedNumber: Int, state: String, isScanned: Int) {
var found = false var found = false
if (myList.filter { it.addressFk == addressFkSelected }.filter { it.id == expedNumber } if (myList.filter { it.addressFk == addressFkSelected }.filter { it.id == expedNumber }
.any { it.code == state }) { .any { it.code == state }) {
@ -285,7 +281,7 @@ class SummaryFragment(
if (!it.isError) { if (!it.isError) {
counterResponse += 1 counterResponse += 1
if (counterResponse == counterCalls) { if (counterResponse == counterCalls) {
callBack(viewModel.routeGetExpeditionSummary(routeSelected)) viewModel.routeGetExpeditionSummary(routeSelected)
counterResponse = 0 counterResponse = 0
counterCalls = 0 counterCalls = 0
checkNextAddress() checkNextAddress()
@ -339,7 +335,7 @@ class SummaryFragment(
if (addressFkSelected != item.addressFk && !isScanning) { if (addressFkSelected != item.addressFk && !isScanning) {
callBack(viewModel.getExpeditionFromRoute(routeSelected)) viewModel.getExpeditionFromRoute(routeSelected)
} }
if (addressFkSelected != item.addressFk && isScanning) { if (addressFkSelected != item.addressFk && isScanning) {
@ -348,7 +344,7 @@ class SummaryFragment(
} }
addressFkSelected = item.addressFk addressFkSelected = item.addressFk
isScanning = false isScanning = false
callBack(viewModel.getExpeditionFromRoute(routeSelected)) viewModel.getExpeditionFromRoute(routeSelected)
adapter!!.notifyDataSetChanged() adapter!!.notifyDataSetChanged()
} }
@ -361,7 +357,7 @@ class SummaryFragment(
binding.expeditionSummaryRecyclerview.adapter = adapter binding.expeditionSummaryRecyclerview.adapter = adapter
binding.expeditionSummaryRecyclerview.layoutManager = binding.expeditionSummaryRecyclerview.layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
adapter!!.notifyDataSetChanged() adapter!!.notifyDataSetChanged()
} }
private fun createList(list: MutableList<ExpeditionInfoLoadUnload>) { private fun createList(list: MutableList<ExpeditionInfoLoadUnload>) {

28
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
View File

@ -68,24 +68,23 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
private var firstVisibleItemPosition = -1 private var firstVisibleItemPosition = -1
companion object { companion object {
//Tarea 6810 revisar fallos app //Tarea 6810 revisar fallos app
private const val ARG_TITLE = "title" private const val ARG_TITLE = "title"
private const val ARG_ROUTE = "route" private const val ARG_ROUTE = "route"
private const val REQUEST_CALL_PERMISSION = 1 private const val REQUEST_CALL_PERMISSION = 1
fun newInstance(title: String, entryPoint: String) = fun newInstance(title: String, entryPoint: String) = TicketsFragment().apply {
TicketsFragment().apply { arguments = Bundle().apply {
arguments = Bundle().apply { putString(ARG_TITLE, title)
putString(ARG_TITLE, title) putString(ARG_ROUTE, entryPoint)
putString(ARG_ROUTE, entryPoint)
}
} }
}
/* fun newInstance(title: String, entryPoint: String) =
/* fun newInstance(title: String, entryPoint: String) = TicketsFragment(title, Gson().fromJson(entryPoint, RouteInfo::class.java))*/
TicketsFragment(title, Gson().fromJson(entryPoint, RouteInfo::class.java))*/
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
arguments?.let { arguments?.let {
@ -93,6 +92,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
route = Gson().fromJson(it.getString(ARG_ROUTE), RouteInfo::class.java) route = Gson().fromJson(it.getString(ARG_ROUTE), RouteInfo::class.java)
} }
} }
override fun getLayoutId(): Int = R.layout.fragment_tickets override fun getLayoutId(): Int = R.layout.fragment_tickets
override fun init() { override fun init() {
@ -102,6 +102,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
binding.mainToolbar.toolbarTitle.text = route.name binding.mainToolbar.toolbarTitle.text = route.name
viewModel.getTickets(route.id) viewModel.getTickets(route.id)
db = database(requireContext().applicationContext) db = database(requireContext().applicationContext)
println("tickets in ")
} }
@ -418,7 +419,6 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
R.string.titleUnLoadTruck R.string.titleUnLoadTruck
) )
), entryPoint, myListClientTicket.filter { it.id == item.id }) ), entryPoint, myListClientTicket.filter { it.id == item.id })
} }
"map" -> { "map" -> {
@ -510,7 +510,6 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
customDialogInput.getRecyclerView().layoutManager = customDialogInput.getRecyclerView().layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
customDialogInput.setOkButton(getString(R.string.save)) { customDialogInput.setOkButton(getString(R.string.save)) {
//tarea 6921
if (itemClient.observationDropOff == null) { if (itemClient.observationDropOff == null) {
viewModel.addFropOff( viewModel.addFropOff(
ticketFK = itemClient.id, ticketFK = itemClient.id,
@ -522,7 +521,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
itemClient.id, description = customDialogInput.getValue() itemClient.id, description = customDialogInput.getValue()
) )
} }
// viewModel.addNotes(itemClient.tickets, customDialogInput.getValue())
customDialogInput.dismiss() customDialogInput.dismiss()
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {
customDialogInput.cancel() customDialogInput.cancel()
@ -530,9 +529,6 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
} }
customDialogInput.show() customDialogInput.show()
/* firstVisibleItemPosition =
(binding.ticketsRecyclerview.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()*/
} }
fun showNotes(clientClicked: ClientTicketSalix) { fun showNotes(clientClicked: ClientTicketSalix) {

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

@ -13,10 +13,6 @@ class FreeLanceDeliveryInfoList(
var list: List<DeliveryInfo> = listOf() var list: List<DeliveryInfo> = listOf()
) )
class CompanyInfoList(
var list: List<DeliveryInfo> = listOf()
)
class DeliveryInfo( class DeliveryInfo(
var name: String? = null, var name: String? = null,
var street: String? = null, var street: String? = null,

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

@ -63,8 +63,8 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
val responseStateAdd: LiveData<ResponseItemVO> val responseStateAdd: LiveData<ResponseItemVO>
get() = _responseStateAdd get() = _responseStateAdd
private val _responseUpdateRoute by lazy { MutableLiveData<ResponseItemVO>() } private val _responseUpdateRoute by lazy { MutableLiveData<Boolean>() }
val responseUpdateRoute: LiveData<ResponseItemVO> val responseUpdateRoute: LiveData<Boolean>
get() = _responseUpdateRoute get() = _responseUpdateRoute
private val _response by lazy { MutableLiveData<ResponseItemVO>() } private val _response by lazy { MutableLiveData<ResponseItemVO>() }
@ -308,16 +308,11 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
salix.routeUpdate(route.id, route).enqueue(object : SalixCallback<Any>(context) { salix.routeUpdate(route.id, route).enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_responseUpdateRoute.value = ResponseItemVO() _responseUpdateRoute.value = true
super.onSuccess(response) super.onSuccess(response)
} }
override fun onError(t: Throwable) {
_responseUpdateRoute.value = ResponseItemVO()
super.onError(t)
}
}) })
} }

6
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
View File

@ -101,7 +101,7 @@ class ShelvingLogFragment(
customDialog.dismiss() customDialog.dismiss()
}.show() }.show()
} else { } else {
openViewer(it.list[0].id!!, "shelving") openWebViewer(it.list[0].id!!, "shelving")
} }
} }
@ -109,14 +109,14 @@ class ShelvingLogFragment(
loadResponseParking.observe(viewLifecycleOwner) { event -> loadResponseParking.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull { event.getContentIfNotHandled().notNull {
setToolBar(getString(R.string.parking) + ":" + itemScan) setToolBar(getString(R.string.parking) + ":" + itemScan)
openViewer(it, "parking") openWebViewer(it, "parking")
} }
} }
} }
} }
private fun openViewer(param: Int, web: String) { private fun openWebViewer(param: Int, web: String) {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = getString(R.string.titleWebViewer),

8
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
View File

@ -121,7 +121,6 @@ class InventaryParkingFragment(
if (!onBackPressedHandled()) { if (!onBackPressedHandled()) {
isEnabled = false isEnabled = false
requireActivity().onBackPressedDispatcher requireActivity().onBackPressedDispatcher
} else {
} }
} }
}) })
@ -729,13 +728,12 @@ class InventaryParkingFragment(
override fun onBackPressedHandled(): Boolean { override fun onBackPressedHandled(): Boolean {
return if (shelvingSaved.isBlank()) {
if (shelvingSaved.isBlank()) {
ma.onMyBackPressed() ma.onMyBackPressed()
return false false
} else { } else {
resetChecking() resetChecking()
return true true
} }
} }
} }

6
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
View File

@ -37,8 +37,8 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
val inventaryList: LiveData<InventaryListVO> val inventaryList: LiveData<InventaryListVO>
get() = _inventaryList get() = _inventaryList
private val _response by lazy { MutableLiveData<Any>() } private val _response by lazy { MutableLiveData<Boolean>() }
val response: LiveData<Any> val response: LiveData<Boolean>
get() = _response get() = _response
private val _responseReset by lazy { MutableLiveData<String>() } private val _responseReset by lazy { MutableLiveData<String>() }
@ -139,7 +139,7 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
salix.setVisibleDiscard(ItemDiscardSalixShortage(itemFk, warehouseFk, newValue, null)) salix.setVisibleDiscard(ItemDiscardSalixShortage(itemFk, warehouseFk, newValue, null))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _response.value = true
} }
}) })
} }

21
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -48,6 +48,7 @@ import es.verdnatura.presentation.common.OnStopMapClickListener
import es.verdnatura.presentation.common.OnTruckClickListener import es.verdnatura.presentation.common.OnTruckClickListener
import es.verdnatura.presentation.common.TAG import es.verdnatura.presentation.common.TAG
import es.verdnatura.presentation.common.addFragment import es.verdnatura.presentation.common.addFragment
import es.verdnatura.presentation.view.commom.WebFragment
import es.verdnatura.presentation.view.component.CustomDialogMainActivity import es.verdnatura.presentation.view.component.CustomDialogMainActivity
import es.verdnatura.presentation.view.feature.ajustes.fragment.AjustesFragment import es.verdnatura.presentation.view.feature.ajustes.fragment.AjustesFragment
import es.verdnatura.presentation.view.feature.articulo.fragment.ItemCardFragment import es.verdnatura.presentation.view.feature.articulo.fragment.ItemCardFragment
@ -69,7 +70,6 @@ import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFra
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreCheckerNew import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreCheckerNew
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment
import es.verdnatura.presentation.view.commom.WebFragment
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoUsuarioFragment import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoUsuarioFragment
import es.verdnatura.presentation.view.feature.delivery.fragments.InfoFragment import es.verdnatura.presentation.view.feature.delivery.fragments.InfoFragment
@ -839,7 +839,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
LoadUnloadFragment.newInstance( LoadUnloadFragment.newInstance(
item.title, "DELIVERED", entryPoint, item.title, "DELIVERED", entryPoint,
param as? ArrayList<ClientTicketSalix> param as? ArrayList<ClientTicketSalix>
), getString(R.string.titleUnLoadTruck), delete = true ), getString(R.string.titleUnLoadTruck)
) )
} }
@ -1087,23 +1087,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
fun openFragmentUnload(delete: Boolean) {
//delete_Fragments()
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
if (delete) {
delete_Fragments()
}
addFragment(
SacadorFragment.newInstance("PREPARED"),
R.id.main_frame_layout,
SacadorFragment.TAG,
true
)
//addFragmentOnTop(SacadorFragment.newInstance())
}
fun openFragmentExpeditionState() { fun openFragmentExpeditionState() {
addFragmentOnTop(ExpeditionStateFragment.newInstance(getString(R.string.titleExpeditionState))) addFragmentOnTop(ExpeditionStateFragment.newInstance(getString(R.string.titleExpeditionState)))