Refactor synthetic y añadir histórico shelving. App en test instalada
This commit is contained in:
parent
155a2102cf
commit
26c9046903
|
|
@ -69,6 +69,7 @@
|
|||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_black.xml" value="0.1" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_selected.xml" value="0.1" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/qrcode_scan.xml" value="0.17395833333333333" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/revision_icon.xml" value="0.1" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/round_av_timer_24.xml" value="0.15052083333333333" />
|
||||
<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" />
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -37,9 +37,9 @@ import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter
|
|||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.*
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
/*import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.fragment_collection.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
import kotlinx.android.synthetic.main.toolbar.**/
|
||||
import timber.log.Timber
|
||||
|
||||
class CollectionFragment(
|
||||
|
|
@ -140,8 +140,9 @@ class CollectionFragment(
|
|||
customDialogInput = CustomDialogInput(requireContext())
|
||||
customDialog = CustomDialog(requireContext())
|
||||
customDialogThreeButtons = CustomDialogThreeButtons(requireContext())
|
||||
requireActivity().main_bottom_navigation.visibility = View.GONE
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
//requireActivity().main_bottom_navigation.visibility = View.GONE
|
||||
(activity as MainActivity).hideBottomNavigation(View.GONE)
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
|
||||
|
||||
|
||||
|
|
@ -151,8 +152,8 @@ class CollectionFragment(
|
|||
if (type != PRECHECKER) {
|
||||
setToolBar()
|
||||
} else {
|
||||
toolbar_subtitle.visibility = View.VISIBLE
|
||||
scan_input.visibility = View.GONE
|
||||
binding.mainToolbar.toolbarSubtitle.visibility = View.VISIBLE
|
||||
binding.scanInput.visibility = View.GONE
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -174,7 +175,7 @@ class CollectionFragment(
|
|||
}
|
||||
|
||||
private fun setToolBar() {
|
||||
toolbar_subtitle.visibility = View.VISIBLE
|
||||
binding.mainToolbar.toolbarSubtitle.visibility = View.VISIBLE
|
||||
|
||||
val listIcons: ArrayList<Drawable> = ArrayList()
|
||||
val iconPrint: Drawable =
|
||||
|
|
@ -193,7 +194,7 @@ class CollectionFragment(
|
|||
listIcons.add(iconAdd)
|
||||
|
||||
|
||||
toolbar_icons.adapter = ToolBarAdapter(listIcons, object : OnOptionsSelectedListener {
|
||||
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapter(listIcons, object : OnOptionsSelectedListener {
|
||||
override fun onOptionsItemSelected(item: Drawable) {
|
||||
if (item == iconPrint) {
|
||||
print()
|
||||
|
|
@ -206,13 +207,13 @@ class CollectionFragment(
|
|||
}
|
||||
}
|
||||
})
|
||||
toolbar_icons.layoutManager =
|
||||
binding.mainToolbar.toolbarIcons.layoutManager =
|
||||
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||
}
|
||||
|
||||
private fun scanRequest() {
|
||||
if (scan_input != null) {
|
||||
scan_input.requestFocus()
|
||||
if (binding.scanInput != null) {
|
||||
binding.scanInput.requestFocus()
|
||||
}
|
||||
hideKeyboards()
|
||||
}
|
||||
|
|
@ -230,24 +231,24 @@ class CollectionFragment(
|
|||
|
||||
private fun setEvents() {
|
||||
|
||||
backButton.setOnClickListener {
|
||||
binding.mainToolbar.backButton.setOnClickListener {
|
||||
requireActivity().onBackPressed()
|
||||
}
|
||||
//ESCANER =========
|
||||
hideKeyboards()
|
||||
/* if (type.equals(CONTROLADOR)){
|
||||
scan_input.inputType= InputType.TYPE_CLASS_NUMBER
|
||||
binding.scanInput.inputType= InputType.TYPE_CLASS_NUMBER
|
||||
}*/
|
||||
scan_input.requestFocus()
|
||||
scan_input.setOnEditorActionListener { v, actionId, event ->
|
||||
binding.scanInput.requestFocus()
|
||||
binding.scanInput.setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED)
|
||||
if (!scan_input.text.toString().isNullOrEmpty()) {
|
||||
if (!binding.scanInput.text.toString().isNullOrEmpty()) {
|
||||
//////Log.i("VERDNATURA:","Pita o no pita si encuentra. Diferencia si es matricula o no")
|
||||
findSale(scan_input.text.toString())
|
||||
findSale(binding.scanInput.text.toString())
|
||||
|
||||
|
||||
}
|
||||
scan_input.setText("")
|
||||
binding.scanInput.setText("")
|
||||
hideKeyboards()
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
|
|
@ -257,11 +258,12 @@ class CollectionFragment(
|
|||
hideKeyboards()
|
||||
|
||||
//LISTA =========
|
||||
collection_swipe.setOnRefreshListener {
|
||||
binding.collectionSwipe.setOnRefreshListener {
|
||||
|
||||
|
||||
collection_swipe.isRefreshing = false
|
||||
binding.collectionSwipe.isRefreshing = false
|
||||
if (type != PRECHECKER) {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.collectionTicketGet(
|
||||
user,
|
||||
password,
|
||||
|
|
@ -269,7 +271,7 @@ class CollectionFragment(
|
|||
sectorFk,
|
||||
type
|
||||
,"collection_getTickets")
|
||||
collection_swipe.isRefreshing = false
|
||||
binding.collectionSwipe.isRefreshing = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -285,7 +287,7 @@ class CollectionFragment(
|
|||
with(viewModel) {
|
||||
|
||||
collectionTicketList.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
if (!it.isError) {
|
||||
if (it.tickets.isNotEmpty()) {
|
||||
collection = it
|
||||
|
|
@ -297,7 +299,7 @@ class CollectionFragment(
|
|||
"El primer workerfk es :${it.tickets.get(0).sales.get(0).workerFk}"
|
||||
)*/
|
||||
} else {
|
||||
toolbar_subtitle.text = "0/0"
|
||||
binding.mainToolbar.toolbarSubtitle.text = "0/0"
|
||||
}
|
||||
} else {
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage)
|
||||
|
|
@ -310,19 +312,19 @@ class CollectionFragment(
|
|||
})
|
||||
|
||||
placementSuppleyList.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
if (!goBack) printShelvingResult(it)
|
||||
goBack = false
|
||||
})
|
||||
|
||||
item.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
if (!goBack) toastDisponibility(it)
|
||||
goBack = false
|
||||
})
|
||||
|
||||
responseNew.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
// if (!goBack) {
|
||||
if (it.isError) {
|
||||
customDialog.setTitle("Disponibilidad").setDescription(it.errorMessage)
|
||||
|
|
@ -332,7 +334,7 @@ class CollectionFragment(
|
|||
}.show()
|
||||
} else {
|
||||
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
|
||||
sendSalixMessage(
|
||||
item=dataMessageSalix.item,
|
||||
|
|
@ -357,7 +359,7 @@ class CollectionFragment(
|
|||
})
|
||||
|
||||
responseCode.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
if (!goBack2) {
|
||||
if (it.isError) {
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage)
|
||||
|
|
@ -385,18 +387,18 @@ class CollectionFragment(
|
|||
})
|
||||
|
||||
responseIncQuantity.observe(viewLifecycleOwner, Observer {
|
||||
/* splash_progress.visibility = View.VISIBLE
|
||||
/* binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk)*/
|
||||
})
|
||||
|
||||
mistakeList.observe(viewLifecycleOwner, Observer {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
if (!goBack) showMistakeList(it.list)
|
||||
goBack = false
|
||||
})
|
||||
//sergio: para si hay algun ticket por revisar
|
||||
responsecheckfully.observe(viewLifecycleOwner, Observer {
|
||||
splash_progress.visibility = View.GONE
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
if (it.isError) {
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage)
|
||||
.setOkButton("Aceptar") {
|
||||
|
|
@ -411,7 +413,7 @@ class CollectionFragment(
|
|||
|
||||
}
|
||||
.setKoButton("Revisar"){
|
||||
splash_progress.visibility=View.VISIBLE
|
||||
binding.splashProgress.visibility=View.VISIBLE
|
||||
viewModel.collectionTicketGet(user, password, it.response, sectorFk, type,"collection_getTickets")
|
||||
customDialog.dismiss()
|
||||
}
|
||||
|
|
@ -478,10 +480,10 @@ class CollectionFragment(
|
|||
speak("Colección cargada, diga listo para empezar.")
|
||||
}
|
||||
|
||||
toolbar_title.text = collection.collectionFk
|
||||
binding.mainToolbar.toolbarTitle.text = collection.collectionFk
|
||||
|
||||
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
var salesList: ArrayList<SaleVO> = ArrayList()
|
||||
tickets = ArrayList()
|
||||
var observations = ""
|
||||
|
|
@ -571,7 +573,7 @@ class CollectionFragment(
|
|||
}, object : OnMistakeClickListener {
|
||||
override fun onMistakeClickListener(sale: SaleVO) {
|
||||
if (type != "PRECHECKER") {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
mistakeSale = sale
|
||||
viewModel.mistakeType(usuario = user, password = password)
|
||||
}
|
||||
|
|
@ -579,8 +581,8 @@ class CollectionFragment(
|
|||
})
|
||||
|
||||
lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||
fragment_sacador_collections.adapter = saleAdapter
|
||||
fragment_sacador_collections.layoutManager = lm
|
||||
binding.fragmentSacadorCollections.adapter = saleAdapter
|
||||
binding.fragmentSacadorCollections.layoutManager = lm
|
||||
setTotalLines()
|
||||
|
||||
if (storedPosition != 0)
|
||||
|
|
@ -596,7 +598,7 @@ class CollectionFragment(
|
|||
}
|
||||
|
||||
private fun setScrollListener(lm: LinearLayoutManager) {
|
||||
fragment_sacador_collections.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
binding.fragmentSacadorCollections.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
|
||||
storedBackPosition = lm.findFirstVisibleItemPosition()
|
||||
super.onScrolled(recyclerView, dx, dy)
|
||||
|
|
@ -733,7 +735,7 @@ class CollectionFragment(
|
|||
if (mpok != null) mpok!!.start()
|
||||
getString(R.string.Ticketaparcado).toast(requireContext())
|
||||
} else {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
storedPosition = 0
|
||||
storedBackPosition = 0
|
||||
if (type != PRECHECKER) {
|
||||
|
|
@ -744,7 +746,7 @@ class CollectionFragment(
|
|||
viewModel.ticketOrCollection_checkFullyControlled(user, password, txtscan,"ticketOrCollection_checkFullyControlled")
|
||||
}
|
||||
} else {
|
||||
splash_progress.visibility = View.GONE
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
}
|
||||
////Log.i("VERDNATURA:","La collection es ${txtscan}")
|
||||
}
|
||||
|
|
@ -852,15 +854,15 @@ class CollectionFragment(
|
|||
private fun setListPosition(position: Int, isFromBack: Boolean) {
|
||||
storedPosition = position
|
||||
if (type == SACADOR) {
|
||||
if (fragment_sacador_collections != null) {
|
||||
fragment_sacador_collections.addViewObserver {
|
||||
if (binding.fragmentSacadorCollections != null) {
|
||||
binding.fragmentSacadorCollections.addViewObserver {
|
||||
lm!!.scrollToPositionWithOffset(position, 0)
|
||||
}
|
||||
}
|
||||
|
||||
} else if (isFromBack) {
|
||||
if (fragment_sacador_collections != null) {
|
||||
fragment_sacador_collections.addViewObserver {
|
||||
if (binding.fragmentSacadorCollections != null) {
|
||||
binding.fragmentSacadorCollections.addViewObserver {
|
||||
lm!!.scrollToPositionWithOffset(position, 0)
|
||||
}
|
||||
}
|
||||
|
|
@ -917,7 +919,7 @@ class CollectionFragment(
|
|||
private fun showShelving(position: Int, shelvingPosition: Int) {
|
||||
storedShelvingPosition = shelvingPosition
|
||||
storedPosition = position
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
var quantityGet = "0"
|
||||
try {
|
||||
quantityGet =
|
||||
|
|
@ -983,7 +985,7 @@ class CollectionFragment(
|
|||
customDialogList.dismiss()
|
||||
} else {
|
||||
itemShelvingFkStored = itemShelvingFk
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.getIdFromCode(
|
||||
usuario = user,
|
||||
password = password,
|
||||
|
|
@ -1051,7 +1053,7 @@ class CollectionFragment(
|
|||
customDialogList.dismiss()
|
||||
} else {
|
||||
itemShelvingFkStored = itemShelvingFk
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.getIdFromCode(
|
||||
usuario = user,
|
||||
password = password,
|
||||
|
|
@ -1145,7 +1147,7 @@ class CollectionFragment(
|
|||
|
||||
d("VERDNATURA","Ordenamos")
|
||||
|
||||
fragment_sacador_collections.adapter?.notifyDataSetChanged()
|
||||
binding.fragmentSacadorCollections.adapter?.notifyDataSetChanged()
|
||||
|
||||
}*/
|
||||
|
||||
|
|
@ -1252,7 +1254,7 @@ class CollectionFragment(
|
|||
) {
|
||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||
} else {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
|
||||
//sergio datos para mensaje salix
|
||||
|
||||
|
|
@ -1308,7 +1310,7 @@ class CollectionFragment(
|
|||
) {
|
||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||
} else {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
|
||||
dataMessageSalix= DataMessageSalix(
|
||||
ticket=ticketSelected,
|
||||
|
|
@ -1360,8 +1362,8 @@ class CollectionFragment(
|
|||
.setDescription(getString(R.string.Escaneaetiqueta))
|
||||
.setOkButton(getString(R.string.Buscar)) {
|
||||
try {
|
||||
if (splash_progress != null) {
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) {
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
} catch (e: Exception) {
|
||||
|
|
@ -1379,8 +1381,8 @@ class CollectionFragment(
|
|||
customDialogInput.dismiss()
|
||||
|
||||
}.setKoButton("Cancelar") {
|
||||
if (splash_progress != null) {
|
||||
splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
}
|
||||
hideKeyboards()
|
||||
scanRequest()
|
||||
|
|
@ -1390,7 +1392,7 @@ class CollectionFragment(
|
|||
customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
if (!customDialogInput.getValue().isNullOrEmpty()) {
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.itemGetAvailable(
|
||||
usuario = user,
|
||||
password = password,
|
||||
|
|
@ -1436,9 +1438,9 @@ class CollectionFragment(
|
|||
}
|
||||
}
|
||||
//toolbar_title.text = "" + totalMark + "/" + sales.size
|
||||
if (toolbar_title != null) toolbar_title.text =
|
||||
if (binding.mainToolbar.toolbarTitle != null) binding.mainToolbar.toolbarTitle.text =
|
||||
if (collection.collectionFk != null) collection.collectionFk else ""
|
||||
if (toolbar_subtitle != null && totalMark != null && sales != null) toolbar_subtitle.text =
|
||||
if (binding.mainToolbar.toolbarSubtitle != null && totalMark != null && sales != null) binding.mainToolbar.toolbarSubtitle .text =
|
||||
"" + totalMark + "/" + sales.size
|
||||
if (totalMark == sales.size) {
|
||||
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)
|
||||
|
|
@ -1762,7 +1764,7 @@ class CollectionFragment(
|
|||
}
|
||||
|
||||
private fun showMistakeList(list: List<MistakeTypeVO>) {
|
||||
if (splash_progress != null) splash_progress.visibility = View.GONE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
||||
listPlacementSupply = ArrayList()
|
||||
list.forEach {
|
||||
listPlacementSupply.add(BarcodeVO(code = it.description))
|
||||
|
|
|
|||
|
|
@ -4,22 +4,14 @@ package es.verdnatura.presentation.view.feature.historicoshelvinglog.model
|
|||
class ShelvingLog(
|
||||
var id:String = "",
|
||||
var originFk:String = "",
|
||||
var workerName:String = "",
|
||||
var action:String = "",
|
||||
var name:String = "",
|
||||
var creationDate:String = "",
|
||||
var description:String = "",
|
||||
var changedModel:String = "",
|
||||
var oldInstance:Boolean = false,
|
||||
var newInstance:String = "",
|
||||
var changedModelId:String = "",
|
||||
var changedModelValue:String = "",
|
||||
var isError:Boolean = false,
|
||||
var errorMessage:String = ""
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class ShelvingLogList(
|
||||
var list:List<ShelvingLog> = listOf())
|
||||
|
|
|
|||
|
|
@ -12,43 +12,41 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
|
|||
|
||||
fun inititializeDefaultData() {
|
||||
|
||||
/* _pasillerositem.add(
|
||||
PasillerosItemVO(20,
|
||||
R.drawable.barcode_scan,
|
||||
"Visor web",R.string.SmarttagAssociate)
|
||||
/* _pasillerositem.add(
|
||||
PasillerosItemVO(20,
|
||||
R.drawable.barcode_scan,
|
||||
"Visor web",R.string.SmarttagAssociate)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(20,
|
||||
R.drawable.barcode_scan,
|
||||
"Asociar Sacador SmartTags",R.string.SmarttagAssociate)
|
||||
)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(21,
|
||||
R.drawable.barcode,
|
||||
"Registrar SmartTags",R.string.SmarttagRegister)
|
||||
)
|
||||
*/
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(20,
|
||||
R.drawable.barcode_scan,
|
||||
"Asociar Sacador SmartTags",R.string.SmarttagAssociate)
|
||||
)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(21,
|
||||
R.drawable.barcode,
|
||||
"Registrar SmartTags",R.string.SmarttagRegister)
|
||||
)
|
||||
*/
|
||||
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Control",R.string.precontrolprevious)
|
||||
)
|
||||
/* _pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Control",R.string.precontrolprevious)
|
||||
)*/
|
||||
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_history_orange_24dp,
|
||||
"Log Shelving",R.string.shelvingLog)
|
||||
)
|
||||
//sergio para que aparezca el nuevo menu
|
||||
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Sacador",R.string.PreSacador)
|
||||
)
|
||||
PasillerosItemVO(
|
||||
7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Sacador", R.string.PreSacador
|
||||
)
|
||||
)
|
||||
//sergio para que aparezca el nuevo menu
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
|
|
@ -63,16 +61,21 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
|
|||
41,
|
||||
R.drawable.day_of_sale,
|
||||
"Día de venta", R.string.dayofSale
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
10,
|
||||
R.drawable.ic_history_orange_24dp,
|
||||
R.drawable.revision_icon,
|
||||
"Histórico Shelving", R.string.itemShelvingLog
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_history_orange_24dp,
|
||||
"Log Shelving",R.string.shelvingLog)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ import android.content.Context
|
|||
import android.content.SharedPreferences
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.view.View
|
||||
import androidx.fragment.app.setFragmentResult
|
||||
import androidx.fragment.app.setFragmentResultListener
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import es.verdnatura.R
|
||||
|
|
@ -20,14 +17,14 @@ import es.verdnatura.presentation.common.TAG
|
|||
import es.verdnatura.presentation.common.addFragment
|
||||
import es.verdnatura.presentation.view.component.CustomDialog
|
||||
import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter
|
||||
import es.verdnatura.presentation.view.feature.login.fragment.LoginFragment
|
||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapter
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||
import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.AssociateSmartTagsFragment
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
|
||||
/*import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.fragment_sacador.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
import kotlinx.android.synthetic.main.toolbar.**/
|
||||
|
||||
class SacadorFragment :
|
||||
BaseFragment<FragmentSacadorBinding, SacadorViewModel>(SacadorViewModel::class) {
|
||||
|
|
@ -80,9 +77,9 @@ class SacadorFragment :
|
|||
override fun init() {
|
||||
|
||||
customDialog = CustomDialog(requireContext())
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
splash_progress_two.visibility = View.GONE
|
||||
toolbar_title.text = getString(R.string.getcollection)
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
binding.splashProgressTwo.visibility = View.GONE
|
||||
binding.mainToolbar.toolbarTitle.text = getString(R.string.getcollection)
|
||||
setToolBar()
|
||||
setEvents()
|
||||
viewModel.collectionGet(user, password,"collection_get")
|
||||
|
|
@ -98,8 +95,9 @@ class SacadorFragment :
|
|||
|
||||
private fun setToolBar() {
|
||||
|
||||
requireActivity().main_bottom_navigation.visibility = View.VISIBLE
|
||||
backButton.visibility = View.GONE
|
||||
// requireActivity().main_bottom_navigation.visibility = View.VISIBLE
|
||||
(activity as MainActivity).hideBottomNavigation(View.VISIBLE)
|
||||
binding.mainToolbar.backButton.visibility = View.GONE
|
||||
val listIcons: ArrayList<Drawable> = ArrayList()
|
||||
val iconAdd: Drawable =
|
||||
resources.getDrawable(R.drawable.ic_add_black_24dp, resources.newTheme())
|
||||
|
|
@ -109,10 +107,10 @@ class SacadorFragment :
|
|||
listIcons.add(iconVehicleIn)
|
||||
listIcons.add(iconAdd)
|
||||
|
||||
toolbar_icons.adapter = ToolBarAdapter(listIcons, object : OnOptionsSelectedListener {
|
||||
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapter(listIcons, object : OnOptionsSelectedListener {
|
||||
override fun onOptionsItemSelected(item: Drawable) {
|
||||
if (item == iconAdd) {
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
//viewModel.collectionNew(user, password, sectorFk, wagons)
|
||||
viewModel.collectionNew(user,password,sectorFk,wagons,getTagsType(),"collection_new_wagon")
|
||||
//checkTagsMode()
|
||||
|
|
@ -124,14 +122,14 @@ class SacadorFragment :
|
|||
}
|
||||
}
|
||||
})
|
||||
toolbar_icons.layoutManager =
|
||||
binding.mainToolbar.toolbarIcons.layoutManager =
|
||||
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||
}
|
||||
|
||||
private fun setEvents() {
|
||||
sacador_swipe.setOnRefreshListener {
|
||||
binding.sacadorSwipe.setOnRefreshListener {
|
||||
viewModel.collectionGet(user, password,"collection_get")
|
||||
sacador_swipe.isRefreshing = false
|
||||
binding.sacadorSwipe.isRefreshing = false
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -168,13 +166,13 @@ class SacadorFragment :
|
|||
with(viewModel) {
|
||||
|
||||
collectionList.observe(viewLifecycleOwner, Observer {
|
||||
if (!goBack2) splash_progress.visibility = View.GONE
|
||||
if (!goBack2) binding.splashProgress.visibility = View.GONE
|
||||
createCollectionList(it.list)
|
||||
splash_progress.visibility = View.GONE
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
goBack2 = false
|
||||
})
|
||||
/* collectionTicketList.observe(viewLifecycleOwner, Observer {
|
||||
splash_progress_two.visibility = View.GONE
|
||||
binding.splashProgress_two.visibility = View.GONE
|
||||
if (it.isError){
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Aceptar"){
|
||||
customDialog.dismiss()
|
||||
|
|
@ -185,8 +183,8 @@ class SacadorFragment :
|
|||
goBack = false
|
||||
})*/
|
||||
response.observe(viewLifecycleOwner, Observer {
|
||||
splash_progress_two.visibility = View.GONE
|
||||
splash_progress.visibility = View.GONE
|
||||
binding.splashProgressTwo.visibility = View.GONE
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
if (it.isError) {
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage)
|
||||
.setOkButton("Aceptar") {
|
||||
|
|
@ -209,8 +207,8 @@ class SacadorFragment :
|
|||
}
|
||||
val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||
adapter = CollectionAdapter(collectionsList, onCollectionSelectedListener!!)
|
||||
fragment_sacador_collections.layoutManager = lm
|
||||
fragment_sacador_collections.adapter = adapter
|
||||
binding.fragmentSacadorCollections.layoutManager = lm
|
||||
binding.fragmentSacadorCollections.adapter = adapter
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
|||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||
import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapter
|
||||
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
/*import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.fragment_ubicador.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
import kotlinx.android.synthetic.main.toolbar.**/
|
||||
|
||||
class UbicadorFragment(
|
||||
var shelvingFk:String = ""
|
||||
|
|
@ -78,13 +78,14 @@ class UbicadorFragment(
|
|||
customDialog = CustomDialog(requireContext())
|
||||
customDialogUbicador = CustomDialogUbicador(requireContext())
|
||||
customDialogTwoButtons = CustomDialogTwoButtons(requireContext())
|
||||
requireActivity().main_bottom_navigation.visibility = View.GONE
|
||||
toolbar_title.text = getString(R.string.locator)
|
||||
//requireActivity().main_bottom_navigation.visibility = View.GONE
|
||||
(activity as MainActivity).hideBottomNavigation(View.GONE)
|
||||
binding.mainToolbar.toolbarTitle.text = getString(R.string.locator)
|
||||
setEvents()
|
||||
setToolBar()
|
||||
if (!shelvingFk.isNullOrEmpty()){
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
toolbar_title.text = shelvingFk
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk
|
||||
viewModel.itemShelvingList(user,password,shelvingFk,"itemShelvingList")
|
||||
}
|
||||
super.init()
|
||||
|
|
@ -102,50 +103,50 @@ class UbicadorFragment(
|
|||
val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme())
|
||||
listIcons.add(iconAdd)
|
||||
listIcons.add(iconReload)
|
||||
toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener {
|
||||
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener {
|
||||
override fun onOptionsItemSelected(item: Drawable) {
|
||||
if (item == iconAdd){
|
||||
showAddItem("","","","",false,ItemUbicadorVO(),"")
|
||||
}else if(item == iconReload){
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.itemShelvingList(user,password,shelvingFk,"itemShelvingList")
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||
binding.mainToolbar.toolbarIcons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||
}
|
||||
|
||||
private fun setEvents(){
|
||||
backButton.setOnClickListener {
|
||||
binding.mainToolbar.backButton.setOnClickListener {
|
||||
requireActivity().onBackPressed()
|
||||
}
|
||||
|
||||
edit_matricula.requestFocus()
|
||||
edit_matricula.setOnEditorActionListener { v, actionId, event ->
|
||||
binding.editMatricula.requestFocus()
|
||||
binding.editMatricula.setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||
if (!edit_matricula.text.toString().isNullOrEmpty()){
|
||||
toolbar_title.text = edit_matricula.text.toString()
|
||||
shelvingFk = edit_matricula.text.toString()
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
viewModel.itemShelvingList(user,password,edit_matricula.text.toString(),"itemShelvingList")
|
||||
if (!binding.editMatricula.text.toString().isNullOrEmpty()){
|
||||
binding.mainToolbar.toolbarTitle.text = binding.editMatricula.text.toString()
|
||||
shelvingFk = binding.editMatricula.text.toString()
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.itemShelvingList(user,password,binding.editMatricula.text.toString(),"itemShelvingList")
|
||||
}
|
||||
|
||||
edit_matricula.setText("")
|
||||
(activity as MainActivity).hideKeyboard(edit_matricula)
|
||||
binding.editMatricula.setText("")
|
||||
(activity as MainActivity).hideKeyboard(binding.editMatricula)
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
|
||||
return@setOnEditorActionListener false
|
||||
}
|
||||
|
||||
edit_prioridad.setOnEditorActionListener { v, actionId, event ->
|
||||
binding.editPrioridad.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,"shelvingPriority_update")
|
||||
if (!binding.editPrioridad.text.toString().isNullOrEmpty()){
|
||||
viewModel.shelvingPriorityUpdate(user,password,binding.editPrioridad.text.toString(),shelvingFk,"shelvingPriority_update")
|
||||
}
|
||||
|
||||
(activity as MainActivity).hideKeyboard(edit_prioridad)
|
||||
(activity as MainActivity).hideKeyboard(binding.editPrioridad)
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
|
||||
|
|
@ -153,18 +154,18 @@ class UbicadorFragment(
|
|||
}
|
||||
|
||||
|
||||
automatic_img.setOnClickListener {
|
||||
binding.automaticImg.setOnClickListener {
|
||||
if (!shelvingFk.isNullOrEmpty())
|
||||
(activity as MainActivity).onPasillerosItemClickListener(PasillerosItemVO(title = "Automatic"),entryPoint = shelvingFk)
|
||||
else
|
||||
"Escanea una matrícula".toast(requireActivity(),Toast.LENGTH_SHORT)
|
||||
}
|
||||
|
||||
parking_img.setOnClickListener {
|
||||
binding.parkingImg.setOnClickListener {
|
||||
customDialogInput.setTitle("Aparcar carro").setValue("").setOkButton("Aparcar"){
|
||||
viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue(),"shelvingPark")
|
||||
parking = customDialogInput.getValue()
|
||||
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking + " E: "+etiquetas
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: "+parking + " E: "+etiquetas
|
||||
if(mpok != null) mpok!!.start()
|
||||
customDialogInput.dismiss()
|
||||
}.setKoButton("Cancelar"){
|
||||
|
|
@ -179,10 +180,10 @@ class UbicadorFragment(
|
|||
viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue(),"shelvingPark")
|
||||
customDialogInput.dismiss()
|
||||
parking = customDialogInput.getValue()
|
||||
if (toolbar_title != null && shelvingFk != null && parking != null && etiquetas != null){
|
||||
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
if (binding.mainToolbar.toolbarTitle != null && shelvingFk != null && parking != null && etiquetas != null){
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
}else{
|
||||
toolbar_title.text = ""
|
||||
binding.mainToolbar.toolbarTitle.text = ""
|
||||
}
|
||||
if (mpok != null) {
|
||||
mpok!!.start()
|
||||
|
|
@ -195,11 +196,11 @@ class UbicadorFragment(
|
|||
|
||||
}
|
||||
|
||||
edit_img.setOnClickListener {
|
||||
binding.editPrioridad.setOnClickListener {
|
||||
customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton("Guardar"){
|
||||
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue(),"shelvingChange")
|
||||
shelvingFk = customDialogInput.getValue()
|
||||
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
if(mpok != null) mpok!!.start()
|
||||
customDialogInput.dismiss()
|
||||
}.setKoButton("Cancelar"){
|
||||
|
|
@ -213,7 +214,7 @@ class UbicadorFragment(
|
|||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue(),"shelvingChange")
|
||||
shelvingFk = customDialogInput.getValue()
|
||||
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
if(mpok != null) mpok!!.start()
|
||||
customDialogInput.dismiss()
|
||||
return@setOnEditorActionListener true
|
||||
|
|
@ -223,7 +224,7 @@ class UbicadorFragment(
|
|||
|
||||
}
|
||||
|
||||
delete_img.setOnClickListener {
|
||||
binding.deleteImg.setOnClickListener {
|
||||
customDialog.setTitle("Vaciar carro").setDescription("Esta operación no se puede rectificar.").setOkButton("Vaciar"){
|
||||
viewModel.clearShelvingList(user,password,shelvingFk,"clearShelvingList")
|
||||
listItems.forEach {
|
||||
|
|
@ -259,10 +260,10 @@ class UbicadorFragment(
|
|||
listItems.add(item)
|
||||
}
|
||||
etiquetas = contEtiquetas.toString()
|
||||
toolbar_title.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: "+parking+ " E: "+etiquetas
|
||||
if(it.list.size > 0)
|
||||
edit_prioridad.setText(it.list[0].priority)
|
||||
splash_progress.visibility = View.GONE
|
||||
binding.editPrioridad.setText(it.list[0].priority)
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
|
||||
//sergio: para mostrar CustomDialogUbicator, ubicador con grouping
|
||||
adapter = UbicadorAdapter(listItems,onPasillerosItemClickListener = pasillerosItemClickListener!!,
|
||||
|
|
@ -282,8 +283,8 @@ class UbicadorFragment(
|
|||
|
||||
})
|
||||
|
||||
location_recyclerview.adapter = adapter
|
||||
location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, true)
|
||||
binding.locationRecyclerview.adapter = adapter
|
||||
binding.locationRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, true)
|
||||
|
||||
}
|
||||
})
|
||||
|
|
@ -310,8 +311,8 @@ class UbicadorFragment(
|
|||
|
||||
responseMake.observe(viewLifecycleOwner, Observer {
|
||||
if (!shelvingFk.isNullOrEmpty()){
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
toolbar_title.text = shelvingFk
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
binding.mainToolbar.toolbarTitle.text = shelvingFk
|
||||
viewModel.itemShelvingList(user,password,shelvingFk,"itemShelvingList")
|
||||
}
|
||||
})
|
||||
|
|
@ -438,7 +439,7 @@ class UbicadorFragment(
|
|||
}*/
|
||||
|
||||
private fun changeOfflineValue(item:ItemUbicadorVO){
|
||||
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
|
||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
||||
/*listItems.add(item)
|
||||
adapter?.notifyDataSetChanged()*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,4 +2,6 @@
|
|||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#F7931E" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
||||
|
||||
|
||||
</vector>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
<!-- drawable/barcode_scan.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:pathData="M21 11.11V5C21 3.9 20.11 3 19 3H14.82C14.4 1.84 13.3 1 12 1S9.6 1.84 9.18 3H5C3.9 3 3 3.9 3 5V19C3 20.11 3.9 21 5 21H11.11C12.37 22.24 14.09 23 16 23C19.87 23 23 19.87 23 16C23 14.09 22.24 12.37 21 11.11M12 3C12.55 3 13 3.45 13 4S12.55 5 12 5 11 4.55 11 4 11.45 3 12 3M6 7H18V9H6V7M9.08 17H6V15H9.08" android:fillColor="#000"/>
|
||||
|
||||
|
||||
|
||||
</vector>
|
||||
|
|
@ -89,6 +89,7 @@
|
|||
android:text="Acción"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:visibility="gone"
|
||||
|
||||
android:gravity="right"
|
||||
android:paddingRight="@dimen/layout_margin_min"/>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
android:id="@+id/itemFk"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.workerName}"
|
||||
android:text="@{item.name}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
|
|
@ -49,15 +49,7 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.action}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:gravity="right"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -83,16 +75,6 @@
|
|||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
/>
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.description}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -152,6 +152,6 @@
|
|||
<string name="Referencia">Referencia</string>
|
||||
<string name="precontrolprevious">Control Previa</string>
|
||||
<string name="itemShelvingLog">Historico de ítems del carro</string>
|
||||
<string name="shelvingLog">Histórico por matrícula</string>
|
||||
<string name="shelvingLog">Histórico del carro</string>
|
||||
<string name="bufferload">Cargar expedición en buffer</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue