From 7483a587d551113ac6342b2e7b461d48da2b717f Mon Sep 17 00:00:00 2001
From: Mauricio Sanchez <msanchez@focasoftware.com>
Date: Tue, 1 Sep 2020 16:59:44 -0300
Subject: [PATCH] 01092020 1658

---
 .../deboinventariov20/DB/DAO/ArticulosDAO.kt       |  3 ++
 .../deboinventariov20/Model/ProductosService.kt    |  5 +-
 .../actualizacionMaestros/ActuaMaestrosFragment.kt | 18 ++++++-
 .../ui/configuracion/ConfiguracionFragment.kt      | 63 +++++++++++++---------
 .../ui/detalleProducto/DetalleArtFragment.kt       |  2 -
 .../ui/servidores/ServidoresFragment.kt            |  1 -
 app/src/main/res/layout/fragment_configuracion.xml |  8 +--
 app/src/main/res/navigation/mobile_navigation.xml  |  3 ++
 8 files changed, 68 insertions(+), 35 deletions(-)

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 49bd990..8563833 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
@@ -91,4 +91,7 @@ interface ServeInvDao {
 
     @Query("UPDATE $TABLA_SERV_INV SET SER_PRE=1 WHERE SER_DESC LIKE :description AND SER_DIR LIKE :dir")
     suspend fun UpdateServerPre(description: String, dir: String)
+
+    @Query("SELECT * FROM $TABLA_SERV_INV WHERE SER_PRE =:sOne")
+    suspend fun fetchServerPreOne(sOne: String): ServeInv
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt b/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt
index 70212b5..96d26ae 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt
@@ -1,11 +1,12 @@
 package com.focasoftware.deboinventariov20.Model
 
+import com.focasoftware.deboinventariov20.ui.actualizacionMaestros.BASE_URL
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 object ProductosService {
-    private val BASE_URL ="http://10.0.2.2:3000/"
-        //"http://192.168.0.2:3000/"
+//    private val BASE_URL ="http://10.0.2.2:3000/"
+//    //        //"http://192.168.0.2:3000/"
 
 
     fun getProductosService(): ProductosApi {
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 bd24c5d..4df6243 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
@@ -10,10 +10,12 @@ import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
 import com.focasoftware.deboinventariov20.Model.Articles
 import com.focasoftware.deboinventariov20.Model.Productos
 import com.focasoftware.deboinventariov20.Model.ProductosService
+import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
 import kotlinx.android.synthetic.main.fragment_actua_maestros.*
 import kotlinx.coroutines.*
 
+var BASE_URL =""
 class ActuaMaestrosFragment : Fragment() {
 
     var job: Job? = null
@@ -21,11 +23,23 @@ class ActuaMaestrosFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        GlobalScope.launch(Dispatchers.Main) {
+            BASE_URL = fetchServerPre().direccion.toString()
+        }
+        mostrarArticulos()
+    }
 
-
-        //mostrarArticulos()
+    suspend fun fetchServerPre(): ServeInv {
+        var busqueda: ServeInv
+        return GlobalScope.async(Dispatchers.IO) {
+            busqueda = AppDb.getAppDb(requireContext())!!.ServeInvDao()!!.fetchServerPreOne("1")
+            return@async busqueda
+        }.await()
     }
 
+//       return "http://10.0.2.2:3000/"
+//    }
+
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
index 05b7475..7a04128 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
@@ -8,10 +8,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.fragment.app.Fragment
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
 import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
 import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
+import com.focasoftware.deboinventariov20.ui.servidores.ItemsServidores
 import kotlinx.android.synthetic.main.fragment_configuracion.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -21,15 +24,23 @@ import kotlinx.coroutines.launch
 class ConfiguracionFragment : Fragment() {
 
     lateinit var sharedPreferences: SharedPreferences
-
+    private lateinit var navController: NavController
+    private lateinit var listaServers : MutableMap<Int,String>
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        navController = Navigation.findNavController(view)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val v = inflater.inflate(R.layout.fragment_configuracion, container, false)
 
+        var index=0
+        val listServerDescription = arrayListOf<String>()
+        val v = inflater.inflate(R.layout.fragment_configuracion, container, false)
         val etRuta = v.findViewById<EditText>(R.id.etRuta)
         val btnGuardar = v.findViewById<Button>(R.id.btnGuardar)
         val rbProInclu = v.findViewById<RadioButton>(R.id.rbProInclu)
@@ -47,17 +58,16 @@ class ConfiguracionFragment : Fragment() {
         val spServidor = v.findViewById<Spinner>(R.id.spServidor)
         val btnValidarServidor = v.findViewById<Button>(R.id.btnValidarServidor)
 
-        if (sharedPreferences.contains("etRuta")) etRuta.setText(sharedPreferences.getString("etRuta", "").toString())
-
-        if (sharedPreferences.contains("rbProInclu")) {
-            if (sharedPreferences.getString("rbProInclu", "").toString() == "0") {
-                rbProInclu.isChecked = false
-                rbProNoInclu.isChecked = true
-            } else if (sharedPreferences.getString("rbProInclu", "").toString() == "1") {
-                rbProInclu.isChecked = true
-                rbProNoInclu.isChecked = false
-            }
-        } else (sharedPreferences.getString("rbProInclu", "").toString() == "")
+        if (sharedPreferences.contains("etRuta"))
+            if (sharedPreferences.contains("rbProInclu")) {
+                if (sharedPreferences.getString("rbProInclu", "").toString() == "0") {
+                    rbProInclu.isChecked = false
+                    rbProNoInclu.isChecked = true
+                } else if (sharedPreferences.getString("rbProInclu", "").toString() == "1") {
+                    rbProInclu.isChecked = true
+                    rbProNoInclu.isChecked = false
+                }
+            } else (sharedPreferences.getString("rbProInclu", "").toString() == "")
 
         if (sharedPreferences.contains("rbProNoInclu")) {
             if (sharedPreferences.getString("rbProNoInclu", "").toString() == "0") {
@@ -69,7 +79,6 @@ class ConfiguracionFragment : Fragment() {
             }
         } else (sharedPreferences.getString("rbProNoInclu", "").toString() == "")
 
-
         if (sharedPreferences.contains("cbHabiLectura")) {
             if (sharedPreferences.getString("cbHabiLectura", "").toString() == "0") {
                 cbHabiLectura.isChecked = false
@@ -78,7 +87,6 @@ class ConfiguracionFragment : Fragment() {
             }
         } else (sharedPreferences.getString("cbHabiLectura", "").toString() == "")
 
-
         if (sharedPreferences.contains("cbMostrarStock")) {
             if (sharedPreferences.getString("cbMostrarStock", "").toString() == "0") {
                 cbMostrarStock.isChecked = false
@@ -87,7 +95,6 @@ class ConfiguracionFragment : Fragment() {
             }
         } else (sharedPreferences.getString("cbMostrarStock", "").toString() == "")
 
-
         if (sharedPreferences.contains("rbVentas")) {
             if (sharedPreferences.getString("rbVentas", "").toString() == "0") {
                 rbVentas.isChecked = false
@@ -127,6 +134,7 @@ class ConfiguracionFragment : Fragment() {
                 rbCodigoOrigen.isChecked = true
             }
         } else (sharedPreferences.getString("rbCodigoOrigen", "").toString() == "")
+
         if (sharedPreferences.contains("rbCodigoBarras")) {
             if (sharedPreferences.getString("rbCodigoBarras", "").toString() == "0") {
                 rbCodigoBarras.isChecked = false
@@ -135,7 +143,6 @@ class ConfiguracionFragment : Fragment() {
             }
         } else (sharedPreferences.getString("rbCodigoBarras", "").toString() == "")
 
-
         if (sharedPreferences.contains("cbMostrarExistencia")) {
             if (sharedPreferences.getString("cbMostrarExistencia", "").toString() == "0") {
                 cbMostrarExistencia.isChecked = false
@@ -144,7 +151,6 @@ class ConfiguracionFragment : Fragment() {
             }
         } else (sharedPreferences.getString("cbMostrarExistencia", "").toString() == "")
 
-
         if (sharedPreferences.contains("cbMostrarPrecio")) {
             if (sharedPreferences.getString("cbMostrarPrecio", "").toString() == "0") {
                 cbMostrarPrecio.isChecked = false
@@ -156,21 +162,31 @@ class ConfiguracionFragment : Fragment() {
         btnGuardar.setOnClickListener {
             guardarPreferencias()
             Toast.makeText(v.context, "Los Datos se guardaron correctamente", Toast.LENGTH_LONG).show()
+            navController.navigate(R.id.action_configuracionFragment_to_mainFragment2)
         }
         btnAgregarServidor.setOnClickListener { findNavController().navigate(R.id.servidoresFragment) }
+        btnValidarServidor.setOnClickListener { Toast.makeText(requireContext(), "Dirección correcta", Toast.LENGTH_LONG).show() }
 
         GlobalScope.launch(Dispatchers.Main) {
-            val listServerDescription = arrayListOf<String>()
+
             for (any in getDescServers()) {
                 listServerDescription.add(any.descripcion.toString())
+                listaServers[index]=(any.direccion.toString())
+                index+=index
             }
+
             if (spServidor != null) {
                 val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, listServerDescription)
                 spServidor.adapter = adapter
             }
         }
-        btnValidarServidor.setOnClickListener {
-            Toast.makeText(requireContext(), "Dirección correcta", Toast.LENGTH_LONG).show()
+        if (sharedPreferences.contains("ServerPredeterminado")) {
+            spServidor.setSelection(sharedPreferences.getString("ServerPredeterminado", "").toString().toInt())
+
+        } else (spServidor.setSelection(2))
+
+        spServidor.setOnItemClickListener { adapterView, view, i, l ->
+
         }
         return v
     }
@@ -199,15 +215,14 @@ class ConfiguracionFragment : Fragment() {
             if (rbCodigoBarras.isChecked) editor?.putString("rbCodigoBarras", "1") else editor?.putString("rbCodigoBarras", "0")
             if (cbMostrarExistencia.isChecked) editor?.putString("cbMostrarExistencia", "1") else editor?.putString("cbMostrarExistencia", "0")
             if (cbMostrarPrecio.isChecked) editor?.putString("cbMostrarPrecio", "1") else editor?.putString("cbMostrarPrecio", "0")
+            editor?.putString("ServerPredeterminado", spServidor.selectedItemId.toString())
 
             editor?.apply()
             editor.commit()
-            GlobalScope.launch(Dispatchers.Main) {
 
-
-            }
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/detalleProducto/DetalleArtFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/detalleProducto/DetalleArtFragment.kt
index a4dc963..4c43487 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/detalleProducto/DetalleArtFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/detalleProducto/DetalleArtFragment.kt
@@ -17,10 +17,8 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 
-
 class DetalleArtFragment : Fragment() {
 
-    private lateinit var navController: NavController
     private var Inventario: Int = 0
     private var sector: String? = null
     private var codigo: String? = null
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
index 1f105f4..bd507da 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
@@ -75,7 +75,6 @@ class ServidoresFragment : Fragment() {
     }
 
     suspend fun buscarEnBD(): List<ServeInv> {
-        //TODO BUSQUEDA POR DESCRIPCION
         var busqueda: List<ServeInv>
         return GlobalScope.async(Dispatchers.IO) {
             busqueda = AppDb.getAppDb(requireContext())!!.ServeInvDao()!!.fetchAllServers()
diff --git a/app/src/main/res/layout/fragment_configuracion.xml b/app/src/main/res/layout/fragment_configuracion.xml
index 1637020..0030e84 100644
--- a/app/src/main/res/layout/fragment_configuracion.xml
+++ b/app/src/main/res/layout/fragment_configuracion.xml
@@ -52,16 +52,16 @@
         android:fadeScrollbars="true"
         android:foregroundTint="@android:color/holo_orange_dark"
         android:soundEffectsEnabled="true"
-        android:spinnerMode="dialog"
-        android:splitMotionEvents="false"
-        android:textAlignment="center"
+        android:spinnerMode="dropdown"
+
+        android:splitMotionEvents="true"
+        android:textAlignment="textStart"
         android:textSize="@dimen/NormalText"
         app:layout_constraintBottom_toTopOf="@+id/btnAgregarServidor"
         app:layout_constraintEnd_toStartOf="@+id/btnValidarServidor"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvSeleccioneServidor"
-        android:entries="@array/spinnerServidor"
         android:prompt="@string/leyendaSpinner"/>
 
     <Button
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 4cb76b9..420214f 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -91,6 +91,9 @@
             app:popExitAnim="@anim/slide_out_right"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left" />
+        <action
+            android:id="@+id/action_configuracionFragment_to_mainFragment2"
+            app:destination="@id/mainFragment2" />
     </fragment>
     <fragment
         android:id="@+id/descripcionFragment"
-- 
1.9.1