Version 9.6Beta. TEST7
This commit is contained in:
parent
e006efb01a
commit
a23c8d9caf
|
|
@ -44,7 +44,7 @@
|
|||
</shared>
|
||||
</component>
|
||||
<component name="AndroidLogFilters">
|
||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
|
||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
|
||||
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
|
||||
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
|
||||
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
|
||||
|
|
@ -83,22 +83,16 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador.">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -417,13 +411,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00055" summary="Revert "Revert "Version 8.2 Subida de ficheros que no estaban versionados"" This reverts commit 9b8d092d">
|
||||
<created>1651648056868</created>
|
||||
<option name="number" value="00055" />
|
||||
<option name="presentableId" value="LOCAL-00055" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1651648056868</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00056" summary="Version 8.2 Subida de ficheros que no estaban versionados">
|
||||
<created>1651648467597</created>
|
||||
<option name="number" value="00056" />
|
||||
|
|
@ -760,7 +747,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1670580001733</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="104" />
|
||||
<task id="LOCAL-00104" summary="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador.">
|
||||
<created>1670915898012</created>
|
||||
<option name="number" value="00104" />
|
||||
<option name="presentableId" value="LOCAL-00104" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1670915898013</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="105" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -862,7 +856,6 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<MESSAGE value="Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString" />
|
||||
<MESSAGE value="Version 9.2Beta-Controlador sin animacion y vuelve al sitio" />
|
||||
<MESSAGE value="Version 9 Arreglado vuelta atrás controlador" />
|
||||
<MESSAGE value="Version 9.2.1 Refactor Inicio" />
|
||||
|
|
@ -887,7 +880,8 @@
|
|||
<MESSAGE value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
|
||||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
|
||||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
|
||||
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
|
|||
|
|
@ -86,22 +86,16 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) {
|
|||
}
|
||||
|
||||
fun itemShelvingMake_multi(
|
||||
usuario: String,
|
||||
password: String,
|
||||
shelving: String,
|
||||
items: List<String>,
|
||||
warehouse: String
|
||||
items: List<Int>,
|
||||
warehouse: Int
|
||||
): Call<Any> {
|
||||
val params: ArrayList<Any> = ArrayList()
|
||||
params.add(shelving)
|
||||
params.add(items)
|
||||
params.add(warehouse)
|
||||
return restClient!!.itemShelvingMake_multi(
|
||||
"json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
|
||||
params
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package es.verdnatura.domain
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import org.json.JSONObject
|
||||
|
|
@ -55,7 +54,7 @@ abstract class SilexCallback<T>(val context: Context) : Callback<T> {
|
|||
}
|
||||
|
||||
open fun onSuccess(response: Response<T>) {
|
||||
(nameofFunction((this))+ context.getString(R.string.operationSuccessful)).toast(context)
|
||||
(nameofFunction((this)) + context.getString(R.string.operationSuccessful)).toast(context)
|
||||
//(context as MobileApplication).playSoundIsOK(true)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -721,11 +721,7 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/itemShelvingMake_multi")//REVISADA
|
||||
fun itemShelvingMake_multi(
|
||||
@Header("aplicacion") aplicacion: String,
|
||||
@Header("version") version: String,
|
||||
@Header("user") user: String,
|
||||
@Header("pass") pass: String,
|
||||
@Header("Content-Type") content_type: String,
|
||||
|
||||
@Body params: List<Any>
|
||||
):
|
||||
Call<Any>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import es.verdnatura.presentation.common.ResponseItemVO
|
|||
import es.verdnatura.presentation.view.feature.ajustes.model.*
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingTypeList
|
||||
import retrofit2.Call
|
||||
import retrofit2.Response
|
||||
|
||||
|
||||
|
|
@ -339,7 +338,6 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
)
|
||||
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -429,30 +427,14 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<String?>,
|
||||
response: Response<String?>
|
||||
) {
|
||||
override fun onSuccess(response: Response<String?>) {
|
||||
|
||||
if (!response.isSuccessful) {
|
||||
_operatorGetItemPackingType.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
_operatorGetItemPackingType.value =
|
||||
ResponseItemVO(
|
||||
if (response.body().toString() == "false") "" else {
|
||||
response.body().toString()
|
||||
}, false
|
||||
)
|
||||
} else {
|
||||
|
||||
_operatorGetItemPackingType.value =
|
||||
ResponseItemVO(
|
||||
if (response.body().toString() == "false") "" else {
|
||||
response.body().toString()
|
||||
}, false
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
})
|
||||
|
|
@ -508,7 +490,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
override fun onSuccess(response: Response<Unit>) {
|
||||
ProgressLoading(GONE)
|
||||
//super.onSuccess(response)
|
||||
super.onSuccess(response)
|
||||
}
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@ class ItemCardFragment(
|
|||
ma.onPasillerosItemClickListener(
|
||||
PasillerosItemVO(
|
||||
title = getString(R.string.titleItemSearch)
|
||||
), itemFk
|
||||
), itemInfoG!!.id.toString()
|
||||
)
|
||||
} else if (item.action == "itemStockUpdateAdd") {
|
||||
customDialogInput.setTitle(item.title!!)
|
||||
|
|
|
|||
|
|
@ -1071,14 +1071,13 @@ class CollectionFragment(
|
|||
|
||||
}, object : OnMistakeClickListener {
|
||||
override fun onMistakeClickListener(sale: SaleVO) {
|
||||
//if (type != "PRECHECKER") {
|
||||
binding.splashProgress.visibility =
|
||||
VISIBLE
|
||||
//Tarea #4969
|
||||
if (type != "PRECHECKER") {
|
||||
binding.splashProgress.visibility = VISIBLE
|
||||
viewModel.mistakeType()
|
||||
mistakeSale = sale
|
||||
goMistakeBack = false
|
||||
viewModel.mistakeType(
|
||||
)
|
||||
// }
|
||||
}
|
||||
}
|
||||
}, object : onPackingClickListener {
|
||||
override fun onPackingClick(sale: SaleVO) {
|
||||
|
|
|
|||
|
|
@ -87,10 +87,10 @@ class AutomaticAddItemFragment(
|
|||
}
|
||||
|
||||
binding.buttonFinalizar.setOnClickListener {
|
||||
val listString: ArrayList<String> = ArrayList()
|
||||
val listString: ArrayList<Int> = ArrayList()
|
||||
val listInt: ArrayList<Int> = ArrayList()
|
||||
listItems.forEach {
|
||||
//listString.add(it.item)
|
||||
listString.add(it.item)
|
||||
listInt.add(it.item)
|
||||
}
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
|
|
@ -104,18 +104,16 @@ class AutomaticAddItemFragment(
|
|||
getDataInt(WAREHOUSEFK)
|
||||
)
|
||||
} else {
|
||||
viewModel.itemShelving_addList(
|
||||
/* viewModel.itemShelving_addList(
|
||||
shelvingFk,
|
||||
"" + listInt + "",
|
||||
FALSE,
|
||||
getDataInt(WAREHOUSEFK))
|
||||
/* viewModel.itemShelvingMake_multi(
|
||||
getData(USER),
|
||||
getData(PASSWORD),
|
||||
getDataInt(WAREHOUSEFK))*/
|
||||
viewModel.itemShelvingMake_multi(
|
||||
shelvingFk,
|
||||
listString,
|
||||
getData(WAREHOUSEFK)
|
||||
)*/
|
||||
getDataInt(WAREHOUSEFK)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,13 +22,11 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
|
||||
fun itemShelvingMake_multi(
|
||||
usuario: String,
|
||||
password: String,
|
||||
shelving: String,
|
||||
items: List<String>,
|
||||
warehouse: String
|
||||
items: List<Int>,
|
||||
warehouse: Int
|
||||
) {
|
||||
getUbicadorUserCase.itemShelvingMake_multi(usuario, password, shelving, items, warehouse)
|
||||
getUbicadorUserCase.itemShelvingMake_multi(shelving, items, warehouse)
|
||||
.enqueue(object :
|
||||
Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue