diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt index b717fea4..6c91190f 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -535,7 +535,7 @@ abstract class BaseFragment(viewModelCla ITEMPACKINGFK -> prefs.getString(name, "").toString() WORKFORMSELECTED -> prefs.getString(name, "Producción").toString() "SUPPLIERNAME" -> prefs.getString(name, "").toString() - "SUPPLIERID" -> prefs.getInt(name, 0).toString() + "SUPPLIERID" -> prefs.getString(name, "").toString() "ENTRYTYPE" -> prefs.getString(name, "").toString() "ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString() "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt index ba68fb0f..08bf81c8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt @@ -42,11 +42,11 @@ class ItemSupplierAdapter( binding.apply { this.item = item - itemImageUpdate.setOnClickListener { + itemAdd.setOnClickListener { onImageUpdateClickListener.OnImageUpdateClickListener( item ) - itemImageTrash.setOnClickListener { + itemRemove.setOnClickListener { onImageTrashClickListener.OnImageUpdateClickListener(item) } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt index 7cc59efe..92fb73c6 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt @@ -79,7 +79,7 @@ class ObservFragment( listImages!!.size.toString() } ) - saveData("ENTRYOBSERVATIONS",binding.observations.text.toString()) + saveData("ENTRYOBSERVATIONS", binding.observations.text.toString()) ma.onPasillerosItemClickListener( PasillerosItemVO(title = getString(R.string.titlePackagingSummary)), getString(R.string.titlePackagingSummary) @@ -105,7 +105,8 @@ class ObservFragment( d("VERDNATURA::", "el nombre es " + image.uri) //binding.imageView30.setImageURI(image.uri) } - listImages = it as MutableList + if (listImages != null) + listImages = it as MutableList setAdapter(listImages!!) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt index 488e53c5..838396e5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt @@ -41,10 +41,12 @@ class PackagingCountFragment( override fun onCreate(savedInstanceState: Bundle?) { + viewModel.supplier_getItems( - getData("SUPPLIERID") as Int + getData("SUPPLIERID") ) + super.onCreate(savedInstanceState) } @@ -56,7 +58,7 @@ class PackagingCountFragment( getString(R.string.titlePackagingObs) ) } - binding.splashProgress.visibility = View.VISIBLE + // binding.splashProgress.visibility = View.VISIBLE customDialogInput = CustomDialogInput(requireContext()) customDialog = CustomDialog(requireContext()) @@ -117,16 +119,37 @@ class PackagingCountFragment( override fun OnImageUpdateClickListener(item: Any) { d("VERDNATURA::", "Seleccionado update" + (item as ItemSupplier).name) + printCustomDialog("quantity") + customDialogInput.setTitle(getString(R.string.quantityReviewed)) + .setDescription(getString(R.string.quantityToReview)) + .setOkButton(getString(R.string.accept)) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + requireActivity().hideKeyboard() + } + customDialogInput.setValue("") + customDialogInput.dismiss() + + }.setKoButton(getString(R.string.cancel)) { + + customDialogInput.dismiss() + + }.setValue("").show() + + } }, object : OnImageTrashClickListener { override fun OnImageUpdateClickListener(item: Any) { d("VERDNATURA::", "Seleccionado trash" + (item as ItemSupplier).name) + printCustomDialog("delete") } }, object : OnEditSubQuantityListener { override fun OnEditSubQuantityListener(item: Any, text: String) { - d("VERDNATURA::", "la subquantity es " + (item as ItemSupplier).name+"el valor es :"+text) + d( + "VERDNATURA::", + "la subquantity es " + (item as ItemSupplier).name + "el valor es :" + text + ) hideKeyboard() } }) @@ -141,6 +164,54 @@ class PackagingCountFragment( } } + private fun printCustomDialog(action: String) { + + when (action) { + "quantity" -> { + customDialogInput.setTitle(getString(R.string.quantityReviewed)) + .setDescription(getString(R.string.Indicanuevacantidad)) + .setOkButton(getString(R.string.accept)) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + requireActivity().hideKeyboard() + } + customDialogInput.setValue("") + customDialogInput.dismiss() + requireActivity().showKeyboard() + }.setKoButton(getString(R.string.cancel)) { + customDialogInput.dismiss() + requireActivity().showKeyboard() + }.setValue("").show() + + customDialogInput.setInputText() + customDialogInput.currentFocus + customDialogInput.setFocusText() + requireActivity().showKeyboard() + } + "delete" -> { + customDialog.setTitle(getString(R.string.deleteEntryReviewed)) + .setDescription(getString(R.string.sure)) + .setOkButton( + getString( + R.string.delete + ) + ) { + d("VERDNATURA::", "borrado") + } + + .setKoButton(getString(R.string.cancel)) { + customDialog.cancel() + customDialog.dismiss() + + + } + } + + } + customDialog.show() + } + } + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt index 6ffb91af..5155b3d3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt @@ -72,7 +72,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) { }) } - fun supplier_getItems(supplierFk: Int) { + fun supplier_getItems(supplierFk: Any) { silex.supplier_getItems(supplierFk) .enqueue(object : SilexCallback>(context) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt index 254d4b5b..4ceeebc7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt @@ -1,13 +1,16 @@ package es.verdnatura.presentation.view.feature.packaging.fragment +import android.app.AlertDialog import android.content.Context import android.os.Bundle +import android.util.Log.d import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import es.verdnatura.R import es.verdnatura.databinding.FragmentPackagingBinding import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.feature.inventario.fragment.SearchSupplierModel import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingViewModel.PackagingViewModel import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix @@ -28,6 +31,7 @@ class SupplierFragment( private var layoutManager: LinearLayoutManager? = null private var onBack = false private val suppliers = ArrayList() + private lateinit var customDialog: CustomDialog companion object { @@ -79,7 +83,7 @@ class SupplierFragment( setEvents() val entry = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442") - viewModel.entry_addSalix(entry) + // viewModel.entry_addSalix(entry) super.init() } @@ -93,7 +97,46 @@ class SupplierFragment( binding.mainToolbar.backButton.setOnClickListener { requireActivity().onBackPressed() } + binding.filterEntry.setOnClickListener { + val builder = AlertDialog.Builder(context) + builder.setTitle(getString(R.string.selectEntryToFill)) + val labelCount = arrayOf("Entrada 1", "Entrada 2", "Añadir Nueva") + builder.setItems(labelCount) { dialog, which -> + + if (labelCount[which] == "Añadir Nueva") { + customDialog = CustomDialog(requireContext()) + customDialog.setTitle(getString(R.string.newEntry)) + .setDescription(getString(R.string.confirmEntry)) + .setOkButton( + getString( + R.string.createEntry + ) + ) { + d("VERDNATURA::", "borrado") + } + + .setKoButton(getString(R.string.cancel)) { + customDialog.cancel() + customDialog.dismiss() + + + } + customDialog.show() + + } + + + ma.onPasillerosItemClickListener( + PasillerosItemVO(title = getString(R.string.titlePackagingCount)), + getString(R.string.titlePackagingCount) + ) + + } + val dialog = builder.create() + dialog.show() + + } binding.radiobuttonTypePackaging.setOnCheckedChangeListener { buttonView, isChecked -> when (isChecked) { R.id.radioButtonRec -> { @@ -105,11 +148,12 @@ class SupplierFragment( } } + binding.filterEntry.visibility = View.VISIBLE if (!onBack) { - ma.onPasillerosItemClickListener( - PasillerosItemVO(title = getString(R.string.titlePackagingCount)), - getString(R.string.titlePackagingCount) - ) + /* ma.onPasillerosItemClickListener( + PasillerosItemVO(title = getString(R.string.titlePackagingCount)), + getString(R.string.titlePackagingCount) + )*/ } onBack = false diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt index c246f232..85b92fe3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt @@ -522,7 +522,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { ) //#tarea4021 - /* _pasillerositem.add( + _pasillerositem.add( PasillerosItemVO( 6, R.drawable.ic_packaging, @@ -530,7 +530,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { R.string.titlePackaging, contextApp.getString(R.string.titlePackagingDescrip) ) - )*/ + ) val working_in_test=false if (working_in_test){ diff --git a/app/src/main/res/layout/fragment_packaging.xml b/app/src/main/res/layout/fragment_packaging.xml index ffad3bbb..e9065065 100644 --- a/app/src/main/res/layout/fragment_packaging.xml +++ b/app/src/main/res/layout/fragment_packaging.xml @@ -1,6 +1,5 @@ - @@ -12,11 +11,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:paddingTop="@dimen/toolbar_height" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:paddingTop="@dimen/toolbar_height"> + app:layout_constraintTop_toTopOf="parent"> + android:textColorHint="@android:color/darker_gray" + android:visibility="gone" /> + + + + + + + + - - - + android:id="@+id/main_toolbar" + layout="@layout/toolbar_fragment" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"> - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_packaging_count.xml b/app/src/main/res/layout/fragment_packaging_count.xml index 5d7518dc..aa54b8ed 100644 --- a/app/src/main/res/layout/fragment_packaging_count.xml +++ b/app/src/main/res/layout/fragment_packaging_count.xml @@ -90,6 +90,7 @@ android:layout_weight="1" android:gravity="center" android:text="@string/Cantidad" + android:visibility="gone" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -103,6 +104,7 @@ android:paddingStart="@dimen/layout_margin_3" android:textSize="@dimen/body2" /> + diff --git a/app/src/main/res/layout/fragment_packaging_obs.xml b/app/src/main/res/layout/fragment_packaging_obs.xml index b56c9cb5..b81ee973 100644 --- a/app/src/main/res/layout/fragment_packaging_obs.xml +++ b/app/src/main/res/layout/fragment_packaging_obs.xml @@ -32,12 +32,13 @@ app:layout_constraintTop_toBottomOf="@+id/textObs" /> + app:layout_constraintTop_toBottomOf="@+id/openPickerImages" > + + diff --git a/app/src/main/res/layout/item_image_row.xml b/app/src/main/res/layout/item_image_row.xml index d0ed16d3..8734a188 100644 --- a/app/src/main/res/layout/item_image_row.xml +++ b/app/src/main/res/layout/item_image_row.xml @@ -45,16 +45,16 @@ + android:src="@drawable/ic_history_black_24dp" + android:visibility="gone" /> + android:src="@drawable/ic_add_black_24dp" /> Indica la causa de eliminar stock: Indica la cantidad a dar de alta "Indica la cantidad a dar de baja " + "Indica la cantidad a sumar a la cantidad total revisada" Falta Basura El elemento introducido no es un número @@ -319,6 +320,7 @@ Número de baldas del ticket Indica el número de baldas que ocupa el ticket Número de paquetes en balda + Cantidad revisada Indica el número de paquetes que caben en una balda Comprobar No ha escaneado expediciones @@ -546,5 +548,9 @@ Va a eliminar para Autoconsumo la cantidad del artículo: " Tickets:" No es posible actualizar. Problema con la descarga de la app + Selecciona la entrada + Va a borrar el ítem y cantidad revisada. + Va a crear una nueva entrada + Crear entrada diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 79d9335d..a9bc666b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,7 +236,8 @@ Fill required fields Packing required Select an action - Delete + "You are going to delete quantity and item " + "You are going to create a new entry" You can only view when you have taken the vehicle yourself unless you have permission to do so. Information Accept @@ -258,6 +259,7 @@ Unmark line You are going to unmark the line: are you sure? + New entry Unmark ALGEMESI V SACADOR V @@ -538,10 +540,14 @@ Scan values : Check items Select label to print + Select entry to fill Expedition format no valid Insert the amount correctly Operación realizada correctamente Self-consumption + Quantity Reviewed + Put the reviewed quantity + Delete Address Modify It\'s not possible to update. Problem with the download of app