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

Versión 7.6.1. No muestra menú VOZ en ajustes y pide las baldas ( se habia quitado sin querer) . En marcha pantalla Fallo de personal.

This commit is contained in:
Sergio De la torre 2022-02-03 07:57:17 +01:00
parent f5c849f4f1
commit b76c721258
27 changed files with 1091 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-02-03T05:45:46.227830600Z" />
</component>
</project>

6
.idea/misc.xml
View File

@ -41,7 +41,8 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_build_black_24dp.xml" value="0.22708333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_delete_black_24dp.xml" value="0.15052083333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_delete_forever_black_24dp.xml" value="0.15052083333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml" value="0.15052083333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_device_hub_black_24dp.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_flash_auto_black_24dp.xml" value="0.15052083333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_history_black_24dp.xml" value="0.15052083333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_launcher_background.xml" value="0.24010416666666667" />
@ -81,6 +82,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/round_outline.xml" value="0.11979166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/walk.xml" value="0.10885416666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/worker.xml" value="0.12" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/worker_mistake.xml" value="0.15364583333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_imageview.xml" value="0.134375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_login.xml" value="0.134375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_main.xml" value="0.17916666666666667" />
@ -133,6 +135,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol.xml" value="0.1546875" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" value="0.23052536231884058" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_web.xml" value="0.2463768115942029" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_workermistake.xml" value="0.2265625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ajustes_row.xml" value="0.10009057971014493" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.4466666666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_presacador.xml" value="0.4466666666666667" />
@ -164,6 +167,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_toolbar_row.xml" value="0.15307971014492755" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ubication_row.xml" value="0.11822916666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_worker_image.xml" value="0.23177083333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_workermistake_row.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/qauality_fragment.xml" value="0.15353260869565216" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/reposicion_fragment.xml" value="0.15353260869565216" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/shelvinglog_row.xml" value="0.18385416666666668" />

5
app/build.gradle
View File

@ -14,8 +14,9 @@ android {
applicationId "es.verdnatura"
minSdkVersion 21
targetSdkVersion 29
versionCode 100
versionName "7.6" //VERSION CODE 100. Envios rocket a previa, revisados databinding layouts,
versionCode 101
versionName "7.6.1" //VERSION CODE 101. Pide las baldas, se había quitado sin querer y se quita menú Voz
//versionName "7.6" //VERSION CODE 100. Envios rocket a previa, revisados databinding layouts,
//versionName "7.5.1" //VERSION CODE 97. Control de previa, Llamadas ok, menú ok y textos en iconos y imágenes.
//versionName "7.5.1" VERSION CODE 99 PARA TESTEAR APP-->INSTALADA EN VARIOS USUARIO 24-01-2022

4
app/release/output-metadata.json
View File

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 100,
"versionName": "7.6",
"versionCode": 101,
"versionName": "7.6.1",
"outputFile": "app-release.apk"
}
],

BIN
app/release/vn-picking-full7.6.apk
View File

Binary file not shown.

BIN
app/release/vn-picking_final.apk Normal file
View File

Binary file not shown.

7
app/src/main/java/es/verdnatura/di/viewModelModule.kt
View File

