Version 8.6.1Beta tareas #3601 refactor ivnentario.Tarea #3959(warnings deprecated,typedate,neverused)
This commit is contained in:
parent
35253779e6
commit
bafe1f8c03
|
@ -1,10 +1,12 @@
|
||||||
<component name="InspectionProjectProfileManager">
|
<component name="InspectionProjectProfileManager">
|
||||||
<profile version="1.0">
|
<profile version="1.0">
|
||||||
<option name="myName" value="Project Default" />
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="RedundantSamConstructor" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||||
<option name="processCode" value="true" />
|
<option name="processCode" value="true" />
|
||||||
<option name="processLiterals" value="true" />
|
<option name="processLiterals" value="true" />
|
||||||
<option name="processComments" value="true" />
|
<option name="processComments" value="true" />
|
||||||
</inspection_tool>
|
</inspection_tool>
|
||||||
|
<inspection_tool class="UnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
</profile>
|
</profile>
|
||||||
</component>
|
</component>
|
|
@ -175,7 +175,7 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_general_black.xml" value="0.20878623188405798" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_general_black.xml" value="0.20878623188405798" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_historico.xml" value="0.1734375" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_historico.xml" value="0.1734375" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_historicovehiculo.xml" value="0.23052536231884058" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_historicovehiculo.xml" value="0.23052536231884058" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_inventary.xml" value="0.11271529888551166" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_inventary.xml" value="0.1" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_inventary_old.xml" value="0.22604166666666667" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_inventary_old.xml" value="0.22604166666666667" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_item_card.xml" value="0.22" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_item_card.xml" value="0.22" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemdayofsale_card.xml" value="0.22" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemdayofsale_card.xml" value="0.22" />
|
||||||
|
@ -220,7 +220,7 @@
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_general_row.xml" value="0.13360507246376813" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_general_row.xml" value="0.13360507246376813" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_historico_row.xml" value="0.15353260869565216" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_historico_row.xml" value="0.15353260869565216" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_historicovehiculo_row.xml" value="0.18795289855072464" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_historicovehiculo_row.xml" value="0.18795289855072464" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_inventary_row.xml" value="0.22604166666666667" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_inventary_row.xml" value="0.15163934426229508" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_itemshelvingdayofsale_row.xml" value="0.18206521739130435" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_itemshelvingdayofsale_row.xml" value="0.18206521739130435" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_location_all_row.xml" value="0.12259371833839919" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_location_all_row.xml" value="0.12259371833839919" />
|
||||||
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_location_row.xml" value="0.16875" />
|
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_location_row.xml" value="0.16875" />
|
||||||
|
|
|
@ -11,10 +11,10 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "es.verdnatura"
|
applicationId "es.verdnatura"
|
||||||
minSdkVersion 26 //21
|
minSdkVersion 21 //21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 123
|
versionCode 126
|
||||||
versionName = "8.5.2Beta"
|
versionName = "8.6.1Beta"
|
||||||
//versionName = "8.5.1Beta" versionCode 122
|
//versionName = "8.5.1Beta" versionCode 122
|
||||||
//versionName = "8.5Beta" //versionCode 121
|
//versionName = "8.5Beta" //versionCode 121
|
||||||
//versionName = "8.4"// versionCode 120
|
//versionName = "8.4"// versionCode 120
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 126,
|
"versionCode": 126,
|
||||||
"versionName": "8.6Beta",
|
"versionName": "8.6.1Beta",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
Binary file not shown.
|
@ -30,12 +30,12 @@ fun getMessageFromAllResponse(callFunction: String, ResponseMessage: String): St
|
||||||
|
|
||||||
|
|
||||||
//sergio:para personalizar los mensajes de respuesta según la llamada.
|
//sergio:para personalizar los mensajes de respuesta según la llamada.
|
||||||
when (callFunction) {
|
/* when (callFunction) {
|
||||||
//"collection_getTickets" -> returnMessage ="No hay tickets para sacar. Llamada $callFunction."
|
//"collection_getTickets_" -> returnMessage ="No hay tickets para sacar. Llamada $callFunction."
|
||||||
else -> {
|
else -> {*/
|
||||||
returnMessage = "Callback: $callFunction."
|
returnMessage = "Callback: $callFunction."
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
return "$messageFromError.\r$returnMessage"
|
return "$messageFromError.\r$returnMessage"
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ class CustomDialogHour(context: Context) : Dialog(context, R.style.DialogTheme)
|
||||||
// ib_obtener_hora.setOnClickListener {
|
// ib_obtener_hora.setOnClickListener {
|
||||||
binding.ibObtenerHora.setOnClickListener {
|
binding.ibObtenerHora.setOnClickListener {
|
||||||
val cal = Calendar.getInstance()
|
val cal = Calendar.getInstance()
|
||||||
val timeSetListener = TimePickerDialog.OnTimeSetListener { timePicker, hour, minute ->
|
val timeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
||||||
cal.set(Calendar.HOUR_OF_DAY, hour)
|
cal.set(Calendar.HOUR_OF_DAY, hour)
|
||||||
cal.set(Calendar.MINUTE, minute)
|
cal.set(Calendar.MINUTE, minute)
|
||||||
binding.customDialogHourValue.setText(SimpleDateFormat(context.getString(R.string.timeFormat)).format(cal.time))
|
binding.customDialogHourValue.setText(SimpleDateFormat(context.getString(R.string.timeFormat)).format(cal.time))
|
||||||
|
|
|
@ -155,7 +155,7 @@ class ItemCardFragment(
|
||||||
//edit_itemFk.requestFocus()
|
//edit_itemFk.requestFocus()
|
||||||
binding.editItemFk.requestFocus()
|
binding.editItemFk.requestFocus()
|
||||||
//edit_itemFk.setOnEditorActionListener { v, actionId, event ->
|
//edit_itemFk.setOnEditorActionListener { v, actionId, event ->
|
||||||
binding.editItemFk.setOnEditorActionListener { v, actionId, event ->
|
binding.editItemFk.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
//if (!edit_itemFk.text.toString().isNullOrEmpty())
|
//if (!edit_itemFk.text.toString().isNullOrEmpty())
|
||||||
if (!binding.editItemFk.text.toString().isNullOrEmpty())
|
if (!binding.editItemFk.text.toString().isNullOrEmpty())
|
||||||
|
@ -220,7 +220,7 @@ class ItemCardFragment(
|
||||||
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
|
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
|
||||||
} else {
|
} else {
|
||||||
binding.splashProgressTwo.visibility = GONE
|
binding.splashProgressTwo.visibility = GONE
|
||||||
binding.itemcardLayout.visibility = View.GONE
|
binding.itemcardLayout.visibility = GONE
|
||||||
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard)
|
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard)
|
||||||
ma.messageWithSound(
|
ma.messageWithSound(
|
||||||
getString(R.string.itemNotFound),
|
getString(R.string.itemNotFound),
|
||||||
|
@ -241,7 +241,7 @@ class ItemCardFragment(
|
||||||
})
|
})
|
||||||
|
|
||||||
response.observe(viewLifecycleOwner, Observer {
|
response.observe(viewLifecycleOwner, Observer {
|
||||||
binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = GONE
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
ma.messageWithSound(it.errorMessage, true, false)
|
ma.messageWithSound(it.errorMessage, true, false)
|
||||||
} else {
|
} else {
|
||||||
|
@ -458,7 +458,8 @@ class ItemCardFragment(
|
||||||
}.setValue("").show()
|
}.setValue("").show()
|
||||||
customDialogInput.getEditText().requestFocus()
|
customDialogInput.getEditText().requestFocus()
|
||||||
customDialogInput.getEditText()
|
customDialogInput.getEditText()
|
||||||
.setOnEditorActionListener { v, actionId, event ->
|
.setOnEditorActionListener { _, actionId, _ ->
|
||||||
|
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||||
editItemCardRow(item, customDialogInput.getValue())
|
editItemCardRow(item, customDialogInput.getValue())
|
||||||
|
@ -492,7 +493,7 @@ class ItemCardFragment(
|
||||||
}.setValue("").show()
|
}.setValue("").show()
|
||||||
customDialogInput.getEditText().requestFocus()
|
customDialogInput.getEditText().requestFocus()
|
||||||
customDialogInput.getEditText()
|
customDialogInput.getEditText()
|
||||||
.setOnEditorActionListener { v, actionId, event ->
|
.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||||
editItemCardRow(item, customDialogInput.getValue())
|
editItemCardRow(item, customDialogInput.getValue())
|
||||||
|
@ -517,7 +518,7 @@ class ItemCardFragment(
|
||||||
}.setValue("").show()
|
}.setValue("").show()
|
||||||
customDialogInput.getEditText().requestFocus()
|
customDialogInput.getEditText().requestFocus()
|
||||||
customDialogInput.getEditText()
|
customDialogInput.getEditText()
|
||||||
.setOnEditorActionListener { v, actionId, event ->
|
.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||||
editItemCardRow(item, customDialogInput.getValue())
|
editItemCardRow(item, customDialogInput.getValue())
|
||||||
|
@ -715,7 +716,7 @@ class ItemCardFragment(
|
||||||
|
|
||||||
customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
|
customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
if (!customDialogList.getValue().isNullOrEmpty())
|
if (!customDialogList.getValue().isEmpty())
|
||||||
updateBarcode(customDialogList.getValue(), "0", itemB)
|
updateBarcode(customDialogList.getValue(), "0", itemB)
|
||||||
customDialogList.dismiss()
|
customDialogList.dismiss()
|
||||||
|
|
||||||
|
@ -726,7 +727,7 @@ class ItemCardFragment(
|
||||||
|
|
||||||
|
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
customDialogList.getEditText().setOnEditorActionListener { v, actionId, event ->
|
customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||||
if (!customDialogList.getValue().isNullOrEmpty())
|
if (!customDialogList.getValue().isNullOrEmpty())
|
||||||
updateBarcode(customDialogList.getValue(), "0", itemB)
|
updateBarcode(customDialogList.getValue(), "0", itemB)
|
||||||
|
@ -799,7 +800,7 @@ class ItemCardFragment(
|
||||||
array
|
array
|
||||||
) { _, position ->
|
) { _, position ->
|
||||||
|
|
||||||
updateItemPackingType(itemsPackingType[position].code.toString())
|
updateItemPackingType(itemsPackingType[position].code)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,15 +7,13 @@ import androidx.lifecycle.Observer
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.FragmentBufferBinding
|
import es.verdnatura.databinding.FragmentBufferBinding
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
|
||||||
|
|
||||||
class BufferFragment(
|
class BufferFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentBufferBinding, BufferFragmentViewModel>(BufferFragmentViewModel::class) {
|
) : BaseFragment<FragmentBufferBinding, BufferFragmentViewModel>(BufferFragmentViewModel::class) {
|
||||||
|
|
||||||
private var password = ""
|
private var password = ""
|
||||||
private var goBack: Boolean = false
|
//private var goBack: Boolean = false
|
||||||
override fun getLayoutId(): Int = R.layout.fragment_buffer
|
override fun getLayoutId(): Int = R.layout.fragment_buffer
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
|
@ -171,7 +171,7 @@ class BufferLoadFragment(
|
||||||
customDialogList.getEditText().requestFocus()
|
customDialogList.getEditText().requestFocus()
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
|
|
||||||
customDialogList.getEditText().setOnEditorActionListener { v, actionId, event ->
|
customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
||||||
if (!customDialogList.getValue().isNullOrEmpty()) {
|
if (!customDialogList.getValue().isNullOrEmpty()) {
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ class BuscarItemFragment(
|
||||||
|
|
||||||
private fun setEvents() {
|
private fun setEvents() {
|
||||||
binding.editItemFk.requestFocus()
|
binding.editItemFk.requestFocus()
|
||||||
binding.editItemFk.setOnEditorActionListener { v, actionId, event ->
|
binding.editItemFk.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
if (!binding.editItemFk.text.toString().isNullOrEmpty())
|
if (!binding.editItemFk.text.toString().isNullOrEmpty())
|
||||||
getLocations(binding.editItemFk.text.toString())
|
getLocations(binding.editItemFk.text.toString())
|
||||||
|
|
|
@ -16,10 +16,8 @@ import es.verdnatura.presentation.common.*
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.feature.calidad.adapter.ItemBuyersAdapter
|
import es.verdnatura.presentation.view.feature.calidad.adapter.ItemBuyersAdapter
|
||||||
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
|
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.collections.ArrayList
|
|
||||||
|
|
||||||
class QaualityFragment(
|
class QaualityFragment(
|
||||||
var userFk : String = "0"
|
var userFk : String = "0"
|
||||||
|
@ -96,9 +94,9 @@ class QaualityFragment(
|
||||||
//ESCANER =========
|
//ESCANER =========
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
binding.scanInput.setOnEditorActionListener { v, actionId, event ->
|
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
if (! binding.scanInput.text.toString().isNullOrEmpty()){
|
if (! binding.scanInput.text.toString().isEmpty()){
|
||||||
findSale( binding.scanInput.text.toString())
|
findSale( binding.scanInput.text.toString())
|
||||||
}
|
}
|
||||||
binding.scanInput.setText("")
|
binding.scanInput.setText("")
|
||||||
|
@ -131,7 +129,7 @@ class QaualityFragment(
|
||||||
private fun createBuyerList(list:List<ItemBuyerVO>){
|
private fun createBuyerList(list:List<ItemBuyerVO>){
|
||||||
list.forEach { item ->
|
list.forEach { item ->
|
||||||
if (!goBack){
|
if (!goBack){
|
||||||
if (item.created != null && item.created != ""){
|
if (item.created != ""){
|
||||||
item.created = getCalendarFromDate(item.created).convertToDateString()
|
item.created = getCalendarFromDate(item.created).convertToDateString()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -165,7 +163,7 @@ class QaualityFragment(
|
||||||
private fun getCalendarFromDate(date:String): Calendar {
|
private fun getCalendarFromDate(date:String): Calendar {
|
||||||
val sdf = SimpleDateFormat(getString(R.string.dateFormat))
|
val sdf = SimpleDateFormat(getString(R.string.dateFormat))
|
||||||
val cal = Calendar.getInstance()
|
val cal = Calendar.getInstance()
|
||||||
cal.time = sdf.parse(date)
|
cal.time = sdf.parse(date)!!
|
||||||
return cal
|
return cal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,11 +191,9 @@ class QaualityFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun goToPosition(position:Int){
|
private fun goToPosition(position:Int){
|
||||||
if (binding.shelvingBuyersItems != null){
|
|
||||||
binding.shelvingBuyersItems.addViewObserver {
|
binding.shelvingBuyersItems.addViewObserver {
|
||||||
lm!!.scrollToPositionWithOffset(position,0)
|
lm!!.scrollToPositionWithOffset(position,0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,3 +1,5 @@
|
||||||
|
@file:Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
|
|
||||||
package es.verdnatura.presentation.view.feature.claim.fragment
|
package es.verdnatura.presentation.view.feature.claim.fragment
|
||||||
|
|
||||||
|
|
||||||
|
@ -171,6 +173,7 @@ class ClaimFragment(
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private fun showInputClaim() {
|
private fun showInputClaim() {
|
||||||
|
|
||||||
customDialogList.setTitle(getString(R.string.insertClaimCode))
|
customDialogList.setTitle(getString(R.string.insertClaimCode))
|
||||||
|
|
|
@ -1,12 +1,7 @@
|
||||||
package es.verdnatura.presentation.view.feature.collection.adapter
|
package es.verdnatura.presentation.view.feature.collection.adapter
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.BlendMode
|
|
||||||
import android.graphics.BlendModeColorFilter
|
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.graphics.PorterDuff
|
|
||||||
import android.os.Build
|
|
||||||
import android.util.Log
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
@ -15,7 +10,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ItemArticleRowFragmentBinding
|
import es.verdnatura.databinding.ItemArticleRowFragmentBinding
|
||||||
import es.verdnatura.domain.toast
|
|
||||||
import es.verdnatura.presentation.common.*
|
import es.verdnatura.presentation.common.*
|
||||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
||||||
|
@ -114,7 +108,8 @@ class SaleAdapter(
|
||||||
//ERROR
|
//ERROR
|
||||||
if (sale.originalQuantity != sale.quantity) {
|
if (sale.originalQuantity != sale.quantity) {
|
||||||
layoutError.visibility = View.VISIBLE
|
layoutError.visibility = View.VISIBLE
|
||||||
txtError.text = binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity
|
txtError.text =
|
||||||
|
binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity
|
||||||
if (sale.isPrepared == "1" || sale.isControlled == "1")
|
if (sale.isPrepared == "1" || sale.isControlled == "1")
|
||||||
sale.pickedQuantity = sale.quantity
|
sale.pickedQuantity = sale.quantity
|
||||||
}
|
}
|
||||||
|
@ -306,172 +301,56 @@ class SaleAdapter(
|
||||||
|
|
||||||
|
|
||||||
when (color.uppercase().trim()) {
|
when (color.uppercase().trim()) {
|
||||||
"ROJO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"ROJO" ->
|
||||||
|
itemView.setBackgroundColor(Color.RED)
|
||||||
|
/*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
itemView.background.colorFilter =
|
itemView.background.colorFilter =
|
||||||
BlendModeColorFilter(Color.RED, BlendMode.SRC_ATOP)
|
BlendModeColorFilter(Color.RED, BlendMode.SRC_ATOP)
|
||||||
} else {
|
} else {
|
||||||
itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
|
itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
|
||||||
}
|
}*/
|
||||||
// itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
|
|
||||||
"AMARILLO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"AMARILLO" ->
|
||||||
itemView.background.colorFilter =
|
itemView.setBackgroundColor(Color.YELLOW)
|
||||||
BlendModeColorFilter(Color.YELLOW, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
"VERDE" -> itemView.setBackgroundColor(Color.GREEN)
|
||||||
itemView.background.setColorFilter(Color.YELLOW, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
"AZUL" -> itemView.setBackgroundColor(Color.BLUE)
|
||||||
"VERDE" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
"BLANCO" -> itemView.setBackgroundColor(Color.WHITE)
|
||||||
BlendModeColorFilter(Color.GREEN, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
"AZUL" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(Color.BLUE, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
"BLANCO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(Color.WHITE, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
// "NEGRO"-> itemView.setBackgroundResource((R.drawable.rectangle))
|
|
||||||
|
|
||||||
"NEGRO" -> {
|
"NEGRO" -> {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(Color.BLACK, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(Color.BLACK, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
itemView.setBackgroundColor(Color.BLACK)
|
||||||
itemView.setBackgroundResource((R.drawable.border))
|
itemView.setBackgroundResource((R.drawable.border))
|
||||||
}
|
}
|
||||||
"VIOLETA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"VIOLETA" -> itemView.setBackgroundColor(0xFF4c2882.toInt())
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFF4c2882.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
// BlendModeColorFilter(Color.YELLOW, BlendMode.SRC_ATOP)
|
|
||||||
//Log.d("VERDNATURA::", "EL COLOR ES " + color)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(0xFF4c2882.toInt(), PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
|
|
||||||
"GRIS" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"GRIS" -> itemView.setBackgroundColor(Color.GRAY)
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(Color.GRAY, BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(Color.GRAY, PorterDuff.Mode.SRC_ATOP)
|
|
||||||
}
|
|
||||||
"ORANGE" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(
|
|
||||||
getColor(
|
|
||||||
context!!,
|
|
||||||
android.R.color.holo_orange_light
|
|
||||||
), BlendMode.SRC_ATOP
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
getColor(
|
|
||||||
context!!,
|
|
||||||
android.R.color.holo_orange_light
|
|
||||||
), PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
"MORADO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"ORANGE" -> itemView.setBackgroundColor(0xFFFFBB33.toInt())
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(
|
|
||||||
getColor(
|
|
||||||
context!!,
|
|
||||||
android.R.color.holo_purple
|
|
||||||
), BlendMode.SRC_ATOP
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
getColor(
|
|
||||||
context!!,
|
|
||||||
android.R.color.holo_purple
|
|
||||||
), PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
"CELESTE" ->if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"MORADO" -> itemView.setBackgroundColor(0xFFAA66CC.toInt())
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFF5b85F5.toInt(), BlendMode.SRC_ATOP)
|
"CELESTE" -> itemView.setBackgroundColor(0xFF5b85F5.toInt())
|
||||||
}
|
|
||||||
|
"ROSA" -> itemView.setBackgroundColor(0xFFfc0fc0.toInt())
|
||||||
|
|
||||||
|
"DORADO" -> itemView.setBackgroundColor(0xFFb8860b.toInt())
|
||||||
|
|
||||||
|
"MARRON" -> itemView.setBackgroundColor(0xFF663300.toInt())
|
||||||
|
|
||||||
|
"PERLA" -> itemView.setBackgroundColor(0xFFcdcecf.toInt())
|
||||||
|
|
||||||
|
"MARFIL" -> itemView.setBackgroundColor(0xFFf7eada.toInt())
|
||||||
|
|
||||||
|
"CIAN" -> itemView.setBackgroundColor(0xFF00ffff.toInt())
|
||||||
|
|
||||||
|
|
||||||
"ROSA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
"BEIGE" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFFfc0fc0.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFFfc0fc0.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
"DORADO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFFb8860b.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFFb8860b.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"MARRON" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFF663300.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFF663300.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"PERLA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFFcdcecf.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFFcdcecf.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"MARFIL" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFFf7eada.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFFf7eada.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"CIAN" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFF00ffff.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFF00ffff.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"BEIGE" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
itemView.background.colorFilter =
|
|
||||||
BlendModeColorFilter(0xFFf2e7bf.toInt(), BlendMode.SRC_ATOP)
|
|
||||||
} else {
|
|
||||||
itemView.background.setColorFilter(
|
|
||||||
0xFFf2e7bf.toInt(),
|
|
||||||
PorterDuff.Mode.SRC_ATOP
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
// itemView.setBackgroundColor(Color.TRANSPARENT)
|
itemView.setBackgroundColor(Color.TRANSPARENT)
|
||||||
//itemView.setBackgroundResource(R.drawable.background_item_color)
|
//itemView.setBackgroundResource(R.drawable.background_item_color)
|
||||||
// itemView.visibility=View.INVISIBLE
|
// itemView.visibility=View.INVISIBLE
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.*
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class CollectionFragment(
|
class CollectionFragment(
|
||||||
var collection: CollectionVO = CollectionVO(),
|
var collection: CollectionVO = CollectionVO(),
|
||||||
var type: String = SACADOR
|
var type: String = SACADOR
|
||||||
|
@ -113,7 +114,7 @@ class CollectionFragment(
|
||||||
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
||||||
|
|
||||||
|
|
||||||
if ((collection.collectionFk != null) && type.equals(CONTROLADOR)) {
|
if (type.equals(CONTROLADOR)) {
|
||||||
|
|
||||||
//sergio: comprueba si viene de la pantalla de controlador
|
//sergio: comprueba si viene de la pantalla de controlador
|
||||||
viewModel.ticket_checkFullyControlled(
|
viewModel.ticket_checkFullyControlled(
|
||||||
|
@ -152,7 +153,7 @@ class CollectionFragment(
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
customDialogThreeButtons = CustomDialogThreeButtons(requireContext())
|
customDialogThreeButtons = CustomDialogThreeButtons(requireContext())
|
||||||
ma.hideBottomNavigation(View.GONE)
|
ma.hideBottomNavigation(View.GONE)
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = VISIBLE
|
binding.splashProgress.visibility = VISIBLE
|
||||||
|
|
||||||
setEvents()
|
setEvents()
|
||||||
setToolBar()
|
setToolBar()
|
||||||
|
@ -262,9 +263,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun scanRequest() {
|
private fun scanRequest() {
|
||||||
if (binding.scanInput != null) {
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
}
|
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -470,19 +469,19 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
placementSuppleyList.observe(viewLifecycleOwner, Observer {
|
placementSuppleyList.observe(viewLifecycleOwner, Observer {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = GONE
|
||||||
if (!goBack) printShelvingResult(it)
|
if (!goBack) printShelvingResult(it)
|
||||||
goBack = false
|
goBack = false
|
||||||
})
|
})
|
||||||
|
|
||||||
item.observe(viewLifecycleOwner, Observer {
|
item.observe(viewLifecycleOwner, Observer {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = GONE
|
||||||
if (!goBack) toastDisponibility(it)
|
if (!goBack) toastDisponibility(it)
|
||||||
goBack = false
|
goBack = false
|
||||||
})
|
})
|
||||||
|
|
||||||
responseNew.observe(viewLifecycleOwner, Observer {
|
responseNew.observe(viewLifecycleOwner, Observer {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
// if (!goBack) {
|
// if (!goBack) {
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
customDialog.setTitle(getString(R.string.disponibility))
|
customDialog.setTitle(getString(R.string.disponibility))
|
||||||
|
@ -493,8 +492,8 @@ class CollectionFragment(
|
||||||
}.show()
|
}.show()
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
|
|
||||||
|
|
||||||
if (!goBack) {
|
if (!goBack) {
|
||||||
|
@ -522,7 +521,7 @@ class CollectionFragment(
|
||||||
})
|
})
|
||||||
|
|
||||||
responseCode.observe(viewLifecycleOwner, Observer {
|
responseCode.observe(viewLifecycleOwner, Observer {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
if (!goBack2) {
|
if (!goBack2) {
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
customDialog.setTitle(getString(R.string.error))
|
customDialog.setTitle(getString(R.string.error))
|
||||||
|
@ -616,7 +615,7 @@ class CollectionFragment(
|
||||||
|
|
||||||
|
|
||||||
mistakeList.observe(viewLifecycleOwner, Observer {
|
mistakeList.observe(viewLifecycleOwner, Observer {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = GONE
|
binding.splashProgress.visibility = GONE
|
||||||
/*sergio:se quita y se pone esta comprobacion porque si no aparece de nuevo otra vez al volver atrás */
|
/*sergio:se quita y se pone esta comprobacion porque si no aparece de nuevo otra vez al volver atrás */
|
||||||
|
|
||||||
if (!goMistakeBack)
|
if (!goMistakeBack)
|
||||||
|
@ -788,7 +787,7 @@ class CollectionFragment(
|
||||||
viewModel.sendChekingPresence(
|
viewModel.sendChekingPresence(
|
||||||
token = getData(TOKEN),
|
token = getData(TOKEN),
|
||||||
workerId = salePerson,
|
workerId = salePerson,
|
||||||
message = message, "sendChekingPresence"
|
message = message
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -803,7 +802,7 @@ class CollectionFragment(
|
||||||
binding.mainToolbar.toolbarTitle.text = collection.collectionFk
|
binding.mainToolbar.toolbarTitle.text = collection.collectionFk
|
||||||
|
|
||||||
|
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
var salesList: ArrayList<SaleVO> = ArrayList()
|
var salesList: ArrayList<SaleVO> = ArrayList()
|
||||||
tickets = ArrayList()
|
tickets = ArrayList()
|
||||||
var observations = ""
|
var observations = ""
|
||||||
|
@ -886,8 +885,8 @@ class CollectionFragment(
|
||||||
}, object : OnMistakeClickListener {
|
}, object : OnMistakeClickListener {
|
||||||
override fun onMistakeClickListener(sale: SaleVO) {
|
override fun onMistakeClickListener(sale: SaleVO) {
|
||||||
if (type != "PRECHECKER") {
|
if (type != "PRECHECKER") {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
mistakeSale = sale
|
mistakeSale = sale
|
||||||
goMistakeBack=false
|
goMistakeBack=false
|
||||||
viewModel.mistakeType(
|
viewModel.mistakeType(
|
||||||
|
@ -1067,8 +1066,8 @@ class CollectionFragment(
|
||||||
/* if (mpok != null) mpok!!.start()
|
/* if (mpok != null) mpok!!.start()
|
||||||
getString(R.string.Ticketaparcado).toast(requireContext())*/
|
getString(R.string.Ticketaparcado).toast(requireContext())*/
|
||||||
} else {
|
} else {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
storedPosition = 0
|
storedPosition = 0
|
||||||
storedBackPosition = 0
|
storedBackPosition = 0
|
||||||
// if (type != PRECHECKER) {
|
// if (type != PRECHECKER) {
|
||||||
|
@ -1281,7 +1280,7 @@ class CollectionFragment(
|
||||||
private fun showShelving(position: Int, shelvingPosition: Int) {
|
private fun showShelving(position: Int, shelvingPosition: Int) {
|
||||||
storedShelvingPosition = shelvingPosition
|
storedShelvingPosition = shelvingPosition
|
||||||
storedPosition = position
|
storedPosition = position
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = VISIBLE
|
||||||
var quantityGet = "0"
|
var quantityGet = "0"
|
||||||
try {
|
try {
|
||||||
quantityGet =
|
quantityGet =
|
||||||
|
@ -1354,8 +1353,8 @@ class CollectionFragment(
|
||||||
customDialogList.dismiss()
|
customDialogList.dismiss()
|
||||||
} else {
|
} else {
|
||||||
itemShelvingFkStored = itemShelvingFk
|
itemShelvingFkStored = itemShelvingFk
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
|
|
||||||
/* var working_in_test = true // sergio: en proves app
|
/* var working_in_test = true // sergio: en proves app
|
||||||
if (working_in_test) {*/
|
if (working_in_test) {*/
|
||||||
|
@ -1639,8 +1638,8 @@ class CollectionFragment(
|
||||||
) {
|
) {
|
||||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||||
} else {
|
} else {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
|
|
||||||
//sergio datos para mensaje salix
|
//sergio datos para mensaje salix
|
||||||
|
|
||||||
|
@ -1695,8 +1694,8 @@ class CollectionFragment(
|
||||||
) {
|
) {
|
||||||
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
|
||||||
} else {
|
} else {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility =
|
binding.splashProgress.visibility =
|
||||||
View.VISIBLE
|
VISIBLE
|
||||||
|
|
||||||
dataMessageSalix = DataMessageSalix(
|
dataMessageSalix = DataMessageSalix(
|
||||||
ticket = ticketSelected,
|
ticket = ticketSelected,
|
||||||
|
@ -1831,7 +1830,7 @@ class CollectionFragment(
|
||||||
|
|
||||||
if (binding.mainToolbar.toolbarTitle != null) binding.mainToolbar.toolbarTitle.text =
|
if (binding.mainToolbar.toolbarTitle != null) binding.mainToolbar.toolbarTitle.text =
|
||||||
if (collection.collectionFk != null) collection.collectionFk else ""
|
if (collection.collectionFk != null) collection.collectionFk else ""
|
||||||
if (binding.mainToolbar.toolbarSubtitle != null && totalMark != null && sales != null) binding.mainToolbar.toolbarSubtitle.text =
|
if (binding.mainToolbar.toolbarSubtitle != null && totalMark != null) binding.mainToolbar.toolbarSubtitle.text =
|
||||||
"" + totalMark + "/" + sales.size
|
"" + totalMark + "/" + sales.size
|
||||||
|
|
||||||
if (totalMark == sales.size) {
|
if (totalMark == sales.size) {
|
||||||
|
@ -2320,8 +2319,8 @@ class CollectionFragment(
|
||||||
viewModel.sendChekingPresence(
|
viewModel.sendChekingPresence(
|
||||||
token = getData(TOKEN),
|
token = getData(TOKEN),
|
||||||
workerId = workerId,
|
workerId = workerId,
|
||||||
message = message,
|
message = message
|
||||||
"sendChekingPresence"
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2448,7 +2447,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showMistakeList(list: List<MistakeTypeVO>) {
|
private fun showMistakeList(list: List<MistakeTypeVO>) {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = GONE
|
||||||
listPlacementSupply = ArrayList()
|
listPlacementSupply = ArrayList()
|
||||||
list.forEach {
|
list.forEach {
|
||||||
listPlacementSupply.add(BarcodeVO(code = it.description))
|
listPlacementSupply.add(BarcodeVO(code = it.description))
|
||||||
|
@ -2524,13 +2523,13 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
LISTO -> {
|
LISTO -> {
|
||||||
state += 1
|
state += 1
|
||||||
speakOrder()
|
//speakOrder()
|
||||||
}
|
}
|
||||||
VOLVER -> {
|
VOLVER -> {
|
||||||
|
|
||||||
}
|
}
|
||||||
REPITE -> {
|
REPITE -> {
|
||||||
speakOrder()
|
// speakOrder()
|
||||||
}
|
}
|
||||||
OTRO -> {
|
OTRO -> {
|
||||||
// speak("Orden no registrada")
|
// speak("Orden no registrada")
|
||||||
|
@ -2542,7 +2541,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun speakOrder() {
|
/*private fun speakOrder() {
|
||||||
if (type == SACADOR) {
|
if (type == SACADOR) {
|
||||||
if (state == 0) {
|
if (state == 0) {
|
||||||
//speak("Colección cargada.")
|
//speak("Colección cargada.")
|
||||||
|
@ -2675,7 +2674,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
cancelSpeech()
|
cancelSpeech()
|
||||||
|
|
|
@ -867,8 +867,8 @@ class CollectionViewModel(context: Context) : BaseViewModel() {
|
||||||
fun sendChekingPresence(
|
fun sendChekingPresence(
|
||||||
token: String,
|
token: String,
|
||||||
workerId: String,
|
workerId: String,
|
||||||
message: String,
|
message: String
|
||||||
calledFunction: String
|
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
getLoginUserCase.sendChekingPresence(token, workerId.toInt(), message)
|
getLoginUserCase.sendChekingPresence(token, workerId.toInt(), message)
|
||||||
|
|
|
@ -127,7 +127,7 @@ class CollectionShowTicketFragment(
|
||||||
requireActivity().onBackPressed()
|
requireActivity().onBackPressed()
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.scanInput.setOnEditorActionListener { v, actionId, event ->
|
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED)
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED)
|
||||||
if (!binding.scanInput.text.toString().isNullOrEmpty()) {
|
if (!binding.scanInput.text.toString().isNullOrEmpty()) {
|
||||||
binding.splashProgress.visibility = VISIBLE
|
binding.splashProgress.visibility = VISIBLE
|
||||||
|
@ -271,7 +271,7 @@ class CollectionShowTicketFragment(
|
||||||
}
|
}
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
collection.collectionFk
|
collection.collectionFk
|
||||||
if (sales != null) binding.mainToolbar.toolbarSubtitle.text =
|
binding.mainToolbar.toolbarSubtitle.text =
|
||||||
"" + totalMark + "/" + sales.size
|
"" + totalMark + "/" + sales.size
|
||||||
if (totalMark == sales.size) {
|
if (totalMark == sales.size) {
|
||||||
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)
|
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)
|
||||||
|
|
|
@ -70,7 +70,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
this.isError = true
|
this.isError = true
|
||||||
if (this.tickets == null || this.tickets.isEmpty()) {
|
if (this.tickets.isEmpty()) {
|
||||||
this.errorMessage = context.getString(R.string.collectionNoTickets)
|
this.errorMessage = context.getString(R.string.collectionNoTickets)
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -85,6 +85,6 @@ fun CollectionVO.map(context: Context): CollectionVO {
|
||||||
private fun getCalendarFromDate(date: String,context:Context): Calendar {
|
private fun getCalendarFromDate(date: String,context:Context): Calendar {
|
||||||
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
|
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
|
||||||
val cal = Calendar.getInstance()
|
val cal = Calendar.getInstance()
|
||||||
cal.setTime(sdf.parse(date))
|
cal.time = sdf.parse(date)!!
|
||||||
return cal
|
return cal
|
||||||
}
|
}
|
|
@ -13,6 +13,7 @@ import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ControladorFragment :
|
class ControladorFragment :
|
||||||
BaseFragment<FragmentControladorBinding, ControladorViewModel>(ControladorViewModel::class) {
|
BaseFragment<FragmentControladorBinding, ControladorViewModel>(ControladorViewModel::class) {
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class WebFragment(
|
class WebFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentWebBinding, ControladorViewModel>(ControladorViewModel::class) {
|
) : BaseFragment<FragmentWebBinding, ControladorViewModel>(ControladorViewModel::class) {
|
||||||
|
|
|
@ -22,6 +22,7 @@ import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.Histor
|
||||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||||
import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment
|
import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ControlVehiculoFragment(
|
class ControlVehiculoFragment(
|
||||||
var tagName: String = ""
|
var tagName: String = ""
|
||||||
) : BaseFragment<FragmentVehiclecontrolBinding, ControlVehiculoViewModel>(
|
) : BaseFragment<FragmentVehiclecontrolBinding, ControlVehiculoViewModel>(
|
||||||
|
|
|
@ -19,6 +19,7 @@ import es.verdnatura.presentation.view.feature.diadeventa.adapter.DayOfSaleAdapt
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class DayOfSaleFragment(
|
class DayOfSaleFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentItemdayofsaleCardBinding, DayOfSaleViewModel>(DayOfSaleViewModel::class) {
|
) : BaseFragment<FragmentItemdayofsaleCardBinding, DayOfSaleViewModel>(DayOfSaleViewModel::class) {
|
||||||
|
|
|
@ -18,6 +18,7 @@ import es.verdnatura.presentation.view.feature.faltas.adapter.FaltasAdapter
|
||||||
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
|
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class FaltasFragment :
|
class FaltasFragment :
|
||||||
BaseFragment<FragmentFaltasBinding, FaltasViewModel>(FaltasViewModel::class) {
|
BaseFragment<FragmentFaltasBinding, FaltasViewModel>(FaltasViewModel::class) {
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class HistoricoArticuloFragment(
|
class HistoricoArticuloFragment(
|
||||||
var itemFk: String = ""
|
var itemFk: String = ""
|
||||||
) : BaseFragment<FragmentHistoricoBinding, HistoricoArticuloViewModel>(
|
) : BaseFragment<FragmentHistoricoBinding, HistoricoArticuloViewModel>(
|
||||||
|
@ -133,10 +134,10 @@ class HistoricoArticuloFragment(
|
||||||
listHistoryAux.forEach {
|
listHistoryAux.forEach {
|
||||||
|
|
||||||
|
|
||||||
if (it.name != null && (it.name.contains(
|
if (it.name.contains(
|
||||||
binding.filterNameordateitem.text.toString(),
|
binding.filterNameordateitem.text.toString(),
|
||||||
true
|
true
|
||||||
))
|
)
|
||||||
) {
|
) {
|
||||||
//Log.i("VERDNATURA:","si contiene ${filter_nameordateitem.text.toString()}")
|
//Log.i("VERDNATURA:","si contiene ${filter_nameordateitem.text.toString()}")
|
||||||
listHistoric.add(it)
|
listHistoric.add(it)
|
||||||
|
@ -179,7 +180,7 @@ class HistoricoArticuloFragment(
|
||||||
// listHistoryAux.add(it)
|
// listHistoryAux.add(it)
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if ((it.name != null) && (it.name.contains(filter, true))) {
|
if (it.name.contains(filter, true)) {
|
||||||
listHistoric.add(it)
|
listHistoric.add(it)
|
||||||
// listHistoryAux.add(it)
|
// listHistoryAux.add(it)
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class itemShelvingLogFragment(
|
class itemShelvingLogFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
// ) : BaseFragment<FragmentItemdayofsaleCardBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {
|
// ) : BaseFragment<FragmentItemdayofsaleCardBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {
|
||||||
|
|
|
@ -13,6 +13,7 @@ import es.verdnatura.presentation.view.component.CustomDialogList
|
||||||
import es.verdnatura.presentation.view.feature.historicoshelvinglog.adapter.ShelvingLogAdapter
|
import es.verdnatura.presentation.view.feature.historicoshelvinglog.adapter.ShelvingLogAdapter
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class shelvingLogFragment(
|
class shelvingLogFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
package es.verdnatura.presentation.view.feature.inventario.fragment
|
package es.verdnatura.presentation.view.feature.inventario.fragment
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
|
||||||
import android.graphics.drawable.Drawable
|
import android.graphics.drawable.Drawable
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
|
@ -21,29 +20,31 @@ import es.verdnatura.presentation.view.component.CustomDialogInput
|
||||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||||
import es.verdnatura.presentation.view.feature.inventario.adapter.InventoryAdapter
|
import es.verdnatura.presentation.view.feature.inventario.adapter.InventoryAdapter
|
||||||
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
|
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
|
||||||
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
|
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
|
||||||
import ir.mirrajabi.searchdialog.core.SearchResultListener
|
import ir.mirrajabi.searchdialog.core.SearchResultListener
|
||||||
|
|
||||||
class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewModel>(InventaryViewModel::class) {
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
|
class InventaryFragment :
|
||||||
|
BaseFragment<FragmentInventaryBinding, InventaryViewModel>(InventaryViewModel::class) {
|
||||||
|
|
||||||
|
|
||||||
private var adapter : InventoryAdapter? = null
|
private var adapter: InventoryAdapter? = null
|
||||||
private lateinit var customDialogInput: CustomDialogInput
|
private lateinit var customDialogInput: CustomDialogInput
|
||||||
private var listInvetory:ArrayList<ItemInventaryVO> = ArrayList()
|
private var listInvetory: ArrayList<ItemInventaryVO> = ArrayList()
|
||||||
private var listInvetoryAux:ArrayList<ItemInventaryVO> = ArrayList()
|
private var listInvetoryAux: ArrayList<ItemInventaryVO> = ArrayList()
|
||||||
private lateinit var customDialog: CustomDialog
|
private lateinit var customDialog: CustomDialog
|
||||||
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
|
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
|
||||||
private var reload = false
|
// private var reload = false
|
||||||
private var hideLoad = true
|
// private var hideLoad = true
|
||||||
private var layoutManager : LinearLayoutManager? = null
|
private var layoutManager: LinearLayoutManager? = null
|
||||||
private var firstVisiblePosition = 0
|
private var firstVisiblePosition = 0
|
||||||
private var secondVisiblePosition = 1
|
private var secondVisiblePosition = 1
|
||||||
|
private lateinit var itemClicked: ItemInventaryVO
|
||||||
|
|
||||||
|
|
||||||
//sergio : cmbios para insertar lista compradores en inventary en el searchable
|
//sergio : cmbios para insertar lista compradores en inventary en el searchable
|
||||||
private val items=ArrayList<SearchBuyerModel>()
|
private val items = ArrayList<SearchBuyerModel>()
|
||||||
private lateinit var buyerId:String
|
private lateinit var buyerId: String
|
||||||
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
@ -57,31 +58,37 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
super.onAttach(context)
|
super.onAttach(context)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
|
|
||||||
//sergio. se quita para subir version.A la espera de como será el inventario
|
|
||||||
viewModel.itemShelvingBuyerGet(user = getData(USER),password = getData(PASSWORD))
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
override fun init() {
|
override fun init() {
|
||||||
|
|
||||||
binding.filterBuyer.setText(getData(BUYER))
|
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
buyerId=getData(BUYERID)
|
viewModel.itemShelvingBuyerGet(user = getData(USER), password = getData(PASSWORD))
|
||||||
|
|
||||||
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
|
binding.filterBuyer.text = getData(BUYER)
|
||||||
binding.filterBuyer.setOnClickListener{
|
buyerId = getData(BUYERID)
|
||||||
|
if (!buyerId.isBlank()) {
|
||||||
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
|
viewModel.getInventory(getData(USER), getData(PASSWORD), buyerId, getData(WAREHOUSEFK))
|
||||||
|
}
|
||||||
|
binding.filterBuyer.setOnClickListener {
|
||||||
//SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(),
|
//SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(),
|
||||||
SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,items,
|
SimpleSearchDialogCompat(context,
|
||||||
|
getString(R.string.compradores),
|
||||||
|
getString(R.string.escribirparteNombre),
|
||||||
|
null,
|
||||||
|
items,
|
||||||
SearchResultListener { baseSearchDialogCompat, nombre, position ->
|
SearchResultListener { baseSearchDialogCompat, nombre, position ->
|
||||||
|
|
||||||
binding.filterBuyer.setText((nombre.title))
|
binding.filterBuyer.text = (nombre.title)
|
||||||
saveBuyer(nombre.getBuyerNickname())
|
saveBuyer(nombre.getBuyerNickname())
|
||||||
saveBuyerId(nombre.getBuyerId())
|
saveBuyerId(nombre.getBuyerId())
|
||||||
buyerId=nombre.getBuyerId()
|
buyerId = nombre.getBuyerId()
|
||||||
viewModel.getInventory(getData(USER),getData(PASSWORD),nombre.getBuyerId(),getData(WAREHOUSEFK))
|
viewModel.getInventory(
|
||||||
|
getData(USER),
|
||||||
|
getData(PASSWORD),
|
||||||
|
nombre.getBuyerId(),
|
||||||
|
getData(WAREHOUSEFK)
|
||||||
|
)
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
baseSearchDialogCompat.dismiss()
|
baseSearchDialogCompat.dismiss()
|
||||||
}).show()
|
}).show()
|
||||||
|
@ -90,26 +97,18 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
|
|
||||||
customDialogInput = CustomDialogInput(requireContext())
|
customDialogInput = CustomDialogInput(requireContext())
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
ma.hideBottomNavigation(View.GONE)
|
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemShelvingRadar)
|
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemShelvingRadar)
|
||||||
setToolBar()
|
setToolBar()
|
||||||
setEvents()
|
setEvents()
|
||||||
|
|
||||||
if (reload){
|
|
||||||
reload = false
|
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
|
||||||
hideLoad = false
|
|
||||||
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
super.init()
|
super.init()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private fun setToolBar() {
|
||||||
|
|
||||||
private fun setToolBar(){
|
ma.hideBottomNavigation(View.GONE)
|
||||||
|
|
||||||
val listIcons: ArrayList<ImageView> = ArrayList()
|
val listIcons: ArrayList<ImageView> = ArrayList()
|
||||||
val iconReload = ImageView(context)
|
val iconReload = ImageView(context)
|
||||||
|
@ -121,45 +120,53 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
}
|
}
|
||||||
listIcons.add(iconReload)
|
listIcons.add(iconReload)
|
||||||
|
|
||||||
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapterTooltip(listIcons,object: OnOptionsSelectedListener{
|
binding.mainToolbar.toolbarIcons.adapter =
|
||||||
|
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
|
||||||
override fun onOptionsItemSelected(item: Drawable) {
|
override fun onOptionsItemSelected(item: Drawable) {
|
||||||
if (item == iconReload.drawable){
|
if (item == iconReload.drawable) {
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
|
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
|
||||||
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
|
viewModel.getInventory(
|
||||||
|
getData(USER),
|
||||||
|
getData(PASSWORD),
|
||||||
|
buyerId,
|
||||||
|
getData(WAREHOUSEFK)
|
||||||
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
binding.mainToolbar.toolbarIcons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
binding.mainToolbar.toolbarIcons.layoutManager =
|
||||||
|
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setEvents(){
|
@SuppressLint("NotifyDataSetChanged")
|
||||||
|
private fun setEvents() {
|
||||||
binding.mainToolbar.backButton.setOnClickListener {
|
binding.mainToolbar.backButton.setOnClickListener {
|
||||||
requireActivity().onBackPressed()
|
requireActivity().onBackPressed()
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.filterItemFk.setOnKeyListener { v, keyCode, event ->
|
binding.filterItemFk.setOnKeyListener { v, keyCode, event ->
|
||||||
if (binding.filterItemFk.text.toString().isNullOrEmpty()){
|
if (binding.filterItemFk.text.toString().isEmpty()) {
|
||||||
if (listInvetory.size != listInvetoryAux.size){
|
|
||||||
|
if (listInvetory.size != listInvetoryAux.size) {
|
||||||
listInvetory.removeAll(listInvetoryAux)
|
listInvetory.removeAll(listInvetoryAux)
|
||||||
listInvetoryAux.forEach {
|
listInvetory.addAll(listInvetoryAux)
|
||||||
listInvetory.add(it)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
} else {
|
||||||
|
|
||||||
listInvetory.removeAll(listInvetoryAux)
|
listInvetory.removeAll(listInvetoryAux)
|
||||||
listInvetoryAux.forEach {
|
listInvetory.addAll(listInvetoryAux.filter {
|
||||||
if ((it.itemFk.contains(binding.filterItemFk.text.toString(),true)) || (it.producer.contains(binding.filterItemFk.text.toString(),true))){
|
it.itemFk.contains(
|
||||||
listInvetory.add(it)
|
binding.filterItemFk.text.toString(),
|
||||||
}
|
true
|
||||||
}
|
) || it.producer.contains(binding.filterItemFk.text.toString(), true)
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
adapter!!.notifyDataSetChanged()
|
adapter!!.notifyDataSetChanged()
|
||||||
|
@ -167,7 +174,6 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
|
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
|
||||||
|
@ -175,15 +181,15 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
if (binding.locationRecyclerview.layoutManager != null){
|
if (binding.locationRecyclerview.layoutManager != null) {
|
||||||
if (firstVisiblePosition <= listInvetory.size){
|
if (firstVisiblePosition <= listInvetory.size) {
|
||||||
binding.locationRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
|
binding.locationRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun observeViewModel() {
|
override fun observeViewModel() {
|
||||||
with(viewModel){
|
with(viewModel) {
|
||||||
|
|
||||||
//sergio: para compradores
|
//sergio: para compradores
|
||||||
buyersList.observe(viewLifecycleOwner, Observer {
|
buyersList.observe(viewLifecycleOwner, Observer {
|
||||||
|
@ -193,46 +199,49 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
|
|
||||||
|
|
||||||
inventaryList.observe(viewLifecycleOwner, Observer {
|
inventaryList.observe(viewLifecycleOwner, Observer {
|
||||||
if (hideLoad){
|
|
||||||
binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
}else{
|
|
||||||
hideLoad = true
|
|
||||||
}
|
|
||||||
|
|
||||||
listInvetory = ArrayList()
|
listInvetory = ArrayList()
|
||||||
listInvetoryAux = ArrayList()
|
listInvetoryAux = ArrayList()
|
||||||
it.list.forEach {
|
it.list.forEach {
|
||||||
if (it.nicho != "0"){
|
if (it.nicho != "0") {
|
||||||
listInvetory.add(it)
|
listInvetory.add(it)
|
||||||
listInvetoryAux.add(it)
|
listInvetoryAux.add(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
adapter = InventoryAdapter(listInvetory,object: OnInvetoryNichoClickListener{
|
adapter = InventoryAdapter(listInvetory, object : OnInvetoryNichoClickListener {
|
||||||
override fun onInvetoryNichoClickListener(item: ItemInventaryVO) {
|
override fun onInvetoryNichoClickListener(item: ItemInventaryVO) {
|
||||||
|
|
||||||
//sergio: cambiado customdialogInput pòr customdialog 6.1.4
|
customDialog.setTitle(item.itemFk + "\n" + item.longName + " " + item.size)
|
||||||
customDialog.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription(getString(R.string.quantityReal)+item.nicho+")").setOkButton(getString(R.string.pull)){
|
.setDescription(getString(R.string.quantityReal) + item.nicho + ")")
|
||||||
//customDialogInput.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton(getString(R.string.pull)){
|
.setOkButton(getString(R.string.pull)) {
|
||||||
viewModel.itemTrash(item.itemFk,getData(WAREHOUSEFK),getData(USER),getData(PASSWORD),item.nicho,"0")
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
//viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,"0","0")
|
viewModel.itemTrash(
|
||||||
// viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0")
|
item.itemFk,
|
||||||
changeOfflineValue(item)
|
getData(WAREHOUSEFK),
|
||||||
// customDialogInput.dismiss()
|
getData(USER),
|
||||||
|
getData(PASSWORD),
|
||||||
|
item.nicho,
|
||||||
|
"0"
|
||||||
|
)
|
||||||
|
itemClicked = item
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.setKoButton(getString(R.string.cancel)){
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
// customDialogInput.dismiss()
|
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
|
|
||||||
}
|
}
|
||||||
},onPasillerosItemClickListener = pasillerosItemClickListener!!)
|
}, onPasillerosItemClickListener = pasillerosItemClickListener!!)
|
||||||
binding.locationRecyclerview.adapter = adapter
|
binding.locationRecyclerview.adapter = adapter
|
||||||
layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
layoutManager =
|
||||||
|
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
binding.locationRecyclerview.layoutManager = layoutManager
|
binding.locationRecyclerview.layoutManager = layoutManager
|
||||||
|
|
||||||
if (firstVisiblePosition <= listInvetory.size){
|
if (firstVisiblePosition <= listInvetory.size) {
|
||||||
binding.locationRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
|
binding.locationRecyclerview.layoutManager!!.scrollToPosition(
|
||||||
|
firstVisiblePosition
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -240,53 +249,41 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
|
||||||
|
|
||||||
|
|
||||||
response.observe(viewLifecycleOwner, Observer {
|
response.observe(viewLifecycleOwner, Observer {
|
||||||
if (it.isError){
|
binding.splashProgress.visibility = View.GONE
|
||||||
ma.messageWithSound(it.errorMessage,true,false)
|
if (it.isError) {
|
||||||
/* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage).setOkButton(getString(R.string.close)){
|
ma.messageWithSound(it.errorMessage, true, true)
|
||||||
customDialog.dismiss()
|
|
||||||
}.show()*/
|
} else {
|
||||||
|
changeOfflineValue(itemClicked)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun changeOfflineValue(item:ItemInventaryVO){
|
|
||||||
var i = 0
|
|
||||||
var position = 0
|
|
||||||
listInvetory.forEach {
|
|
||||||
if (it.itemFk == item.itemFk) {
|
|
||||||
position = i
|
|
||||||
}
|
|
||||||
i = i.plus(1)
|
|
||||||
}
|
|
||||||
listInvetory.removeAt(position)
|
|
||||||
|
|
||||||
i = 0
|
@SuppressLint("NotifyDataSetChanged")
|
||||||
position = 0
|
private fun changeOfflineValue(item: ItemInventaryVO) {
|
||||||
listInvetoryAux.forEach {
|
listInvetory.removeAt(listInvetory.indexOf(item))
|
||||||
if (it.itemFk == item.itemFk) {
|
listInvetoryAux.removeAt(listInvetoryAux.indexOf(item))
|
||||||
position = i
|
listInvetory.filter { it.itemFk.contains("996") }
|
||||||
}
|
|
||||||
i = i.plus(1)
|
|
||||||
}
|
|
||||||
listInvetoryAux.removeAt(position)
|
|
||||||
adapter?.notifyDataSetChanged()
|
adapter?.notifyDataSetChanged()
|
||||||
|
//reload = true
|
||||||
reload = true
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//sergio:añadido para compradores
|
//sergio:añadido para compradores
|
||||||
private fun createBuyerList(list: List<BuyerVO>){
|
private fun createBuyerList(list: List<BuyerVO>) {
|
||||||
items.clear()
|
items.clear()
|
||||||
list.forEach { buyer ->
|
list.forEach { buyer ->
|
||||||
if (!buyer.isError){
|
if (!buyer.isError) {
|
||||||
try {
|
try {
|
||||||
items.add(SearchBuyerModel(buyer.nickname,buyer.userFk));
|
items.add(SearchBuyerModel(buyer.nickname, buyer.userFk))
|
||||||
}catch (e:Exception){}
|
} catch (e: Exception) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import android.content.Context
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.Transformations
|
import androidx.lifecycle.Transformations
|
||||||
import es.verdnatura.R
|
|
||||||
import es.verdnatura.domain.GetInventaryUserCase
|
import es.verdnatura.domain.GetInventaryUserCase
|
||||||
import es.verdnatura.domain.GetItemCardUserCase
|
import es.verdnatura.domain.GetItemCardUserCase
|
||||||
import es.verdnatura.domain.GetWokerMistakeUSerCase
|
import es.verdnatura.domain.GetWokerMistakeUSerCase
|
||||||
|
|
|
@ -316,7 +316,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
} else {
|
} else {
|
||||||
if (!it.list.get(0).isError) {
|
if (!it.list.get(0).isError) {
|
||||||
saveDataInt(PRINTERFK, it.list.get(0).id!!)
|
saveDataInt(PRINTERFK, it.list.get(0).id!!)
|
||||||
saveData(PRINTERNAME, it.list.get(0).name!!)
|
saveData(PRINTERNAME, it.list.get(0).name)
|
||||||
} else {
|
} else {
|
||||||
it.list.get(0).errorMessage.toast(context)
|
it.list.get(0).errorMessage.toast(context)
|
||||||
}
|
}
|
||||||
|
|
|
@ -266,7 +266,7 @@ class LoginViewModel(context: Context) : BaseViewModel()
|
||||||
{
|
{
|
||||||
_devicelogresponse.value = ResponseItemVO(
|
_devicelogresponse.value = ResponseItemVO(
|
||||||
isError = true,
|
isError = true,
|
||||||
errorMessage = getMessageFromAllResponse(nameofFunction(this),message)
|
errorMessage = getMessageFromAllResponse(callFunction,message)
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,7 @@ class ExpeditionPalletDetailFragment(
|
||||||
val c = Calendar.getInstance()
|
val c = Calendar.getInstance()
|
||||||
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
||||||
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
||||||
c.time = df.parse(date)
|
c.time = df.parse(date)!!
|
||||||
return df2.format(c.time)
|
return df2.format(c.time)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.collections.ArrayList
|
import kotlin.collections.ArrayList
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ExpeditionPalletFragment(
|
class ExpeditionPalletFragment(
|
||||||
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null
|
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null
|
||||||
) : BaseFragment<FragmentExpeditionPalletBinding, ExpeditionPalletViewModel>(
|
) : BaseFragment<FragmentExpeditionPalletBinding, ExpeditionPalletViewModel>(
|
||||||
|
@ -114,7 +115,7 @@ class ExpeditionPalletFragment(
|
||||||
val c = Calendar.getInstance()
|
val c = Calendar.getInstance()
|
||||||
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
||||||
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
||||||
c.time = df.parse(date)
|
c.time = df.parse(date)!!
|
||||||
return df2.format(c.time)
|
return df2.format(c.time)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.collections.ArrayList
|
import kotlin.collections.ArrayList
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ExpeditionScanFragment (
|
class ExpeditionScanFragment (
|
||||||
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null,
|
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null,
|
||||||
var itemPalletVO: ItemPalletVO? = null
|
var itemPalletVO: ItemPalletVO? = null
|
||||||
|
@ -110,7 +111,7 @@ class ExpeditionScanFragment (
|
||||||
val c = Calendar.getInstance()
|
val c = Calendar.getInstance()
|
||||||
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
|
||||||
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
|
||||||
c.time = df.parse(date)
|
c.time = df.parse(date)!!
|
||||||
return df2.format(c.time)
|
return df2.format(c.time)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,13 +163,13 @@ class ExpeditionScanFragment (
|
||||||
binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
adapter = ExpeditionScanAdapter(it.list,object: OnScanLongClickListener{
|
adapter = ExpeditionScanAdapter(it.list,object: OnScanLongClickListener{
|
||||||
override fun onScanLongClickListener(itemExpeditionScanVO: ItemExpeditionScanVO) {
|
override fun onScanLongClickListener(itemExpeditionScan: ItemExpeditionScanVO) {
|
||||||
customDialogTwoButtons.setTitle(getString(R.string.ticket)+itemExpeditionScanVO.Ticket+getString(R.string.pallet)+itemPalletVO!!.Pallet)
|
customDialogTwoButtons.setTitle(getString(R.string.ticket)+itemExpeditionScan.Ticket+getString(R.string.pallet)+itemPalletVO!!.Pallet)
|
||||||
.setDescription(getString(R.string.expedit)+itemExpeditionScanVO!!.expeditionFk)
|
.setDescription(getString(R.string.expedit)+itemExpeditionScan.expeditionFk)
|
||||||
.setOkButton(getString(R.string.delete)){
|
.setOkButton(getString(R.string.delete)){
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.expeditionScanDel(getData(USER),
|
viewModel.expeditionScanDel(getData(USER),
|
||||||
getData(PASSWORD),itemExpeditionScanVO.id)
|
getData(PASSWORD),itemExpeditionScan.id)
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
}.setKoButton(getString(R.string.cancel)){
|
}.setKoButton(getString(R.string.cancel)){
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
|
|
|
@ -11,6 +11,7 @@ import es.verdnatura.presentation.view.feature.paletizador.adapter.ExpeditionSta
|
||||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionStateRow
|
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionStateRow
|
||||||
import es.verdnatura.presentation.view.feature.paletizador.model.itemExpedetionState
|
import es.verdnatura.presentation.view.feature.paletizador.model.itemExpedetionState
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ExpeditionStateFragment(
|
class ExpeditionStateFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentItemexpeditionstateCardBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {
|
) : BaseFragment<FragmentItemexpeditionstateCardBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {
|
||||||
|
|
|
@ -157,7 +157,7 @@ class ExpeditionStateViewModel(context: Context) : BaseViewModel() {
|
||||||
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
|
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
|
||||||
expeditionState.forEach {
|
expeditionState.forEach {
|
||||||
|
|
||||||
list.add(itemsExpeditionDynamics(key=it.key,it.value?.toString()))
|
list.add(itemsExpeditionDynamics(key=it.key, it.value.toString()))
|
||||||
|
|
||||||
}
|
}
|
||||||
return list
|
return list
|
||||||
|
|
|
@ -23,6 +23,7 @@ import java.util.*
|
||||||
import java.util.Calendar.getInstance as getInstance1
|
import java.util.Calendar.getInstance as getInstance1
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ExpeditionTruckListFragment : BaseFragment<FragmentExpeditionTruckListBinding, ExpeditionTruckListViewModel>(
|
class ExpeditionTruckListFragment : BaseFragment<FragmentExpeditionTruckListBinding, ExpeditionTruckListViewModel>(
|
||||||
ExpeditionTruckListViewModel::class) {
|
ExpeditionTruckListViewModel::class) {
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
||||||
import org.koin.android.ext.android.bind
|
import org.koin.android.ext.android.bind
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ParkingFragment (var menuOrigin:String): BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
|
class ParkingFragment (var menuOrigin:String): BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
|
||||||
|
|
||||||
// private lateinit var customDialog: CustomDialog
|
// private lateinit var customDialog: CustomDialog
|
||||||
|
|
|
@ -16,6 +16,7 @@ import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ParkingSaleFragment : BaseFragment<FragmentParkingBinding,ParkingSaleViewModel>(ParkingSaleViewModel::class) {
|
class ParkingSaleFragment : BaseFragment<FragmentParkingBinding,ParkingSaleViewModel>(ParkingSaleViewModel::class) {
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ class PasilleroFragment(
|
||||||
context,
|
context,
|
||||||
LinearLayoutManager.VERTICAL
|
LinearLayoutManager.VERTICAL
|
||||||
)
|
)
|
||||||
dividerItemDecoration.setDrawable(requireContext().resources.getDrawable(R.drawable.list_divider_items))
|
dividerItemDecoration.setDrawable(requireContext().resources.getDrawable(R.drawable.list_divider_items,requireContext().theme))
|
||||||
binding.pasillerosItems.addItemDecoration(dividerItemDecoration)
|
binding.pasillerosItems.addItemDecoration(dividerItemDecoration)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class PreControladorFragment: BaseFragment<FragmentControladorBinding,ShowTicketViewModel>(ShowTicketViewModel::class) {
|
class PreControladorFragment: BaseFragment<FragmentControladorBinding,ShowTicketViewModel>(ShowTicketViewModel::class) {
|
||||||
private var goBack:Boolean = false
|
private var goBack:Boolean = false
|
||||||
private var onCollectionSelectedListener : OnCollectionSelectedListener? = null
|
private var onCollectionSelectedListener : OnCollectionSelectedListener? = null
|
||||||
|
|
|
@ -35,6 +35,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO
|
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class EndSacadorFragment(
|
class EndSacadorFragment(
|
||||||
var collection: CollectionVO = CollectionVO(),
|
var collection: CollectionVO = CollectionVO(),
|
||||||
var type: String = ""
|
var type: String = ""
|
||||||
|
@ -1221,9 +1222,7 @@ class EndSacadorFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun scanRequest() {
|
private fun scanRequest() {
|
||||||
if (binding.scanInput != null) {
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
}
|
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyList
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class PreSacadorFragment :
|
class PreSacadorFragment :
|
||||||
BaseFragment<FragmentPreSacadorBinding, PreSacadorViewModel>(PreSacadorViewModel::class) {
|
BaseFragment<FragmentPreSacadorBinding, PreSacadorViewModel>(PreSacadorViewModel::class) {
|
||||||
var mperror: MediaPlayer? = null
|
var mperror: MediaPlayer? = null
|
||||||
|
@ -980,9 +981,7 @@ class PreSacadorFragment :
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun scanRequest() {
|
private fun scanRequest() {
|
||||||
if (binding.scanInput != null) {
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
}
|
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class QrFragment(
|
class QrFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentQrBinding, QrFragmentViewModel>(QrFragmentViewModel::class) {
|
) : BaseFragment<FragmentQrBinding, QrFragmentViewModel>(QrFragmentViewModel::class) {
|
||||||
|
|
|
@ -29,6 +29,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyList
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionViewModel>(
|
class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionViewModel>(
|
||||||
ReposicionViewModel::class
|
ReposicionViewModel::class
|
||||||
) {
|
) {
|
||||||
|
|
|
@ -76,7 +76,7 @@ class ReubicatorAdapter(
|
||||||
|
|
||||||
itemArticlePlacements.apply {
|
itemArticlePlacements.apply {
|
||||||
layoutManager = childLayoutManager
|
layoutManager = childLayoutManager
|
||||||
adapter = reubication.placements?.let { ReubicatorPlacementAdapter(it, onPasillerosItemClickListener) }
|
adapter = reubication.placements.let { ReubicatorPlacementAdapter(it, onPasillerosItemClickListener) }
|
||||||
}
|
}
|
||||||
|
|
||||||
//CLICK EVENTS
|
//CLICK EVENTS
|
||||||
|
|
|
@ -22,6 +22,7 @@ import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewMod
|
||||||
|
|
||||||
|
|
||||||
//Tarea #3754
|
//Tarea #3754
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ReubicationCollectionFragment(
|
class ReubicationCollectionFragment(
|
||||||
var list: List<Reubication>,
|
var list: List<Reubication>,
|
||||||
var shelving: String
|
var shelving: String
|
||||||
|
@ -106,7 +107,7 @@ class ReubicationCollectionFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
binding.scanInput.setOnEditorActionListener { v, actionId, event ->
|
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
|
|
||||||
if (!binding.scanInput.text.isNullOrEmpty()) {
|
if (!binding.scanInput.text.isNullOrEmpty()) {
|
||||||
|
@ -128,7 +129,7 @@ class ReubicationCollectionFragment(
|
||||||
var found = false
|
var found = false
|
||||||
all_list@ for (items in list) {
|
all_list@ for (items in list) {
|
||||||
|
|
||||||
for (placements in items.placements!!) {
|
for (placements in items.placements) {
|
||||||
|
|
||||||
|
|
||||||
if (placements.plate == plate ) {
|
if (placements.plate == plate ) {
|
||||||
|
@ -300,7 +301,7 @@ class ReubicationCollectionFragment(
|
||||||
|
|
||||||
private fun createReubicationsTwo(list: List<Reubication>) {
|
private fun createReubicationsTwo(list: List<Reubication>) {
|
||||||
|
|
||||||
var listItems= mutableListOf<String>()
|
//var listItems= mutableListOf<String>()
|
||||||
val reubication=mutableListOf<Reubication>()
|
val reubication=mutableListOf<Reubication>()
|
||||||
|
|
||||||
for (item in list){
|
for (item in list){
|
||||||
|
|
|
@ -56,7 +56,7 @@ class ReubicationFragment(var entrypoint: String) :
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
binding.scanInput.setOnEditorActionListener { v, actionId, event ->
|
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
goBack = false
|
goBack = false
|
||||||
if (!binding.scanInput.text.isNullOrEmpty()) {
|
if (!binding.scanInput.text.isNullOrEmpty()) {
|
||||||
|
@ -122,7 +122,7 @@ class ReubicationFragment(var entrypoint: String) :
|
||||||
private fun createReubications(list: List<Reubication>) {
|
private fun createReubications(list: List<Reubication>) {
|
||||||
|
|
||||||
|
|
||||||
var listItems = mutableListOf<String>()
|
// var listItems = mutableListOf<String>()
|
||||||
|
|
||||||
val reubication = mutableListOf<Reubication>() as ArrayList
|
val reubication = mutableListOf<Reubication>() as ArrayList
|
||||||
Log.d("VERDNATURA::", "Iniciem llistat")
|
Log.d("VERDNATURA::", "Iniciem llistat")
|
||||||
|
@ -162,7 +162,7 @@ class ReubicationFragment(var entrypoint: String) :
|
||||||
}
|
}
|
||||||
|
|
||||||
for (item in reubication) {
|
for (item in reubication) {
|
||||||
if (item.placements.isNullOrEmpty()) {
|
if (item.placements.isEmpty()) {
|
||||||
item.pickingOrder = 0
|
item.pickingOrder = 0
|
||||||
}else{
|
}else{
|
||||||
//item.pickingOrder=
|
//item.pickingOrder=
|
||||||
|
|
|
@ -83,7 +83,7 @@ class SacadorFragment :
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
setFragmentResultListener("requestKey") { requestKey, bundle ->
|
setFragmentResultListener("requestKey") { _, bundle ->
|
||||||
|
|
||||||
val result = bundle.getString("tagMode")
|
val result = bundle.getString("tagMode")
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ class SacadorViewModel(context: Context) : BaseViewModel() {
|
||||||
collectionFk: String,
|
collectionFk: String,
|
||||||
sectorFk: String,
|
sectorFk: String,
|
||||||
print: String,
|
print: String,
|
||||||
type:String,callFunction:String
|
type:String
|
||||||
){
|
){
|
||||||
getSacadorControladorUserCase.collectionTicketGet(
|
getSacadorControladorUserCase.collectionTicketGet(
|
||||||
usuario,
|
usuario,
|
||||||
|
|
|
@ -24,6 +24,6 @@ fun List<CollectionVO>.toDateFormat(context:Context): ArrayList<CollectionVO> {
|
||||||
private fun getCalendarFromDate(date:String,context:Context): Calendar {
|
private fun getCalendarFromDate(date:String,context:Context): Calendar {
|
||||||
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
|
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
|
||||||
val cal = Calendar.getInstance()
|
val cal = Calendar.getInstance()
|
||||||
cal.setTime(sdf.parse(date))
|
cal.time = sdf.parse(date)!!
|
||||||
return cal
|
return cal
|
||||||
}
|
}
|
|
@ -1,7 +1,5 @@
|
||||||
package es.verdnatura.presentation.view.feature.sacador.model
|
package es.verdnatura.presentation.view.feature.sacador.model
|
||||||
|
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
class CollectionListVO(
|
class CollectionListVO(
|
||||||
var list: List<CollectionVO> = listOf()
|
var list: List<CollectionVO> = listOf()
|
||||||
)
|
)
|
||||||
|
@ -12,7 +10,7 @@ class CollectionVO(
|
||||||
var tickets: List<TicketVO> = listOf(),
|
var tickets: List<TicketVO> = listOf(),
|
||||||
var isError: Boolean = false,
|
var isError: Boolean = false,
|
||||||
var errorMessage: String = "",
|
var errorMessage: String = "",
|
||||||
var itemPackingTypeFk:String=""
|
var itemPackingTypeFk: String = ""
|
||||||
)
|
)
|
||||||
|
|
||||||
class TicketVO(
|
class TicketVO(
|
||||||
|
@ -63,11 +61,11 @@ class SaleVO(
|
||||||
var cel2: String = "",
|
var cel2: String = "",
|
||||||
var cel3: String = "",
|
var cel3: String = "",
|
||||||
var saleGroupFk: String = "",
|
var saleGroupFk: String = "",
|
||||||
var packingShelve:String="",
|
var packingShelve: String = "",
|
||||||
|
|
||||||
var picked:String="",
|
var picked: String = "",
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
class PlacementVO(
|
class PlacementVO(
|
||||||
var saleFk: String = "",
|
var saleFk: String = "",
|
||||||
|
@ -86,7 +84,7 @@ class PlacementVO(
|
||||||
var itemShelvingSaleFk: String = "",
|
var itemShelvingSaleFk: String = "",
|
||||||
var ticketFk: String = "",
|
var ticketFk: String = "",
|
||||||
var id: String = "",
|
var id: String = "",
|
||||||
var pickingOrder:Int=0
|
var pickingOrder: Int = 0
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||||
import es.verdnatura.presentation.view.feature.shelvingparking.adapter.ShelvingParkingAdapter
|
import es.verdnatura.presentation.view.feature.shelvingparking.adapter.ShelvingParkingAdapter
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ShelvingParkingFragment : BaseFragment<FragmentShelvingParkingBinding, ShelvingParkingViewModel>(
|
class ShelvingParkingFragment : BaseFragment<FragmentShelvingParkingBinding, ShelvingParkingViewModel>(
|
||||||
ShelvingParkingViewModel::class) {
|
ShelvingParkingViewModel::class) {
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
|
||||||
import es.verdnatura.presentation.view.feature.precontrol.ShowTicketViewModel
|
import es.verdnatura.presentation.view.feature.precontrol.ShowTicketViewModel
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class ShowTicketFragment(var menuOrigin: String) :
|
class ShowTicketFragment(var menuOrigin: String) :
|
||||||
BaseFragment<FragmentControladorBinding, ShowTicketViewModel>(
|
BaseFragment<FragmentControladorBinding, ShowTicketViewModel>(
|
||||||
ShowTicketViewModel::class
|
ShowTicketViewModel::class
|
||||||
|
|
|
@ -291,7 +291,7 @@ class RegisterSmartTagsFragment(
|
||||||
customDialogList.getEditText().requestFocus()
|
customDialogList.getEditText().requestFocus()
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
|
|
||||||
customDialogList.getEditText().setOnEditorActionListener { v, actionId, event ->
|
customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
||||||
if (!customDialogList.getValue().isEmpty()) {
|
if (!customDialogList.getValue().isEmpty()) {
|
||||||
// Log.i("VERDNATURA:", "scan valor ${customDialogList.getValue()}")
|
// Log.i("VERDNATURA:", "scan valor ${customDialogList.getValue()}")
|
||||||
|
|
|
@ -123,9 +123,7 @@ class AssociateSmartTagsFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun scanRequest() {
|
private fun scanRequest() {
|
||||||
if (binding.scanInput != null) {
|
|
||||||
binding.scanInput.requestFocus()
|
binding.scanInput.requestFocus()
|
||||||
}
|
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,15 +176,6 @@ class AssociateSmartTagsFragment(
|
||||||
.setOkButton(getString(R.string.close)) {
|
.setOkButton(getString(R.string.close)) {
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()*/
|
}.show()*/
|
||||||
} else {
|
|
||||||
if (it.response == null) {
|
|
||||||
|
|
||||||
customDialog.setTitle(getString(R.string.error))
|
|
||||||
.setDescription(getString(R.string.labelNovalid))
|
|
||||||
.setOkButton(getString(R.string.close)) {
|
|
||||||
customDialog.dismiss()
|
|
||||||
}.show()
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
|
||||||
|
@ -196,7 +185,6 @@ class AssociateSmartTagsFragment(
|
||||||
customDialogList.setValue("")
|
customDialogList.setValue("")
|
||||||
ma.messageWithSound(getString(R.string.deletedLabel),false,false)
|
ma.messageWithSound(getString(R.string.deletedLabel),false,false)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
binding.splashProgress.visibility = GONE
|
binding.splashProgress.visibility = GONE
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
|
||||||
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
|
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class AutomaticAddItemFragment(
|
class AutomaticAddItemFragment(
|
||||||
var shelvingFk : String = ""
|
var shelvingFk : String = ""
|
||||||
) : BaseFragment<FragmentAutomaticAddItemBinding,AutomaticAddItemViewModel>(AutomaticAddItemViewModel::class) {
|
) : BaseFragment<FragmentAutomaticAddItemBinding,AutomaticAddItemViewModel>(AutomaticAddItemViewModel::class) {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package es.verdnatura.presentation.view.feature.ubicador.fragment
|
package es.verdnatura.presentation.view.feature.ubicador.fragment
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.drawable.Drawable
|
import android.graphics.drawable.Drawable
|
||||||
import android.media.MediaPlayer
|
import android.media.MediaPlayer
|
||||||
|
@ -27,6 +28,7 @@ import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapter
|
||||||
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
|
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class UbicadorFragment(
|
class UbicadorFragment(
|
||||||
var shelvingFk: String = ""
|
var shelvingFk: String = ""
|
||||||
) : BaseFragment<FragmentUbicadorBinding, UbicadorViewModel>(
|
) : BaseFragment<FragmentUbicadorBinding, UbicadorViewModel>(
|
||||||
|
@ -125,6 +127,7 @@ class UbicadorFragment(
|
||||||
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
private fun setEvents() {
|
private fun setEvents() {
|
||||||
binding.mainToolbar.backButton.setOnClickListener {
|
binding.mainToolbar.backButton.setOnClickListener {
|
||||||
requireActivity().onBackPressed()
|
requireActivity().onBackPressed()
|
||||||
|
@ -193,7 +196,7 @@ class UbicadorFragment(
|
||||||
)
|
)
|
||||||
parking = customDialogInput.getValue()
|
parking = customDialogInput.getValue()
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
shelvingFk.uppercase() + " "+getString(R.string.pUppercase) + parking + getString(R.string.label) + etiquetas
|
shelvingFk.uppercase() + getString(R.string.pUppercase) +parking + getString(R.string.label) + etiquetas
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
|
@ -213,12 +216,8 @@ class UbicadorFragment(
|
||||||
)
|
)
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
parking = customDialogInput.getValue()
|
parking = customDialogInput.getValue()
|
||||||
if (binding.mainToolbar.toolbarTitle != null && shelvingFk != null && parking != null && etiquetas != null) {
|
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
shelvingFk.uppercase() + "*"+getString(R.string.pUppercase) + parking + "*"+getString(R.string.label) + etiquetas
|
shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(R.string.label) + etiquetas
|
||||||
} else {
|
|
||||||
binding.mainToolbar.toolbarTitle.text = ""
|
|
||||||
}
|
|
||||||
if (mpok != null) {
|
if (mpok != null) {
|
||||||
mpok!!.start()
|
mpok!!.start()
|
||||||
}
|
}
|
||||||
|
@ -240,7 +239,7 @@ class UbicadorFragment(
|
||||||
)
|
)
|
||||||
shelvingFk = customDialogInput.getValue()
|
shelvingFk = customDialogInput.getValue()
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
shelvingFk.uppercase() + " "+getString(R.string.pUppercase) + parking + " "+getString(R.string.label) + etiquetas
|
shelvingFk.uppercase() +getString(R.string.pUppercase) + parking +getString(R.string.label) + etiquetas
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
|
@ -260,7 +259,7 @@ class UbicadorFragment(
|
||||||
)
|
)
|
||||||
shelvingFk = customDialogInput.getValue()
|
shelvingFk = customDialogInput.getValue()
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
shelvingFk.uppercase() + " "+getString(R.string.pUppercase) + parking + " "+getString(R.string.label) + etiquetas
|
shelvingFk.uppercase() +getString(R.string.pUppercase) + parking +getString(R.string.label) + etiquetas
|
||||||
if (mpok != null) mpok!!.start()
|
if (mpok != null) mpok!!.start()
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
return@setOnEditorActionListener true
|
return@setOnEditorActionListener true
|
||||||
|
@ -307,13 +306,14 @@ class UbicadorFragment(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
override fun observeViewModel() {
|
override fun observeViewModel() {
|
||||||
with(viewModel) {
|
with(viewModel) {
|
||||||
loadShelvingList.observe(viewLifecycleOwner, Observer { event ->
|
loadShelvingList.observe(viewLifecycleOwner, Observer { event ->
|
||||||
event.getContentIfNotHandled().notNull {
|
event.getContentIfNotHandled().notNull {
|
||||||
deep = it.list.size
|
deep = it.list.size
|
||||||
listItems = ArrayList()
|
listItems = ArrayList()
|
||||||
var contEtiquetas: Int = 0
|
var contEtiquetas= 0
|
||||||
it.list.forEach { item ->
|
it.list.forEach { item ->
|
||||||
try {
|
try {
|
||||||
contEtiquetas += item.stickers.toInt()
|
contEtiquetas += item.stickers.toInt()
|
||||||
|
@ -325,7 +325,7 @@ class UbicadorFragment(
|
||||||
}
|
}
|
||||||
etiquetas = contEtiquetas.toString()
|
etiquetas = contEtiquetas.toString()
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
shelvingFk.uppercase() + " " +getString(R.string.pUppercase) + parking + " "+getString(R.string.label) + etiquetas
|
shelvingFk.uppercase() +getString(R.string.pUppercase) + parking +getString(R.string.label) + etiquetas
|
||||||
if (it.list.size > 0)
|
if (it.list.size > 0)
|
||||||
binding.editPrioridad.setText(it.list[0].priority)
|
binding.editPrioridad.setText(it.list[0].priority)
|
||||||
binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
|
@ -489,6 +489,8 @@ class UbicadorFragment(
|
||||||
if (!packing.isNullOrEmpty()) {
|
if (!packing.isNullOrEmpty()) {
|
||||||
if (updatePacking == null) {
|
if (updatePacking == null) {
|
||||||
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty()) {
|
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty()) {
|
||||||
|
|
||||||
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.itemShelvingMake(
|
viewModel.itemShelvingMake(
|
||||||
getData(USER),
|
getData(USER),
|
||||||
getData(PASSWORD),
|
getData(PASSWORD),
|
||||||
|
@ -501,13 +503,13 @@ class UbicadorFragment(
|
||||||
"1",
|
"1",
|
||||||
groupingPack
|
groupingPack
|
||||||
)
|
)
|
||||||
changeOfflineValue(
|
/*changeOfflineValue(
|
||||||
ItemUbicadorVO(
|
ItemUbicadorVO(
|
||||||
item = itemFk,
|
item = itemFk,
|
||||||
visible = visible,
|
visible = visible,
|
||||||
packing = packing
|
packing = packing
|
||||||
)
|
)
|
||||||
)
|
)*/
|
||||||
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
||||||
.setEtiquetaValue("").setVisibleValue("")
|
.setEtiquetaValue("").setVisibleValue("")
|
||||||
customDialogUbicador.getEditItem().requestFocus()
|
customDialogUbicador.getEditItem().requestFocus()
|
||||||
|
@ -516,6 +518,7 @@ class UbicadorFragment(
|
||||||
|
|
||||||
} else if (!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty()) {
|
} else if (!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty()) {
|
||||||
val visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
|
val visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
|
||||||
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.itemShelvingMake(
|
viewModel.itemShelvingMake(
|
||||||
getData(USER),
|
getData(USER),
|
||||||
getData(PASSWORD),
|
getData(PASSWORD),
|
||||||
|
@ -528,14 +531,14 @@ class UbicadorFragment(
|
||||||
"1",
|
"1",
|
||||||
groupingPack
|
groupingPack
|
||||||
)
|
)
|
||||||
changeOfflineValue(
|
/*changeOfflineValue(
|
||||||
ItemUbicadorVO(
|
ItemUbicadorVO(
|
||||||
item = itemFk,
|
item = itemFk,
|
||||||
visible = visible_calc,
|
visible = visible_calc,
|
||||||
packing = packing,
|
packing = packing,
|
||||||
stickers = etiquetas
|
stickers = etiquetas
|
||||||
)
|
)
|
||||||
)
|
)*/
|
||||||
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
||||||
.setEtiquetaValue("").setVisibleValue("")
|
.setEtiquetaValue("").setVisibleValue("")
|
||||||
customDialogUbicador.getEditItem().requestFocus()
|
customDialogUbicador.getEditItem().requestFocus()
|
||||||
|
@ -550,6 +553,7 @@ class UbicadorFragment(
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty() && !updatePacking) {
|
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty() && !updatePacking) {
|
||||||
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.itemShelvingMakeEdit(
|
viewModel.itemShelvingMakeEdit(
|
||||||
getData(USER),
|
getData(USER),
|
||||||
getData(PASSWORD),
|
getData(PASSWORD),
|
||||||
|
@ -563,13 +567,13 @@ class UbicadorFragment(
|
||||||
itemShelvingFk,
|
itemShelvingFk,
|
||||||
groupingPack
|
groupingPack
|
||||||
)
|
)
|
||||||
changeOfflineValue(
|
/* changeOfflineValue(
|
||||||
ItemUbicadorVO(
|
ItemUbicadorVO(
|
||||||
item = itemFk,
|
item = itemFk,
|
||||||
visible = visible,
|
visible = visible,
|
||||||
packing = packing
|
packing = packing
|
||||||
)
|
)
|
||||||
)
|
)*/
|
||||||
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
||||||
.setEtiquetaValue("").setVisibleValue("")
|
.setEtiquetaValue("").setVisibleValue("")
|
||||||
customDialogUbicador.getEditItem().requestFocus()
|
customDialogUbicador.getEditItem().requestFocus()
|
||||||
|
@ -582,6 +586,7 @@ class UbicadorFragment(
|
||||||
visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
|
visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
}
|
}
|
||||||
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.itemShelvingMakeEdit(
|
viewModel.itemShelvingMakeEdit(
|
||||||
getData(USER),
|
getData(USER),
|
||||||
getData(PASSWORD),
|
getData(PASSWORD),
|
||||||
|
@ -595,14 +600,14 @@ class UbicadorFragment(
|
||||||
itemShelvingFk,
|
itemShelvingFk,
|
||||||
groupingPack
|
groupingPack
|
||||||
)
|
)
|
||||||
changeOfflineValue(
|
/* changeOfflineValue(
|
||||||
ItemUbicadorVO(
|
ItemUbicadorVO(
|
||||||
item = itemFk,
|
item = itemFk,
|
||||||
visible = visible_calc,
|
visible = visible_calc,
|
||||||
packing = packing,
|
packing = packing,
|
||||||
stickers = etiquetas
|
stickers = etiquetas
|
||||||
)
|
)
|
||||||
)
|
)*/
|
||||||
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
|
||||||
.setEtiquetaValue("").setVisibleValue("")
|
.setEtiquetaValue("").setVisibleValue("")
|
||||||
customDialogUbicador.getEditItem().requestFocus()
|
customDialogUbicador.getEditItem().requestFocus()
|
||||||
|
@ -645,11 +650,11 @@ class UbicadorFragment(
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
private fun changeOfflineValue(item: ItemUbicadorVO) {
|
/*private fun changeOfflineValue(item: ItemUbicadorVO) {
|
||||||
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
/*listItems.add(item)
|
*//*listItems.add(item)
|
||||||
adapter?.notifyDataSetChanged()*/
|
adapter?.notifyDataSetChanged()*//*
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private fun showMoreOptions(item: ItemUbicadorVO) {
|
private fun showMoreOptions(item: ItemUbicadorVO) {
|
||||||
customDialogTwoButtons.setTitle(item.item).setDescription(getString(R.string.selectAction))
|
customDialogTwoButtons.setTitle(item.item).setDescription(getString(R.string.selectAction))
|
||||||
|
|
|
@ -23,6 +23,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorker
|
||||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||||
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
|
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
|
||||||
|
|
||||||
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class WorkermistakeFragment(
|
class WorkermistakeFragment(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,8 @@
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textColorHint="@android:color/darker_gray" />
|
android:textColorHint="#78909C"
|
||||||
|
tools:ignore="TextContrastCheck" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/filter_buyer"
|
android:id="@+id/filter_buyer"
|
||||||
|
@ -53,23 +54,15 @@
|
||||||
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
|
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
android:hint="@string/buscarcomprador"
|
android:hint="@string/buscarcomprador"
|
||||||
android:inputType="text"
|
|
||||||
android:lines="1"
|
android:lines="1"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||||
android:textColorHint="@android:color/darker_gray"
|
android:textColorHint="#78909C"
|
||||||
android:visibility="visible" />
|
android:visibility="visible"
|
||||||
|
tools:ignore="TextContrastCheck" />
|
||||||
|
|
||||||
<ImageView
|
|
||||||
|
|
||||||
android:id="@+id/item_image"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -92,7 +85,8 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/ubicado"
|
android:text="@string/ubicado"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body2" />
|
android:textSize="@dimen/body2"
|
||||||
|
tools:ignore="TextContrastCheck" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -101,7 +95,8 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/altillo"
|
android:text="@string/altillo"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body2" />
|
android:textSize="@dimen/body2"
|
||||||
|
tools:ignore="TextContrastCheck" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -110,7 +105,8 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/sinubicar"
|
android:text="@string/sinubicar"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body2" />
|
android:textSize="@dimen/body2"
|
||||||
|
tools:ignore="TextContrastCheck" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -125,7 +121,8 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
' <include
|
|
||||||
|
<include
|
||||||
android:id="@+id/main_toolbar"
|
android:id="@+id/main_toolbar"
|
||||||
layout="@layout/toolbar_fragment"
|
layout="@layout/toolbar_fragment"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
|
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
|
||||||
android:paddingLeft="@dimen/default_layout_margin"/>
|
android:importantForAutofill="no" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
android:id="@+id/item_fk"
|
android:id="@+id/item_fk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@{item.itemFk}"
|
|
||||||
android:textSize="@dimen/h7"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
tool:text="31100"/>
|
android:text="@{item.itemFk}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/h7"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="31100" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
|
@ -253,8 +253,8 @@
|
||||||
<string name="selectDestiny">Introduce el destino para item: </string>
|
<string name="selectDestiny">Introduce el destino para item: </string>
|
||||||
<string name="empty">Vaciar carro</string>
|
<string name="empty">Vaciar carro</string>
|
||||||
<string name="operationNoReturn">Esta operación no se puede rectificar.</string>
|
<string name="operationNoReturn">Esta operación no se puede rectificar.</string>
|
||||||
<string name="label"> E: </string>
|
<string name="label">\u0020E: </string>
|
||||||
<string name="pUppercase"> P: </string>
|
<string name="pUppercase">\u0020P: </string>
|
||||||
<string name="itemSearch">Consultar artículo</string>
|
<string name="itemSearch">Consultar artículo</string>
|
||||||
<string name="quantityReal">Cantidad real(</string>
|
<string name="quantityReal">Cantidad real(</string>
|
||||||
<string name="pull">Tirar</string>
|
<string name="pull">Tirar</string>
|
||||||
|
@ -271,13 +271,13 @@
|
||||||
<string name="errorNotNumber">El elemento introducido no es un número</string>
|
<string name="errorNotNumber">El elemento introducido no es un número</string>
|
||||||
<string name="buyer">Comprador</string>
|
<string name="buyer">Comprador</string>
|
||||||
<string name="accessSalix">Accede a Salix para ver más información</string>
|
<string name="accessSalix">Accede a Salix para ver más información</string>
|
||||||
<string name="item">"Ítem : "</string>
|
<string name="item">"Ítem :"</string>
|
||||||
<string name="changeShelving">Cambiar matrícula</string>
|
<string name="changeShelving">Cambiar matrícula</string>
|
||||||
<string name="registerOneWagoon">Carro escaneado completamente.¿Registrar otro carro?</string>
|
<string name="registerOneWagoon">Carro escaneado completamente.¿Registrar otro carro?</string>
|
||||||
<string name="exit">Salir</string>
|
<string name="exit">Salir</string>
|
||||||
<string name="scanUpToDown">Escanea matrícula del carro y etiquetas smartTags de arriba a abajo.</string>
|
<string name="scanUpToDown">Escanea matrícula del carro y etiquetas smartTags de arriba a abajo.</string>
|
||||||
<string name="visible">Visible:</string>
|
<string name="visible">Visible:</string>
|
||||||
<string name="visibleTotal"> Total visible: </string>
|
<string name="visibleTotal"> Total visible:</string>
|
||||||
<string name="printerUpdated">Impresora actualizada</string>
|
<string name="printerUpdated">Impresora actualizada</string>
|
||||||
<string name="sectorUpdated">sector actualizado</string>
|
<string name="sectorUpdated">sector actualizado</string>
|
||||||
<string name="logAppName">warehouse</string>
|
<string name="logAppName">warehouse</string>
|
||||||
|
@ -301,12 +301,12 @@
|
||||||
<string name="pendingReview">Pendiente de revisar : </string>
|
<string name="pendingReview">Pendiente de revisar : </string>
|
||||||
<string name="review">Revisar</string>
|
<string name="review">Revisar</string>
|
||||||
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
||||||
<string name="fromTicket"> del ticket </string>
|
<string name="fromTicket"> \u0020del ticket\u0020</string>
|
||||||
<string name="itemAdded">Se ha añadido el articulo </string>
|
<string name="itemAdded">Se ha añadido el articulo </string>
|
||||||
<string name="unityTicket"> unidad/es al ticket </string>
|
<string name="unityTicket">" \\u0020unidad/es al ticket "</string>
|
||||||
<string name="with"> con </string>
|
<string name="with"> \u0020con\u0020 </string>
|
||||||
<string name="quantityHigh">La cantidad supera a la disponible</string>
|
<string name="quantityHigh">La cantidad supera a la disponible</string>
|
||||||
<string name="quantityError">cantidad introducida erronea</string>
|
<string name="quantityError">\\u0020cantidad introducida erronea</string>
|
||||||
<string name="scanItemValidate">Escanea item para validar</string>
|
<string name="scanItemValidate">Escanea item para validar</string>
|
||||||
<string name="quantitySelect">Cantidad que coges:</string>
|
<string name="quantitySelect">Cantidad que coges:</string>
|
||||||
<string name="errorMarkLine">Error al marcar la línea</string>
|
<string name="errorMarkLine">Error al marcar la línea</string>
|
||||||
|
@ -320,7 +320,7 @@
|
||||||
<string name="expeditionNoSorter">Escanea expediciones que no han pasado por el Sorter</string>
|
<string name="expeditionNoSorter">Escanea expediciones que no han pasado por el Sorter</string>
|
||||||
<string name="added">Añadida</string>
|
<string name="added">Añadida</string>
|
||||||
<string name="registerAdded">Registro añadido</string>
|
<string name="registerAdded">Registro añadido</string>
|
||||||
<string name="keepPlate">" guardada con matrícula "</string>
|
<string name="keepPlate">\u0020 guardada con matrícula \u0020</string>
|
||||||
<string name="splitOk">Split ok</string>
|
<string name="splitOk">Split ok</string>
|
||||||
<string name="user">Usuario:</string>
|
<string name="user">Usuario:</string>
|
||||||
<string name="warning">Aviso</string>
|
<string name="warning">Aviso</string>
|
||||||
|
@ -436,7 +436,7 @@
|
||||||
<string name="fromItem"> del articulo </string>
|
<string name="fromItem"> del articulo </string>
|
||||||
<string name="ticketSpaces"> ticket </string>
|
<string name="ticketSpaces"> ticket </string>
|
||||||
<string name="ticketCompleted">Ticket completo</string>
|
<string name="ticketCompleted">Ticket completo</string>
|
||||||
<string name="toNewQuantity"> a nueva cantidad: </string>
|
<string name="toNewQuantity">" \\u0020a nueva cantidad: "</string>
|
||||||
<string name="getPreviousCollection">Obtener colección previa</string>
|
<string name="getPreviousCollection">Obtener colección previa</string>
|
||||||
<string name="saleParked">Sale/s aparcada/s</string>
|
<string name="saleParked">Sale/s aparcada/s</string>
|
||||||
<string name="modifiedOriginalQuantityPrevious">Se ha modificado desde previa la cantidad de </string>
|
<string name="modifiedOriginalQuantityPrevious">Se ha modificado desde previa la cantidad de </string>
|
||||||
|
|
|
@ -259,8 +259,8 @@
|
||||||
<string name="selectDestiny">"Introduce item destiny: "</string>
|
<string name="selectDestiny">"Introduce item destiny: "</string>
|
||||||
<string name="empty">Empty wagoon</string>
|
<string name="empty">Empty wagoon</string>
|
||||||
<string name="operationNoReturn">This operation cannot be rectified.</string>
|
<string name="operationNoReturn">This operation cannot be rectified.</string>
|
||||||
<string name="label"> L: </string>
|
<string name="label">\u0020L: </string>
|
||||||
<string name="pUppercase"> P: </string>
|
<string name="pUppercase">\u0020P: </string>
|
||||||
<string name="itemSearch">Consult item</string>
|
<string name="itemSearch">Consult item</string>
|
||||||
<string name="quantityReal">Real quantity (</string>
|
<string name="quantityReal">Real quantity (</string>
|
||||||
<string name="quantity">Quantity</string>
|
<string name="quantity">Quantity</string>
|
||||||
|
@ -308,12 +308,12 @@
|
||||||
<string name="pendingReview">Pending review : </string>
|
<string name="pendingReview">Pending review : </string>
|
||||||
<string name="review">Review</string>
|
<string name="review">Review</string>
|
||||||
<string name="splitSent">The article has been sent to Split </string>
|
<string name="splitSent">The article has been sent to Split </string>
|
||||||
<string name="fromTicket"> from ticket </string>
|
<string name="fromTicket">" \\u0020from ticket\\u0020"</string>
|
||||||
<string name="itemAdded">Item added </string>
|
<string name="itemAdded">Item added </string>
|
||||||
<string name="unityTicket"> unity to ticket </string>
|
<string name="unityTicket">" \\u0020unity to ticket "</string>
|
||||||
<string name="with"> with </string>
|
<string name="with">" \\u0020with\\u0020"</string>
|
||||||
<string name="quantityHigh">Quantity exceeds available</string>
|
<string name="quantityHigh">Quantity exceeds available</string>
|
||||||
<string name="quantityError">" wrong amount entered"</string>
|
<string name="quantityError">" \\u0020wrong amount entered"</string>
|
||||||
<string name="scanItemValidate"> Scan item to validate</string>
|
<string name="scanItemValidate"> Scan item to validate</string>
|
||||||
<string name="quantitySelect">Amount you take:</string>
|
<string name="quantitySelect">Amount you take:</string>
|
||||||
<string name="errorMarkLine">Error when marking the line</string>
|
<string name="errorMarkLine">Error when marking the line</string>
|
||||||
|
|
Loading…
Reference in New Issue