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 8563833..51efcb3 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 @@ -77,7 +77,7 @@ interface ServeInvDao { @Insert(onConflict = OnConflictStrategy.REPLACE) fun insertServer(servidor: ServeInv) - @Query("SELECT * FROM $TABLA_SERV_INV") + @Query("SELECT * FROM $TABLA_SERV_INV ORDER BY SER_NUM") suspend fun fetchAllServers(): List @Query("DELETE FROM $TABLA_SERV_INV WHERE SER_DESC LIKE :description AND SER_DIR LIKE :dir") 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 4df6243..a40aafb 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 @@ -12,6 +12,7 @@ import com.focasoftware.deboinventariov20.Model.Productos import com.focasoftware.deboinventariov20.Model.ProductosService import com.focasoftware.deboinventariov20.Model.ServeInv import com.focasoftware.deboinventariov20.R +import com.google.android.material.bottomappbar.BottomAppBarTopEdgeTreatment import kotlinx.android.synthetic.main.fragment_actua_maestros.* import kotlinx.coroutines.* @@ -23,10 +24,12 @@ class ActuaMaestrosFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - GlobalScope.launch(Dispatchers.Main) { - BASE_URL = fetchServerPre().direccion.toString() - } - mostrarArticulos() +// GlobalScope.launch(Dispatchers.Main) { +// +// BASE_URL = fetchServerPre().direccion.toString() +// } + BASE_URL="http://10.0.2.2:3000/" +// mostrarArticulos() } suspend fun fetchServerPre(): ServeInv { 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 7a04128..f19c3e1 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 @@ -14,7 +14,7 @@ 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 com.focasoftware.deboinventariov20.ui.servidores.SpinnerAdapterServidor import kotlinx.android.synthetic.main.fragment_configuracion.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -25,7 +25,9 @@ class ConfiguracionFragment : Fragment() { lateinit var sharedPreferences: SharedPreferences private lateinit var navController: NavController - private lateinit var listaServers : MutableMap + lateinit var adapterSpinnerServidor: SpinnerAdapterServidor + var itemSelect: Int = 0 + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE) @@ -34,12 +36,11 @@ class ConfiguracionFragment : Fragment() { 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? { - var index=0 - val listServerDescription = arrayListOf() val v = inflater.inflate(R.layout.fragment_configuracion, container, false) val etRuta = v.findViewById(R.id.etRuta) val btnGuardar = v.findViewById