@ -29,11 +29,18 @@ import es.verdnatura.presentation.view.feature.shelvingparking.fragment.Shelving
import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.SmartTagsViewModel
import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemViewModel
import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewModel
import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeViewModel
import org.koin.android.ext.koin.androidContext
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module
val viewModelModule = module {
viewModel{
WorkermistakeViewModel(androidContext())
}
// Login
viewModel {
LoginViewModel(androidContext())

61
app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt Normal file
View File

@ -0,0 +1,61 @@
package es.verdnatura.domain
import android.content.Context
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
import retrofit2.Call
class GetWokerMistakeUSerCase(context: Context) : RestClient(context) {
fun collectionGet(usuario: String, password: String): Call<List<CollectionVO>> {
// val params:ArrayList<String> = ArrayList()
return restClient!!.collectionGet("json", "1", usuario, password, "application/json")
}
fun collectionGetSalix(token:String): Call<List<CollectionVO>> {
// val params:ArrayList<String> = ArrayList()
return salixClient!!.getCollectionSalix(content_type = "application/json",token)
}
fun saleMistakeAdd(
usuario: String,
password: String,
vSaleFk: String,
vUserFk: String,
vTypeFk: String
): Call<String> {
val params: ArrayList<String> = ArrayList()
params.add(vSaleFk)
params.add(vUserFk)
params.add(vTypeFk)
return restClient!!.saleMistakeAdd(
"json",
"1",
usuario,
password,
"application/json",
params
)
}
fun workerMistakeType_get(usuario: String, password: String): Call<List<MistakeWorkerType>> {
return restClient!!.workerMistakeType_get("json", "1", usuario, password, "application/json")
}
fun department_getHasMistake(usuario: String, password: String): Call<List<DepartmentMistake>> {
return restClient!!.department_getHasMistake("json", "1", usuario, password, "application/json")
}
fun worker_getFromHasMistake(usuario: String, password: String, department:String): Call<List<WorkerFromMistake>> {
val params: ArrayList<String> = ArrayList()
params.add(department)
return restClient!!.worker_getFromHasMistake("json", "1", usuario, password, "application/json",params)
}
}

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

@ -25,6 +25,9 @@ import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
import retrofit2.Call
import retrofit2.http.Body
import retrofit2.http.Header
@ -423,6 +426,39 @@ interface VerdnaturaService {
):
Call<List<MistakeTypeVO>>
@POST("almacennew/workerMistakeType_get")//REVISADA
fun workerMistakeType_get(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String
):
Call<List<MistakeWorkerType>>
@POST("almacennew/department_getHasMistake")//REVISADA
fun department_getHasMistake(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
):
Call<List<DepartmentMistake>>
@POST("almacennew/worker_getFromHasMistake")//REVISADA
fun worker_getFromHasMistake(
@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>
):
Call<List<WorkerFromMistake>>
//PASILLEROS ========================================================================>
//CONSULTAR ARTICULO ========================================================================>

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

@ -17,6 +17,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
interface OnOptionsSelectedListener {
fun onOptionsItemSelected(item: Drawable)
@ -27,6 +28,10 @@ interface OnPasillerosItemClickListener {
fun onPasillerosItemClickListener(item: PasillerosItemVO,entryPoint:String)
}
interface onMistakeWorkerClickListener {
fun onMistakeWorkerClickListener(item: WorkerFromMistake)
}
interface hideBottomNavigation{
fun hideBottomNavigation(entryPoint:String)

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

@ -55,13 +55,13 @@ class AjustesViewModel(context: Context) : BaseViewModel() {
0,
0)
)
_ajustesitem.add(
/*_ajustesitem.add(
AjustesItemVO(2,
"Voz",
vozDescrip,
0,
0)
)
)*/
_ajustesitem.add(
AjustesItemVO(3,
"Tipo etiqueta",

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

@ -1058,6 +1058,7 @@ class CollectionFragment(
}*/
saleTrackingReplace(position, newType)
isMarking = true
setTotalLines()
}

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

@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
import es.verdnatura.domain.GetInventaryUserCase
import es.verdnatura.domain.GetItemCardUserCase
import es.verdnatura.domain.GetWokerMistakeUSerCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
@ -13,17 +14,24 @@ import es.verdnatura.presentation.common.Event
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo
import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculoList
import es.verdnatura.presentation.view.feature.inventario.model.InventaryListVO
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeListVO
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
import es.verdnatura.presentation.view.feature.workermistake.model.*
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
import timber.log.Timber
class InventaryViewModel(context: Context) : BaseViewModel() {
private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context)
private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context)
private val getWorkerMistakeUserCase:GetWokerMistakeUSerCase= GetWokerMistakeUSerCase(context)
private val _inventaryList by lazy { MutableLiveData<InventaryListVO>() }
val inventaryList: LiveData<InventaryListVO>
@ -38,6 +46,19 @@ class InventaryViewModel(context: Context) : BaseViewModel() {
val buyersList: LiveData<BuyerListVO>
get() = _buyersList
//********************** a borrar, solo para montar fragment ****************/
private val _mistakeDepartmentList by lazy { MutableLiveData<departmentMistakeList>() }
val mistakeDepartmentList: LiveData<departmentMistakeList>
get() = _mistakeDepartmentList
private val _workerFromMistakeList by lazy { MutableLiveData<workerFromMistakeList>() }
val workerFromMistakeList: LiveData<workerFromMistakeList>
get() = _workerFromMistakeList
private val _mistakeWorkerList by lazy { MutableLiveData<workerMistakeTypeList>()}
val mistakeWorkerList: LiveData<workerMistakeTypeList>
get() = _mistakeWorkerList
//sergio para obtener comprador
fun itemShelvingBuyerGet(user:String,password:String,callFunction:String){
@ -172,4 +193,93 @@ class InventaryViewModel(context: Context) : BaseViewModel() {
}
fun department_getHasMistake(usuario: String, password: String)
{
getWorkerMistakeUserCase.department_getHasMistake(usuario, password)
.enqueue(object : Callback<List<DepartmentMistake>>
{
override fun onFailure(call: Call<List<DepartmentMistake>>, t: Throwable)
{
val listError: ArrayList<DepartmentMistake> = ArrayList()
listError.add(DepartmentMistake(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
_mistakeDepartmentList.value = departmentMistakeList(listError)
}
override fun onResponse(
call: Call<List<DepartmentMistake>>,
response: Response<List<DepartmentMistake>>
)
{
if (response.body() != null)
{
_mistakeDepartmentList.value = response.body()?.let { departmentMistakeList(it) }
} else
{
val listError: ArrayList<DepartmentMistake> = ArrayList()
listError.add(DepartmentMistake("0", ""))
_mistakeDepartmentList.value = departmentMistakeList(listError)
}
}
})
}
fun worker_getFromHasMistake(usuario:String,password:String,departmentFk:String,callFunction:String){
getWorkerMistakeUserCase.worker_getFromHasMistake(usuario,password,departmentFk).enqueue(object :
Callback<List<WorkerFromMistake>> {
override fun onFailure(call: Call<List<WorkerFromMistake>>, t: Throwable) {
val listError:ArrayList<WorkerFromMistake> = ArrayList()
listError.add(WorkerFromMistake(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
_workerFromMistakeList.value = workerFromMistakeList(listError)
}
override fun onResponse(
call: Call<List<WorkerFromMistake>>,
response: Response<List<WorkerFromMistake>>
) {
if (response.body() != null){
_workerFromMistakeList.value = response.body()?.let { workerFromMistakeList(it) }
}else{
val listError:ArrayList<WorkerFromMistake> = ArrayList()
listError.add(WorkerFromMistake(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())))
_workerFromMistakeList.value = workerFromMistakeList(listError)
}
}
})
}
fun workerMistakeType_get(usuario: String, password: String)
{
getWorkerMistakeUserCase.workerMistakeType_get(usuario, password)
.enqueue(object : Callback<List<MistakeWorkerType>>
{
override fun onFailure(call: Call<List<MistakeWorkerType>>, t: Throwable)
{
val listError: ArrayList<MistakeWorkerType> = ArrayList()
listError.add(MistakeWorkerType(isError=true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!),id="0", description = ""))
_mistakeWorkerList.value = workerMistakeTypeList(listError)
}
override fun onResponse(
call: Call<List<MistakeWorkerType>>,
response: Response<List<MistakeWorkerType>>
)
{
if (response.body() != null)
{
_mistakeWorkerList.value = response.body()?.let { workerMistakeTypeList(it) }
} else
{
val listError: ArrayList<MistakeWorkerType> = ArrayList()
listError.add(MistakeWorkerType(isError=true,errorMessage =getMessageFromAllResponse(nameofFunction(this),response.message()),id="0", description = ""))
_mistakeWorkerList.value = workerMistakeTypeList(listError)
}
}
})
}
}

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

@ -19,4 +19,23 @@ class SearchBuyerModel(private var nickname: String?, private var buyerId: Strin
return nickname!!
}
}
class SearchDepartmentModel(private var name: String?, private var departmentId: String?) : Searchable {
override fun getTitle(): String {
return name!!
}
fun getDepartmentId(): String {
return departmentId!!
}
fun getDepartmentName(): String {
return name!!
}
}

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

@ -59,6 +59,7 @@ import es.verdnatura.presentation.view.feature.smarttag.register.RegisterSmartTa
import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.AssociateSmartTagsFragment
import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment
import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment
import es.verdnatura.presentation.view.feature.workermistake.adapter.WorkermistakeFragment
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@ -470,7 +471,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
"Log Shelving" -> {
addFragmentOnTop(shelvingLogFragment.newInstance("Log Shelving"))
}
"Fallo personal" -> {
addFragmentOnTop(WorkermistakeFragment.newInstance("Fallo personal"))
}
}

11
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
View File

@ -29,12 +29,15 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
)
*/
//sergio para que aparezca el nuevo menu
/* _pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.worker_mistake,
"Fallo personal", R.string.workermistake,"Permite añadir fallos a un trabajador"
)
)*/
_pasillerositem.add(
PasillerosItemVO(

71
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt Normal file
View File

@ -0,0 +1,71 @@
package es.verdnatura.presentation.view.feature.workermistake.adapter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContentProviderCompat.requireContext
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.databinding.ItemInventaryRowBinding
import es.verdnatura.databinding.ItemWorkermistakeRowBinding
import es.verdnatura.domain.toast
import es.verdnatura.presentation.common.OnInvetoryNichoClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.onMistakeWorkerClickListener
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
import timber.log.Timber.d
class WorkermistakeAdapter (
private val items: List<WorkerFromMistake>,
private val onMistakeWorkerClickListener: onMistakeWorkerClickListener
//private val onPasillerosItemClickListener: OnPasillerosItemClickListener*/
): RecyclerView.Adapter<WorkermistakeAdapter.ItemHolder> () {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
return ItemHolder(
ItemWorkermistakeRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
)
}
override fun getItemCount() =items.size
override fun onBindViewHolder(holder: ItemHolder, position: Int) {
holder.bind(items[position])
}
inner class ItemHolder(
val binding: ItemWorkermistakeRowBinding
) : RecyclerView.ViewHolder(binding.root){
private val res = binding.root.context.resources
fun bind(item: WorkerFromMistake) {
binding.apply {
this.item = item
itemFirstname.visibility = View.VISIBLE
itemLastname.visibility = View.VISIBLE
}
/* itemNicho.setOnClickListener {
onInvetoryNichoClickListener.onInvetoryNichoClickListener(item)
}
itemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk)
}
itemUp.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk)
}
itemDown.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk)
}*/
binding.imageErrorMessage.setOnClickListener {
d("test_imageError")
onMistakeWorkerClickListener.onMistakeWorkerClickListener(item)
//false
}
}
}
}

351
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt Normal file
View File

@ -0,0 +1,351 @@
package es.verdnatura.presentation.view.feature.workermistake.adapter
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel
import es.verdnatura.presentation.view.feature.inventario.fragment.SearchBuyerModel
import android.content.Context
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.ImageView
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentWorkermistakeBinding
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.*
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.component.CustomDialogInput
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
import es.verdnatura.presentation.view.feature.inventario.adapter.InventoryAdapter
import es.verdnatura.presentation.view.feature.inventario.fragment.SearchDepartmentModel
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
import es.verdnatura.presentation.view.feature.workermistake.model.workerFromMistakeList
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
import ir.mirrajabi.searchdialog.core.SearchResultListener
import timber.log.Timber.d
class WorkermistakeFragment( var entryPoint: String = ""
) : BaseFragment<FragmentWorkermistakeBinding, InventaryViewModel>(
InventaryViewModel::class) {
private var adapter : InventoryAdapter? = null
private var adapterworker:WorkermistakeAdapter? = null
private lateinit var customDialogInput: CustomDialogInput
private var listInvetory:ArrayList<ItemInventaryVO> = ArrayList()
private var listInvetoryAux:ArrayList<ItemInventaryVO> = ArrayList()
private var listWorker:ArrayList<WorkerFromMistake> = ArrayList()
private lateinit var customDialog: CustomDialog
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var reload = false
private var hideLoad = true
private var layoutManager : LinearLayoutManager? = null
private var firstVisiblePosition = 0
//sergio : cmbios para insertar lista compradores en inventary en el searchable
private val items=ArrayList<SearchBuyerModel>()
private val departments=ArrayList<SearchDepartmentModel>()
private lateinit var buyerId:String
companion object {
fun newInstance(entryPoint:String) = WorkermistakeFragment(entryPoint)
}
override fun getLayoutId(): Int = R.layout.fragment_workermistake
override fun onAttach(context: Context) {
if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
super.onAttach(context)
}
override fun onCreate(savedInstanceState: Bundle?) {
//viewModel.itemShelvingBuyerGet(user = getData(USER),password = getData(PASSWORD),"itemShelvingBuyerGet")
viewModel.department_getHasMistake(usuario = getData(USER),password = getData(PASSWORD))
super.onCreate(savedInstanceState)
}
override fun init() {
binding.filterBuyer.setText(getData(BUYER))
binding.splashProgress.visibility = View.VISIBLE
buyerId=getData(BUYERID)
// viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK),"itemShelving_filterBuyer")
binding.filterBuyer.setOnClickListener{
SimpleSearchDialogCompat(context,getString(R.string.departamentos),getString(R.string.escribirparteNombre),null,departments,
SearchResultListener { baseSearchDialogCompat, nombre, position ->
binding.filterBuyer.setText((nombre.title))
saveBuyer(nombre.getDepartmentName())
saveBuyerId(nombre.getDepartmentId())
buyerId=nombre.getDepartmentId()
// viewModel.getInventory(getData(USER),getData(PASSWORD),nombre.getBuyerId(),getData(WAREHOUSEFK),"itemShelving_filterBuyer")
viewModel.worker_getFromHasMistake(getData(USER),getData(PASSWORD),nombre.getDepartmentId(),"worker_getFromHasMistake")
binding.splashProgress.visibility = View.VISIBLE
baseSearchDialogCompat.dismiss()
}).show()
}
customDialogInput = CustomDialogInput(requireContext())
customDialog = CustomDialog(requireContext())
(activity as MainActivity).hideBottomNavigation(View.GONE)
binding.splashProgress.visibility = View.VISIBLE
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemShelvingRadar)
setToolBar()
setEvents()
if (reload){
reload = false
binding.splashProgress.visibility = View.VISIBLE
hideLoad = false
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK),"itemShelving_filterBuyer")
}
super.init()
}
private fun setToolBar(){
binding.mainToolbar.toolbarTitle.text=entryPoint
val listIcons: ArrayList<ImageView> = ArrayList()
val iconReload = ImageView(context)
iconReload.setImageResource(R.drawable.ic_autorenew_black_24dp)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp)
}
listIcons.add(iconReload)
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapterTooltip(listIcons,object: OnOptionsSelectedListener{
override fun onOptionsItemSelected(item: Drawable) {
if (item == iconReload.drawable){
binding.splashProgress.visibility = View.VISIBLE
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
viewModel.department_getHasMistake(usuario = getData(USER),password = getData(PASSWORD))
}
}
})
binding.mainToolbar.toolbarIcons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
private fun setEvents(){
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
}
binding.filterItemFk.setOnKeyListener { v, keyCode, event ->
if (binding.filterItemFk.text.toString().isNullOrEmpty()){
if (listInvetory.size != listInvetoryAux.size){
listInvetory.removeAll(listInvetoryAux)
listInvetoryAux.forEach {
listInvetory.add(it)
}
}
}else{
listInvetory.removeAll(listInvetoryAux)
listInvetoryAux.forEach {
if ((it.itemFk.contains(binding.filterItemFk.text.toString(),true)) || (it.producer.contains(binding.filterItemFk.text.toString(),true))){
listInvetory.add(it)
}
}
}
adapter!!.notifyDataSetChanged()
return@setOnKeyListener false
}
}
override fun onPause() {
super.onPause()
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
}
override fun onResume() {
super.onResume()
if (binding.workermistakeRecyclerview.layoutManager != null){
if (firstVisiblePosition <= listInvetory.size){
binding.workermistakeRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
}
}
}
override fun observeViewModel() {
with(viewModel){
//sergio: para compradores
buyersList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
createBuyerList(it.list)
})
mistakeDepartmentList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
createDepartmentList(it.list)
})
workerFromMistakeList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
createWorkerList(it.list)
it.list.forEach {
if (it.id != "0"){
listWorker.add(it)
}
}
adapterworker= WorkermistakeAdapter(listWorker,object:onMistakeWorkerClickListener{
override fun onMistakeWorkerClickListener(item: WorkerFromMistake) {
viewModel.workerMistakeType_get(usuario = getData(USER), password = getData(PASSWORD))
}
})
binding.workermistakeRecyclerview.adapter = adapterworker
layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
binding.workermistakeRecyclerview.layoutManager = layoutManager
})
inventaryList.observe(viewLifecycleOwner, Observer {
if (hideLoad){
binding.splashProgress.visibility = View.GONE
}else{
hideLoad = true
}
listInvetory = ArrayList()
listInvetoryAux = ArrayList()
it.list.forEach {
if (it.nicho != "0"){
listInvetory.add(it)
listInvetoryAux.add(it)
}
}
adapter = InventoryAdapter(listInvetory,object: OnInvetoryNichoClickListener{
override fun onInvetoryNichoClickListener(item: ItemInventaryVO) {
//sergio: cambiado customdialogInput pòr customdialog 6.1.4
customDialog.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton("Tirar"){
//customDialogInput.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton("Tirar"){
viewModel.itemTrash(item.itemFk,getData(WAREHOUSEFK),getData(USER),getData(PASSWORD),item.nicho,"0","itemTrash")
//viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,"0","0")
// viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0")
changeOfflineValue(item)
// customDialogInput.dismiss()
customDialog.dismiss()
}.setKoButton("Cancelar"){
// customDialogInput.dismiss()
customDialog.dismiss()
}.show()
}
},onPasillerosItemClickListener = pasillerosItemClickListener!!)
binding.workermistakeRecyclerview.adapter = adapter
layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
binding.workermistakeRecyclerview.layoutManager = layoutManager
if (firstVisiblePosition <= listInvetory.size){
binding.workermistakeRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
}
})
response.observe(viewLifecycleOwner, Observer {
if (it.isError){
(activity as MainActivity).messageWithSound(it.errorMessage,true,false)
/* customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){
customDialog.dismiss()
}.show()*/
}
})
}
}
private fun changeOfflineValue(item:ItemInventaryVO){
var i = 0
var position = 0
listInvetory.forEach {
if (it.itemFk == item.itemFk) {
position = i
}
i = i.plus(1)
}
listInvetory.removeAt(position)
i = 0
position = 0
listInvetoryAux.forEach {
if (it.itemFk == item.itemFk) {
position = i
}
i = i.plus(1)
}
listInvetoryAux.removeAt(position)
adapter?.notifyDataSetChanged()
reload = true
}
//sergio:añadido para compradores
private fun createBuyerList(list: List<BuyerVO>){
items.clear()
list.forEach { buyer ->
if (!buyer.isError){
try {
items.add(SearchBuyerModel(buyer.nickname,buyer.userFk));
}catch (e:Exception){}
}
}}
private fun createDepartmentList(list: List<DepartmentMistake>){
departments.clear()
list.forEach { department ->
d("department"+department.name)
if (!department.isError){
try {
departments.add(SearchDepartmentModel(department.name,department.id));
}catch (e:Exception){}
}
}}
private fun createWorkerList(list: List<WorkerFromMistake>){
departments.clear()
list.forEach { worker ->
d("worker "+worker.firstName)
d("lastname "+worker.lastName)
if (!worker.isError){
try {
//departments.add(SearchDepartmentModel(department.name,department.id));
}catch (e:Exception){}
}
}}
}

90
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt Normal file
View File

@ -0,0 +1,90 @@
package es.verdnatura.presentation.view.feature.workermistake.fragment
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.GetWokerMistakeUSerCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
import es.verdnatura.presentation.view.feature.workermistake.model.departmentMistakeList
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
class WorkermistakeViewModel (context: Context) : BaseViewModel() {
private val getWorkerMistakeUserCase: GetWokerMistakeUSerCase = GetWokerMistakeUSerCase(context)
private val _mistakeDepartmentList by lazy { MutableLiveData<departmentMistakeList>() }
val mistakeDepartmentList: LiveData<departmentMistakeList>
get() = _mistakeDepartmentList
/* fun mistakeWorker(usuario: String, password: String)
{
getWorkerMistakeUserCase.mistakeType(usuario, password)
.enqueue(object : Callback<List<mistakeWorkerType>>
{
override fun onFailure(call: Call<List<mistakeWorkerType>>, t: Throwable)
{
val listError: ArrayList<mistakeWorkerType> = ArrayList()
listError.add(mistakeWorkerType("0", ""))
_mistakeDepartmentList.value = workerMistakeTypeList(listError)
}
override fun onResponse(
call: Call<List<mistakeWorkerType>>,
response: Response<List<mistakeWorkerType>>
)
{
if (response.body() != null)
{
_mistakeDepartmentList.value = response.body()?.let { workerMistakeTypeList(it) }
} else
{
val listError: ArrayList<mistakeWorkerType> = ArrayList()
listError.add(mistakeWorkerType("0", ""))
_mistakeDepartmentList.value = workerMistakeTypeList(listError)
}
}
})
}*/
fun department_getHasMistake(usuario: String, password: String)
{
getWorkerMistakeUserCase.department_getHasMistake(usuario, password)
.enqueue(object : Callback<List<DepartmentMistake>>
{
override fun onFailure(call: Call<List<DepartmentMistake>>, t: Throwable)
{
val listError: ArrayList<DepartmentMistake> = ArrayList()
listError.add(DepartmentMistake("0", ""))
_mistakeDepartmentList.value = departmentMistakeList(listError)
}
override fun onResponse(
call: Call<List<DepartmentMistake>>,
response: Response<List<DepartmentMistake>>
)
{
if (response.body() != null)
{
_mistakeDepartmentList.value = response.body()?.let { departmentMistakeList(it) }
} else
{
val listError: ArrayList<DepartmentMistake> = ArrayList()
listError.add(DepartmentMistake("0", ""))
_mistakeDepartmentList.value = departmentMistakeList(listError)
}
}
})
}
}

