Version 9.6Beta.Modificadas llamadas y fallo en checkItemScan
This commit is contained in:
parent
a23c8d9caf
commit
6b7b0c907a
|
|
@ -44,8 +44,8 @@
|
|||
</shared>
|
||||
</component>
|
||||
<component name="AndroidLogFilters">
|
||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
|
||||
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
|
||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
|
||||
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
|
||||
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
|
||||
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
|
||||
</component>
|
||||
|
|
@ -83,16 +83,30 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador.">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta. TEST7">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/domain/GetItemCardUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.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/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.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/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" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.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/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -189,7 +203,7 @@
|
|||
</option>
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="test" />
|
||||
<entry key="$PROJECT_DIR$" value="test_4744" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
|
|
@ -411,13 +425,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</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" />
|
||||
<option name="presentableId" value="LOCAL-00056" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1651648467597</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00057" summary="Version 8.3 Diseño grafico, llamadas a Salix y return "Finish"">
|
||||
<created>1652788345754</created>
|
||||
<option name="number" value="00057" />
|
||||
|
|
@ -754,7 +761,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1670915898013</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="105" />
|
||||
<task id="LOCAL-00105" summary="Version 9.6Beta. TEST7">
|
||||
<created>1670944142191</created>
|
||||
<option name="number" value="00105" />
|
||||
<option name="presentableId" value="LOCAL-00105" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1670944142191</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="106" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -796,7 +810,7 @@
|
|||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="test_4744" />
|
||||
<option value="test_4897" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
@ -856,7 +870,6 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<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" />
|
||||
<MESSAGE value="Version 9.2.1 Refactor Inicio, pintar a través del rgb, modificado diseño,se añade shelvingLog y muestra colección a través de ticket" />
|
||||
|
|
@ -881,36 +894,37 @@
|
|||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
|
||||
<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." />
|
||||
<MESSAGE value="Version 9.6Beta. TEST7" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta. TEST7" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt</url>
|
||||
<line>62</line>
|
||||
<option name="timeStamp" value="3" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt</url>
|
||||
<line>347</line>
|
||||
<line>351</line>
|
||||
<option name="timeStamp" value="10" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt</url>
|
||||
<line>697</line>
|
||||
<line>694</line>
|
||||
<option name="timeStamp" value="13" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt</url>
|
||||
<line>698</line>
|
||||
<line>695</line>
|
||||
<option name="timeStamp" value="14" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt</url>
|
||||
<line>702</line>
|
||||
<line>699</line>
|
||||
<option name="timeStamp" value="15" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt</url>
|
||||
<line>34</line>
|
||||
<option name="timeStamp" value="17" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<pin-to-top-manager>
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
params.add(itemFk)
|
||||
params.add(warehouseFk)
|
||||
return restClient!!.getItemCard(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -57,12 +57,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
fun getItemPackingType(usuario: String, password: String): Call<List<ItemPackingType>> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
return restClient!!.getItemPackingType(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -107,12 +107,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
params.add(value)
|
||||
params.add(warehouseFk)
|
||||
return restClient!!.updateGrouping(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -128,12 +128,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
params.add(value)
|
||||
params.add(warehouseFk)
|
||||
return restClient!!.updatePacking(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -157,12 +157,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
params.add(itemFk)
|
||||
params.add(value)
|
||||
return restClient!!.item_saveStems(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -171,17 +171,17 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
|
|||
password: String,
|
||||
itemFk: Int,
|
||||
value: Int
|
||||
): Call<Unit> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<Int> = ArrayList()
|
||||
params.add(itemFk)
|
||||
params.add(value)
|
||||
return restClient!!.item_saveReference(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
|
|||
password: String,
|
||||
vBufferFk: Int,
|
||||
vType: String
|
||||
): Call<Boolean> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<Any> = ArrayList()
|
||||
params.add(vBufferFk)
|
||||
params.add(vType)
|
||||
return restClient!!.buffer_setTypeByName(
|
||||
"json",
|
||||
/* "json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params = params
|
||||
params = params*/
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
|
|||
password: String,
|
||||
vExpeditionFk: String,
|
||||
vBufferFk: String
|
||||
): Call<String> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(vExpeditionFk)
|
||||
params.add(vBufferFk)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package es.verdnatura.domain
|
|||
import android.content.Context
|
||||
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
|
||||
import retrofit2.Call
|
||||
|
||||
|
|
@ -50,7 +49,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
usuario: String,
|
||||
password: String,
|
||||
collectionFk: String
|
||||
): Call<String> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(collectionFk)
|
||||
return restClient!!.ticket_checkFullyControlled(
|
||||
|
|
@ -67,7 +66,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
usuario: String,
|
||||
password: String,
|
||||
ticketFk: String
|
||||
): Call<Boolean> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(ticketFk)
|
||||
return restClient!!.ticket_isOutClosureZone(
|
||||
|
|
@ -378,7 +377,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
)
|
||||
}
|
||||
|
||||
fun itemShelving_updateFromSale(usuario: String, password: String, saleFk: String): Call<Unit> {
|
||||
fun itemShelving_updateFromSale(usuario: String, password: String, saleFk: String): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(saleFk)
|
||||
return restClient!!.itemShelving_updateFromSale(
|
||||
|
|
@ -394,7 +393,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
fun ticket_setState(
|
||||
ticketFk: Int,
|
||||
state: String
|
||||
): Call<Unit> {
|
||||
): Call<Any> {
|
||||
|
||||
return restClient!!.ticket_setState(
|
||||
ticketFk, state
|
||||
|
|
@ -405,7 +404,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
fun debug_add(
|
||||
buyFk: String,
|
||||
message: String
|
||||
): Call<Unit> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(buyFk)
|
||||
params.add(message)
|
||||
|
|
@ -515,9 +514,9 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
|
|||
)
|
||||
}
|
||||
|
||||
/* fun mistakeType(usuario: String, password: String): Call<List<MistakeTypeVO>> {
|
||||
// val params:ArrayList<String> = ArrayList()
|
||||
return restClient!!.mistakeType("json", "1", usuario, password, "application/json")
|
||||
}*/
|
||||
/* fun mistakeType(usuario: String, password: String): Call<List<MistakeTypeVO>> {
|
||||
// val params:ArrayList<String> = ArrayList()
|
||||
return restClient!!.mistakeType("json", "1", usuario, password, "application/json")
|
||||
}*/
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
|||
usuario: String,
|
||||
password: String,
|
||||
plateNumber: String
|
||||
): Call<Boolean> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(plateNumber)
|
||||
return restClient!!.machineWorker_add(
|
||||
"json",
|
||||
/*"json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
"application/json",*/
|
||||
params
|
||||
)
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
|||
usuario: String,
|
||||
password: String,
|
||||
plateNumber: String
|
||||
): Call<Boolean> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(plateNumber)
|
||||
return restClient!!.machineWorker_update(
|
||||
|
|
@ -63,7 +63,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
|||
*/
|
||||
fun deviceProductionUser_getWorker(
|
||||
android_id: String
|
||||
): Call<String> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(android_id)
|
||||
return restClient!!.deviceProductionUser_getWorker(
|
||||
|
|
@ -73,7 +73,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
|
|||
|
||||
fun deviceProduction_getnameDevice(
|
||||
android_id: String
|
||||
): Call<String> {
|
||||
): Call<Any> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(android_id)
|
||||
return restClient!!.deviceProduction_getnameDevice(
|
||||
|
|
|
|||
|
|
@ -258,25 +258,15 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/ticket_checkFullyControlled")//NO SALIX
|
||||
fun ticket_checkFullyControlled(
|
||||
@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<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/ticket_isOutClosureZone")//NO SALIX
|
||||
fun ticket_isOutClosureZone(
|
||||
@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<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Boolean>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/collection_getUncheckedTicket")//NO SALIX
|
||||
fun collection_getUncheckedTicket(
|
||||
|
|
@ -413,19 +403,19 @@ interface VerdnaturaService {
|
|||
fun itemShelving_updateFromSale(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Unit>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/ticket_setState")//REVISADA
|
||||
fun ticket_setState(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Unit>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/debug_add")//REVISADA
|
||||
fun debug_add(
|
||||
@Body params: List<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Unit>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/get_salesModifiedFromTicket")//REVISADA
|
||||
fun get_salesModifiedFromTicket(
|
||||
|
|
@ -440,12 +430,7 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/barcodeToItem")//REVISADA
|
||||
fun getIdFromCode(
|
||||
@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<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
|
||||
|
|
@ -516,12 +501,8 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/item_card")//REVISADA
|
||||
fun getItemCard(
|
||||
@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>
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<ItemCardVO>
|
||||
|
||||
|
|
@ -533,12 +514,8 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/get_ItemPackingType")//REVISADA
|
||||
fun getItemPackingType(
|
||||
@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<String>
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<List<ItemPackingType>>
|
||||
|
||||
|
|
@ -552,48 +529,31 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/buy_updateGrouping")//REVISADA
|
||||
fun updateGrouping(
|
||||
@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<Int>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/buy_updatePacking")//REVISADA
|
||||
fun updatePacking(
|
||||
@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>
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
|
||||
|
||||
@POST("almacennew/item_saveStems")//REVISADA
|
||||
fun item_saveStems(
|
||||
@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<Int>
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/item_saveReference")//REVISADA
|
||||
fun item_saveReference(
|
||||
@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<Int>
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Unit>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/barcodes_edit")//REVISADA
|
||||
fun barcodes_edit(
|
||||
|
|
@ -656,13 +616,13 @@ interface VerdnaturaService {
|
|||
fun machineWorker_add(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Boolean>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/machineWorker_update")//REVISADA
|
||||
fun machineWorker_update(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Boolean>
|
||||
Call<Any>
|
||||
|
||||
|
||||
@POST("almacennew/workerMachinery_isRegistered")//REVISADA
|
||||
|
|
@ -672,21 +632,21 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/deviceProduction_getnameDevice")//REVISADA
|
||||
fun deviceProduction_getnameDevice(
|
||||
@Body params: List<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/deviceProductionUser_getWorker")//REVISADA
|
||||
fun deviceProductionUser_getWorker(
|
||||
@Body params: List<String>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
Call<Any>
|
||||
|
||||
|
||||
@POST("almacennew/machine_getWorkerPlate")//REVISADA
|
||||
fun machine_getWorkerPlate(
|
||||
):
|
||||
Call<String>
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/machineWorker_getHistorical")//REVISADA
|
||||
fun machineWorker_getHistorical(
|
||||
|
|
@ -792,14 +752,9 @@ interface VerdnaturaService {
|
|||
|
||||
@POST("almacennew/buffer_setTypeByName")//REVISADA
|
||||
fun buffer_setTypeByName(
|
||||
@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>
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Boolean>
|
||||
Call<Any>
|
||||
|
||||
// Qr reader ==========================================================================
|
||||
|
||||
|
|
@ -979,7 +934,7 @@ interface VerdnaturaService {
|
|||
fun expeditionLoading_add(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
Call<Any>
|
||||
|
||||
//CALIDAD
|
||||
@POST("almacennew/itemShelvingBuyerGet")//REVISADA
|
||||
|
|
|
|||
|
|
@ -271,7 +271,6 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
override fun onSuccess(response: Response<List<Printers>>) {
|
||||
|
||||
|
||||
if (response.body() != null) {
|
||||
_printerList.value = response.body()?.let { PrintersList(it) }
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.app.AlertDialog
|
|||
import android.content.Intent
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.os.Build
|
||||
import android.util.Log.d
|
||||
import android.view.View
|
||||
import android.view.View.GONE
|
||||
import android.view.inputmethod.EditorInfo
|
||||
|
|
@ -111,7 +112,6 @@ class ItemCardFragment(
|
|||
|
||||
when (item) {
|
||||
iconReload.drawable -> {
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
getItemCard(itemFk)
|
||||
}
|
||||
iconHistory.drawable -> {
|
||||
|
|
@ -185,21 +185,12 @@ class ItemCardFragment(
|
|||
user = getData(USER)
|
||||
password = getData(PASSWORD)
|
||||
warehouseFk = getDataInt(WAREHOUSEFK)
|
||||
|
||||
this.itemFk = itemFk.toString()
|
||||
this.itemFk = itemFk
|
||||
|
||||
binding.splashProgressTwo.visibility = View.VISIBLE
|
||||
viewModel.getItemCard(itemFk, warehouseFk!!, user, password)
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.getItemCard(itemFk, warehouseFk!!)
|
||||
//binding.splashProgress.visibility = View.VISIBLE
|
||||
|
||||
|
||||
var working_in_test = false //sergio:No posar a true fins que Salix puje versió 8.3
|
||||
|
||||
if (working_in_test) {
|
||||
viewModel.getItemPackingTypeSalix()
|
||||
} else {
|
||||
viewModel.getItemPackingType(getData(USER), getData(PASSWORD))
|
||||
}
|
||||
}
|
||||
|
||||
override fun observeViewModel() {
|
||||
|
|
@ -570,28 +561,20 @@ class ItemCardFragment(
|
|||
)*/
|
||||
"updateGrouping" -> viewModel.updateGrouping(
|
||||
itemFk = itemFk.toInt(),
|
||||
user = user,
|
||||
password = password,
|
||||
value = value,
|
||||
warehouseFk = warehouseFk!!
|
||||
)
|
||||
"updatePacking" -> viewModel.updatePacking(
|
||||
itemFk = itemFk.toInt(),
|
||||
user = user,
|
||||
password = password,
|
||||
value = value,
|
||||
warehouseFk = warehouseFk!!
|
||||
)
|
||||
"itemSaveStem" -> viewModel.item_saveStems(
|
||||
itemFk = itemFk.toInt(),
|
||||
user = user,
|
||||
password = password,
|
||||
value = value
|
||||
)
|
||||
"item_saveReference" -> viewModel.item_saveReference(
|
||||
itemFk = itemFk.toInt(),
|
||||
user = user,
|
||||
password = password,
|
||||
value = value
|
||||
)
|
||||
|
||||
|
|
@ -702,6 +685,7 @@ class ItemCardFragment(
|
|||
}
|
||||
|
||||
private fun updateBarcode(code: String, delete: Boolean) {
|
||||
d("VERDNATURA::","El bacode se va actualizar"+code+delete)
|
||||
if (delete) {
|
||||
var i = 0
|
||||
var posDelete = 0
|
||||
|
|
@ -724,10 +708,7 @@ class ItemCardFragment(
|
|||
|
||||
}
|
||||
|
||||
// var working_in_test=false //sergio:Revisar como borrar directamente en Salix o crear proc en back para borrar.
|
||||
|
||||
barcodeAdapter!!.notifyDataSetChanged()
|
||||
|
||||
showProgress()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
package es.verdnatura.presentation.view.feature.articulo.fragment
|
||||
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetItemCardUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.common.itemBarCodeSalix
|
||||
import es.verdnatura.presentation.common.itemPackingTypeSalix
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.*
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingTypeList
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemProposalList
|
||||
import retrofit2.Response
|
||||
|
||||
class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
||||
private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context)
|
||||
class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val _itemcard by lazy { MutableLiveData<ItemCardVO>() }
|
||||
val itemcard: LiveData<ItemCardVO>
|
||||
|
|
@ -40,14 +39,13 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
fun getItemCard(
|
||||
itemFk: String,
|
||||
warehouseFk: Int,
|
||||
user: String,
|
||||
password: String
|
||||
|
||||
) {
|
||||
getItemCardUserCase.getItemCard(user, password, itemFk, warehouseFk)
|
||||
.enqueue(object : Callback<ItemCardVO> {
|
||||
override fun onFailure(call: Call<ItemCardVO>, t: Throwable) {
|
||||
_itemcard.value = ItemCardVO(0,
|
||||
) {
|
||||
silex.getItemCard(itemFk, warehouseFk)
|
||||
.enqueue(object : SilexCallback<ItemCardVO>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_itemcard.value = ItemCardVO(
|
||||
0,
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!),
|
||||
stems = "", itemCost = ""
|
||||
|
|
@ -55,14 +53,13 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<ItemCardVO>, response: Response<ItemCardVO>) {
|
||||
|
||||
|
||||
override fun onSuccess(response: Response<ItemCardVO>) {
|
||||
if (response.body() != null) {
|
||||
|
||||
_itemcard.value = response.body()!!
|
||||
} else {
|
||||
_itemcard.value = ItemCardVO(0,
|
||||
_itemcard.value = ItemCardVO(
|
||||
0,
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
|
|
@ -89,8 +86,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
warehouseFk,
|
||||
vShipped,
|
||||
vIsShowedByType
|
||||
).enqueue(object : Callback<List<ItemProposal>> {
|
||||
override fun onFailure(call: Call<List<ItemProposal>>, t: Throwable) {
|
||||
).enqueue(object : SilexCallback<List<ItemProposal>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<ItemProposal> = ArrayList()
|
||||
listError.add(
|
||||
ItemProposal(
|
||||
|
|
@ -101,10 +98,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
_itemProposallist.value = ItemProposalList(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemProposal>>,
|
||||
response: Response<List<ItemProposal>>
|
||||
) {
|
||||
override fun onSuccess(response: Response<List<ItemProposal>>) {
|
||||
|
||||
if (response.body() != null) {
|
||||
_itemProposallist.value = response.body()?.let {
|
||||
ItemProposalList(it)
|
||||
|
|
@ -130,83 +125,83 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
}
|
||||
|
||||
|
||||
fun getItemPackingType(user: String, password: String) {
|
||||
getItemCardUserCase.getItemPackingType(user, password).enqueue(object :
|
||||
Callback<List<ItemPackingType>> {
|
||||
override fun onFailure(call: Call<List<ItemPackingType>>, t: Throwable) {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
/* fun getItemPackingType() {
|
||||
silex.getItemPackingType().enqueue(object :
|
||||
Callback<List<ItemPackingType>> {
|
||||
override fun onFailure(call: Call<List<ItemPackingType>>, t: Throwable) {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemPackingType>>,
|
||||
response: Response<List<ItemPackingType>>
|
||||
) {
|
||||
if (response.body() != null) {
|
||||
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemPackingType>>,
|
||||
response: Response<List<ItemPackingType>>
|
||||
) {
|
||||
if (response.body() != null) {
|
||||
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
|
||||
|
||||
} else {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
}*/
|
||||
|
||||
fun getItemPackingTypeSalix() {
|
||||
getItemCardUserCase.getItemPackingTypeSalix().enqueue(object :
|
||||
Callback<List<ItemPackingType>> {
|
||||
override fun onFailure(call: Call<List<ItemPackingType>>, t: Throwable) {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
/* fun getItemPackingTypeSalix() {
|
||||
salix.get_ItemPackingType().enqueue(object :
|
||||
Callback<List<ItemPackingType>> {
|
||||
override fun onFailure(call: Call<List<ItemPackingType>>, t: Throwable) {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemPackingType>>,
|
||||
response: Response<List<ItemPackingType>>
|
||||
) {
|
||||
if (response.body() != null) {
|
||||
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemPackingType>>,
|
||||
response: Response<List<ItemPackingType>>
|
||||
) {
|
||||
if (response.body() != null) {
|
||||
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
|
||||
|
||||
} else {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
val listError: ArrayList<ItemPackingType> = ArrayList()
|
||||
listError.add(
|
||||
ItemPackingType(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_itemspackinglist.value = ItemPackingTypeList(listError)
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
}*/
|
||||
|
||||
|
||||
fun itemTrash(
|
||||
|
|
@ -216,101 +211,63 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
isTrash: Boolean
|
||||
) {
|
||||
silex.itemTrash(itemFk, warehouseFk, newValue, isTrash)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
fun updateGrouping(
|
||||
itemFk: Int,
|
||||
user: String,
|
||||
password: String,
|
||||
value: Int,
|
||||
warehouseFk: Int
|
||||
|
||||
) {
|
||||
getItemCardUserCase.updateGrouping(user, password, itemFk, value, warehouseFk)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
silex.updateGrouping(itemFk, value, warehouseFk)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
super.onError(t)
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun updatePacking(
|
||||
itemFk: Int,
|
||||
user: String,
|
||||
password: String,
|
||||
value: Int,
|
||||
warehouseFk: Int
|
||||
|
||||
) {
|
||||
getItemCardUserCase.updatePacking(user, password, itemFk, value, warehouseFk)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
silex.updatePacking(itemFk, value, warehouseFk)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -318,27 +275,17 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) {
|
||||
salix.update_ItemPackingType(itemFk, itemPackingType)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.body()!!.toString())
|
||||
}
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.body()!!.toString())
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -347,69 +294,41 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun item_saveStems(
|
||||
itemFk: Int,
|
||||
user: String,
|
||||
password: String,
|
||||
value: Int
|
||||
|
||||
) {
|
||||
getItemCardUserCase.item_saveStems(user, password, itemFk, value)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
silex.item_saveStems(itemFk, value)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun item_saveReference(
|
||||
itemFk: Int,
|
||||
user: String,
|
||||
password: String,
|
||||
value: Int
|
||||
|
||||
) {
|
||||
getItemCardUserCase.item_saveReference(user, password, itemFk, value)
|
||||
.enqueue(object : Callback<Unit> {
|
||||
override fun onFailure(call: Call<Unit>, t: Throwable) {
|
||||
silex.item_saveReference(itemFk, value)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
|
||||
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value = ResponseItemVO(isError = false)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value = ResponseItemVO(isError = false)
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -420,29 +339,23 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
value: String,
|
||||
delete: Boolean
|
||||
) {
|
||||
silex.barcodes_edit( value,itemFk, delete)
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
silex.barcodes_edit(value, itemFk, delete)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = false,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = false,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -451,29 +364,19 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun barcodesEditSalix(itemFk: Int, barCodeValue: String) {
|
||||
salix.barcodes_edit(
|
||||
itemBarCodeSalix(itemFk, barCodeValue))
|
||||
.enqueue(object : Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
itemBarCodeSalix(itemFk, barCodeValue)
|
||||
)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
if (!response.isSuccessful) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message()!!)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message()!!)
|
||||
}
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import android.view.inputmethod.EditorInfo
|
|||
import androidx.lifecycle.Observer
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentBufferBinding
|
||||
import es.verdnatura.domain.toInt
|
||||
import es.verdnatura.presentation.base.BaseFragment
|
||||
|
||||
class BufferFragment(
|
||||
|
|
@ -52,9 +53,7 @@ class BufferFragment(
|
|||
}
|
||||
|
||||
viewModel.buffer_setTypeByName(
|
||||
getData(USER),
|
||||
getData(PASSWORD),
|
||||
binding.scanInput.text.toString().toInt(),
|
||||
binding.scanInput.toInt(),
|
||||
entryPoint
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,18 +3,16 @@ package es.verdnatura.presentation.view.feature.buffer.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetPaletizadoresUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class BufferFragmentViewModel(context: Context) : BaseViewModel(context) {
|
||||
private val GetPaletizadoresUserCase: GetPaletizadoresUserCase =
|
||||
GetPaletizadoresUserCase(context)
|
||||
class BufferFragmentViewModel(val context: Context) : BaseViewModel(context) {
|
||||
/* private val GetPaletizadoresUserCase: GetPaletizadoresUserCase =
|
||||
GetPaletizadoresUserCase(context)*/
|
||||
|
||||
|
||||
private val _itembuffertype by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
|
|
@ -22,31 +20,23 @@ class BufferFragmentViewModel(context: Context) : BaseViewModel(context) {
|
|||
get() = _itembuffertype
|
||||
|
||||
|
||||
/*private val _bufferresponse by lazy { MutableLiveData<Boolean>() }
|
||||
val bufferresponse: LiveData<Boolean>
|
||||
get() = _bufferresponse*/
|
||||
|
||||
private val _bufferloadresponse by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val bufferloadresponse: LiveData<ResponseItemVO>
|
||||
get() = _bufferloadresponse
|
||||
|
||||
|
||||
|
||||
fun buffer_setTypeByName(user: String, password: String, vBufferFk: Int, vType: String){
|
||||
GetPaletizadoresUserCase.buffer_setTypeByName(user, password, vBufferFk, vType)
|
||||
.enqueue(object : Callback<Boolean> {
|
||||
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
||||
|
||||
|
||||
fun buffer_setTypeByName(vBufferFk: Int, vType: String) {
|
||||
silex.buffer_setTypeByName(vBufferFk, vType)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_itembuffertype.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
|
||||
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Boolean>, response: Response<Boolean>) {
|
||||
//sergio: espera respuesta en el body
|
||||
if (response.body() == true) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
if (response.body() as Boolean) {
|
||||
|
||||
_itembuffertype.value = ResponseItemVO(
|
||||
isError = false,
|
||||
|
|
@ -54,54 +44,40 @@ class BufferFragmentViewModel(context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
|
||||
} else {
|
||||
//_bufferresponse.value = false
|
||||
_itembuffertype.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
|
||||
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun expeditionLoading_add(vExpeditionFk: Int, vBufferFk: Int) {
|
||||
silex.expeditionLoading_add(vExpeditionFk, vBufferFk)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = false,
|
||||
response = response.body().toString()!!
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun expeditionLoading_add(vExpeditionFk:Int, vBufferFk:Int){
|
||||
silex.expeditionLoading_add(vExpeditionFk, vBufferFk).enqueue(object : Callback<String>{
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
|
||||
if (!response.isSuccessful){
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()!!))
|
||||
}else {
|
||||
|
||||
if (response.body()!!.isNullOrEmpty()) {
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage =
|
||||
getMessageFromAllResponse(nameofFunction(this),response.message()!!)
|
||||
)
|
||||
} else {
|
||||
_bufferloadresponse.value = ResponseItemVO(
|
||||
isError = false,
|
||||
response = response.body()!!
|
||||
)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,19 +4,17 @@ import android.content.Context
|
|||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import es.verdnatura.domain.GetBuscarItemUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.Event
|
||||
import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
|
||||
import es.verdnatura.presentation.view.feature.buscaritem.model.LocationListVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class BuscarItemViewModel(context: Context) : BaseViewModel(context) {
|
||||
private val getBuscarItemUserCase: GetBuscarItemUserCase = GetBuscarItemUserCase(context)
|
||||
class BuscarItemViewModel(val context: Context) : BaseViewModel(context) {
|
||||
//private val getBuscarItemUserCase: GetBuscarItemUserCase = GetBuscarItemUserCase(context)
|
||||
|
||||
|
||||
private val _locationList by lazy { MutableLiveData<LocationListVO>() }
|
||||
|
|
@ -27,28 +25,42 @@ class BuscarItemViewModel(context: Context) : BaseViewModel(context) {
|
|||
val loadLocationList = Transformations.map(_locationList) { Event(it) }
|
||||
|
||||
|
||||
fun getLocations(itemFk:Int){
|
||||
silex.searchItemsUbicador(itemFk).enqueue(object : Callback<List<ItemLocationVO>> {
|
||||
override fun onFailure(call: Call<List<ItemLocationVO>>, t: Throwable) {
|
||||
val listError:ArrayList<ItemLocationVO> = ArrayList()
|
||||
listError.add(ItemLocationVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
|
||||
_locationList.value = LocationListVO(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemLocationVO>>,
|
||||
response: Response<List<ItemLocationVO>>
|
||||
) {
|
||||
if (response.body() != null){
|
||||
_locationList.value = response.body()?.let { LocationListVO(it) }
|
||||
}else{
|
||||
val listError:ArrayList<ItemLocationVO> = ArrayList()
|
||||
listError.add(ItemLocationVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())))
|
||||
fun getLocations(itemFk: Int) {
|
||||
silex.searchItemsUbicador(itemFk)
|
||||
.enqueue(object : SilexCallback<List<ItemLocationVO>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<ItemLocationVO> = ArrayList()
|
||||
listError.add(
|
||||
ItemLocationVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
t.message!!
|
||||
)
|
||||
)
|
||||
)
|
||||
_locationList.value = LocationListVO(listError)
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
override fun onSuccess(response: Response<List<ItemLocationVO>>) {
|
||||
if (response.body() != null) {
|
||||
_locationList.value = response.body()?.let { LocationListVO(it) }
|
||||
} else {
|
||||
val listError: ArrayList<ItemLocationVO> = ArrayList()
|
||||
listError.add(
|
||||
ItemLocationVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_locationList.value = LocationListVO(listError)
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,42 +3,51 @@ package es.verdnatura.presentation.view.feature.calidad.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetQualityUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class BuyersViewModel(context: Context) : BaseViewModel(context) {
|
||||
class BuyersViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context)
|
||||
// private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context)
|
||||
|
||||
private val _buyersList by lazy { MutableLiveData<BuyerListVO>() }
|
||||
val buyersList: LiveData<BuyerListVO>
|
||||
get() = _buyersList
|
||||
|
||||
fun itemShelvingBuyerGet(){
|
||||
silex.itemShelvingBuyerGet().enqueue(object :
|
||||
Callback<List<BuyerVO>> {
|
||||
override fun onFailure(call: Call<List<BuyerVO>>, t: Throwable) {
|
||||
val listError:ArrayList<BuyerVO> = ArrayList()
|
||||
listError.add(BuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
|
||||
fun itemShelvingBuyerGet() {
|
||||
silex.itemShelvingBuyerGet().enqueue(object :
|
||||
SilexCallback<List<BuyerVO>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<BuyerVO> = ArrayList()
|
||||
listError.add(
|
||||
BuyerVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_buyersList.value = BuyerListVO(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<BuyerVO>>,
|
||||
response: Response<List<BuyerVO>>
|
||||
) {
|
||||
if (response.body() != null){
|
||||
override fun onSuccess(response: Response<List<BuyerVO>>) {
|
||||
|
||||
if (response.body() != null) {
|
||||
_buyersList.value = response.body()?.let { BuyerListVO(it) }
|
||||
}else{
|
||||
val listError:ArrayList<BuyerVO> = ArrayList()
|
||||
listError.add(BuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),response.message())))
|
||||
} else {
|
||||
val listError: ArrayList<BuyerVO> = ArrayList()
|
||||
listError.add(
|
||||
BuyerVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_buyersList.value = BuyerListVO(listError)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,20 +3,18 @@ package es.verdnatura.presentation.view.feature.calidad.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetQualityUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerListVO
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class QaualityViewModel(context: Context) : BaseViewModel(context) {
|
||||
class QaualityViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context)
|
||||
//private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context)
|
||||
|
||||
private val _buyersList by lazy { MutableLiveData<ItemBuyerListVO>() }
|
||||
val buyersList: LiveData<ItemBuyerListVO>
|
||||
|
|
@ -28,24 +26,35 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) {
|
|||
get() = _response
|
||||
|
||||
|
||||
fun itemShelvingBuyerTask(userFk:String){
|
||||
fun itemShelvingBuyerTask(userFk: String) {
|
||||
silex.itemShelvingBuyerTask(userFk).enqueue(object :
|
||||
Callback<List<ItemBuyerVO>> {
|
||||
override fun onFailure(call: Call<List<ItemBuyerVO>>, t: Throwable) {
|
||||
val listError:ArrayList<ItemBuyerVO> = ArrayList()
|
||||
listError.add(ItemBuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
|
||||
SilexCallback<List<ItemBuyerVO>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<ItemBuyerVO> = ArrayList()
|
||||
listError.add(
|
||||
ItemBuyerVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
)
|
||||
_buyersList.value = ItemBuyerListVO(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemBuyerVO>>,
|
||||
response: Response<List<ItemBuyerVO>>
|
||||
) {
|
||||
if (response.body() != null){
|
||||
override fun onSuccess(response: Response<List<ItemBuyerVO>>) {
|
||||
super.onSuccess(response)
|
||||
if (response.body() != null) {
|
||||
_buyersList.value = response.body()?.let { ItemBuyerListVO(it) }
|
||||
}else{
|
||||
val listError:ArrayList<ItemBuyerVO> = ArrayList()
|
||||
listError.add(ItemBuyerVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())))
|
||||
} else {
|
||||
val listError: ArrayList<ItemBuyerVO> = ArrayList()
|
||||
listError.add(
|
||||
ItemBuyerVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
)
|
||||
_buyersList.value = ItemBuyerListVO(listError)
|
||||
}
|
||||
}
|
||||
|
|
@ -53,19 +62,17 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun itemShelvingStarsUpdate(vId: String,vStars: String) {
|
||||
silex.itemShelvingStarsUpdate(vId,vStars).enqueue(object : Callback<Any>{
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
|
||||
fun itemShelvingStarsUpdate(vId: String, vStars: String) {
|
||||
silex.itemShelvingStarsUpdate(vId, vStars).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Any>, response: Response<Any>) {
|
||||
|
||||
if (!response.isSuccessful){
|
||||
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
|
||||
}else{
|
||||
_response.value = ResponseItemVO(isError = false,response = response.message())
|
||||
}
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value = ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,19 +4,16 @@ package es.verdnatura.presentation.view.feature.claim.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetClaimUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class ClaimViewModel(context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context)
|
||||
class ClaimViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
//private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context)
|
||||
|
||||
private val _responseadd by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val responseadd: LiveData<ResponseItemVO>
|
||||
|
|
@ -24,27 +21,17 @@ class ClaimViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
|
||||
fun itemShelving_addByClaim(claimFK: Int, shelvingFK: String) {
|
||||
silex.itemShelving_addByClaim(claimFK, shelvingFK).enqueue(object : Callback<Void> {
|
||||
override fun onFailure(call: Call<Void>, t: Throwable) {
|
||||
|
||||
_responseadd.value = ResponseItemVO(
|
||||
isError = true, errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this), t.message!!
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Void>, response: Response<Void>) {
|
||||
|
||||
if (!response.isSuccessful) {
|
||||
silex.itemShelving_addByClaim(claimFK, shelvingFK)
|
||||
.enqueue(object : SilexCallback<Void>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseadd.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
isError = true, errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this), t.message!!
|
||||
)
|
||||
)
|
||||
} else {
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Void>) {
|
||||
_responseadd.value = ResponseItemVO(
|
||||
isError = false,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
|
|
@ -52,21 +39,11 @@ class ClaimViewModel(context: Context) : BaseViewModel(context) {
|
|||
response.message()
|
||||
)
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/* fun messageError(message: String,call: String ): ResponseItemVO? {
|
||||
return ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = "Error al llamar a " + call + " . Descripción del error:" + message
|
||||
)
|
||||
}*/
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class SaleAdapter(
|
|||
sale.pickedQuantity = sale.quantity
|
||||
}
|
||||
}
|
||||
d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}")
|
||||
// d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}")
|
||||
|
||||
if (sale.isNew) {
|
||||
layoutError.visibility = View.VISIBLE
|
||||
|
|
|
|||
|
|
@ -587,12 +587,11 @@ class CollectionFragment(
|
|||
} else {
|
||||
var value = customDialogList.getValueTwo()
|
||||
customDialogList.setValueTwo("")
|
||||
|
||||
if (it.response.isBlank() || it.response.isEmpty()) {
|
||||
showErrorMessage(getString(R.string.codeNotExist))
|
||||
viewModel.debug_add(
|
||||
"buy_deletedFromApp",
|
||||
value + "-" + sales[storedPosition].itemFk + "-" + getData(
|
||||
value + "-" + sales[storedPosition].itemFk + "-" + getDataInt(
|
||||
USERFK
|
||||
)
|
||||
)
|
||||
|
|
@ -855,9 +854,9 @@ class CollectionFragment(
|
|||
binding.splashProgress.visibility = GONE
|
||||
if (it.isError) {
|
||||
//TEST3
|
||||
if (getDataInt(USERFK) == 18890 || getDataInt(USERFK) == 19591) {
|
||||
/* if (getDataInt(USERFK) == 18890 || getDataInt(USERFK) == 19591) {
|
||||
"La línea NO se ha marcado correctamente".toast(context)
|
||||
}
|
||||
}*/
|
||||
|
||||
if (!goBack) {
|
||||
ma.messageWithSound(it.errorMessage, it.isError, true)
|
||||
|
|
@ -980,7 +979,6 @@ class CollectionFragment(
|
|||
getString(R.string.itemAdded) + item + getString(R.string.with) + quantity + getString(R.string.unityTicket) + ticket
|
||||
|
||||
viewModel.sendChekingPresence(
|
||||
token = getData(TOKEN),
|
||||
workerId = salePerson,
|
||||
message = message
|
||||
)
|
||||
|
|
@ -1715,7 +1713,7 @@ class CollectionFragment(
|
|||
|
||||
|
||||
private fun checkItemScan(valueToCheck: String): Boolean {
|
||||
|
||||
d("VERDNATURA::","Entramos a ver el checkItem")
|
||||
if (storedPosition >= 0 && sales.size > storedPosition) {
|
||||
val saleToCheck = sales[storedPosition]
|
||||
|
||||
|
|
@ -1728,6 +1726,7 @@ class CollectionFragment(
|
|||
}
|
||||
}
|
||||
}
|
||||
d("VERDNATURA::","SAlimos de ver el checkItem")
|
||||
return false
|
||||
}
|
||||
|
||||
|
|
@ -2383,7 +2382,6 @@ class CollectionFragment(
|
|||
private fun sendSalixMessageNew(message: String, workerId: String) {
|
||||
|
||||
viewModel.sendChekingPresence(
|
||||
token = getData(TOKEN),
|
||||
workerId = workerId,
|
||||
message = message
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,24 +3,23 @@ package es.verdnatura.presentation.view.feature.controlador.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetSacadorControladorUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.view.feature.collection.mapper.map
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class ControladorViewModel(context: Context) : BaseViewModel(context) {
|
||||
class ControladorViewModel(var context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val contextApp = context
|
||||
private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() }
|
||||
private val getSacadorControladorUserCase: GetSacadorControladorUserCase =
|
||||
GetSacadorControladorUserCase(context)
|
||||
|
||||
/* private val getSacadorControladorUserCase: GetSacadorControladorUserCase =
|
||||
GetSacadorControladorUserCase(context)
|
||||
*/
|
||||
private val _response by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val response: LiveData<ResponseItemVO>
|
||||
get() = _response
|
||||
|
|
@ -31,8 +30,8 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun collectionTicketGet(collectionFk: Int, sectorFk: Int, print: String, type: String) {
|
||||
silex.collection_getTickets(collectionFk, sectorFk, print, type).enqueue(object :
|
||||
Callback<CollectionVO> {
|
||||
override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
|
||||
SilexCallback<CollectionVO>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_collectionTicketList.value = CollectionVO(
|
||||
0,
|
||||
isError = true,
|
||||
|
|
@ -40,19 +39,13 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<CollectionVO>,
|
||||
response: Response<CollectionVO>
|
||||
) {
|
||||
override fun onSuccess(response: Response<CollectionVO>) {
|
||||
|
||||
if (response.body() != null) {
|
||||
|
||||
_collectionTicketList.value = response.body()?.let {
|
||||
it.map(contextApp)
|
||||
}
|
||||
/* response.body()?.let {
|
||||
Log.d("VERDNTURA::","el itempacking es "+it.tickets.get(0).itemPackingTypeFk)
|
||||
}.also { }*/
|
||||
|
||||
|
||||
} else {
|
||||
_collectionTicketList.value = CollectionVO(
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ class ControlVehiculoFragment(
|
|||
|
||||
with(viewModel) {
|
||||
binding.splashProgress.visibility = GONE
|
||||
responseinsert.observe(viewLifecycleOwner, {
|
||||
responseinsert.observe(viewLifecycleOwner) {
|
||||
|
||||
if (it.isError) {
|
||||
ma.messageWithSound(it.errorMessage, true, false)
|
||||
|
|
@ -341,16 +341,16 @@ class ControlVehiculoFragment(
|
|||
}
|
||||
}
|
||||
binding.splashProgress.visibility = GONE
|
||||
})
|
||||
}
|
||||
|
||||
responsecontrol.observe(viewLifecycleOwner, {
|
||||
responsecontrol.observe(viewLifecycleOwner) {
|
||||
binding.splashProgress.visibility = GONE
|
||||
|
||||
if (it.isError) {
|
||||
ma.messageWithSound(it.errorMessage, true, false)
|
||||
|
||||
} else {
|
||||
if (it.response.equals("1")) {
|
||||
if (it.response == "1") {
|
||||
isWorkedTimed = "REGISTERED"
|
||||
setToolBar("OUT")
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ class ControlVehiculoFragment(
|
|||
|
||||
} else {
|
||||
|
||||
if (it.response.equals("0")) {
|
||||
if (it.response == "0") {
|
||||
setToolBar("IN")
|
||||
|
||||
customDialogInput.setTitle(getString(R.string.vehiclecontrol))
|
||||
|
|
@ -390,7 +390,7 @@ class ControlVehiculoFragment(
|
|||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,21 +3,19 @@ package es.verdnatura.presentation.view.feature.controlvehiculo.fragment
|
|||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetVehicleControlTimeUserCase
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
import es.verdnatura.presentation.common.ResponseItemMachineControl
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import org.json.JSONObject
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
||||
class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val getVehicleControlTimeUserCase: GetVehicleControlTimeUserCase =
|
||||
GetVehicleControlTimeUserCase(context)
|
||||
/* private val getVehicleControlTimeUserCase: GetVehicleControlTimeUserCase =
|
||||
GetVehicleControlTimeUserCase(context)*/
|
||||
|
||||
private val _responseinsert by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val responseinsert: LiveData<ResponseItemVO>
|
||||
|
|
@ -39,34 +37,35 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
PlateNumber: String
|
||||
) {
|
||||
silex.machineWorker_add(PlateNumber)
|
||||
.enqueue(object : Callback<Boolean> {
|
||||
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Boolean>, response: Response<Boolean>) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
//sergio_devuelve true o false
|
||||
if (response.isSuccessful){
|
||||
if (response.body().toString() == "false") {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
|
||||
)
|
||||
} else {
|
||||
|
||||
_responseinsert.value =
|
||||
ResponseItemVO(isError = false, response = response.body()!!.toString())
|
||||
if (response.body().toString() == "false") {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
|
||||
}
|
||||
}else{
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
|
||||
)
|
||||
}
|
||||
} else {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -78,22 +77,25 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
PlateNumber: String
|
||||
) {
|
||||
silex.machineWorker_update(PlateNumber)
|
||||
.enqueue(object : Callback<Boolean> {
|
||||
override fun onFailure(call: Call<Boolean>, t: Throwable) {
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Boolean>, response: Response<Boolean>) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
|
||||
//sergio devuelve true o false
|
||||
if (response.isSuccessful){
|
||||
|
||||
if (response.body().toString() == "false") {
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
|
||||
|
|
@ -102,67 +104,81 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
}
|
||||
|
||||
}else{
|
||||
_responseinsert.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun workerMachinery_isRegistered() {
|
||||
silex.workerMachinery_isRegistered(
|
||||
).enqueue(object : Callback<String> {
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
_responsecontrol.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
|
||||
if (!response.isSuccessful) {
|
||||
silex.workerMachinery_isRegistered()
|
||||
.enqueue(object : SilexCallback<String>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responsecontrol.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
} else {
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<String>) {
|
||||
_responsecontrol.value =
|
||||
ResponseItemVO(isError = false, response = response.body()!!)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
fun deviceProduction_getnameDevice(android_id: String) {
|
||||
getVehicleControlTimeUserCase.deviceProduction_getnameDevice(
|
||||
silex.deviceProduction_getnameDevice(
|
||||
android_id
|
||||
).enqueue(object : Callback<String> {
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
)
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responsemachine.value = ResponseItemMachineControl(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!),
|
||||
type = ""
|
||||
)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
if (response.body() != null) {
|
||||
|
||||
_responsemachine.value =
|
||||
ResponseItemMachineControl(
|
||||
isError = false,
|
||||
response = response.body()!!.toString(),
|
||||
type = "getnameDevice"
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun deviceProductionUser_getWorker(android_id: String) {
|
||||
silex.deviceProductionUser_getWorker(
|
||||
android_id
|
||||
).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responsemachine.value = ResponseItemMachineControl(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!),
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!),
|
||||
type = ""
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
if (response.body() != null) {
|
||||
|
||||
_responsemachine.value =
|
||||
ResponseItemMachineControl(
|
||||
isError = false,
|
||||
response = response.body()!!,
|
||||
type = "getnameDevice"
|
||||
response = response.body()!!.toString(),
|
||||
type = "getWorker"
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -171,60 +187,27 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun deviceProductionUser_getWorker(android_id: String) {
|
||||
getVehicleControlTimeUserCase.deviceProductionUser_getWorker(
|
||||
android_id
|
||||
).enqueue(object : Callback<String> {
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
_responsemachine.value = ResponseItemMachineControl(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!),
|
||||
type = ""
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
if (response.body() != null) {
|
||||
/* _responsemachine.value = ResponseItemMachineControl(
|
||||
isError = true,
|
||||
errorMessage = "Error al comprobar usuario del dispositivo",
|
||||
type = ""
|
||||
)*/
|
||||
|
||||
_responsemachine.value =
|
||||
ResponseItemMachineControl(
|
||||
isError = false,
|
||||
response = response.body()!!,
|
||||
type = "getWorker"
|
||||
)}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
fun machine_getWorkerPlate() {
|
||||
silex.machine_getWorkerPlate(
|
||||
|
||||
).enqueue(object : Callback<String> {
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
|
||||
_responsemachine.value = ResponseItemMachineControl(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!),
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!),
|
||||
type = ""
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
//sergio: devuelve en el body
|
||||
if (response.body() == null) {
|
||||
ResponseItemMachineControl(
|
||||
isError = false,
|
||||
response = response.body()!!,
|
||||
response = response.body()!!.toString(),
|
||||
type = "getWorkerPlate"
|
||||
)
|
||||
|
||||
|
|
@ -232,7 +215,7 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
_responsemachine.value =
|
||||
ResponseItemMachineControl(
|
||||
isError = false,
|
||||
response = response.body()!!,
|
||||
response = response.body()!!.toString(),
|
||||
type = "getWorkerPlate"
|
||||
)
|
||||
}
|
||||
|
|
@ -241,24 +224,21 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
})
|
||||
}
|
||||
|
||||
fun sip_getExtensionSalix(
|
||||
workerId: Int
|
||||
) {
|
||||
salix.sip_getExtension(
|
||||
workerId
|
||||
).enqueue(object :
|
||||
Callback<Any> {
|
||||
override fun onFailure(call: Call<Any>, t: Throwable) {
|
||||
).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseGetExtensionFromUserId.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<Any>,
|
||||
response: Response<Any?>
|
||||
) {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
|
||||
if (response.body() != null) {
|
||||
_responseGetExtensionFromUserId.value = ResponseItemVO(
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import android.content.pm.PackageInfo
|
|||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.provider.Settings
|
||||
import android.system.Os.kill
|
||||
import android.view.View
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
|
|
@ -25,6 +26,7 @@ import es.verdnatura.presentation.view.component.CustomDialogList
|
|||
import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter
|
||||
import es.verdnatura.presentation.view.feature.login.model.WorkForms
|
||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
|
||||
class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginViewModel::class) {
|
||||
|
|
@ -100,7 +102,8 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
|||
saveData("base_urlSalix", item.urlSalix)
|
||||
saveData(WORKFORMSELECTED, item.name)
|
||||
customDialogList.dismiss()
|
||||
requireActivity().recreate()
|
||||
exitProcess(1)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,7 +123,8 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
|||
customDialog.dismiss()
|
||||
customDialogList.dismiss()
|
||||
saveData(WORKFORMSELECTED, "Producción")
|
||||
requireActivity().recreate()
|
||||
exitProcess(1)
|
||||
|
||||
|
||||
}
|
||||
.show()
|
||||
|
|
@ -188,7 +192,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
|||
saveData(WORKFORMSELECTED, customNewForm.getValue())
|
||||
customNewForm.dismiss()
|
||||
customDialogList.dismiss()
|
||||
requireActivity().recreate()
|
||||
exitProcess(1)
|
||||
|
||||
}.setKoButton(getString(R.string.cancel)) {
|
||||
customNewForm.dismiss()
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@ import android.util.Log
|
|||
import android.util.Log.d
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.GetLoginUserCase
|
||||
import es.verdnatura.domain.GetPreSacadorUseCase
|
||||
import es.verdnatura.domain.GetSacadorControladorUserCase
|
||||
import es.verdnatura.domain.GetUbicadorUserCase
|
||||
import es.verdnatura.domain.*
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.base.nameofFunction
|
||||
|
|
@ -26,7 +23,7 @@ import retrofit2.Call
|
|||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
|
||||
class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
private val contextApp=context
|
||||
private val getPreSacadorUseCase: GetPreSacadorUseCase = GetPreSacadorUseCase(context)
|
||||
|
|
@ -868,27 +865,19 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
|
|||
silex.itemShelving_updateFromSale(
|
||||
saleFk
|
||||
)
|
||||
.enqueue(object : Callback<Unit> {
|
||||
override fun onFailure(call: Call<Unit>, t: Throwable) {
|
||||
.enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
_responseItemShelvingUpdate.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
|
||||
if (!response.isSuccessful) {
|
||||
_responseItemShelvingUpdate.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
)
|
||||
)
|
||||
} else {
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
|
||||
_responseItemShelvingUpdate.value =
|
||||
ResponseItemVO(isError = false, response = response.message()!!)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue