v6.2.Añadida pantalla para mostrar itemshlevingLog y solucionado el tema del icono que salía de la pantalla .
This commit is contained in:
parent
bf1818220d
commit
a16a6b1957
|
|
@ -4,6 +4,7 @@
|
|||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/background_gradient.xml" value="0.1" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/ic_history_orange_24dp.xml" value="0.38229166666666664" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.13541666666666666" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/selector_bottombar_text.xml" value="0.13541666666666666" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_b_circle_outline.xml" value="0.2359375" />
|
||||
|
|
@ -26,7 +27,6 @@
|
|||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/crane.xml" value="0.23802083333333332" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/day_of_sale.xml" value="0.184375" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/delete.xml" value="0.19166666666666668" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/emoticon_error.xml" value="0.23229166666666667" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/face_man_outline.xml" value="0.22708333333333333" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/filter_outline.xml" value="0.22239583333333332" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/human_dolly.xml" value="0.2111111111111111" />
|
||||
|
|
@ -92,6 +92,7 @@
|
|||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml" value="0.22" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemproposal.xml" value="0.22" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemshelvingdayofsale.xml" value="0.3333333333333333" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemshelvinglog.xml" value="0.3333333333333333" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_login.xml" value="0.22" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_paletizador_menu.xml" value="0.13829787234042554" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_parking.xml" value="0.5" />
|
||||
|
|
@ -100,10 +101,11 @@
|
|||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_sacador_associatesmarttag.xml" value="0.22" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_smarttag_register.xml" value="0.3118811881188119" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_transferencia.xml" value="0.10666666666666667" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_ubicador.xml" value="0.15729166666666666" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol.xml" value="0.1546875" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" value="0.23052536231884058" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_web.xml" value="0.2463768115942029" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.40375586854460094" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.4466666666666667" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_card_row.xml" value="0.2269021739130435" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_expeditionstate_row.xml" value="0.23489583333333333" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_historicovehiculo_row.xml" value="0.18795289855072464" />
|
||||
|
|
@ -114,6 +116,7 @@
|
|||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_proposal_row.xml" value="0.22604166666666667" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_reposicion.xml" value="0.1" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_shelvingdayofsale_row.xml" value="0.2375" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_shelvinglog_row.xml" value="0.21739130434782608" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_smarttag_row.xml" value="0.20153985507246377" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_worker_image.xml" value="0.23177083333333334" />
|
||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar.xml" value="0.15353260869565216" />
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@ android {
|
|||
applicationId "es.verdnatura"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 80
|
||||
versionName "6.1.9.1" //VERSION CODE 77, arreglado el null de grouping en ubicador.
|
||||
versionCode 81
|
||||
versionName "6.2" //VERSION CODE 81, arreglado el null de grouping en ubicador.
|
||||
//versionName "6.1.9.1" //VERSION CODE 80, arreglado el null de grouping en ubicador.
|
||||
//versionName "6.1.9" VERSION CODE 76, añadido grouping, reference, prioridad, controladores vs scadores, boton mensaje error,rocket salix y error al añadir elemento a colección.
|
||||
// Sin subir, Modificado y añadido mensajes de error, añadido opcion Dia de venta y su parking, teclado numerico para controlador
|
||||
// versionName "6.1.8.5" VERSION CODE 75 // 23-10-2021//VERSION CODE 74-75 .Pantalla "Dia de venta y parking" Modificado itemtrash, deprecated preferenceManager, quitados ;,puesto menu general al controlador
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -11,8 +11,8 @@
|
|||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 80,
|
||||
"versionName": "6.1.9.1",
|
||||
"versionCode": 81,
|
||||
"versionName": "6.2",
|
||||
"outputFile": "app-release.apk"
|
||||
}
|
||||
],
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -13,6 +13,7 @@ import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlV
|
|||
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleViewModel
|
||||
import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasViewModel
|
||||
import es.verdnatura.presentation.view.feature.historico.fragment.HistoricoViewModel
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.fragment.itemShelvingLogViewModel
|
||||
import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoViewModel
|
||||
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel
|
||||
import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel
|
||||
|
|
@ -176,4 +177,7 @@ val viewModelModule = module {
|
|||
viewModel {
|
||||
SmartTagsViewModel(androidContext())
|
||||
}
|
||||
viewModel {
|
||||
itemShelvingLogViewModel(androidContext())
|
||||
}
|
||||
}
|
||||
|
|
@ -80,27 +80,28 @@ class GetLoginUserCase(context: Context) : RestClient(context)
|
|||
|
||||
}
|
||||
|
||||
fun checkVersion_old(usuario: String, password: String, version: String): Call<Boolean>
|
||||
{
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(version)
|
||||
return restClient!!.version("json", "1", usuario, password, "application/json", params)
|
||||
}
|
||||
/* fun checkVersion_old(usuario: String, password: String, version: String): Call<Boolean>
|
||||
{
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(version)
|
||||
return restClient!!.version("json", "1", usuario, password, "application/json", params)
|
||||
|
||||
//SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
|
||||
//SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
|
||||
*/
|
||||
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
|
||||
return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
|
||||
}
|
||||
|
||||
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
|
||||
return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
|
||||
}
|
||||
/* // SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
|
||||
fun sendChekingPresence(token: String, workerId: Int, message: String): Call<Boolean>
|
||||
{
|
||||
return salixClient!!.sendGroup(
|
||||
content_type = "application/json",
|
||||
authorization = token,
|
||||
params = SalixGrupo(to = "#android-test", message = message)
|
||||
)
|
||||
}*/
|
||||
// SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
|
||||
|
||||
/* fun sendChekingPresence(token: String, workerId: Int, message: String): Call<Boolean>
|
||||
{
|
||||
return salixClient!!.sendGroup(
|
||||
content_type = "application/json",
|
||||
authorization = token,
|
||||
params = SalixGrupo(to = "#android-test", message = message)
|
||||
)
|
||||
}*/
|
||||
|
||||
fun checkVersion(usuario: String, password: String, nameApp: String): Call<versionApp>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,10 +9,11 @@ import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
|
|||
import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
|
||||
import es.verdnatura.presentation.view.feature.collection.ItemVO
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate
|
||||
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
|
||||
import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog
|
||||
import es.verdnatura.presentation.view.feature.historicoshelvingparking.model.ParkingShelvingLog
|
||||
import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo
|
||||
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
|
||||
import es.verdnatura.presentation.view.feature.login.model.LoginDevice
|
||||
|
|
@ -871,7 +872,27 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<List<ItemShelvingSaleDate>>
|
||||
|
||||
@POST("almacennew/itemShelvingLog_get")//REVISADA
|
||||
fun itemShelvingLog_get(
|
||||
@Header("aplicacion") aplicacion: String,
|
||||
@Header("version") version: String,
|
||||
@Header("user") user: String,
|
||||
@Header("pass") pass: String,
|
||||
@Header("Content-Type") content_type: String,
|
||||
@Body params: List<String>
|
||||
):
|
||||
Call<List<ItemShelvingLog>>
|
||||
|
||||
@POST("almacennew/parkingShelvingLog_get")//REVISADA
|
||||
fun parkingShelvingLog_get(
|
||||
@Header("aplicacion") aplicacion: String,
|
||||
@Header("version") version: String,
|
||||
@Header("user") user: String,
|
||||
@Header("pass") pass: String,
|
||||
@Header("Content-Type") content_type: String,
|
||||
@Body params: List<String>
|
||||
):
|
||||
Call<List<ParkingShelvingLog>>
|
||||
|
||||
@POST("almacennew/itemShelving_updateSpam")//REVISADA
|
||||
fun itemShelving_updateSpam(
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
package es.verdnatura.domain
|
||||
|
||||
|
||||
import android.content.Context
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog
|
||||
import es.verdnatura.presentation.view.feature.historicoshelvingparking.model.ParkingShelvingLog
|
||||
import retrofit2.Call
|
||||
|
||||
class itemShelvingLogUSerCase(context: Context) : RestClient(context) {
|
||||
|
||||
|
||||
|
||||
fun itemShelvingLog_get(
|
||||
usuario: String,
|
||||
password: String,
|
||||
vShelvingFk: String
|
||||
): Call<List<ItemShelvingLog>> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(vShelvingFk)
|
||||
return restClient!!.itemShelvingLog_get(
|
||||
"json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params
|
||||
)
|
||||
}
|
||||
|
||||
fun parkingShelvingLog_get(
|
||||
usuario: String,
|
||||
password: String,
|
||||
vShelvingFk: String
|
||||
): Call<List<ParkingShelvingLog>> {
|
||||
val params: ArrayList<String> = ArrayList()
|
||||
params.add(vShelvingFk)
|
||||
return restClient!!.parkingShelvingLog_get(
|
||||
"json",
|
||||
"1",
|
||||
usuario,
|
||||
password,
|
||||
"application/json",
|
||||
params
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
package es.verdnatura.presentation.view.feature.collection.adapter
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
|
|
@ -107,6 +108,13 @@ class SaleAdapter (
|
|||
|
||||
}
|
||||
|
||||
/*if (sale.level.equals("AMARILLO")){
|
||||
level.setTextColor(Color.YELLOW)
|
||||
}else{
|
||||
level.setTextColor(Color.GREEN)
|
||||
}*/
|
||||
|
||||
|
||||
if (!sale.isNew && sale.originalQuantity == sale.quantity){
|
||||
layoutError.visibility = View.GONE
|
||||
}
|
||||
|
|
|
|||
|
|
@ -883,9 +883,6 @@ class CollectionFragment(
|
|||
vBuyFk = originalItemScan,
|
||||
callFunction = "saleTrackingReplace"
|
||||
)
|
||||
//Log.i("VERDNATURA:","POSICION $position y el vStateFk $type")
|
||||
//Log.i("VERDNATURA:","vIscheked es ${if(type == CONTROLADOR) sales[position].isControlled else "1"}")
|
||||
//Log.i("VERDNATURA:","El buyfk que no es real es $originalItemScan")
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelving.adapter
|
||||
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.ItemShelvinglogRowBinding
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
|
||||
class ItemShelvingLogAdapter (
|
||||
private val items: List<ItemShelvingLog>
|
||||
): RecyclerView.Adapter<ItemShelvingLogAdapter.ItemHolder>() {
|
||||
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
|
||||
return ItemHolder(
|
||||
ItemShelvinglogRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
|
||||
)
|
||||
}
|
||||
|
||||
override fun getItemCount() =items.size
|
||||
|
||||
override fun onBindViewHolder(holder: ItemHolder, position: Int) {
|
||||
holder.bind(items[position])
|
||||
}
|
||||
|
||||
inner class ItemHolder(
|
||||
val binding: ItemShelvinglogRowBinding
|
||||
) : RecyclerView.ViewHolder(binding.root){
|
||||
private val res = binding.root.context.resources
|
||||
fun bind(item: ItemShelvingLog) {
|
||||
binding.apply {
|
||||
this.item = item
|
||||
/* val sdf = SimpleDateFormat("yyyy-MM-dd")
|
||||
val currentDate = sdf.format(Date())
|
||||
if (currentDate == item.created){
|
||||
saledate.setBackgroundColor(
|
||||
ContextCompat.getColor(historicoDate.context,
|
||||
R.color.verdnatura_pumpkin_orange))
|
||||
}else{
|
||||
saledate.setBackgroundColor(
|
||||
ContextCompat.getColor(historicoDate.context,
|
||||
R.color.verdnatura_black_5))
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,159 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.view.View
|
||||
import android.view.inputmethod.EditorInfo
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentItemshelvinglogBinding
|
||||
import es.verdnatura.domain.notNull
|
||||
import es.verdnatura.domain.toast
|
||||
import es.verdnatura.presentation.base.BaseFragment
|
||||
import es.verdnatura.presentation.view.component.CustomDialog
|
||||
import es.verdnatura.presentation.view.component.CustomDialogList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.adapter.ItemShelvingLogAdapter
|
||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.buyers_fragment.*
|
||||
import kotlinx.android.synthetic.main.fragment_historicovehiculo.*
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.*
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.edit_itemFk
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.splash_progress
|
||||
import kotlinx.android.synthetic.main.fragment_itemexpeditionstate_card.*
|
||||
import kotlinx.android.synthetic.main.fragment_itemshelvingdayofsale.*
|
||||
import kotlinx.android.synthetic.main.fragment_itemshelvinglog.*
|
||||
import kotlinx.android.synthetic.main.fragment_parking.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
|
||||
class itemShelvingLogFragment(
|
||||
var entryPoint: String = ""
|
||||
// ) : BaseFragment<FragmentItemdayofsaleCardBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {
|
||||
) : BaseFragment<FragmentItemshelvinglogBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {
|
||||
private lateinit var customDialogList: CustomDialogList
|
||||
private var user = ""
|
||||
private var password = ""
|
||||
private var warehouseFk = ""
|
||||
private var adapter: ItemShelvingLogAdapter? = null
|
||||
private var itemScan = ""
|
||||
|
||||
companion object {
|
||||
fun newInstance(entryPoint: String) = itemShelvingLogFragment(entryPoint)
|
||||
}
|
||||
|
||||
private lateinit var customDialog: CustomDialog
|
||||
|
||||
override fun getLayoutId(): Int = R.layout.fragment_itemshelvinglog
|
||||
|
||||
override fun init() {
|
||||
|
||||
customDialog = CustomDialog(requireContext())
|
||||
customDialogList = CustomDialogList(requireContext())
|
||||
setEvents()
|
||||
setToolBar(getString(R.string.itemShelvingLog))
|
||||
super.init()
|
||||
|
||||
}
|
||||
|
||||
private fun setToolBar(title: String) {
|
||||
toolbar_title.text = title
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private fun setEvents() {
|
||||
edit_itemFk.requestFocus()
|
||||
edit_itemFk.setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||
if (!edit_itemFk.text.toString().isNullOrEmpty()) {
|
||||
itemShelvingLog_get(edit_itemFk.text.toString())
|
||||
|
||||
itemScan = edit_itemFk.text.toString()
|
||||
}
|
||||
edit_itemFk.setText("")
|
||||
(activity as MainActivity).hideKeyboard(edit_itemFk)
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
|
||||
backButton.setOnClickListener {
|
||||
requireActivity().onBackPressed()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private fun itemShelvingLog_get(vShelvingFK: String) {
|
||||
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
|
||||
user = prefs.getString(USER, "").toString()
|
||||
password = prefs.getString(PASSWORD, "").toString()
|
||||
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
viewModel.itemShelvingLog_get(user, password,vShelvingFK,"itemShelvingLog_get")
|
||||
|
||||
}
|
||||
|
||||
|
||||
override fun observeViewModel() {
|
||||
with(viewModel) {
|
||||
|
||||
loadItemShelvingLogList.observe(viewLifecycleOwner, Observer{ event ->
|
||||
event.getContentIfNotHandled().notNull {
|
||||
splash_progress.visibility = View.GONE
|
||||
adapter = ItemShelvingLogAdapter(it.list)
|
||||
itemshelvinglog_recyclerview.adapter = adapter
|
||||
itemshelvinglog_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||
setToolBar(getString(R.string.itemShelvingLog)+":"+itemScan)
|
||||
|
||||
// navigateToToday(it)
|
||||
if (it.list.isEmpty()){
|
||||
customDialog.setTitle("Sin resultados")
|
||||
.setDescription("No se ha podido obtener datos de la etiqueta escaneada. ")
|
||||
.setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}else{
|
||||
|
||||
if (it.list.get(0).isError){
|
||||
customDialog.setTitle("Error")
|
||||
.setDescription(it.list.get(0).errorMessage)
|
||||
.setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
response.observe(viewLifecycleOwner, Observer {
|
||||
if (it.isError){
|
||||
|
||||
splash_progress.visibility = View.GONE
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
|
||||
}else{
|
||||
|
||||
it.response.toast(requireContext())
|
||||
/* customDialog.setTitle("Información").setDescription(it.response).setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()*/
|
||||
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,95 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
||||
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import es.verdnatura.domain.itemShelvingLogUSerCase
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.common.Event
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDateList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLogList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
import timber.log.Timber.i
|
||||
|
||||
class itemShelvingLogViewModel(context: Context) : BaseViewModel() {
|
||||
private val itemShelvingLogUSerCase: itemShelvingLogUSerCase =
|
||||
itemShelvingLogUSerCase(context)
|
||||
|
||||
|
||||
private val _response by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val response: LiveData<ResponseItemVO>
|
||||
get() = _response
|
||||
|
||||
|
||||
private val _itemShelvingSaleDateList by lazy { MutableLiveData<ItemShelvingSaleDateList>() }
|
||||
val itemShelvingSaleDateList: LiveData<ItemShelvingSaleDateList>
|
||||
get() = _itemShelvingSaleDateList
|
||||
|
||||
|
||||
private val _itemShelvingLogList by lazy { MutableLiveData<ItemShelvingLogList>() }
|
||||
val itemShelvingLogList: LiveData<ItemShelvingLogList>
|
||||
get() = _itemShelvingLogList
|
||||
|
||||
|
||||
val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }
|
||||
|
||||
|
||||
|
||||
fun itemShelvingLog_get(usuario:String,password:String,vShelvingFK: String,callFunction:String){
|
||||
itemShelvingLogUSerCase.itemShelvingLog_get(usuario,password,vShelvingFK).enqueue(object :
|
||||
Callback<List<ItemShelvingLog>> {
|
||||
override fun onFailure(call: Call<List<ItemShelvingLog>>, t: Throwable) {
|
||||
val listError:ArrayList<ItemShelvingLog> = ArrayList()
|
||||
listError.add(ItemShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(callFunction,t.message!!)))
|
||||
_itemShelvingLogList.value = ItemShelvingLogList(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ItemShelvingLog>>,
|
||||
response: Response<List<ItemShelvingLog>>
|
||||
) {
|
||||
|
||||
if (!response.isSuccessful){
|
||||
val listError:ArrayList<ItemShelvingLog> = ArrayList()
|
||||
listError.add(ItemShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(callFunction,response.message())))
|
||||
_itemShelvingLogList.value = ItemShelvingLogList(listError)
|
||||
}else{
|
||||
|
||||
if (response.body() != null)
|
||||
{
|
||||
i("crea la lista " + response.body())
|
||||
_itemShelvingLogList.value = response.body()?.let {
|
||||
ItemShelvingLogList(it)
|
||||
}
|
||||
|
||||
|
||||
i("finalizada la lista ${response.body()}")
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelving.model
|
||||
|
||||
|
||||
|
||||
class ItemShelvingLog(
|
||||
var itemFk:String = "",
|
||||
var longName:String = "",
|
||||
var shelvingFk:String = "",
|
||||
var visible:String = "",
|
||||
var accion:String = "",
|
||||
var created:String = "",
|
||||
var code:String = "",
|
||||
var isError:Boolean = false,
|
||||
var errorMessage:String = ""
|
||||
)
|
||||
|
||||
class ItemShelvingSaleDateList(
|
||||
var list:List<ItemShelvingLog> = listOf())
|
||||
|
||||
class ItemShelvingLogList(
|
||||
var list:List<ItemShelvingLog> = listOf()
|
||||
)
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelvingparking.fragment
|
||||
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import es.verdnatura.domain.itemShelvingLogUSerCase
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
import es.verdnatura.presentation.common.Event
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDateList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLogList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog
|
||||
import es.verdnatura.presentation.view.feature.historicoshelvingparking.model.ParkingShelvingLog
|
||||
import es.verdnatura.presentation.view.feature.historicoshelvingparking.model.ParkingShelvingLogList
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
import timber.log.Timber.i
|
||||
|
||||
|
||||
class ParkingShelvingLogViewModel(context: Context) : BaseViewModel() {
|
||||
private val itemShelvingLogUSerCase: itemShelvingLogUSerCase =
|
||||
itemShelvingLogUSerCase(context)
|
||||
|
||||
|
||||
private val _response by lazy { MutableLiveData<ResponseItemVO>() }
|
||||
val response: LiveData<ResponseItemVO>
|
||||
get() = _response
|
||||
|
||||
|
||||
/* private val _itemShelvingSaleDateList by lazy { MutableLiveData<ItemShelvingSaleDateList>() }
|
||||
val itemShelvingSaleDateList: LiveData<ItemShelvingSaleDateList>
|
||||
get() = _itemShelvingSaleDateList*/
|
||||
|
||||
|
||||
private val _parkingShelvingLogList by lazy { MutableLiveData<ParkingShelvingLogList>() }
|
||||
val parkingShelvingLogList: LiveData<ParkingShelvingLogList>
|
||||
get() = _parkingShelvingLogList
|
||||
|
||||
|
||||
val loadParkingShelvingLogList = Transformations.map(_parkingShelvingLogList) { Event(it) }
|
||||
|
||||
|
||||
|
||||
fun parkingShelvingLog_get(usuario:String,password:String,vShelvingFK: String,callFunction:String){
|
||||
itemShelvingLogUSerCase.parkingShelvingLog_get(usuario,password,vShelvingFK).enqueue(object :
|
||||
Callback<List<ParkingShelvingLog>> {
|
||||
override fun onFailure(call: Call<List<ParkingShelvingLog>>, t: Throwable) {
|
||||
val listError:ArrayList<ParkingShelvingLog> = ArrayList()
|
||||
listError.add(ParkingShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(callFunction,t.message!!)))
|
||||
_parkingShelvingLogList.value = ParkingShelvingLogList(listError)
|
||||
}
|
||||
|
||||
override fun onResponse(
|
||||
call: Call<List<ParkingShelvingLog>>,
|
||||
response: Response<List<ParkingShelvingLog>>
|
||||
) {
|
||||
|
||||
if (!response.isSuccessful){
|
||||
val listError:ArrayList<ParkingShelvingLog> = ArrayList()
|
||||
listError.add(ParkingShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(callFunction,response.message())))
|
||||
_parkingShelvingLogList.value = ParkingShelvingLogList(listError)
|
||||
}else{
|
||||
|
||||
if (response.body() != null)
|
||||
{
|
||||
i("crea la lista " + response.body())
|
||||
_parkingShelvingLogList.value = response.body()?.let {
|
||||
ParkingShelvingLogList(it)
|
||||
}
|
||||
|
||||
|
||||
i("finalizada la lista ${response.body()}")
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelvingparking.fragment
|
||||
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.fragment.itemShelvingLogViewModel
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.view.View
|
||||
import android.view.inputmethod.EditorInfo
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentItemshelvinglogBinding
|
||||
import es.verdnatura.domain.notNull
|
||||
import es.verdnatura.domain.toast
|
||||
import es.verdnatura.presentation.base.BaseFragment
|
||||
import es.verdnatura.presentation.view.component.CustomDialog
|
||||
import es.verdnatura.presentation.view.component.CustomDialogList
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.adapter.ItemShelvingLogAdapter
|
||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.buyers_fragment.*
|
||||
import kotlinx.android.synthetic.main.fragment_historicovehiculo.*
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.*
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.edit_itemFk
|
||||
import kotlinx.android.synthetic.main.fragment_item_card.splash_progress
|
||||
import kotlinx.android.synthetic.main.fragment_itemexpeditionstate_card.*
|
||||
import kotlinx.android.synthetic.main.fragment_itemshelvingdayofsale.*
|
||||
import kotlinx.android.synthetic.main.fragment_itemshelvinglog.*
|
||||
import kotlinx.android.synthetic.main.fragment_parking.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
|
||||
class ParkingShlelvingLog(
|
||||
var entryPoint: String = ""
|
||||
// ) : BaseFragment<FragmentItemdayofsaleCardBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {
|
||||
) : BaseFragment<FragmentItemshelvinglogBinding, itemShelvingLogViewModel>(
|
||||
itemShelvingLogViewModel::class) {
|
||||
private lateinit var customDialogList: CustomDialogList
|
||||
private var user = ""
|
||||
private var password = ""
|
||||
private var warehouseFk = ""
|
||||
private var adapter: ItemShelvingLogAdapter? = null
|
||||
private var itemScan = ""
|
||||
|
||||
companion object {
|
||||
fun newInstance(entryPoint: String) = ParkingShlelvingLog(entryPoint)
|
||||
}
|
||||
|
||||
private lateinit var customDialog: CustomDialog
|
||||
|
||||
override fun getLayoutId(): Int = R.layout.fragment_itemshelvinglog
|
||||
|
||||
override fun init() {
|
||||
|
||||
customDialog = CustomDialog(requireContext())
|
||||
customDialogList = CustomDialogList(requireContext())
|
||||
setEvents()
|
||||
setToolBar(getString(R.string.itemShelvingLog))
|
||||
super.init()
|
||||
|
||||
}
|
||||
|
||||
private fun setToolBar(title: String) {
|
||||
toolbar_title.text = title
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private fun setEvents() {
|
||||
edit_itemFk.requestFocus()
|
||||
edit_itemFk.setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||
if (!edit_itemFk.text.toString().isNullOrEmpty()) {
|
||||
itemShelvingLog_get(edit_itemFk.text.toString())
|
||||
|
||||
itemScan = edit_itemFk.text.toString()
|
||||
}
|
||||
edit_itemFk.setText("")
|
||||
(activity as MainActivity).hideKeyboard(edit_itemFk)
|
||||
return@setOnEditorActionListener true
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
|
||||
backButton.setOnClickListener {
|
||||
requireActivity().onBackPressed()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private fun itemShelvingLog_get(vShelvingFK: String) {
|
||||
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
|
||||
user = prefs.getString(USER, "").toString()
|
||||
password = prefs.getString(PASSWORD, "").toString()
|
||||
warehouseFk = prefs.getInt(WAREHOUSEFK, 1).toString()
|
||||
splash_progress.visibility = View.VISIBLE
|
||||
viewModel.itemShelvingLog_get(user, password,vShelvingFK,"itemShelvingLog_get")
|
||||
|
||||
}
|
||||
|
||||
|
||||
override fun observeViewModel() {
|
||||
with(viewModel) {
|
||||
|
||||
loadItemShelvingLogList.observe(viewLifecycleOwner, Observer{ event ->
|
||||
event.getContentIfNotHandled().notNull {
|
||||
splash_progress.visibility = View.GONE
|
||||
adapter = ItemShelvingLogAdapter(it.list)
|
||||
itemshelvinglog_recyclerview.adapter = adapter
|
||||
itemshelvinglog_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||
setToolBar(getString(R.string.itemShelvingLog)+":"+itemScan)
|
||||
|
||||
// navigateToToday(it)
|
||||
if (it.list.isEmpty()){
|
||||
customDialog.setTitle("Sin resultados")
|
||||
.setDescription("No se ha podido obtener datos de la etiqueta escaneada. ")
|
||||
.setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}else{
|
||||
|
||||
if (it.list.get(0).isError){
|
||||
customDialog.setTitle("Error")
|
||||
.setDescription(it.list.get(0).errorMessage)
|
||||
.setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
response.observe(viewLifecycleOwner, Observer {
|
||||
if (it.isError){
|
||||
|
||||
splash_progress.visibility = View.GONE
|
||||
customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){
|
||||
customDialog.dismiss()
|
||||
}.show()
|
||||
|
||||
}else{
|
||||
|
||||
it.response.toast(requireContext())
|
||||
/* customDialog.setTitle("Información").setDescription(it.response).setOkButton("Cerrar") {
|
||||
customDialog.dismiss()
|
||||
}.show()*/
|
||||
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package es.verdnatura.presentation.view.feature.historicoshelvingparking.model
|
||||
|
||||
|
||||
class ParkingShelvingLog(
|
||||
var itemFk:String = "",
|
||||
var longName:String = "",
|
||||
var shelvingFk:String = "",
|
||||
var visible:String = "",
|
||||
var accion:String = "",
|
||||
var created:String = "",
|
||||
var code:String = "",
|
||||
var isError:Boolean = false,
|
||||
var errorMessage:String = ""
|
||||
)
|
||||
|
||||
|
||||
class ParkingShelvingLogList(
|
||||
var list:List<ParkingShelvingLog> = listOf())
|
||||
|
|
@ -27,6 +27,7 @@ import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlV
|
|||
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment
|
||||
import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasFragment
|
||||
import es.verdnatura.presentation.view.feature.historico.fragment.HistoricoFragment
|
||||
import es.verdnatura.presentation.view.feature.historicoshelving.fragment.itemShelvingLogFragment
|
||||
import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoFragment
|
||||
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryFragment
|
||||
import es.verdnatura.presentation.view.feature.main.model.ItemMenuVO
|
||||
|
|
@ -402,6 +403,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
|||
addFragmentOnTop(BufferFragment.newInstance("Desactivado buffer"))
|
||||
}
|
||||
|
||||
/*sergio:pruebas*/
|
||||
"Pre Control" -> {
|
||||
addFragmentOnTop(PreControladorFragment.newInstance())
|
||||
}
|
||||
"Histórico Shelving" -> {
|
||||
addFragmentOnTop(itemShelvingLogFragment.newInstance("Histórico Shelving"))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,16 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
|
|||
"Registrar SmartTags",R.string.SmarttagRegister)
|
||||
)
|
||||
*/
|
||||
|
||||
|
||||
/*_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
"Pre Control",R.string.precontrolprevious)
|
||||
)*/
|
||||
//sergio para que aparezca el nuevo menu
|
||||
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(7,
|
||||
R.drawable.ic_streetview_black_24dp,
|
||||
|
|
@ -49,6 +59,15 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
|
|||
"Día de venta", R.string.dayofSale
|
||||
)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
10,
|
||||
R.drawable.ic_history_orange_24dp,
|
||||
"Histórico Shelving", R.string.itemShelvingLog
|
||||
)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
22,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<vector android:height="24dp"
|
||||
|
||||
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="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/scroll_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_username"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColorHint="@android:color/darker_gray"
|
||||
android:layout_marginTop="@dimen/toolbar_height">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/edit_itemFk"
|
||||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="@string/Escaneaetiqueta"
|
||||
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>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Item"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
|
||||
android:gravity="center"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Nombre"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Parking"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="right"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Cantidad"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
android:gravity="right"
|
||||
android:paddingRight="@dimen/layout_margin_min"/>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:orientation="vertical"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<!--android:id="@+id/itemexpeditionstate_recyclerview"-->
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/itemshelvinglog_recyclerview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clipToPadding="false"
|
||||
android:visibility="visible"
|
||||
tools:listitem="@layout/item_shelvinglog_row" />
|
||||
</RelativeLayout>>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
<include
|
||||
android:id="@+id/main_toolbar"
|
||||
layout="@layout/toolbar"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/splash_progress"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/verdnatura_black_8_alpha_6"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:gravity="center">
|
||||
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/verdnatura_logo_large_height"
|
||||
app:lottie_autoPlay="true"
|
||||
app:lottie_loop="true"
|
||||
app:lottie_rawRes="@raw/orange_loading"
|
||||
app:lottie_speed="2" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</layout>
|
||||
|
|
@ -42,6 +42,7 @@
|
|||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/level"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -58,6 +59,7 @@
|
|||
android:text="@string/Ticket"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -66,15 +68,24 @@
|
|||
tool:text="123456789"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageErrorMessage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="80dp"
|
||||
app:srcCompat="@drawable/emoticon_error" />
|
||||
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
app:srcCompat="@drawable/emoticon_error"
|
||||
/>
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
|
|
|
|||
|
|
@ -0,0 +1,160 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tool="http://schemas.android.com/tools">
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog" />
|
||||
|
||||
</data>
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/layout_margin_min"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingBottom="@dimen/layout_margin_min"
|
||||
>
|
||||
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/itemFk"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.itemFk}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
android:gravity="left"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.longName}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.shelvingFk}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.visible}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:gravity="right"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_rowsub_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.accion}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.created}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1.5"
|
||||
android:gravity="center"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.code}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="0.5"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:gravity="right"/>
|
||||
|
||||
|
||||
<!-- <TextView
|
||||
android:id="@+id/date"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.created}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.accion}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.code}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="center"/>-->
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageViewSeparator"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@android:drawable/divider_horizontal_bright"
|
||||
android:background="@color/verdnatura_pumpkin_orange"/>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9"/>
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
@ -150,4 +150,6 @@
|
|||
<string name="dayofSale">Día de venta</string>
|
||||
<string name="wagon">Carro</string>
|
||||
<string name="Referencia">Referencia</string>
|
||||
<string name="precontrolprevious">Control Previa</string>
|
||||
<string name="itemShelvingLog">Historico de ítems del carro</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -148,5 +148,7 @@
|
|||
<string name="dayofSale">Day of sale</string>
|
||||
<string name="wagon">Wagon</string>
|
||||
<string name="Referencia">Reference</string>
|
||||
<string name="precontrolprevious">Control previous</string>
|
||||
<string name="itemShelvingLog">Item Log</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue