Commit 8f56b4b215d3026b29c8273c60414f3c02b55119
1 parent
7778faf6a5
Exists in
master
26022020 2335
Showing
5 changed files
with
170 additions
and
148 deletions
Show diff stats
app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
| ... | ... | @@ -27,7 +27,9 @@ import com.focasoftware.deboinventariov20.Model.Articles |
| 27 | 27 | import com.focasoftware.deboinventariov20.Model.InvBody |
| 28 | 28 | import com.focasoftware.deboinventariov20.R |
| 29 | 29 | import com.focasoftware.deboinventariov20.ui.inventario.InventarioFragment |
| 30 | +import kotlinx.android.synthetic.main.ingresar_cantidad.view.* | |
| 30 | 31 | import kotlinx.android.synthetic.main.login_dialog.view.* |
| 32 | +import kotlinx.android.synthetic.main.login_dialog.view.btnAceptar | |
| 31 | 33 | import kotlinx.coroutines.* |
| 32 | 34 | |
| 33 | 35 | class DescripcionFragment : Fragment() { |
| ... | ... | @@ -95,16 +97,22 @@ class DescripcionFragment : Fragment() { |
| 95 | 97 | (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)?.codigo.toString(), |
| 96 | 98 | numeroInventario.toString()) |
| 97 | 99 | if (artCargadoEnBD == null) { |
| 98 | - val type = InputType.TYPE_CLASS_NUMBER | |
| 99 | - | |
| 100 | - MaterialDialog(requireContext()).show { | |
| 101 | - title(text = "Producto: ${(viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.descripcion}") | |
| 102 | - message(R.string.sMensajeEncontrado) | |
| 103 | - input(waitForPositiveButton = false, hint = "99.99", inputType = type) { materialDialog, charSequence -> | |
| 104 | - cantidad = 0F | |
| 105 | - cantidad = charSequence.toString().toFloat() | |
| 106 | - } | |
| 107 | - positiveButton(R.string.btnOk) { | |
| 100 | +// val type = InputType.TYPE_CLASS_NUMBER | |
| 101 | +// | |
| 102 | +// MaterialDialog(requireContext()).show { | |
| 103 | +// title(text = "Producto: ${(viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.descripcion}") | |
| 104 | +// message(R.string.sMensajeEncontrado) | |
| 105 | +// input(waitForPositiveButton = false, hint = "99.99", inputType = type) { materialDialog, charSequence -> | |
| 106 | +// cantidad = 0F | |
| 107 | +// cantidad = charSequence.toString().toFloat() | |
| 108 | +// } | |
| 109 | +// positiveButton(R.string.btnOk) { | |
| 110 | + val mDialogView = LayoutInflater.from(context).inflate(R.layout.ingresar_cantidad, null) | |
| 111 | + val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setCancelable(false) | |
| 112 | + mDialogView.tvTitulo.text="Producto '${(viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.descripcion}'." | |
| 113 | + val mAlertDialog = mBuilder.show() | |
| 114 | + mDialogView.btnAceptar.setOnClickListener { | |
| 115 | + cantidad = mDialogView.etCantidad.text.toString().toFloat() | |
| 108 | 116 | val body = InvBody(numeroInventario, |
| 109 | 117 | (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.sector, |
| 110 | 118 | // TODO: PREPARO PARA MANDAR A CARGAR EN LA BD |
| ... | ... | @@ -121,9 +129,10 @@ class DescripcionFragment : Fragment() { |
| 121 | 129 | InventarioFragment().ObtenerFechaActual()) |
| 122 | 130 | InsertarArtEnDB(body)// TODO: MANDO A CARGAR A LA BASE DE DATOS |
| 123 | 131 | VolverAinventario() |
| 124 | - dismiss() | |
| 132 | + mAlertDialog.dismiss() | |
| 133 | +// dismiss() | |
| 125 | 134 | } |
| 126 | - }.cancelOnTouchOutside(false).cornerRadius(10F) | |
| 135 | +// }.cancelOnTouchOutside(false).cornerRadius(10F) | |
| 127 | 136 | |
| 128 | 137 | } else if (artCargadoEnBD != null) { |
| 129 | 138 | |
| ... | ... | @@ -133,17 +142,21 @@ class DescripcionFragment : Fragment() { |
| 133 | 142 | |
| 134 | 143 | val mAlertDialog = mBuilder.show() |
| 135 | 144 | mDialogView.rbSumar.setOnClickListener { |
| 136 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 137 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 145 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 146 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 147 | + } | |
| 138 | 148 | } |
| 139 | 149 | mDialogView.rbRestar.setOnClickListener { |
| 140 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 141 | - if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 142 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 150 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 151 | + if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 152 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 153 | + } | |
| 143 | 154 | } |
| 144 | 155 | } |
| 145 | 156 | mDialogView.rbMdodificar.setOnClickListener { |
| 146 | - mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 157 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 158 | + mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 159 | + } | |
| 147 | 160 | } |
| 148 | 161 | mDialogView.btnAceptar.setOnClickListener { |
| 149 | 162 | val name = mDialogView.tvgenerico4.text.toString().toFloat() |
app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogoLogin.kt
| ... | ... | @@ -0,0 +1,44 @@ |
| 1 | +package com.focasoftware.deboinventariov20.ui.dialogos | |
| 2 | + | |
| 3 | +import android.app.AlertDialog | |
| 4 | +import android.app.Dialog | |
| 5 | +import android.content.SharedPreferences | |
| 6 | +import android.os.Bundle | |
| 7 | +import androidx.fragment.app.DialogFragment | |
| 8 | +import com.focasoftware.deboinventariov20.R | |
| 9 | + | |
| 10 | +class DialogoLogin() : DialogFragment() { | |
| 11 | + private lateinit var sharedPreferences: SharedPreferences | |
| 12 | + | |
| 13 | + interface OnContinueCancelClickListener { | |
| 14 | + fun onPositiveClick() | |
| 15 | + fun onCancelClick() | |
| 16 | + } | |
| 17 | + | |
| 18 | + fun newInstance(s: String): DialogoLogin? { | |
| 19 | + val dialog = DialogoLogin() | |
| 20 | + | |
| 21 | + val args = Bundle() | |
| 22 | + args.putString("title", s) | |
| 23 | + dialog.arguments = args | |
| 24 | + | |
| 25 | + return dialog | |
| 26 | + } | |
| 27 | + | |
| 28 | + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | |
| 29 | + return activity?.let { | |
| 30 | + val builder = AlertDialog.Builder(it) | |
| 31 | + | |
| 32 | + val inflater = requireActivity().layoutInflater; | |
| 33 | + | |
| 34 | + builder.setView(inflater.inflate(R.layout.login_dialog, null)).setTitle("El producto ya fue escaneado").setPositiveButton(android.R.string.ok) { _, _ -> | |
| 35 | + val listener = activity as OnContinueCancelClickListener? | |
| 36 | + listener!!.onPositiveClick() | |
| 37 | + }.setNegativeButton(android.R.string.cancel) { _, _ -> | |
| 38 | + val listener = activity as OnContinueCancelClickListener? | |
| 39 | + listener!!.onCancelClick() | |
| 40 | + } | |
| 41 | + builder.create() | |
| 42 | + } ?: throw IllegalStateException("Activity cannot be null") | |
| 43 | + } | |
| 44 | +} | |
| 0 | 45 | \ No newline at end of file |
app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/InsertCant.kt
| 1 | 1 | package com.focasoftware.deboinventariov20.ui.dialogos |
| 2 | 2 | |
| 3 | +import android.app.AlertDialog | |
| 3 | 4 | import android.app.Dialog |
| 4 | 5 | import android.content.Context |
| 6 | +import android.content.SharedPreferences | |
| 7 | +import android.os.Bundle | |
| 5 | 8 | import android.view.View |
| 6 | 9 | import android.widget.EditText |
| 10 | +import androidx.fragment.app.DialogFragment | |
| 7 | 11 | import com.focasoftware.deboinventariov20.R |
| 8 | 12 | |
| 9 | -class InsertCant(ctxt: Context) : Dialog(ctxt) { | |
| 10 | - | |
| 11 | - private val editT: EditText | |
| 12 | - fun get_text(): String { | |
| 13 | - return editT.text.toString() | |
| 14 | - } | |
| 15 | - init { | |
| 16 | - super.setContentView(R.layout.ingresar_cantidad) | |
| 17 | - editT = super.findViewById<View>(R.id.etCantidad) as EditText | |
| 18 | - } | |
| 19 | -} | |
| 20 | 13 | \ No newline at end of file |
| 14 | +class InsertCant() : DialogFragment() { | |
| 15 | + | |
| 16 | + private lateinit var sharedPreferences: SharedPreferences | |
| 17 | + | |
| 18 | + interface OnContinueCancelClickListener { | |
| 19 | + fun onPositiveClick() | |
| 20 | + fun onCancelClick() | |
| 21 | + } | |
| 22 | + | |
| 23 | + fun newInstance(s: String): InsertCant? { | |
| 24 | + val dialog = InsertCant() | |
| 25 | + | |
| 26 | + val args = Bundle() | |
| 27 | + args.putString("title", s) | |
| 28 | + dialog.arguments = args | |
| 29 | + | |
| 30 | + return dialog | |
| 31 | + } | |
| 32 | + | |
| 33 | + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | |
| 34 | + return activity?.let { | |
| 35 | + val builder = AlertDialog.Builder(it) | |
| 36 | + | |
| 37 | + val inflater = requireActivity().layoutInflater; | |
| 38 | + | |
| 39 | + builder.setView(inflater.inflate(R.layout.ingresar_cantidad, null)).setTitle("").setPositiveButton(android.R.string.ok) { _, _ -> | |
| 40 | + val listener = activity as OnContinueCancelClickListener? | |
| 41 | + listener!!.onPositiveClick() | |
| 42 | + }.setNegativeButton(android.R.string.cancel) { _, _ -> | |
| 43 | + val listener = activity as OnContinueCancelClickListener? | |
| 44 | + listener!!.onCancelClick() | |
| 45 | + } | |
| 46 | + builder.create() | |
| 47 | + } ?: throw IllegalStateException("Activity cannot be null") | |
| 48 | + } | |
| 49 | + } | |
| 21 | 50 | \ No newline at end of file |
app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/dialogoLogin.kt
| ... | ... | @@ -1,71 +0,0 @@ |
| 1 | -package com.focasoftware.deboinventariov20.ui.dialogos | |
| 2 | - | |
| 3 | -import android.app.AlertDialog | |
| 4 | -import android.app.Dialog | |
| 5 | -import android.content.Context | |
| 6 | -import android.content.DialogInterface | |
| 7 | -import android.content.SharedPreferences | |
| 8 | -import android.os.Bundle | |
| 9 | -import androidx.fragment.app.DialogFragment | |
| 10 | -import com.focasoftware.deboinventariov20.R | |
| 11 | - | |
| 12 | -class dialogoLogin() : DialogFragment() { | |
| 13 | - private lateinit var sharedPreferences: SharedPreferences | |
| 14 | - interface OnContinueCancelClickListener { | |
| 15 | - fun onPositiveClick() | |
| 16 | - fun onCancelClick() | |
| 17 | - } | |
| 18 | -// interface onDialogPositiveClick { | |
| 19 | -// abstract fun onDialogPositiveClick() | |
| 20 | -// | |
| 21 | -//// fun onDialogNegativeClick(dialog: DialogFragment) | |
| 22 | -// } | |
| 23 | - // var mDialogSelectorCallback: dialogoLogin.onDialogPositiveClick? = null | |
| 24 | - fun newInstance(s: String): dialogoLogin? { | |
| 25 | - val dialog = dialogoLogin() | |
| 26 | - | |
| 27 | - val args = Bundle() | |
| 28 | - args.putString("title", s) | |
| 29 | - dialog.arguments = args | |
| 30 | - | |
| 31 | - return dialog | |
| 32 | - } | |
| 33 | - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | |
| 34 | - return activity?.let { | |
| 35 | - val builder = AlertDialog.Builder(it) | |
| 36 | -// val args = requireArguments() | |
| 37 | -// val title = args.getString("title") | |
| 38 | - val inflater = requireActivity().layoutInflater; | |
| 39 | - | |
| 40 | - builder.setView(inflater.inflate(R.layout.login_dialog, null)) | |
| 41 | - .setTitle("El producto ya fue escaneado") | |
| 42 | -// .setMessage("La cantidad cargada es $title") | |
| 43 | - .setPositiveButton(android.R.string.ok) { _, _ -> | |
| 44 | - val listener = activity as OnContinueCancelClickListener? | |
| 45 | - listener!!.onPositiveClick() | |
| 46 | - } | |
| 47 | - .setNegativeButton(android.R.string.cancel) { _, _ -> | |
| 48 | - val listener = activity as OnContinueCancelClickListener? | |
| 49 | - listener!!.onCancelClick() | |
| 50 | - } | |
| 51 | -// builder.setPositiveButton(android.R.string.ok) { _, _ -> | |
| 52 | -// mDialogSelectorCallback!!.onDialogPositiveClick() | |
| 53 | -// } | |
| 54 | -// .setPositiveButton(R.string.btnOk, | |
| 55 | -// DialogInterface.OnClickListener { dialog, id -> | |
| 56 | -// mDialogSelectorCallback!!.onDialogPositiveClick() | |
| 57 | -// sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE) | |
| 58 | -// val editor = sharedPreferences.edit() | |
| 59 | -// editor?.putString("cantArtIng", R.id.username.toString()) | |
| 60 | -//// editor?.putString("TitArtIng", "") | |
| 61 | -// editor?.apply() | |
| 62 | -// editor.commit() | |
| 63 | -// }) | |
| 64 | -// .setNegativeButton(R.string.btnCancela, | |
| 65 | -// DialogInterface.OnClickListener { dialog, id -> | |
| 66 | -// getDialog()!!.cancel() | |
| 67 | -// }) | |
| 68 | - builder.create() | |
| 69 | - } ?: throw IllegalStateException("Activity cannot be null") | |
| 70 | - } | |
| 71 | -} | |
| 72 | 0 | \ No newline at end of file |
app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/InventarioFragment.kt
| ... | ... | @@ -7,7 +7,6 @@ import android.graphics.Canvas |
| 7 | 7 | import android.graphics.Color |
| 8 | 8 | import android.graphics.drawable.Drawable |
| 9 | 9 | import android.os.Bundle |
| 10 | -import android.text.InputType | |
| 11 | 10 | import android.view.KeyEvent |
| 12 | 11 | import android.view.LayoutInflater |
| 13 | 12 | import android.view.View |
| ... | ... | @@ -25,14 +24,15 @@ import androidx.recyclerview.widget.ItemTouchHelper |
| 25 | 24 | import androidx.recyclerview.widget.LinearLayoutManager |
| 26 | 25 | import androidx.recyclerview.widget.RecyclerView |
| 27 | 26 | import com.afollestad.materialdialogs.MaterialDialog |
| 28 | -import com.afollestad.materialdialogs.input.input | |
| 29 | 27 | import com.focasoftware.deboinventariov20.DB.DataBase.AppDb |
| 30 | 28 | import com.focasoftware.deboinventariov20.Model.Articles |
| 31 | 29 | import com.focasoftware.deboinventariov20.Model.InvBody |
| 32 | 30 | import com.focasoftware.deboinventariov20.Model.InvHead |
| 33 | 31 | import com.focasoftware.deboinventariov20.R |
| 34 | 32 | import kotlinx.android.synthetic.main.fragment_inventario.* |
| 33 | +import kotlinx.android.synthetic.main.ingresar_cantidad.view.* | |
| 35 | 34 | import kotlinx.android.synthetic.main.login_dialog.view.* |
| 35 | +import kotlinx.android.synthetic.main.login_dialog.view.btnAceptar | |
| 36 | 36 | import kotlinx.coroutines.* |
| 37 | 37 | import java.time.LocalDateTime |
| 38 | 38 | import java.time.format.DateTimeFormatter |
| ... | ... | @@ -124,17 +124,21 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 124 | 124 | mDialogView.tvCantInicial.text = listArticulos[indiceDelArtEncontrado].cantTomada.toString() |
| 125 | 125 | val mAlertDialog = mBuilder.show() |
| 126 | 126 | mDialogView.rbSumar.setOnClickListener { |
| 127 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 128 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 127 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 128 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 129 | + } | |
| 129 | 130 | } |
| 130 | 131 | mDialogView.rbRestar.setOnClickListener { |
| 131 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 132 | - if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 133 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 132 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 133 | + if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 134 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 135 | + } | |
| 134 | 136 | } |
| 135 | 137 | } |
| 136 | 138 | mDialogView.rbMdodificar.setOnClickListener { |
| 137 | - mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 139 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 140 | + mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 141 | + } | |
| 138 | 142 | } |
| 139 | 143 | mDialogView.btnAceptar.setOnClickListener { |
| 140 | 144 | mAlertDialog.dismiss() |
| ... | ... | @@ -226,17 +230,21 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 226 | 230 | mDialogView.tvCantInicial.text = listArticulos[indiceDelArtEncontrado].cantTomada.toString() |
| 227 | 231 | val mAlertDialog = mBuilder.show() |
| 228 | 232 | mDialogView.rbSumar.setOnClickListener { |
| 229 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 230 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 233 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 234 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 235 | + } | |
| 231 | 236 | } |
| 232 | 237 | mDialogView.rbRestar.setOnClickListener { |
| 233 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 234 | - if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 235 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 238 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 239 | + if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 240 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 241 | + } | |
| 236 | 242 | } |
| 237 | 243 | } |
| 238 | 244 | mDialogView.rbMdodificar.setOnClickListener { |
| 239 | - mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 245 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 246 | + mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 247 | + } | |
| 240 | 248 | } |
| 241 | 249 | mDialogView.btnAceptar.setOnClickListener { |
| 242 | 250 | mAlertDialog.dismiss() |
| ... | ... | @@ -385,7 +393,9 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 385 | 393 | invbody[i].codOrigen, |
| 386 | 394 | invbody[i].precio, |
| 387 | 395 | invbody[i].costo, |
| 388 | - "","","", | |
| 396 | + "", | |
| 397 | + "", | |
| 398 | + "", | |
| 389 | 399 | invbody[i].balanza, |
| 390 | 400 | invbody[i].depSn, |
| 391 | 401 | invbody[i].costo) |
| ... | ... | @@ -411,7 +421,10 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 411 | 421 | artAcargar[0].codBar, |
| 412 | 422 | artAcargar[0].codOrigen, |
| 413 | 423 | artAcargar[0].precio, |
| 414 | - artAcargar[0].costo,"","","", | |
| 424 | + artAcargar[0].costo, | |
| 425 | + "", | |
| 426 | + "", | |
| 427 | + "", | |
| 415 | 428 | artAcargar[0].balanza, |
| 416 | 429 | artAcargar[0].depSn, |
| 417 | 430 | "") |
| ... | ... | @@ -482,27 +495,17 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 482 | 495 | cargarRecicler(artAcargar, fCant) |
| 483 | 496 | } else {//SI NO ESTA +1 PREGUNTA CANTIDAD |
| 484 | 497 | |
| 485 | - val type = InputType.TYPE_CLASS_PHONE | |
| 486 | - MaterialDialog(requireContext()).show { | |
| 487 | - | |
| 488 | - title(text = "Producto: ${artAcargar.descripcion.toString()}") | |
| 489 | - message(text = "Ingrese la cantidad") | |
| 490 | - input(waitForPositiveButton = false, hint = "99.99", inputType = type) { materialDialog, charSequence -> | |
| 491 | -// val inputField = materialDialog.getInputField() | |
| 492 | -// val isValid = charSequence.isEmpty() | |
| 493 | -// | |
| 494 | -// inputField.error = if (isValid) null else "El campo no puede quedar vacio" | |
| 495 | -// materialDialog.setActionButtonEnabled(WhichButton.POSITIVE, isValid) | |
| 496 | - fCant = 0F | |
| 497 | - fCant = charSequence.toString().toFloat() | |
| 498 | - } | |
| 499 | - positiveButton(R.string.btnOk) { | |
| 500 | - dismiss() | |
| 501 | - cargarArtEnBd(artAcargar, fCant) | |
| 502 | - cargarRecicler(artAcargar, fCant) | |
| 503 | - | |
| 504 | - } | |
| 505 | - }.cancelOnTouchOutside(false).cornerRadius(10F) | |
| 498 | + val mDialogView = LayoutInflater.from(context).inflate(R.layout.ingresar_cantidad, null) | |
| 499 | + val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setCancelable(false) | |
| 500 | + mDialogView.tvTitulo.text="Producto '${artAcargar.descripcion.toString()}'." | |
| 501 | + val mAlertDialog = mBuilder.show() | |
| 502 | + mDialogView.btnAceptar.setOnClickListener { | |
| 503 | + mAlertDialog.dismiss() | |
| 504 | + fCant = 0F | |
| 505 | + fCant = mDialogView.etCantidad.text.toString().toFloat() | |
| 506 | + cargarArtEnBd(artAcargar, fCant) | |
| 507 | + cargarRecicler(artAcargar, fCant) | |
| 508 | + } | |
| 506 | 509 | } |
| 507 | 510 | } else {// TODO si no lo encuentra en la BD |
| 508 | 511 | |
| ... | ... | @@ -535,12 +538,13 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 535 | 538 | |
| 536 | 539 | suspend fun borrarArticulo(sector: String, codigo: String, inventario: String): Int? { |
| 537 | 540 | //TODO BUSQUEDA POR DESCRIPCION |
| 538 | - var result:Int | |
| 541 | + var result: Int | |
| 539 | 542 | return GlobalScope.async(Dispatchers.IO) { |
| 540 | - result = AppDb.getAppDb(requireContext())!!.InvBodyDAO()!!.deleteItemFromInvBody(sector, codigo,inventario) | |
| 543 | + result = AppDb.getAppDb(requireContext())!!.InvBodyDAO()!!.deleteItemFromInvBody(sector, codigo, inventario) | |
| 541 | 544 | return@async result |
| 542 | 545 | }.await() |
| 543 | 546 | } |
| 547 | + | |
| 544 | 548 | private fun buscoArtEnRv(codigoBarras: String, sTipoBusqueda: Int): Int { |
| 545 | 549 | var indice = 0 |
| 546 | 550 | var bEncontrado = false |
| ... | ... | @@ -595,7 +599,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 595 | 599 | val item = ItemsRecycler(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar, articulos.codOrigen) |
| 596 | 600 | listArticulos.add(item) |
| 597 | 601 | |
| 598 | - viewAdapter = ProductosListAdapter(requireContext(),listArticulos, this) | |
| 602 | + viewAdapter = ProductosListAdapter(requireContext(), listArticulos, this) | |
| 599 | 603 | viewManager = LinearLayoutManager(requireContext()) |
| 600 | 604 | deleteIcon = ContextCompat.getDrawable(requireContext(), R.drawable.borrar)!! |
| 601 | 605 | rcInventarios.apply { |
| ... | ... | @@ -699,22 +703,25 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
| 699 | 703 | override fun onImagePenClick(sector: String?, codigo: String?, cantidad: String?, position: String) { |
| 700 | 704 | |
| 701 | 705 | val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null) |
| 702 | - val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Producto '${listArticulos[position.toInt()].descripcion}', se encuentra cargado.") | |
| 703 | - .setCancelable(false) | |
| 706 | + val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Producto '${listArticulos[position.toInt()].descripcion}'.").setCancelable(false) | |
| 704 | 707 | mDialogView.tvCantInicial.text = cantidad |
| 705 | 708 | val mAlertDialog = mBuilder.show() |
| 706 | 709 | mDialogView.rbSumar.setOnClickListener { |
| 707 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 708 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 710 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 711 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 712 | + } | |
| 709 | 713 | } |
| 710 | 714 | mDialogView.rbRestar.setOnClickListener { |
| 711 | - if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) mDialogView.tvNuevaCantidad.setText("0") | |
| 712 | - if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 713 | - mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 715 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 716 | + if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) { | |
| 717 | + mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 718 | + } | |
| 714 | 719 | } |
| 715 | 720 | } |
| 716 | 721 | mDialogView.rbMdodificar.setOnClickListener { |
| 717 | - mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 722 | + if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) { | |
| 723 | + mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString() | |
| 724 | + } | |
| 718 | 725 | } |
| 719 | 726 | mDialogView.btnAceptar.setOnClickListener { |
| 720 | 727 | mAlertDialog.dismiss() |