From be3b7b8379eb7270ca91858b56670bab94d91506 Mon Sep 17 00:00:00 2001 From: Mauricio Sanchez Date: Mon, 21 Sep 2020 09:34:34 -0300 Subject: [PATCH] 21092020 0900 --- .idea/codeStyles/Project.xml | 3 + .idea/codeStyles/codeStyleConfig.xml | 1 - .../deboinventariov20/DB/DAO/ArticulosDAO.kt | 21 +- .../deboinventariov20/UI/SplashActivity.kt | 2 +- .../deboinventariov20/UI/Utils/Utils.kt | 72 ++++-- .../actualizacionMaestros/ActuaMaestrosFragment.kt | 74 +----- .../UI/configuracion/ConfiguracionFragment.kt | 177 +++++++------- .../UI/descripCorigenFragment/CodigoOriFragment.kt | 121 ++++++---- .../UI/descripcionFragment/DescripcionFragment.kt | 176 ++++++++------ .../UI/inventario/InventarioFragment.kt | 70 ++++-- .../UI/main/InventarioListAdapter.kt | 37 +-- .../deboinventariov20/UI/main/MainFragment.kt | 40 +++- app/src/main/res/drawable/logo_splash.jpeg | Bin 0 -> 14670 bytes app/src/main/res/drawable/suitedebo.png | Bin 6899 -> 0 bytes .../main/res/layout-land/fragment_servidores.xml | 26 +-- app/src/main/res/layout/activity_splash.xml | 31 +-- .../main/res/layout/fragment_actua_maestros.xml | 15 +- app/src/main/res/layout/fragment_configuracion.xml | 4 +- app/src/main/res/layout/fragment_detalle_art.xml | 258 +++++++++++---------- app/src/main/res/layout/fragment_servidores.xml | 26 +-- app/src/main/res/layout/ingresar_cantidad.xml | 1 + app/src/main/res/layout/item_codigo_origen.xml | 2 +- app/src/main/res/layout/item_descripcion.xml | 2 +- app/src/main/res/layout/login_dialog.xml | 41 +++- app/src/main/res/navigation/mobile_navigation.xml | 10 +- 25 files changed, 646 insertions(+), 564 deletions(-) create mode 100644 app/src/main/res/drawable/logo_splash.jpeg delete mode 100644 app/src/main/res/drawable/suitedebo.png diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3cc336b..f165935 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -133,6 +133,9 @@ \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 6e6eec1..79ee123 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,6 +1,5 @@ \ No newline at end of file diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt index 10b7c39..4fb2f9c 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt @@ -51,19 +51,19 @@ interface InvHeadDAO { suspend fun deleteAllArticulos() @Query("DELETE FROM $TABLA_INV_H WHERE INV_NUM=:inven") - suspend fun deleteinvHead(inven: Int) + suspend fun deleteinvHead(inven: Long) @Query("SELECT * FROM $TABLA_INV_H ORDER BY INV_FEI") suspend fun fetchAllInvHead(): List @Query("SELECT INV_LUG FROM $TABLA_INV_H WHERE INV_NUM=:inven") - suspend fun fetchAreaInvH (inven: Int): Boolean + suspend fun fetchAreaInvH (inven: Long): Boolean @Query("SELECT INV_PRODCONT FROM $TABLA_INV_H WHERE INV_NUM=:inven") - suspend fun consultaCantidadInvH (inven: Int): Int + suspend fun consultaCantidadInvH (inven: Long): Int @Query("UPDATE $TABLA_INV_H SET INV_PRODCONT=:cant WHERE INV_NUM=:inven") - suspend fun updateInvBody(inven: Int,cant: Int) + suspend fun updateInvBody(inven: Long,cant: Int) } @Dao @@ -75,19 +75,19 @@ interface InvBodyDAO { suspend fun deleteAllInvBody() @Query("DELETE FROM $TABLA_INV_B WHERE INV_NUM =:inven") - suspend fun deleteInvBody(inven: Int) + suspend fun deleteInvBody(inven: Long) @Query("UPDATE $TABLA_INV_B SET CANT=:cant WHERE SEC=:sec AND COD=:cod") - suspend fun UpdateInvBody(cant: Float, sec: String, cod: String) + suspend fun UpdateInvBody(cant: Float, sec: Long, cod: Long) @Query("SELECT * FROM $TABLA_INV_B WHERE INV_NUM =:inven ORDER BY INV_FEI DESC") suspend fun fetchAllInvBody(inven: Int): List @Query("SELECT * FROM $TABLA_INV_B WHERE INV_NUM =:numInventario AND SEC=:sector AND COD=:codigo") - suspend fun fetchArtInInvBody(sector: String, codigo: String, numInventario: String): InvBody + suspend fun fetchArtInInvBody(sector: Long, codigo: Long, numInventario: Long): InvBody @Query("DELETE FROM $TABLA_INV_B WHERE INV_NUM =:numInventario AND SEC=:sector AND COD=:codigo") - suspend fun deleteItemFromInvBody(sector: String, codigo: String, numInventario: String): Int + suspend fun deleteItemFromInvBody(sector: Long, codigo: Long, numInventario: Long): Int } @Dao @@ -111,5 +111,8 @@ interface ServeInvDao { suspend fun UpdateServerPre(numero: Int) @Query("SELECT * FROM $TABLA_SERV_INV WHERE SER_PRE= 1") - suspend fun fetchServerPreOne(): ServeInv + suspend fun fetchServerPreOne(): ServeInv + + @Query("SELECT * FROM $TABLA_SERV_INV WHERE SER_NUM = :numero") + suspend fun fetchServer(numero: Int): ServeInv } \ No newline at end of file diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt index 6f9eca6..ab7f7fa 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt @@ -15,7 +15,7 @@ class SplashActivity : Activity() { val bac = object : Thread(){ override fun run(){ try { - Thread.sleep(5) + Thread.sleep(3000) val intent = Intent(baseContext, MainActivity:: class.java) startActivity(intent) finish() diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt index fe393bd..0e7d08d 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt @@ -12,14 +12,17 @@ import kotlinx.coroutines.async import java.io.IOException import java.net.UnknownHostException -fun modificarCantidadEnCabecera(inventarioActual: Int, b: Boolean,context: Context) { +fun modificarCantidadEnCabecera(inventarioActual: Int, b: Boolean, context: Context) { GlobalScope.async(Dispatchers.IO) { var cantProductos = 0 - cantProductos = AppDb.getAppDb(context)!!.InvHeadDAO()!!.consultaCantidadInvH(inventarioActual) + cantProductos = + AppDb.getAppDb(context)!!.InvHeadDAO()!!.consultaCantidadInvH(inventarioActual.toLong()) if (b) { - AppDb.getAppDb(context)!!.InvHeadDAO()!!.updateInvBody(inventarioActual, cantProductos + 1) + AppDb.getAppDb(context)!!.InvHeadDAO()!! + .updateInvBody(inventarioActual.toLong(), cantProductos + 1) } else { - AppDb.getAppDb(context)!!.InvHeadDAO()!!.updateInvBody(inventarioActual, cantProductos - 1) + AppDb.getAppDb(context)!!.InvHeadDAO()!! + .updateInvBody(inventarioActual.toLong(), cantProductos - 1) } } } @@ -48,38 +51,37 @@ open class AlertDialogBorrarInv : DialogFragment() { return builder.create() } ?: throw IllegalStateException("Activity cannot be null") } - public fun Int.twoDigits() = - if (this <= 9) "0$this" else this.toString()} +} -public class NoEncontradoSimple : DialogFragment() { +class NoEncontradoSimple : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return activity?.let { val title = "" val content = "¡El producto buscado NO fue encontrado!" val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) - builder.setTitle(title).setMessage(content).setPositiveButton(android.R.string.ok) { _, _ -> - //Todo OK click + builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> } + return builder.create() + } ?: throw IllegalStateException("Activity cannot be null") + } +} + +class noServerConf : DialogFragment() { + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + return activity?.let { + val title = "" + val content = "¡Antes de importar debe configurar un servidor!" + val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> + activity?.onBackPressed() } return builder.create() } ?: throw IllegalStateException("Activity cannot be null") } } - public class noServerConf : DialogFragment() { - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - return activity?.let { - val title = "" - val content = "¡Antes de importar debe configurar un servidor!" - val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) - builder.setTitle(title).setMessage(content) - .setPositiveButton(android.R.string.ok) { _, _ -> - activity?.onBackPressed(); - } - return builder.create() - } ?: throw IllegalStateException("Activity cannot be null") - } -} fun isConnectedToThisServer(host: String): Boolean { val runtime = Runtime.getRuntime() @@ -98,3 +100,27 @@ fun isConnectedToThisServer(host: String): Boolean { return false } +class serverValido : DialogFragment() { + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + return activity?.let { + val title = "" + val content = "¡La IP del servidor es correcta!" + val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> } + return builder.create() + } ?: throw IllegalStateException("Activity cannot be null") + } +} +class serverNoValido : DialogFragment() { + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + return activity?.let { + val title = "" + val content = "¡La IP del servidor es Incorrecta! Verfique en la carga de Servidores." + val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> } + return builder.create() + } ?: throw IllegalStateException("Activity cannot be null") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt index d58c07a..67cb475 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt @@ -24,6 +24,7 @@ class ActuaMaestrosFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + GlobalScope.launch(Main) { val serverPre = fetchServerPreOne() if (serverPre!!.direccion.isNullOrEmpty()) { @@ -31,8 +32,10 @@ class ActuaMaestrosFragment : Fragment() { modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") } else { BASE_URL = serverPre.direccion.toString()+":"+serverPre.puerto.toString()+"/" + tvServerConectado.text="Conectado al servidor: ${serverPre.descripcion}" } } + // mostrarArticulos() } @@ -46,9 +49,10 @@ class ActuaMaestrosFragment : Fragment() { // Inflate the layout for this fragment val v = inflater.inflate(R.layout.fragment_actua_maestros, container, false) val bConfirmarAct = v.findViewById