39
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt Normal file
View File

@ -0,0 +1,39 @@
package es.verdnatura.presentation.view.feature.workermistake.model
class MistakeWorkerType (
var id: String = "",
var description: String = "",
var isError:Boolean = false,
var errorMessage:String = ""
)
class DepartmentMistake(
var id:String ="",
var name:String="",
var isError:Boolean = false,
var errorMessage:String = ""
)
class WorkerFromMistake(
var id:String="",
var firstName: String="",
var lastName: String="",
var isError:Boolean = false,
var errorMessage:String = ""
)
class workerMistakeTypeList(
var list: List<MistakeWorkerType> = listOf()
)
class departmentMistakeList(
var list: List<DepartmentMistake> = listOf()
)
class workerFromMistakeList(
var list: List<WorkerFromMistake> = listOf()
)

9
app/src/main/res/drawable/worker_mistake.xml Normal file
View File

@ -0,0 +1,9 @@
<!-- drawable/account_hard_hat.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="#F7931E"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000" android:pathData="M12,15C7.58,15 4,16.79 4,19V21H20V19C20,16.79 16.42,15 12,15M8,9A4,4 0 0,0 12,13A4,4 0 0,0 16,9M11.5,2C11.2,2 11,2.21 11,2.5V5.5H10V3C10,3 7.75,3.86 7.75,6.75C7.75,6.75 7,6.89 7,8H17C16.95,6.89 16.25,6.75 16.25,6.75C16.25,3.86 14,3 14,3V5.5H13V2.5C13,2.21 12.81,2 12.5,2H11.5Z" />
</vector>

156
app/src/main/res/layout/fragment_workermistake.xml Normal file
View File

@ -0,0 +1,156 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:paddingTop="@dimen/toolbar_height">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/filter_itemFk"
style="@style/InputLineTextSearch"
android:layout_width="wrap_content"
android:layout_weight="1.5"
android:backgroundTint="@android:color/white"
android:hint="@string/Filtro"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textAlignment="center"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
<TextView
android:id="@+id/filter_buyer"
style="@style/InputLineTextSearch"
android:layout_width="match_parent"
android:layout_weight="1"
android:backgroundTint="@android:color/white"
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
android:focusable="false"
android:hint="@string/buscarcomprador"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textAlignment="center"
android:textColor="@color/verdnatura_pumpkin_orange"
android:textColorHint="@android:color/darker_gray"
android:visibility="visible" />
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/layout_margin_min"
android:layout_marginBottom="@dimen/layout_margin_1"
android:paddingLeft="@dimen/layout_margin_min"
android:paddingRight="@dimen/layout_margin_min">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="Nombre"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="Apellido"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text=""
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/workermistake_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
tools:listitem="@layout/item_workermistake_row"/>
</LinearLayout>
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/splash_progress"
android:visibility="visible"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/verdnatura_black_8_alpha_6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:gravity="center">
<com.airbnb.lottie.LottieAnimationView
android:layout_width="wrap_content"
android:layout_height="@dimen/verdnatura_logo_large_height"
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/orange_loading"
app:lottie_speed="2" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

