From fd80d694cc2453ee51a3f6ddc315eee51d89d4b5 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Mon, 20 Mar 2023 10:38:04 +0100 Subject: [PATCH] refs #4755 mostrar tickets --- .../sacador/fragment/SacadorFragment.kt | 142 +----------------- .../feature/sacador/mapper/SacadoresMapper.kt | 18 ++- .../feature/sacador/model/TicketItemVO.kt | 9 +- .../main/res/layout/item_collection_row.xml | 9 ++ app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 31 insertions(+), 149 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 1b63fbbb..5a0c16ee 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.sacador.fragment import android.content.Context import android.graphics.drawable.Drawable import android.os.Build -import android.os.Bundle import android.view.View import android.widget.ImageView import androidx.lifecycle.Observer @@ -20,7 +19,6 @@ import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapter import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO -//private var getCollections = false class SacadorFragment : BaseFragment(SacadorViewModel::class) { @@ -33,7 +31,6 @@ class SacadorFragment : private var adapter: CollectionAdapter? = null private var resultTagMode: String? = "" - companion object { fun newInstance() = SacadorFragment() } @@ -45,7 +42,6 @@ class SacadorFragment : override fun getLayoutId(): Int = R.layout.fragment_sacador - override fun init() { customDialog = CustomDialog(requireContext()) @@ -54,49 +50,10 @@ class SacadorFragment : binding.mainToolbar.toolbarTitle.text = getString(R.string.getcollection) setToolBar() setEvents() - - /* if (getCollections) { - viewModel.collection_new_smart( - getData(USER), - getData(PASSWORD), - getData(SECTORFK), - getData(WAGON), - getData(TAGSTYPE) - ) - - } else {*/ - val working_in_test = true //sergio: Ok en app - if (!working_in_test) { - viewModel.collectionGetSalix() - } else { - viewModel.collectionGet( - ) - } - - //} + viewModel.collectionGetSalix() super.init() } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - /* setFragmentResultListener("requestKey") { _, bundle -> - - val result = bundle.getString("tagMode") - - resultTagMode = result - if (result.equals(getString(R.string.complete)) && getData(TAGSTYPE).equals(getString(R.string.smarttags))) { - getCollections = true - - } else { - getCollections = false - } - - }*/ - - } - override fun onPause() { goBack = true goBack2 = true @@ -135,10 +92,6 @@ class SacadorFragment : iconAdd.drawable -> { binding.splashProgress.visibility = View.VISIBLE - // checkTagsMode() - //Tarea 4351 cambiar getData(WAGON) por getData(NUMBEROFWAGONS) - - //Tarea 4520 viewModel.collection_assign( ) @@ -159,41 +112,6 @@ class SacadorFragment : } } - - /* private fun checkTagsMode() { - - //sergio:codigo smarttags - //Tarea 4351 cambiar getData(WAGON por NUMBEROFWAGONS) - if (getData(TAGSTYPE).equals(getString(R.string.stickers))) { - viewModel.collectionNew( - getData(USER), - getData(PASSWORD), - getData(SECTORFK), - getData(NUMBEROFWAGONS) - ) - } else if (getCollections) { - - viewModel.collection_new_smart( - getData(USER), - getData(PASSWORD), - getData(SECTORFK), - getData(WAGON), - getData(TAGSTYPE) - ) - - } else { - requireActivity().addFragment( - AssociateSmartTagsFragment.newInstance(AssociateSmartTagsFragment.TAG), - R.id.main_frame_layout, - AssociateSmartTagsFragment.TAG - ) - - } - - - }*/ - - override fun observeViewModel() { with(viewModel) { @@ -204,17 +122,7 @@ class SacadorFragment : binding.splashProgress.visibility = View.GONE goBack2 = false }) - /* collectionTicketList.observe(viewLifecycleOwner, Observer { - binding.splashProgress_two.visibility = View.GONE - if (it.isError){ - customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage).setOkButton(getString(R.string.accept)){ - customDialog.dismiss() - }.show() - }else{ - if (!goBack)navigateToCollectionList(it) - } - goBack = false - })*/ + response.observe(viewLifecycleOwner, Observer { binding.splashProgressTwo.visibility = View.GONE binding.splashProgress.visibility = View.GONE @@ -225,52 +133,9 @@ class SacadorFragment : if (goBack) addCollectionToList(it.response.toInt()) } goBack = false - //sergio:para asegurarnos que aparece en pantalla. - - val working_in_test = true //sergio: ok en app SACADOR - if (!working_in_test) { - viewModel.collectionGetSalix() - } else { - viewModel.collectionGet() - } - - + viewModel.collectionGetSalix() }) - /* responseCollectionSmart.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = View.GONE - - getCollections = false - if (!goBack) { - if (it.isError) { - ma.messageWithSound(it.errorMessage, true, false) - - } else { - - viewModel.smartTagInsertTicket(it.response) - - goBack = false - } - } - })*/ - - - /* registerSmarttagInsert.observe(viewLifecycleOwner, Observer { - - if (!goBack) { - if (it.isError) { - ma.messageWithSound(it.errorMessage, true, false) - getCollections = true - } else { - ma.messageWithSound(getString(R.string.ticketInsert), false, false) - getCollections = false - viewModel.collectionGetSalix(getData(TOKEN)) - } - goBack = false - } - }) - */ - } } @@ -318,7 +183,6 @@ class SacadorFragment : private fun navigateToCollectionList(collection: CollectionVO) { collectionsList.add(collection) adapter?.notifyDataSetChanged() - onCollectionSelectedListener?.onCollectionSelected(collection, SACADOR) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt index ba6b1f4b..f9f8dc8c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt @@ -6,22 +6,24 @@ import es.verdnatura.presentation.common.convertToDateString import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import java.text.SimpleDateFormat import java.util.* -import kotlin.collections.ArrayList -fun List.toDateFormat(context:Context): ArrayList { - val collections : ArrayList = ArrayList() +fun List.toDateFormat(context: Context): ArrayList { + val collections: ArrayList = ArrayList() this.forEach { - collections.add(CollectionVO( - collectionFk = it.collectionFk, - created = getCalendarFromDate(it.created,context).convertToDateString() - )) + collections.add( + CollectionVO( + collectionFk = it.collectionFk, + created = getCalendarFromDate(it.created, context).convertToDateString(), + ticketTotalCount = it.ticketTotalCount + ) + ) } return collections } -private fun getCalendarFromDate(date:String,context:Context): Calendar { +private fun getCalendarFromDate(date: String, context: Context): Calendar { val sdf = SimpleDateFormat(context.getString(R.string.dateFormat)) val cal = Calendar.getInstance() cal.time = sdf.parse(date)!! diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt index 2e861d0c..d96747bc 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt @@ -11,7 +11,8 @@ class CollectionVO( var isError: Boolean = false, var errorMessage: String = "", var itemPackingTypeFk: String = "", - var rgb: String? = null + var rgb: String? = null, + var ticketTotalCount: Int? = null ) class TicketVO( @@ -68,9 +69,13 @@ class SaleVO( var packingShelve: String = "", var picked: String = "", + var isParent: Boolean = false, + var totalSales: Int = 0, + var sonSales: MutableList = mutableListOf(), + var code: String = "" - ) +) class PlacementVO( var saleFk: String = "", diff --git a/app/src/main/res/layout/item_collection_row.xml b/app/src/main/res/layout/item_collection_row.xml index 22b5a252..5b818d08 100644 --- a/app/src/main/res/layout/item_collection_row.xml +++ b/app/src/main/res/layout/item_collection_row.xml @@ -41,6 +41,15 @@ android:textSize="@dimen/h7" android:gravity="center_vertical" android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/> + Porteador Texto escaneado no válido Va a eliminar la cantidad del artículo: + " Tickets:" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ffe7c19..524e11c6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,6 +12,7 @@ Level: of Ticket + Tickets: Concept NoServing Parked