verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

release version

This commit is contained in:
Enrique Blasco 2020-05-14 02:58:48 +02:00
parent 7d3da7c5b4
commit d4819c4e08
24 changed files with 154 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

5
app/build.gradle
View File

@ -29,6 +29,11 @@ android {
enabled = true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {

BIN
app/release/newapp.apk Normal file
View File

Binary file not shown.

1
app/release/output.json Normal file
View File

@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"5.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

12
app/src/main/AndroidManifest.xml
View File

@ -13,11 +13,17 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".presentation.view.feature.imageview.activity.ImageViewActivity"/>
<activity android:name=".presentation.view.feature.imageview.activity.ImageViewActivity" android:configChanges="orientation"
android:screenOrientation="portrait"/>
<activity
android:name=".presentation.view.feature.main.activity.MainActivity"
android:windowSoftInputMode="stateHidden" />
<activity android:name=".presentation.view.feature.login.activity.LoginActivity">
android:windowSoftInputMode="stateHidden"
android:configChanges="orientation"
android:screenOrientation="portrait"/>
<activity
android:name=".presentation.view.feature.login.activity.LoginActivity"
android:configChanges="orientation"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
app/src/main/java/es/verdnatura/domain/ApiUtils.kt
View File

@ -8,8 +8,8 @@ import java.util.concurrent.TimeUnit
class ApiUtils {
companion object {
const val BASE_URL:String = "http://192.168.1.108:8000/"
//const val BASE_URL:String = "https://app.verdnatura.es/"
//const val BASE_URL:String = "http://192.168.1.108:8000/"
const val BASE_URL:String = "https://app.verdnatura.es/"
fun getApiService():VerdnaturaService{
val retrofit = Retrofit.Builder()
.baseUrl(BASE_URL)

3
app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt
View File

@ -1,10 +1,7 @@
package es.verdnatura.domain
import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
import retrofit2.Call
import java.util.*
import kotlin.collections.ArrayList
class GetUbicadorUserCase : RestClient() {

44
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -28,7 +28,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/version")
@POST("almacennew/version")
fun version(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -39,7 +39,7 @@ interface VerdnaturaService {
//AJUSTES ========================================================================>
@POST("almacenv2/sector_get")
@POST("almacennew/sector_get")
fun getSectors(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -51,7 +51,7 @@ interface VerdnaturaService {
//PASILLEROS ========================================================================>
//CONSULTAR ARTICULO ========================================================================>
@POST("almacenv2/item_card")
@POST("almacennew/item_card")
fun getItemCard(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -60,7 +60,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<ItemCardVO>
@POST("almacenv2/item_Stock_Update")
@POST("almacennew/item_Stock_Update")
fun itemStockUpdate(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -69,7 +69,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/item_placement_save")
@POST("almacennew/item_placement_save")
fun itemPlacementSave(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -78,7 +78,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/buy_updateGrouping")
@POST("almacennew/buy_updateGrouping")
fun updateGrouping(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -87,7 +87,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/buy_updatePacking")
@POST("almacennew/buy_updatePacking")
fun updatePacking(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -96,7 +96,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/itemSaveMin")
@POST("almacennew/itemSaveMin")
fun itemSaveMin(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -106,7 +106,7 @@ interface VerdnaturaService {
Call<String>
@POST("almacenv2/barcodes_edit")
@POST("almacennew/barcodes_edit")
fun barcodes_edit(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -116,7 +116,7 @@ interface VerdnaturaService {
Call<String>
//BUSCAR ITEM ========================================================================>
@POST("almacenv2/getItemUbication")
@POST("almacennew/getItemUbication")
fun searchItemsUbicador(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -126,7 +126,7 @@ interface VerdnaturaService {
Call<List<ItemLocationVO>>
//INVENTARIO ========================================================================>
@POST("almacenv2/itemShelvingRadar")
@POST("almacennew/itemShelvingRadar")
fun itemShelvingRadar(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -135,7 +135,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<List<ItemInventaryVO>>
@POST("almacenv2/faultsReview")
@POST("almacennew/faultsReview")
fun faultsReview(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -144,7 +144,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<List<ItemFaltasVO>>
@POST("almacenv2/faultsReview_isChecked")
@POST("almacennew/faultsReview_isChecked")
fun faultsReview_isChecked(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -154,7 +154,7 @@ interface VerdnaturaService {
Call<String>
//SHELVING PARKING ========================================================================>
@POST("almacenv2/shelvingParking_get")
@POST("almacennew/shelvingParking_get")
fun shelvingParking_get(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -164,7 +164,7 @@ interface VerdnaturaService {
Call<List<ItemShelvingParkingVO>>
//UBICADOR ========================================================================>
@POST("almacenv2/itemShelvingList")
@POST("almacennew/itemShelvingList")
fun itemShelvingList(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -173,7 +173,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<List<ItemUbicadorVO>>
@POST("almacenv2/itemShelvingMake")
@POST("almacennew/itemShelvingMake")
fun itemShelvingMake(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -182,7 +182,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/itemShelvingMake_multi")
@POST("almacennew/itemShelvingMake_multi")
fun itemShelvingMake_multi(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -191,7 +191,7 @@ interface VerdnaturaService {
@Body params: List<Any>):
Call<String>
@POST("almacenv2/shelvingPark")
@POST("almacennew/shelvingPark")
fun shelvingPark(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -200,7 +200,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/shelvingChange")
@POST("almacennew/shelvingChange")
fun shelvingChange(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -209,7 +209,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/clearShelvingList")
@POST("almacennew/clearShelvingList")
fun clearShelvingList(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -218,7 +218,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/itemShelvingTransfer")
@POST("almacennew/itemShelvingTransfer")
fun itemShelvingTransfer(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@ -227,7 +227,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<String>
@POST("almacenv2/itemShelvingDelete")
@POST("almacennew/itemShelvingDelete")
fun itemShelvingDelete(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,

1
app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
View File

@ -23,6 +23,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
protected val SECTORDESCRIP = "sectordescrip"
protected val SECTORFK = "sectorFk"
protected val WAREHOUSEFK = "warehouseFk"
protected val RECORDAR = "recordar"
protected val viewModel: V by viewModel(viewModelClass)
protected lateinit var binding: T

1
app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
View File

@ -8,7 +8,6 @@ import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
interface OnOptionsSelectedListener {

19
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
View File

@ -4,6 +4,7 @@ package es.verdnatura.presentation.view.feature.articulo.fragment
import android.content.Intent
import android.content.SharedPreferences
import android.graphics.drawable.Drawable
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
@ -13,6 +14,7 @@ import es.verdnatura.databinding.FragmentItemCardBinding
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnBarcodeRowClickListener
import es.verdnatura.presentation.common.OnItemCardRowClickListener
import es.verdnatura.presentation.common.OnOptionsSelectedListener
import es.verdnatura.presentation.common.loadUrl
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.component.CustomDialogInput
@ -24,6 +26,7 @@ import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
import es.verdnatura.presentation.view.feature.imageview.activity.ImageViewActivity
import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_item_card.*
@ -65,9 +68,25 @@ class ItemCardFragment(
if (!itemFk.isNullOrEmpty()){
getItemCard(itemFk)
}
setToolBar()
super.init()
}
private fun setToolBar(){
val listIcons:ArrayList<Drawable> = ArrayList()
val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme())
listIcons.add(iconReload)
toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener {
override fun onOptionsItemSelected(item: Drawable) {
if (item == iconReload){
splash_progress.visibility = View.VISIBLE
getItemCard(itemFk)
}
}
})
toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
private fun setEvents(){
edit_itemFk.requestFocus()

1
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt
View File

@ -4,7 +4,6 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.databinding.ItemLocationRowBinding
import es.verdnatura.presentation.common.OnLocationRowClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO

2
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
View File

@ -10,11 +10,9 @@ import es.verdnatura.R
import es.verdnatura.databinding.FragmentBuscarItemBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnLocationRowClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter
import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_buscar_item.*

42
app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt
View File

@ -3,17 +3,16 @@ package es.verdnatura.presentation.view.feature.faltas.fragment
import android.content.Context
import android.content.SharedPreferences
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentFaltasBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnFaltasNichoClickListener
import es.verdnatura.presentation.common.OnFaltasReviewClickListener
import es.verdnatura.presentation.common.OnOptionsSelectedListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.component.CustomDialog
@ -21,7 +20,6 @@ import es.verdnatura.presentation.view.component.CustomDialogInput
import es.verdnatura.presentation.view.feature.faltas.adapter.FaltasAdapter
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_faltas.*
@ -39,6 +37,8 @@ class FaltasFragment : BaseFragment<FragmentFaltasBinding, FaltasViewModel>(Falt
private var listInvetoryAux:ArrayList<ItemFaltasVO> = ArrayList()
private lateinit var customDialog: CustomDialog
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var reload = false
private var hideLoad = true
companion object {
fun newInstance() = FaltasFragment()
@ -51,20 +51,31 @@ class FaltasFragment : BaseFragment<FragmentFaltasBinding, FaltasViewModel>(Falt
override fun getLayoutId(): Int = R.layout.fragment_faltas
override fun init() {
splash_progress.visibility = View.VISIBLE
activity!!.main_bottom_navigation.visibility = View.GONE
toolbar_title.text = "faultsReview"
setToolBar()
override fun onCreate(savedInstanceState: Bundle?) {
val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0)
user = prefs.getString(USER,"").toString()
password = prefs.getString(PASSWORD,"").toString()
sectorFk = prefs.getInt(SECTORFK,1).toString()
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
viewModel.getFaltas(user,password,warehouseFk)
super.onCreate(savedInstanceState)
}
override fun init() {
splash_progress.visibility = View.VISIBLE
activity!!.main_bottom_navigation.visibility = View.GONE
toolbar_title.text = "faultsReview"
setToolBar()
customDialogInput = CustomDialogInput(requireContext())
customDialog = CustomDialog(requireContext())
setEvents()
if (reload){
reload = false
hideLoad = false
splash_progress.visibility = View.VISIBLE
viewModel.getFaltas(user,password,warehouseFk)
}
super.init()
}
@ -117,10 +128,12 @@ class FaltasFragment : BaseFragment<FragmentFaltasBinding, FaltasViewModel>(Falt
override fun observeViewModel() {
with(viewModel){
loadFaltasList.observe(viewLifecycleOwner, Observer { event ->
event.getContentIfNotHandled().notNull {
splash_progress.visibility = View.GONE
faltasList.observe(viewLifecycleOwner, Observer {
if (hideLoad){
splash_progress.visibility = View.GONE
}else{
hideLoad = true
}
listInvetory = ArrayList()
listInvetoryAux = ArrayList()
it.list.forEach {
@ -163,7 +176,7 @@ class FaltasFragment : BaseFragment<FragmentFaltasBinding, FaltasViewModel>(Falt
},pasillerosItemClickListener!!)
location_recyclerview.adapter = adapter
location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
}
})
@ -198,6 +211,9 @@ class FaltasFragment : BaseFragment<FragmentFaltasBinding, FaltasViewModel>(Falt
}
listInvetoryAux.removeAt(position)
adapter?.notifyDataSetChanged()
reload = true
}

37
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
View File

@ -3,13 +3,13 @@ package es.verdnatura.presentation.view.feature.inventario.fragment
import android.content.Context
import android.content.SharedPreferences
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentInventaryBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnInvetoryNichoClickListener
import es.verdnatura.presentation.common.OnOptionsSelectedListener
@ -38,6 +38,8 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
private var listInvetoryAux:ArrayList<ItemInventaryVO> = ArrayList()
private lateinit var customDialog: CustomDialog
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var reload = false
private var hideLoad = true
companion object {
fun newInstance() = InventaryFragment()
@ -50,23 +52,31 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
super.onAttach(context)
}
override fun init() {
override fun onCreate(savedInstanceState: Bundle?) {
val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0)
user = prefs.getString(USER,"").toString()
password = prefs.getString(PASSWORD,"").toString()
sectorFk = prefs.getInt(SECTORFK,1).toString()
warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString()
viewModel.getInventory(user,password,sectorFk)
super.onCreate(savedInstanceState)
}
override fun init() {
customDialogInput = CustomDialogInput(requireContext())
customDialog = CustomDialog(requireContext())
activity!!.main_bottom_navigation.visibility = View.GONE
splash_progress.visibility = View.VISIBLE
toolbar_title.text = "itemShelvingRadar"
setToolBar()
setEvents()
if (reload){
reload = false
splash_progress.visibility = View.VISIBLE
hideLoad = false
viewModel.getInventory(user,password,sectorFk)
}
super.init()
}
@ -119,12 +129,19 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
}
}
override fun observeViewModel() {
with(viewModel){
loadInventaryList.observe(viewLifecycleOwner, Observer { event ->
event.getContentIfNotHandled().notNull {
splash_progress.visibility = View.GONE
inventaryList.observe(viewLifecycleOwner, Observer {
if (hideLoad){
splash_progress.visibility = View.GONE
}else{
hideLoad = true
}
listInvetory = ArrayList()
listInvetoryAux = ArrayList()
it.list.forEach {
@ -163,7 +180,8 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
},onPasillerosItemClickListener = pasillerosItemClickListener!!)
location_recyclerview.adapter = adapter
location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
}
})
@ -198,6 +216,9 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
}
listInvetoryAux.removeAt(position)
adapter?.notifyDataSetChanged()
reload = true
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
View File

@ -20,7 +20,6 @@ class InventaryViewModel : BaseViewModel() {
private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase()
private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase()
private val _inventaryList by lazy { MutableLiveData<InventaryListVO>() }
val inventaryList: LiveData<InventaryListVO>
get() = _inventaryList
@ -52,6 +51,7 @@ class InventaryViewModel : BaseViewModel() {
val listError:ArrayList<ItemInventaryVO> = ArrayList()
listError.add(ItemInventaryVO(isError = true,errorMessage = "Error en la llamada de itemShelvingRadar"))
_inventaryList.value = InventaryListVO(listError)
}
}

39
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -30,15 +30,25 @@ class LoginFragment : BaseFragment<FragmentLoginBinding,LoginViewModel> (LoginVi
splash_progress.visibility = View.VISIBLE
viewModel.login(edittext_username.text.toString(),edittext_password.text.toString())
})
textview_remember_password.setOnClickListener {
edittext_username.setText("")
edittext_password.setText("")
switch_remember.isChecked = false
saveRemember(false)
}
}
private fun checkUser(){
val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0)
edittext_username.setText(prefs.getString(USER,""))
edittext_password.setText(prefs.getString(PASSWORD,""))
if (edittext_password.text.toString().isNotEmpty()){
switch_remember.isChecked = true
if (prefs.getBoolean(RECORDAR,false)){
edittext_username.setText(prefs.getString(USER,""))
edittext_password.setText(prefs.getString(PASSWORD,""))
if (edittext_password.text.toString().isNotEmpty()){
switch_remember.isChecked = true
}
}
}
override fun observeViewModel() {
@ -53,10 +63,12 @@ class LoginFragment : BaseFragment<FragmentLoginBinding,LoginViewModel> (LoginVi
splash_progress.visibility = View.VISIBLE
saveUserFkPref(it)
if (switch_remember.isChecked) {
saveUserAccesPref(edittext_username.text.toString(),edittext_password.text.toString())
saveRemember(true)
}else{
saveUserAccesPref("","")
saveRemember(false)
}
saveUserAccesPref(edittext_username.text.toString(),edittext_password.text.toString())
loginSalix(user = edittext_username.text.toString(),password = edittext_password.text.toString())
}
@ -78,7 +90,13 @@ class LoginFragment : BaseFragment<FragmentLoginBinding,LoginViewModel> (LoginVi
version.observe(viewLifecycleOwner, Observer {
splash_progress.visibility = View.INVISIBLE
if (it){
goToMain()
customDialog.setTitle("Atención").setDescription("La aplicación se encuentra en fase de desarrollo. Algunas funcionalidades están desactivadas y se van a ir añadiendo de forma progresiva.").setOkButton("Entrar"){
goToMain()
customDialog.hide()
}.setKoButton("Cancelar"){
customDialog.hide()
}.show()
}else{
customDialog.setTitle("Error").setDescription("Existe una versión nueva, es recomendable actualizar.").setOkButton("Actualizar"){
val openURL = Intent(Intent.ACTION_VIEW)
@ -116,6 +134,13 @@ class LoginFragment : BaseFragment<FragmentLoginBinding,LoginViewModel> (LoginVi
editor.apply()
}
private fun saveRemember(remember:Boolean){
val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0)
val editor = prefs.edit()
editor.putBoolean(RECORDAR,remember)
editor.apply()
}
private fun goToMain(){
val intent = Intent(activity,MainActivity::class.java)
startActivity(intent)

4
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -116,11 +116,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() , OnPasillerosItemClick
true
}
"Sacadores" -> {
selectedItemMenu.title.toast(this@MainActivity)
"Función Sacadores desactivada".toast(this@MainActivity)
true
}
"Controladores" -> {
selectedItemMenu.title.toast(this@MainActivity)
"Función Controladores desactivada".toast(this@MainActivity)
true
}
"Ajustes" -> {

3
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt
View File

@ -4,11 +4,8 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.databinding.ItemEscanerRowBinding
import es.verdnatura.databinding.ItemUbicationRowBinding
import es.verdnatura.presentation.common.OnAutomaticItemClickListener
import es.verdnatura.presentation.common.loadUrl
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
class AutomaticAdapter (
private val items: List<ItemEscanerVO>,

3
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
View File

@ -4,15 +4,12 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R
import es.verdnatura.databinding.ItemShelvingparkingRowBinding
import es.verdnatura.databinding.ItemUbicationRowBinding
import es.verdnatura.presentation.common.OnMoreClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.OnVisibleClickListener
import es.verdnatura.presentation.common.loadUrl
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.shelvingparking.adapter.ShelvingParkingAdapter
import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
class UbicadorAdapter (

5
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
View File

@ -7,7 +7,6 @@ import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentAutomaticAddItemBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnAutomaticItemClickListener
import es.verdnatura.presentation.view.component.CustomDialog
@ -15,13 +14,9 @@ import es.verdnatura.presentation.view.component.CustomDialogInput
import es.verdnatura.presentation.view.component.CustomDialogUbicador
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapter
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_automatic_add_item.*
import kotlinx.android.synthetic.main.fragment_automatic_add_item.edit_matricula
import kotlinx.android.synthetic.main.fragment_automatic_add_item.splash_progress
import kotlinx.android.synthetic.main.fragment_ubicador.*
import kotlinx.android.synthetic.main.toolbar.*
class AutomaticAddItemFragment(

1
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -1,6 +1,5 @@
package es.verdnatura.presentation.view.feature.ubicador.fragment
import android.app.Activity
import android.content.Context
import android.content.SharedPreferences
import android.graphics.drawable.Drawable

4
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
View File

@ -3,14 +3,10 @@ package es.verdnatura.presentation.view.feature.ubicador.fragment
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
import androidx.lifecycle.ViewModel
import es.verdnatura.domain.GetShelvingParkingUserCase
import es.verdnatura.domain.GetUbicadorUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.common.Event
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingListVO
import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorListVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
import retrofit2.Call

2
app/src/main/res/layout/fragment_login.xml
View File

@ -141,7 +141,7 @@
android:layout_marginEnd="16dp"
android:paddingStart="@dimen/layout_margin_3"
android:paddingEnd="@dimen/layout_margin_3"
android:text="¿No recuerdas tu contraseña? Contacta con informática"
android:text="Borrar datos de acceso"
android:textAllCaps="false"
android:textColor="@color/verdnatura_white"
android:textStyle="normal"