13
app/src/main/res/layout/item_article_row.xml
View File

@ -78,13 +78,12 @@
>
<ImageView
android:id="@+id/imageErrorMessage"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
app:srcCompat="@drawable/emoticon_error"
/>
<ImageView
android:id="@+id/imageErrorMessage"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
app:srcCompat="@drawable/emoticon_error" />
</RelativeLayout>
</LinearLayout>

85
app/src/main/res/layout/item_workermistake_row.xml Normal file
View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools">
<data>
<variable
name="item"
type="es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_black_5"
android:orientation="horizontal"
android:gravity="center"
android:layout_gravity="center"
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
android:paddingRight="@dimen/pasilleros_margin_main_menu"
android:paddingTop="@dimen/pasilleros_margin_main_menu"
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
<TextView
android:id="@+id/item_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingRight="@dimen/pasilleros_margin_main_menu"
android:text="@{item.id}"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/row"
android:textStyle="bold"
android:visibility="gone"
tool:text="19591" />
<TextView
android:id="@+id/item_firstname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="@dimen/pasilleros_margin_main_menu"
android:text="@{item.firstName}"
android:textColor="@color/verdnatura_pumpkin_orange"
android:textSize="@dimen/row"
android:textStyle="bold"
tool:text="Sergio" />
<TextView
android:id="@+id/item_lastname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:text="@{item.lastName}"
android:textColor="@color/verdnatura_pumpkin_orange"
android:textSize="@dimen/row"
android:textStyle="bold"
tool:text="de la Torre Nebot" />
<ImageView
android:id="@+id/imageErrorMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="end"
app:srcCompat="@drawable/emoticon_error" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_black_9" />
</LinearLayout>
</layout>

