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

Se quitan llamadas a itemGetAvailable por itemCard.

This commit is contained in:
Sergio De la torre 2021-10-29 10:55:20 +02:00
parent eea838f05a
commit def4d7e09e
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
) )
} }
fun itemGetAvailable( /* fun itemGetAvailable(
usuario: String, usuario: String,
password: String, password: String,
itemFk: String, itemFk: String,
@ -231,7 +231,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
"application/json", "application/json",
params params
) )
} }*/
fun collectionAddItem( fun collectionAddItem(
usuario: String, usuario: String,

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

@ -256,6 +256,7 @@ interface VerdnaturaService {
): ):
Call<String> Call<String>
/*sergio:modificada en el caso de que quiera utilizarse por item_Card
@POST("almacennew/itemGetAvailable")//REVISADA @POST("almacennew/itemGetAvailable")//REVISADA
fun itemGetAvailable( fun itemGetAvailable(
@Header("aplicacion") aplicacion: String, @Header("aplicacion") aplicacion: String,
@ -265,7 +266,7 @@ interface VerdnaturaService {
@Header("Content-Type") content_type: String, @Header("Content-Type") content_type: String,
@Body params: List<String> @Body params: List<String>
): ):
Call<ItemVO> Call<ItemVO>*/
@POST("almacennew/collectionAddItem")//REVISADA @POST("almacennew/collectionAddItem")//REVISADA
fun collectionAddItem( fun collectionAddItem(

12
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -200,9 +200,9 @@ class CollectionFragment(
override fun onOptionsItemSelected(item: Drawable) { override fun onOptionsItemSelected(item: Drawable) {
if (item == iconPrint) { if (item == iconPrint) {
print() print()
} else if (item == iconSearch) { }/* else if (item == iconSearch) {
showDisponibility() showDisponibility()
} else if (item == iconAdd) { } */else if (item == iconAdd) {
addItem() addItem()
} else if (item == iconFace) { } else if (item == iconFace) {
showUser() showUser()
@ -324,7 +324,7 @@ class CollectionFragment(
responseNew.observe(viewLifecycleOwner, Observer { responseNew.observe(viewLifecycleOwner, Observer {
if (splash_progress != null) splash_progress.visibility = View.GONE if (splash_progress != null) splash_progress.visibility = View.GONE
if (!goBack) { // if (!goBack) {
if (it.isError) { if (it.isError) {
customDialog.setTitle("Disponibilidad").setDescription(it.errorMessage) customDialog.setTitle("Disponibilidad").setDescription(it.errorMessage)
.setKoButton("Cerrar") { .setKoButton("Cerrar") {
@ -343,7 +343,7 @@ class CollectionFragment(
// //Log.i("VERDNATURA:","La collection es ${collection.collectionFk}") // //Log.i("VERDNATURA:","La collection es ${collection.collectionFk}")
} }
} // }
goBack = false goBack = false
@ -1252,7 +1252,7 @@ class CollectionFragment(
} }
private fun showDisponibility() { /* private fun showDisponibility() {
customDialogInput.setTitle(getString(R.string.Verdisponible)) customDialogInput.setTitle(getString(R.string.Verdisponible))
.setDescription(getString(R.string.Escaneaetiqueta)) .setDescription(getString(R.string.Escaneaetiqueta))
@ -1304,7 +1304,7 @@ class CollectionFragment(
} }
false false
} }
} }*/
private fun toastDisponibility(item: ItemVO) { private fun toastDisponibility(item: ItemVO) {
if (item.available.isNullOrEmpty()) { if (item.available.isNullOrEmpty()) {

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

@ -279,7 +279,7 @@ class CollectionViewModel(context: Context) : BaseViewModel()
}) })
} }
fun itemGetAvailable(usuario: String, password: String, itemFk: String, warehouseFk: String,callFunction:String) /* fun itemGetAvailable(usuario: String, password: String, itemFk: String, warehouseFk: String,callFunction:String)
{ {
getSacadorControladorUserCase.itemGetAvailable(usuario, password, itemFk, warehouseFk) getSacadorControladorUserCase.itemGetAvailable(usuario, password, itemFk, warehouseFk)
.enqueue(object : Callback<ItemVO> .enqueue(object : Callback<ItemVO>
@ -306,7 +306,7 @@ class CollectionViewModel(context: Context) : BaseViewModel()
} }
} }
}) })
} }*/
fun collectionAddItem( fun collectionAddItem(
usuario: String, usuario: String,
@ -336,7 +336,18 @@ class CollectionViewModel(context: Context) : BaseViewModel()
override fun onResponse(call: Call<String>, response: Response<String>) override fun onResponse(call: Call<String>, response: Response<String>)
{ {
if (response.body() == null)
if (!response.isSuccessful){
_responseNew.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(callFunction,response.message()))
}else{
_responseNew.value =
ResponseItemVO(isError = false, response = response.body()!!)
}
/* if (response.body() == null)
{ {
_responseNew.value = ResponseItemVO( _responseNew.value = ResponseItemVO(
isError = true, isError = true,
@ -346,7 +357,7 @@ class CollectionViewModel(context: Context) : BaseViewModel()
{ {
_responseNew.value = _responseNew.value =
ResponseItemVO(isError = false, response = response.body()!!) ResponseItemVO(isError = false, response = response.body()!!)
} }*/
} }
}) })
} }