V5.1.5
This commit is contained in:
parent
3c74a6f44e
commit
7bc6e93a84
|
@ -12,8 +12,8 @@ android {
|
|||
applicationId "es.verdnatura"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 24
|
||||
versionName "5.1.4"
|
||||
versionCode 25
|
||||
versionName "5.1.5"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
|
|
@ -8,8 +8,8 @@ import java.util.concurrent.TimeUnit
|
|||
|
||||
class ApiUtils {
|
||||
companion object {
|
||||
// const val BASE_URL:String = "http://192.168.1.104:8009/"
|
||||
const val BASE_URL:String = "https://app.verdnatura.es/"
|
||||
//const val BASE_URL:String = "http://192.168.1.100:8009/"
|
||||
const val BASE_URL:String = "https://app.verdnatura.es/"
|
||||
fun getApiService():VerdnaturaService{
|
||||
val retrofit = Retrofit.Builder()
|
||||
.baseUrl(BASE_URL)
|
||||
|
|
|
@ -33,6 +33,13 @@ class GetUbicadorUserCase : RestClient() {
|
|||
return restClient!!.itemShelvingMake_multi("json","1",usuario,password,"application/json",params)
|
||||
}
|
||||
|
||||
fun shelvingPriorityUpdate(usuario:String,password:String,priority:String,shelving:String) : Call<String> {
|
||||
val params:ArrayList<String> = ArrayList();
|
||||
params.add(priority)
|
||||
params.add(shelving)
|
||||
return restClient!!.shelvingPriorityUpdate("json","1",usuario,password,"application/json",params)
|
||||
}
|
||||
|
||||
fun shelvingPark(usuario:String,password:String,shelving:String,parking:String) : Call<String> {
|
||||
val params:ArrayList<String> = ArrayList();
|
||||
params.add(shelving)
|
||||
|
|
|
@ -340,6 +340,15 @@ interface VerdnaturaService {
|
|||
@Body params: List<String>):
|
||||
Call<List<ItemUbicadorVO>>
|
||||
|
||||
@POST("almacennew/shelvingPriorityUpdate")
|
||||
fun shelvingPriorityUpdate(@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<String>
|
||||
|
||||
@POST("almacennew/itemShelvingMake")
|
||||
fun itemShelvingMake(@Header("aplicacion") aplicacion: String,
|
||||
@Header("version") version: String,
|
||||
|
|
|
@ -36,7 +36,7 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
|||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
prefs = activity!!.getSharedPreferences(PREFS_USER,0)
|
||||
customDialog = CustomDialog(requireContext())
|
||||
viewModel.inititializeDefaultAjusts(prefs!!.getString(SECTORDESCRIP,"Sin sector").toString(),prefs!!.getInt(SECTORFK,0),prefs!!.getInt(WAREHOUSEFK,0))
|
||||
viewModel.inititializeDefaultAjusts(prefs!!.getString(SECTORDESCRIP,getString(R.string.Sinsector)).toString(),prefs!!.getInt(SECTORFK,0),prefs!!.getInt(WAREHOUSEFK,0))
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
}
|
||||
|
@ -62,9 +62,9 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
|||
} else if (item.id == 1){
|
||||
activity!!.onBackPressed()
|
||||
}else if (item.id == 2){
|
||||
"No disponible en esta versión".toast(requireContext())
|
||||
getString(R.string.Nodisponibleenestaversión).toast(requireContext())
|
||||
}else if (item.id == 3){
|
||||
"No disponible en esta versión".toast(requireContext())
|
||||
getString(R.string.Nodisponibleenestaversión).toast(requireContext())
|
||||
}
|
||||
}
|
||||
})
|
||||
|
@ -75,7 +75,7 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
|||
event.getContentIfNotHandled().notNull {
|
||||
splash_progress.visibility = View.INVISIBLE
|
||||
if (it.list != null && it.list.size > 0 && it.list.get(0).isError){
|
||||
customDialog.setTitle("Error").setDescription(it.list.get(0).errorMessage).setOkButton("Cerrar"){
|
||||
customDialog.setTitle("Error").setDescription(it.list.get(0).errorMessage).setOkButton(getString(R.string.Cerrar)){
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}else{
|
||||
|
@ -90,7 +90,7 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
|||
showDialogSector(listSectores.toArray(array))
|
||||
|
||||
}else{
|
||||
customDialog.setTitle("Sectores").setDescription("No existes sectores.").setOkButton("Cerrar"){
|
||||
customDialog.setTitle("Sectores").setDescription(getString(R.string.Noexistessectores)).setOkButton(getString(R.string.Cerrar)){
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ class AjustesFragment : BaseFragment<FragmentAjustesBinding,AjustesViewModel>(Aj
|
|||
val builder = AlertDialog.Builder(this.context)
|
||||
|
||||
|
||||
builder.setTitle("Selecciona un sector")
|
||||
builder.setTitle(getString(R.string.Seleccionaunsector))
|
||||
builder.setItems(array) { _, which ->
|
||||
val selected = array[which]
|
||||
sectorListVO.forEach {
|
||||
|
|
|
@ -186,17 +186,17 @@ class ItemCardFragment(
|
|||
itemcard_tag4.text = itemInfo.value7 + " " + itemInfo.origin
|
||||
listItemsRow = ArrayList()
|
||||
listItemsRow.add(ItemCardRowVO(title = "Total",value = itemInfo.total,isEditable = false))
|
||||
listItemsRow.add(ItemCardRowVO(title = "Disponible",value = itemInfo.available,isEditable = false))
|
||||
listItemsRow.add(ItemCardRowVO(title = "Ubicado",value = itemInfo.enAltillo,isEditable = false))
|
||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Disponible),value = itemInfo.available,isEditable = false))
|
||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Ubicado),value = itemInfo.enAltillo,isEditable = false))
|
||||
|
||||
//EDITABLES
|
||||
listItemsRow.add(ItemCardRowVO(title = "SIN UBICAR",value = itemInfo.enNicho,isEditable = true, action = "itemStockUpdate"))
|
||||
listItemsRow.add(ItemCardRowVO(title = "BUSCAR ITEM",value = "",isEditable = true, action = "buscarItem"))
|
||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.SINUBICAR),value = itemInfo.enNicho,isEditable = true, action = "itemStockUpdate"))
|
||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.BUSCARITEM),value = "",isEditable = true, action = "buscarItem"))
|
||||
//listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave"))
|
||||
// listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave"))
|
||||
listItemsRow.add(ItemCardRowVO(title = "GROUPING",value = itemInfo.grouping,isEditable = true, action = "updateGrouping"))
|
||||
listItemsRow.add(ItemCardRowVO(title = "PACKING",value = itemInfo.packing,isEditable = true, action = "updatePacking"))
|
||||
listItemsRow.add(ItemCardRowVO(title = "MINIMO",value = itemInfo.min,isEditable = true, action = "itemSaveMin"))
|
||||
listItemsRow.add(ItemCardRowVO(title = getString(R.string.MINIMO),value = itemInfo.min,isEditable = true, action = "itemSaveMin"))
|
||||
listItemsRow.add(ItemCardRowVO(title = "BARCODE",barcodes = itemInfo.barcodes,isEditable = true, action = "toBarcode"))
|
||||
listBarcodes = itemInfo.barcodes as ArrayList<BarcodeVO>
|
||||
|
||||
|
|
|
@ -432,9 +432,11 @@ class CollectionFragment(
|
|||
)
|
||||
}
|
||||
mpok!!.start()
|
||||
"Ticket aparcado".toast(requireContext())
|
||||
getString(R.string.Ticketaparcado).toast(requireContext())
|
||||
}else{
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
storedPosition = 0
|
||||
storedBackPosition = 0
|
||||
viewModel.collectionTicketGet(user,password,txtscan,sectorFk)
|
||||
}
|
||||
}
|
||||
|
@ -765,7 +767,7 @@ class CollectionFragment(
|
|||
collectionFk = collection.collectionFk,
|
||||
sectorFk = sectorFk
|
||||
)
|
||||
"Imprimiendo...".toast(requireContext())
|
||||
getString(R.string.Imprimiendo).toast(requireContext())
|
||||
}
|
||||
|
||||
private fun addItem(){
|
||||
|
@ -777,11 +779,11 @@ class CollectionFragment(
|
|||
ticketSelected = listPlacementSupply[0].code!!
|
||||
}
|
||||
|
||||
customDialogList.setTitle("Agregar artículo para ticket: "+ticketSelected).setOkButton("Agregar"){
|
||||
customDialogList.setTitle(getString(R.string.Agregarartículoparaticket)+" "+ticketSelected).setOkButton(getString(R.string.Agregar)){
|
||||
if (ticketSelected.isNullOrEmpty()){
|
||||
"Selecciona un ticket de la lista".toast(requireContext())
|
||||
getString(R.string.Seleccionaunticketdelaista).toast(requireContext())
|
||||
}else if (customDialogList.getValue().isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()) {
|
||||
"Todos los campos son obligatorios".toast(requireContext())
|
||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||
}else{
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
viewModel.collectionAddItem(
|
||||
|
@ -800,7 +802,7 @@ class CollectionFragment(
|
|||
}.setKoButton("Cerrar"){
|
||||
scanRequest()
|
||||
customDialogList.dismiss()
|
||||
}.setHintValue("Artículo:").setValue("").setHintValueTwo("Cantidad:").setValueTwo("").show()
|
||||
}.setHintValue(getString(R.string.Artículo)).setValue("").setHintValueTwo(getString(R.string.Cantidad)).setValueTwo("").show()
|
||||
|
||||
customDialogList.getEditText().requestFocus()
|
||||
hideKeyboards()
|
||||
|
@ -820,9 +822,9 @@ class CollectionFragment(
|
|||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||
if (!customDialogList.getValueTwo().isNullOrEmpty()){
|
||||
if (ticketSelected.isNullOrEmpty()){
|
||||
"Selecciona un ticket de la lista".toast(requireContext())
|
||||
getString(R.string.Seleccionaunticketdelaista).toast(requireContext())
|
||||
}else if (customDialogList.getValue().isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()) {
|
||||
"Todos los campos son obligatorios".toast(requireContext())
|
||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||
}else{
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
viewModel.collectionAddItem(
|
||||
|
@ -847,9 +849,9 @@ class CollectionFragment(
|
|||
|
||||
placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener {
|
||||
override fun onBarcodeRowClickListener(item: BarcodeVO) {
|
||||
customDialogInput.setTitle("Artículo para Ticket: "+item.code!!)
|
||||
customDialogInput.setTitle(getString(R.string.ArtículoparaTicket)+" "+item.code!!)
|
||||
ticketSelected = item.code!!
|
||||
customDialogList.setTitle("Agregar artículo para ticket: "+ticketSelected)
|
||||
customDialogList.setTitle(getString(R.string.Agregarartículoparaticket)+" "+ticketSelected)
|
||||
}
|
||||
},showDelete = false)
|
||||
|
||||
|
@ -862,7 +864,7 @@ class CollectionFragment(
|
|||
|
||||
private fun showDisponibility(){
|
||||
|
||||
customDialogInput.setTitle("Ver disponible").setDescription("Escanea etiqueta: ").setOkButton("Buscar"){
|
||||
customDialogInput.setTitle(getString(R.string.Verdisponible)).setDescription(getString(R.string.Escaneaetiqueta)).setOkButton(getString(R.string.Buscar)){
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
hideKeyboards()
|
||||
viewModel.itemGetAvailable(
|
||||
|
@ -929,25 +931,25 @@ class CollectionFragment(
|
|||
toolbar_title.text = collection.collectionFk
|
||||
toolbar_subtitle.text = "" +totalMark + "/" + sales.size
|
||||
if (totalMark == sales.size) {
|
||||
"Colección completa".toast(this.context,Toast.LENGTH_SHORT)
|
||||
getString(R.string.Coleccióncompleta).toast(this.context,Toast.LENGTH_SHORT)
|
||||
changeTicketState()
|
||||
}
|
||||
}
|
||||
|
||||
//FALTAS / BASURA / SPLIT
|
||||
private fun showQuantityDialog(position:Int) {
|
||||
customDialogThreeButtons.setTitle("Nueva cantidad").setDescription("Indica la nueva cantidad y la acción que quieres realizar con el resto.").setValue("")
|
||||
.setOkButton("Faltas"){
|
||||
customDialogThreeButtons.setTitle(getString(R.string.Nuevacantidad)).setDescription(getString(R.string.txtnuevacantidad)).setValue("")
|
||||
.setOkButton(getString(R.string.Faltas)){
|
||||
if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){
|
||||
"Indica nueva cantidad".toast(requireContext())
|
||||
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
||||
}else{
|
||||
trash(position,customDialogThreeButtons.getValue())
|
||||
scanRequest()
|
||||
customDialogThreeButtons.dismiss()
|
||||
}
|
||||
}.setOkButtonTwo("Basura / Rechazar"){
|
||||
}.setOkButtonTwo(getString(R.string.BasuraRechazar)){
|
||||
if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){
|
||||
"Indica nueva cantidad".toast(requireContext())
|
||||
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
||||
}else{
|
||||
missing(position,customDialogThreeButtons.getValue())
|
||||
scanRequest()
|
||||
|
@ -955,16 +957,16 @@ class CollectionFragment(
|
|||
}
|
||||
}.setOkButtonThree("Split"){
|
||||
if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){
|
||||
"Indica nueva cantidad".toast(requireContext())
|
||||
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
||||
}else{
|
||||
split(position,customDialogThreeButtons.getValue())
|
||||
scanRequest()
|
||||
customDialogThreeButtons.dismiss()
|
||||
}
|
||||
|
||||
}.setOkButtonAdd("Agregar"){
|
||||
}.setOkButtonAdd(getString(R.string.Agregar)){
|
||||
if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){
|
||||
"Indica nueva cantidad".toast(requireContext())
|
||||
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
||||
}else{
|
||||
increaseQuantity(position,customDialogThreeButtons.getValue())
|
||||
scanRequest()
|
||||
|
@ -1130,7 +1132,7 @@ class CollectionFragment(
|
|||
|
||||
//OTROS
|
||||
private fun showScanner(index:Int, sale:SaleVO){
|
||||
customDialogInput.setTitle(""+sale.itemFk).setDescription("Escanea el carro para el item seleccionado").setOkButton("Aceptar"){
|
||||
customDialogInput.setTitle(""+sale.itemFk).setDescription(getString(R.string.Escaneaelcarroparaelitemseleccionado)).setOkButton("Aceptar"){
|
||||
if (!customDialogInput.getValue().isNullOrEmpty()) {
|
||||
findSale(customDialogInput.getValue(),index)
|
||||
}
|
||||
|
|
|
@ -72,23 +72,23 @@ class MainActivity : BaseActivity<ActivityMainBinding>() , OnPasillerosItemClick
|
|||
GlobalScope.launch(Dispatchers.Main){
|
||||
val bottomMenuItems : ArrayList<ItemMenuVO> = ArrayList()
|
||||
|
||||
bottomMenuItems.add(ItemMenuVO(0,title = "Pasilleros",defaultImage = ContextCompat.getDrawable(
|
||||
bottomMenuItems.add(ItemMenuVO(0,title = getString(R.string.Pasilleros),defaultImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_device_hub_black_24dp),selectedImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_device_hub_black_24dp_selected)))
|
||||
|
||||
bottomMenuItems.add(ItemMenuVO(1,title = "Sacadores",defaultImage = ContextCompat.getDrawable(
|
||||
bottomMenuItems.add(ItemMenuVO(1,title = getString(R.string.Sacadores),defaultImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_local_florist_black_24dp),selectedImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_local_florist_black_24dp_selected)))
|
||||
|
||||
bottomMenuItems.add(ItemMenuVO(2,title = "Controladores",defaultImage = ContextCompat.getDrawable(
|
||||
bottomMenuItems.add(ItemMenuVO(2,title = getString(R.string.Controladores),defaultImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_verified_user_black_24dp),selectedImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_verified_user_black_24dp_selected)))
|
||||
|
||||
bottomMenuItems.add(ItemMenuVO(3,title = "Paletizadores",defaultImage = ContextCompat.getDrawable(
|
||||
bottomMenuItems.add(ItemMenuVO(3,title = getString(R.string.Paletizadores),defaultImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_local_shipping_black_24dp),selectedImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_local_shipping_black_24dp_selected)))
|
||||
|
||||
bottomMenuItems.add(ItemMenuVO(4,title = "Ajustes",defaultImage = ContextCompat.getDrawable(
|
||||
bottomMenuItems.add(ItemMenuVO(4,title = getString(R.string.Ajustes),defaultImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_build_black_24dp),selectedImage = ContextCompat.getDrawable(
|
||||
applicationContext,R.drawable.ic_build_black_24dp_selected)))
|
||||
|
||||
|
@ -125,27 +125,27 @@ class MainActivity : BaseActivity<ActivityMainBinding>() , OnPasillerosItemClick
|
|||
|
||||
|
||||
when (selectedItemMenu?.title) {
|
||||
"Pasilleros" -> {
|
||||
getString(R.string.Pasilleros) -> {
|
||||
fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
addFragment(PasilleroFragment.newInstance(),R.id.main_frame_layout, PasilleroFragment.TAG,false)
|
||||
true
|
||||
}
|
||||
"Sacadores" -> {
|
||||
getString(R.string.Sacadores) -> {
|
||||
fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
addFragment(SacadorFragment.newInstance(),R.id.main_frame_layout, SacadorFragment.TAG,false)
|
||||
true
|
||||
}
|
||||
"Controladores" -> {
|
||||
getString(R.string.Controladores) -> {
|
||||
fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
addFragment(ControladorFragment.newInstance(),R.id.main_frame_layout, ControladorFragment.TAG,false)
|
||||
true
|
||||
}
|
||||
"Paletizadores" -> {
|
||||
getString(R.string.Paletizadores) -> {
|
||||
fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
addFragment(ExpeditionTruckListFragment.newInstance(),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false)
|
||||
true
|
||||
}
|
||||
"Ajustes" -> {
|
||||
getString(R.string.Ajustes) -> {
|
||||
fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE)
|
||||
addFragment(AjustesFragment.newInstance(),R.id.main_frame_layout, AjustesFragment.TAG,false)
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package es.verdnatura.presentation.view.feature.pasillero.adapter
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
|
@ -12,8 +13,9 @@ class PasillerosAdapter (
|
|||
private val onPasillerosItemClickListener: OnPasillerosItemClickListener
|
||||
): RecyclerView.Adapter<PasillerosAdapter.PasillerosItemHolder> () {
|
||||
|
||||
|
||||
var context : Context? = null
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PasillerosItemHolder {
|
||||
this.context = parent.context
|
||||
return PasillerosItemHolder(
|
||||
ItemPasillerosMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false)
|
||||
)
|
||||
|
@ -30,12 +32,13 @@ class PasillerosAdapter (
|
|||
}
|
||||
|
||||
|
||||
class PasillerosItemHolder(
|
||||
inner class PasillerosItemHolder(
|
||||
val binding: ItemPasillerosMainMenuBinding
|
||||
) : RecyclerView.ViewHolder(binding.root){
|
||||
fun bind(item: PasillerosItemVO) {
|
||||
binding.apply {
|
||||
this.item = item
|
||||
this.title = context?.getString(item.titleToShow)
|
||||
itemImage.setImageResource(item.iconResource)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package es.verdnatura.presentation.view.feature.pasillero.fragment
|
||||
|
||||
|
||||
import android.app.Application
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||
|
@ -16,51 +17,53 @@ class PasilleroViewModel : BaseViewModel() {
|
|||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Sacador")
|
||||
"Pre Sacador",R.string.PreSacador)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(0,
|
||||
R.drawable.ic_loyalty_black_24dp,
|
||||
"Consultar artículo")
|
||||
"Consultar artículo",R.string.ConsultarArticulo)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(6,
|
||||
R.drawable.ic_local_parking_orange_24dp,
|
||||
"Parking")
|
||||
"Parking",R.string.Parking)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(2,
|
||||
R.drawable.ic_visibility_black_24dp,
|
||||
"Buscar item")
|
||||
"Buscar item",R.string.BuscarItem)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(1,
|
||||
R.drawable.ic_dashboard_black_24dp,
|
||||
"Ubicador")
|
||||
"Ubicador",R.string.Ubicador)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(3,
|
||||
R.drawable.ic_spa_black_24dp,
|
||||
"Inventario")
|
||||
"Inventario",R.string.Inventario)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(4,
|
||||
R.drawable.ic_move_to_inbox_black_24dp,
|
||||
"Faltas")
|
||||
"Faltas",R.string.Faltas)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(5,
|
||||
R.drawable.ic_send_black_24dp,
|
||||
"Shelving Parking")
|
||||
"Shelving Parking",R.string.ShelvingParking)
|
||||
)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -3,5 +3,6 @@ package es.verdnatura.presentation.view.feature.pasillero.model
|
|||
class PasillerosItemVO (
|
||||
var id: Int = 0,
|
||||
var iconResource: Int = 0,
|
||||
val title: String = ""
|
||||
val title: String = "",
|
||||
val titleToShow:Int = 0
|
||||
)
|
|
@ -138,6 +138,19 @@ class UbicadorFragment(
|
|||
return@setOnEditorActionListener false
|
||||
}
|
||||
|
||||
edit_prioridad.setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||
if (!edit_prioridad.text.toString().isNullOrEmpty()){
|
||||
viewModel.shelvingPriorityUpdate(user,password,edit_prioridad.text.toString(),shelvingFk)
|
||||
}
|
||||
|
||||
(activity as MainActivity).hideKeyboard(edit_prioridad)
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
|
||||
return@setOnEditorActionListener false
|
||||
}
|
||||
|
||||
|
||||
automatic_img.setOnClickListener {
|
||||
if (!shelvingFk.isNullOrEmpty())
|
||||
|
@ -234,6 +247,8 @@ class UbicadorFragment(
|
|||
}
|
||||
etiquetas = contEtiquetas.toString()
|
||||
toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas
|
||||
if(it.list.size > 0)
|
||||
edit_prioridad.setText(it.list[0].priority)
|
||||
splash_progress.visibility = View.GONE
|
||||
adapter = UbicadorAdapter(listItems,onPasillerosItemClickListener = pasillerosItemClickListener!!,
|
||||
onVisibleClickListener = object: OnVisibleClickListener{
|
||||
|
|
|
@ -57,6 +57,24 @@ class UbicadorViewModel : BaseViewModel() {
|
|||
})
|
||||
}
|
||||
|
||||
fun shelvingPriorityUpdate(usuario:String,password:String,priority:String,shelving:String){
|
||||
getUbicadorUserCase.shelvingPriorityUpdate(usuario,password,priority,shelving).enqueue(object : Callback<String>{
|
||||
override fun onFailure(call: Call<String>, t: Throwable) {
|
||||
_response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPriorityUpdate")
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call<String>, response: Response<String>) {
|
||||
if (response.body() == null){
|
||||
_response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPriorityUpdate")
|
||||
}else{
|
||||
_response.value = ResponseItemVO(isError = false,response = response.body()!!)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
fun itemShelvingMake(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String){
|
||||
getUbicadorUserCase.itemShelvingMake(usuario,password,shelving,item,deep,quantity,packing,warehouse,level).enqueue(object : Callback<String>{
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Nuevo valor"
|
||||
android:hint="@string/Nuevovalor"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Hora"
|
||||
android:hint="@string/Hora"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -94,7 +94,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Destino"
|
||||
android:hint="@string/Destino"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Nueva cantidad"
|
||||
android:hint="@string/Nuevacantidad"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -87,7 +87,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Etiquetas"
|
||||
android:hint="@string/Etiquetas"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -108,7 +108,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Visible"
|
||||
android:hint="@string/Visible"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -35,11 +35,11 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Versión:"
|
||||
android:text="@string/Versión"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
android:layout_marginRight="@dimen/default_layout_margin" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_version"
|
||||
|
@ -59,7 +59,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Usuario:"
|
||||
android:text="@string/Usuario"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea matricula"
|
||||
android:hint="@string/Escaneamatricula"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -57,7 +57,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/btn_orange"
|
||||
android:text="Finalizar"
|
||||
android:text="@string/Finalizar"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea etiqueta"
|
||||
android:hint="@string/Escaneaetiqueta"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -62,7 +62,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Matrícula"
|
||||
android:text="@string/Matrícula"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -70,7 +70,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Visible"
|
||||
android:text="@string/Visible"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -78,7 +78,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Fecha"
|
||||
android:text="@string/Fecha"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escaner"
|
||||
android:hint="@string/Escaner"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea etiqueta"
|
||||
android:hint="@string/Escaneaetiqueta"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Pallet"
|
||||
android:text="@string/Pallet"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Rutas"
|
||||
android:text="@string/Ruta"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:text="Pallet: "
|
||||
android:text="@string/Pallet"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/h6"/>
|
||||
</LinearLayout>
|
||||
|
@ -52,7 +52,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Ruta"
|
||||
android:text="@string/Ruta"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
@ -61,7 +61,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Cajas"
|
||||
android:text="@string/Cajas"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Ruta"
|
||||
android:text="@string/Ruta"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
@ -63,7 +63,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Ticket"
|
||||
android:text="@string/Ticket"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
@ -72,7 +72,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Caja"
|
||||
android:text="@string/Cajas"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Destino"
|
||||
android:text="@string/Destino"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Filtro"
|
||||
android:hint="@string/Filtro"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -70,7 +70,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Nicho"
|
||||
android:text="@string/Nicho"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -78,7 +78,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Faltas"
|
||||
android:text="@string/Faltas"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Fecha"
|
||||
android:text="@string/Fecha"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -45,7 +45,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Cliente"
|
||||
android:text="@string/Cliente"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -55,7 +55,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Entrada"
|
||||
android:text="@string/Entrada"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -63,7 +63,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Salida"
|
||||
android:text="@string/Salida"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -71,7 +71,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Balance"
|
||||
android:text="@string/Balance"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Filtro"
|
||||
android:hint="@string/Filtro"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -70,7 +70,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Nicho"
|
||||
android:text="@string/Nicho"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea etiqueta"
|
||||
android:hint="@string/Escaneaetiqueta"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -84,10 +84,11 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Tamaño: "
|
||||
android:text="@string/Tamaño"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/itemcard_tag1"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -104,10 +105,11 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Longitud: "
|
||||
android:text="@string/Longitud"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/itemcard_tag2"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -132,10 +134,11 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Color: "
|
||||
android:text="@string/Color"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/itemcard_tag3"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -152,10 +155,11 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Origen: "
|
||||
android:text="@string/Origen"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/itemcard_tag4"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="Bienvenido"
|
||||
android:text="@string/Bienvenido"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="@dimen/h3"
|
||||
android:textStyle="bold"
|
||||
|
@ -55,7 +55,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_margin="@dimen/default_layout_margin"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Usuario (Nombre trabajador)"
|
||||
android:hint="@string/Usuario"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -82,7 +82,7 @@
|
|||
android:layout_margin="@dimen/default_layout_margin"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="Contraseña"
|
||||
android:hint="Password"
|
||||
android:inputType="textPassword"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -96,7 +96,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/default_layout_margin"
|
||||
android:text="Recordar usuario y contraseña"
|
||||
android:text="@string/Recordarusuarioycontraseña"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
|
@ -125,7 +125,7 @@
|
|||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:background="@drawable/btn_orange"
|
||||
android:text="Entrar"
|
||||
android:text="@string/Entrar"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
@ -141,7 +141,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:paddingStart="@dimen/layout_margin_3"
|
||||
android:paddingEnd="@dimen/layout_margin_3"
|
||||
android:text="Borrar datos de acceso"
|
||||
android:text="@string/Borrardatosdeacceso"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textStyle="normal"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escaner"
|
||||
android:hint="@string/Escaner"
|
||||
android:inputType="textCapCharacters"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -45,7 +45,7 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:gravity="center"
|
||||
android:text="Primero escanea tantos carros o tickets como quieras aparcar y finalmente escanea el parking para finalizar el proceso"
|
||||
android:text="@string/txtparking"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/body2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escaner"
|
||||
android:hint="@string/Escaner"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
android:layout_width="match_parent"
|
||||
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea shelving"
|
||||
android:hint="@string/Escaneashelving"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
@ -94,7 +94,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Concept"
|
||||
android:text="@string/Concepto"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -102,7 +102,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SinServir"
|
||||
android:text="@string/SinServir"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
@ -110,7 +110,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Aparcado"
|
||||
android:text="@string/Aparcado"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
android:id="@+id/textView13"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Escanear etiqueta:"
|
||||
android:text="@string/Escaneaetiqueta"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="18sp" />
|
||||
|
||||
|
@ -50,7 +50,7 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
android:hint="etiqueta"
|
||||
android:hint="@string/Etiquetas"
|
||||
android:inputType="number"
|
||||
android:padding="8dp" />
|
||||
|
||||
|
@ -63,7 +63,7 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
android:hint="cantidad"
|
||||
android:hint="@string/cantidad"
|
||||
android:inputType="number"
|
||||
android:padding="8dp" />
|
||||
|
||||
|
@ -73,7 +73,7 @@
|
|||
android:id="@+id/textView19"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Carro de origen:"
|
||||
android:text="@string/carrodeorigen"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="18sp" />
|
||||
|
||||
|
@ -87,14 +87,14 @@
|
|||
android:padding="8dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:hint="carro de origen"/>
|
||||
android:hint="@string/carrodeorigen"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView21"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Carro destino:"
|
||||
android:text="@string/Carrodestino"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="18sp" />
|
||||
|
||||
|
@ -107,14 +107,14 @@
|
|||
android:background="@color/verdnatura_white"
|
||||
android:padding="8dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:hint="carro destino"/>
|
||||
android:hint="@string/Carrodestino"/>
|
||||
|
||||
<Button
|
||||
style="@style/DefaultButton"
|
||||
android:id="@+id/button15"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Transferir"
|
||||
android:text="@string/Transferir"
|
||||
android:background="@drawable/btn_orange"
|
||||
android:layout_marginTop="20dp"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
|
@ -41,13 +41,32 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Escanea matricula"
|
||||
android:hint="@string/Escaneamatricula"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textColorHint="@android:color/darker_gray" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_prioridad"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textColorHint="@android:color/darker_gray">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/edit_prioridad"
|
||||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Prioridad:"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textColorHint="@android:color/darker_gray" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<ImageView
|
||||
android:id="@+id/delete_img"
|
||||
android:layout_width="@dimen/options_image_width"
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:text="Nivel:"
|
||||
android:text="@string/Nivel"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
|
@ -54,7 +54,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:text="Ticket:"
|
||||
android:text="@string/Ticket"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
|
@ -159,7 +159,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="de"
|
||||
android:text="@string/de"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity"
|
||||
|
|
|
@ -8,6 +8,9 @@
|
|||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO" />
|
||||
<variable
|
||||
name="title"
|
||||
type="String"/>
|
||||
</data>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -32,7 +35,7 @@
|
|||
android:id="@+id/item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:text="@{item.title}"
|
||||
android:text="@{title}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
|
|
|
@ -0,0 +1,86 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Gestor Almacén</string>
|
||||
<string name="Fecha">Fecha</string>
|
||||
<string name="Cliente">Cliente</string>
|
||||
<string name="Entrada">Entrada</string>
|
||||
<string name="Salida">Salida</string>
|
||||
<string name="Balance">Balance</string>
|
||||
<string name="Pallet">Pallet</string>
|
||||
<string name="Ruta">Ruta</string>
|
||||
<string name="Cajas">Cajas</string>
|
||||
<string name="Nivel">Nivel:</string>
|
||||
<string name="de">de</string>
|
||||
<string name="Ticket">Ticket</string>
|
||||
<string name="Concepto">Concepto</string>
|
||||
<string name="SinServir">SinServir</string>
|
||||
<string name="Aparcado">Aparcado</string>
|
||||
<string name="Longitud">Longitud</string>
|
||||
<string name="Color">Color</string>
|
||||
<string name="Origen">Origen</string>
|
||||
<string name="Tamaño">Tamaño</string>
|
||||
<string name="Matrícula">Matrícula</string>
|
||||
<string name="Visible">Visible</string>
|
||||
<string name="Finalizar">Finalizar</string>
|
||||
<string name="Destino">Destino</string>
|
||||
<string name="Nicho">Nicho</string>
|
||||
<string name="Entrar">Entrar</string>
|
||||
<string name="Borrardatosdeacceso">Borrar datos de acceso</string>
|
||||
<string name="Bienvenido">Bienvenido</string>
|
||||
<string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string>
|
||||
<string name="Faltas">Faltas</string>
|
||||
<string name="Versión">Versión</string>
|
||||
<string name="Usuario">Usuario</string>
|
||||
<string name="Escaneaetiqueta">Escanea etiqueta</string>
|
||||
<string name="Filtro">Filtro</string>
|
||||
<string name="Nuevovalor">Nuevo Valor</string>
|
||||
<string name="Hora">Hora</string>
|
||||
<string name="Etiquetas">Etiquetas</string>
|
||||
<string name="Escaneamatricula">Escanea matricula</string>
|
||||
<string name="Escaneashelving">Escanea shelving</string>
|
||||
<string name="Escaner">Escaner</string>
|
||||
<string name="Nuevacantidad">Nueva cantidad</string>
|
||||
<string name="cantidad">cantidad</string>
|
||||
<string name="carrodeorigen">carro de origen</string>
|
||||
<string name="Carrodestino">Carro destino</string>
|
||||
<string name="Transferir">Transferir</string>
|
||||
<string name="Sinsector">Sin sector</string>
|
||||
<string name="Nodisponibleenestaversión">No disponible en esta versión</string>
|
||||
<string name="Cerrar">Cerrar</string>
|
||||
<string name="Noexistessectores">No existes sectores.</string>
|
||||
<string name="Seleccionaunsector">Selecciona un sector</string>
|
||||
<string name="Pasilleros">Pasilleros</string>
|
||||
<string name="Sacadores">Sacadores</string>
|
||||
<string name="Controladores">Controladores</string>
|
||||
<string name="Paletizadores">Paletizadores</string>
|
||||
<string name="Ajustes">Ajustes</string>
|
||||
<string name="PreSacador">Pre Sacador</string>
|
||||
<string name="ConsultarArticulo">Consultar artículo</string>
|
||||
<string name="BuscarItem">Buscar Item</string>
|
||||
<string name="Ubicador">Ubicador</string>
|
||||
<string name="Inventario">Inventario</string>
|
||||
<string name="Disponible">Disponible</string>
|
||||
<string name="Ubicado">Ubicado</string>
|
||||
<string name="SINUBICAR">SIN UBICAR</string>
|
||||
<string name="BUSCARITEM">BUSCAR ITEM</string>
|
||||
<string name="MINIMO">MINIMO</string>
|
||||
<string name="txtparking">Primero escanea tantos carros o tickets como quieras aparcar y finalmente escanea el parking para finalizar el proceso</string>
|
||||
<string name="Ticketaparcado">Ticket aparcado</string>
|
||||
<string name="Imprimiendo">Imprimiendo...</string>
|
||||
<string name="Verdisponible">Ver disponible</string>
|
||||
<string name="Buscar">Buscar</string>
|
||||
<string name="Agregarartículoparaticket">Agregar artículo para ticket:</string>
|
||||
<string name="Agregar">Agregar</string>
|
||||
<string name="Seleccionaunticketdelaista">Selecciona un ticket de la lista</string>
|
||||
<string name="Todosloscampossonobligatorios">Todos los campos son obligatorios</string>
|
||||
<string name="Artículo">Artículo</string>
|
||||
<string name="Cantidad">Cantidad</string>
|
||||
<string name="ArtículoparaTicket">Artículo para Ticket</string>
|
||||
<string name="Escaneaelcarroparaelitemseleccionado">Escanea el carro para el item seleccionado</string>
|
||||
<string name="txtnuevacantidad">Indica la nueva cantidad y la acción que quieres realizar con el resto.</string>
|
||||
<string name="BasuraRechazar">Basura / Rechazar</string>
|
||||
<string name="Indicanuevacantidad">Indica nueva cantidad</string>
|
||||
<string name="Coleccióncompleta">Colección completa</string>
|
||||
<string name="Parking">Parking</string>
|
||||
<string name="ShelvingParking">Shelving Parking</string>
|
||||
</resources>
|
|
@ -1,3 +1,85 @@
|
|||
<resources>
|
||||
<string name="app_name">Gestor Almacén</string>
|
||||
<string name="app_name">Warehouse Manager</string>
|
||||
<string name="Fecha">Date</string>
|
||||
<string name="Cliente">Client</string>
|
||||
<string name="Entrada">Entry</string>
|
||||
<string name="Salida">Departure</string>
|
||||
<string name="Balance">Balance</string>
|
||||
<string name="Pallet">Pallet</string>
|
||||
<string name="Ruta">Route</string>
|
||||
<string name="Cajas">Boxes</string>
|
||||
<string name="Nivel">Level:</string>
|
||||
<string name="de">of</string>
|
||||
<string name="Ticket">Ticket</string>
|
||||
<string name="Concepto">Concept</string>
|
||||
<string name="SinServir">NoServing</string>
|
||||
<string name="Aparcado">Parked</string>
|
||||
<string name="Longitud">Length</string>
|
||||
<string name="Color">Color</string>
|
||||
<string name="Origen">Origin</string>
|
||||
<string name="Tamaño">Size</string>
|
||||
<string name="Matrícula">Registration number</string>
|
||||
<string name="Visible">Visible</string>
|
||||
<string name="Finalizar">Finalize</string>
|
||||
<string name="Destino">Destination</string>
|
||||
<string name="Nicho">Niche</string>
|
||||
<string name="Entrar">Log In</string>
|
||||
<string name="Borrardatosdeacceso">Clear access data</string>
|
||||
<string name="Bienvenido">Welcome</string>
|
||||
<string name="Recordarusuarioycontraseña">Remember username and password</string>
|
||||
<string name="Faltas">Fouls</string>
|
||||
<string name="Versión">Version</string>
|
||||
<string name="Usuario">User</string>
|
||||
<string name="Escaneaetiqueta">Scan label</string>
|
||||
<string name="Filtro">Filter</string>
|
||||
<string name="Nuevovalor">New value</string>
|
||||
<string name="Hora">Hour</string>
|
||||
<string name="Etiquetas">Labels</string>
|
||||
<string name="Escaneamatricula">Scan registration number</string>
|
||||
<string name="Escaneashelving">Scans shelving</string>
|
||||
<string name="Escaner">Scanner</string>
|
||||
<string name="Nuevacantidad">New quantity</string>
|
||||
<string name="cantidad">quantity</string>
|
||||
<string name="carrodeorigen">origin car</string>
|
||||
<string name="Carrodestino">Destination car</string>
|
||||
<string name="Transferir">To transfer</string>
|
||||
<string name="Sinsector">Without sector</string>
|
||||
<string name="Nodisponibleenestaversión">Not available in this version</string>
|
||||
<string name="Cerrar">Close</string>
|
||||
<string name="Noexistessectores">There are no sectors.</string>
|
||||
<string name="Seleccionaunsector">Select a sector</string>
|
||||
<string name="Pasilleros">Corridors</string>
|
||||
<string name="Sacadores">Punch</string>
|
||||
<string name="Controladores">Controller</string>
|
||||
<string name="Paletizadores">Palletizers</string>
|
||||
<string name="Ajustes">Setting</string>
|
||||
<string name="PreSacador">Pre Punch</string>
|
||||
<string name="ConsultarArticulo">Consult Article</string>
|
||||
<string name="BuscarItem">Search item</string>
|
||||
<string name="Ubicador">Locator</string>
|
||||
<string name="Inventario">Inventory</string>
|
||||
<string name="Disponible">Available</string>
|
||||
<string name="Ubicado">Located</string>
|
||||
<string name="SINUBICAR">UNLOCATED</string>
|
||||
<string name="BUSCARITEM">SEARCH ITEM</string>
|
||||
<string name="MINIMO">MINIMUM</string>
|
||||
<string name="txtparking">First scan as many cars or tickets as you want to park and finally scan the parking to finish the process</string>
|
||||
<string name="Ticketaparcado">Parked ticket</string>
|
||||
<string name="Imprimiendo">Printing ...</string>
|
||||
<string name="Verdisponible">See available</string>
|
||||
<string name="Buscar">Search</string>
|
||||
<string name="Agregarartículoparaticket">Add item for ticket:</string>
|
||||
<string name="Agregar">Add</string>
|
||||
<string name="Seleccionaunticketdelaista">Select a ticket from the list</string>
|
||||
<string name="Todosloscampossonobligatorios">All fields are required</string>
|
||||
<string name="Artículo">Article</string>
|
||||
<string name="Cantidad">Quantity</string>
|
||||
<string name="ArtículoparaTicket">Ticket Item</string>
|
||||
<string name="Escaneaelcarroparaelitemseleccionado">Scan the cart for the selected item</string>
|
||||
<string name="txtnuevacantidad">Indicate the new quantity and the action you want to take with the rest.</string>
|
||||
<string name="BasuraRechazar">Garbage / Reject</string>
|
||||
<string name="Indicanuevacantidad">Indicates new quantity</string>
|
||||
<string name="Coleccióncompleta">Complete collection</string>
|
||||
<string name="Parking">Parking</string>
|
||||
<string name="ShelvingParking">Shelving Parking</string>
|
||||
</resources>
|
||||
|
|
Loading…
Reference in New Issue