2
app/src/main/res/values-es/strings.xml
View File

@ -99,6 +99,7 @@
<string name="buscarcomprador">Buscar comprador</string>
<string name="escribirparteNombre">Escribe aquí</string>
<string name="compradores">Compradores</string>
<string name="departamentos">Departmentos</string>
<string name="Grouping">Grouping</string>
<string name="Packing">Packing</string>
<string name="Barcode">Barcode</string>
@ -156,4 +157,5 @@
<string name="bufferload">Cargar expedición en buffer</string>
<string name="bufferfstrapping">Flejado buffer</string>
<string name="Split">Split</string>
<string name="workermistake">Fallo del trabajador</string>
</resources>

1
app/src/main/res/values/dimens.xml
View File

@ -42,6 +42,7 @@
<dimen name="button">14sp</dimen>
<dimen name="caption">12sp</dimen>
<dimen name="over_line">10sp</dimen>
<dimen name="row">14sp</dimen>
<!--Button-->
<dimen name="btn_radius">5dp</dimen>

2
app/src/main/res/values/strings.xml
View File

@ -97,6 +97,7 @@
<string name="buscarcomprador">Search buyer</string>
<string name="escribirparteNombre">Write here</string>
<string name="compradores">Buyers</string>
<string name="departamentos">Departments</string>
<string name="Grouping">Grouping</string>
<string name="Packing">Packing</string>
<string name="Barcode">Barcode</string>
@ -154,5 +155,6 @@
<string name="bufferload">Load buffer</string>
<string name="bufferfstrapping">Buffer strapping</string>
<string name="Split">Split</string>
<string name="workermistake">Worker mistaker</string>
</resources>