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

Version 8.6.1Beta tareas #3601 refactor ivnentario.Tarea #3959(warnings deprecated,typedate,neverused)

This commit is contained in:
Sergio De la torre 2022-06-27 11:41:25 +02:00
parent 35253779e6
commit bafe1f8c03
63 changed files with 417 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/inspectionProfiles/Project_Default.xml
View File

@ -1,10 +1,12 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<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">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
<option name="processComments" value="true" />
</inspection_tool>
<inspection_tool class="UnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

4
.idea/misc.xml
View File

@ -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_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_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_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" />
@ -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_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_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_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" />

6
app/build.gradle
View File

@ -11,10 +11,10 @@ android {
defaultConfig {
applicationId "es.verdnatura"
minSdkVersion 26 //21
minSdkVersion 21 //21
targetSdkVersion 30
versionCode 123
versionName = "8.5.2Beta"
versionCode 126
versionName = "8.6.1Beta"
//versionName = "8.5.1Beta" versionCode 122
//versionName = "8.5Beta" //versionCode 121
//versionName = "8.4"// versionCode 120

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

@ -12,7 +12,7 @@
"filters": [],
"attributes": [],
"versionCode": 126,
"versionName": "8.6Beta",
"versionName": "8.6.1Beta",
"outputFile": "app-release.apk"
}
],

BIN
app/release/vn-pickingBeta.apk → app/release/vn-pickingBeta8.6.1.apk
View File

Binary file not shown.

10
app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt
View File

@ -30,12 +30,12 @@ fun getMessageFromAllResponse(callFunction: String, ResponseMessage: String): St
//sergio:para personalizar los mensajes de respuesta según la llamada.
when (callFunction) {
//"collection_getTickets" -> returnMessage ="No hay tickets para sacar. Llamada $callFunction."
else -> {
/* when (callFunction) {
//"collection_getTickets_" -> returnMessage ="No hay tickets para sacar. Llamada $callFunction."
else -> {*/
returnMessage = "Callback: $callFunction."
}
}
// }
// }
return "$messageFromError.\r$returnMessage"

2
app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogHour.kt
View File

@ -71,7 +71,7 @@ class CustomDialogHour(context: Context) : Dialog(context, R.style.DialogTheme)
// ib_obtener_hora.setOnClickListener {
binding.ibObtenerHora.setOnClickListener {
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.MINUTE, minute)
binding.customDialogHourValue.setText(SimpleDateFormat(context.getString(R.string.timeFormat)).format(cal.time))

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

@ -155,7 +155,7 @@ class ItemCardFragment(
//edit_itemFk.requestFocus()
binding.editItemFk.requestFocus()
//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 (!edit_itemFk.text.toString().isNullOrEmpty())
if (!binding.editItemFk.text.toString().isNullOrEmpty())
@ -220,7 +220,7 @@ class ItemCardFragment(
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
} else {
binding.splashProgressTwo.visibility = GONE
binding.itemcardLayout.visibility = View.GONE
binding.itemcardLayout.visibility = GONE
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard)
ma.messageWithSound(
getString(R.string.itemNotFound),
@ -241,7 +241,7 @@ class ItemCardFragment(
})
response.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = GONE
if (it.isError) {
ma.messageWithSound(it.errorMessage, true, false)
} else {
@ -458,7 +458,8 @@ class ItemCardFragment(
}.setValue("").show()
customDialogInput.getEditText().requestFocus()
customDialogInput.getEditText()
.setOnEditorActionListener { v, actionId, event ->
.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
editItemCardRow(item, customDialogInput.getValue())
@ -492,7 +493,7 @@ class ItemCardFragment(
}.setValue("").show()
customDialogInput.getEditText().requestFocus()
customDialogInput.getEditText()
.setOnEditorActionListener { v, actionId, event ->
.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
editItemCardRow(item, customDialogInput.getValue())
@ -517,7 +518,7 @@ class ItemCardFragment(
}.setValue("").show()
customDialogInput.getEditText().requestFocus()
customDialogInput.getEditText()
.setOnEditorActionListener { v, actionId, event ->
.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
editItemCardRow(item, customDialogInput.getValue())
@ -715,7 +716,7 @@ class ItemCardFragment(
customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
ma.hideKeyboard(customDialogList.getEditText())
if (!customDialogList.getValue().isNullOrEmpty())
if (!customDialogList.getValue().isEmpty())
updateBarcode(customDialogList.getValue(), "0", itemB)
customDialogList.dismiss()
@ -726,7 +727,7 @@ class ItemCardFragment(
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 (!customDialogList.getValue().isNullOrEmpty())
updateBarcode(customDialogList.getValue(), "0", itemB)
@ -799,7 +800,7 @@ class ItemCardFragment(
array
) { _, position ->
updateItemPackingType(itemsPackingType[position].code.toString())
updateItemPackingType(itemsPackingType[position].code)
}

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

@ -7,15 +7,13 @@ import androidx.lifecycle.Observer
import es.verdnatura.R
import es.verdnatura.databinding.FragmentBufferBinding
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
class BufferFragment(
var entryPoint: String = ""
) : BaseFragment<FragmentBufferBinding, BufferFragmentViewModel>(BufferFragmentViewModel::class) {
private var password = ""
private var goBack: Boolean = false
//private var goBack: Boolean = false
override fun getLayoutId(): Int = R.layout.fragment_buffer
companion object {

2
app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
View File

@ -171,7 +171,7 @@ class BufferLoadFragment(
customDialogList.getEditText().requestFocus()
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 (!customDialogList.getValue().isNullOrEmpty()) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
View File

@ -47,7 +47,7 @@ class BuscarItemFragment(
private fun setEvents() {
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 (!binding.editItemFk.text.toString().isNullOrEmpty())
getLocations(binding.editItemFk.text.toString())

16
app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt
View File

@ -16,10 +16,8 @@ import es.verdnatura.presentation.common.*
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.calidad.adapter.ItemBuyersAdapter
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import java.text.SimpleDateFormat
import java.util.*
import kotlin.collections.ArrayList
class QaualityFragment(
var userFk : String = "0"
@ -96,9 +94,9 @@ class QaualityFragment(
//ESCANER =========
hideKeyboards()
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 (! binding.scanInput.text.toString().isNullOrEmpty()){
if (! binding.scanInput.text.toString().isEmpty()){
findSale( binding.scanInput.text.toString())
}
binding.scanInput.setText("")
@ -131,7 +129,7 @@ class QaualityFragment(
private fun createBuyerList(list:List<ItemBuyerVO>){
list.forEach { item ->
if (!goBack){
if (item.created != null && item.created != ""){
if (item.created != ""){
item.created = getCalendarFromDate(item.created).convertToDateString()
}
}
@ -165,7 +163,7 @@ class QaualityFragment(
private fun getCalendarFromDate(date:String): Calendar {
val sdf = SimpleDateFormat(getString(R.string.dateFormat))
val cal = Calendar.getInstance()
cal.time = sdf.parse(date)
cal.time = sdf.parse(date)!!
return cal
}
@ -193,10 +191,8 @@ class QaualityFragment(
}
private fun goToPosition(position:Int){
if (binding.shelvingBuyersItems != null){
binding.shelvingBuyersItems.addViewObserver {
lm!!.scrollToPositionWithOffset(position,0)
}
binding.shelvingBuyersItems.addViewObserver {
lm!!.scrollToPositionWithOffset(position,0)
}
}

3
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
View File

@ -1,3 +1,5 @@
@file:Suppress("UNUSED_ANONYMOUS_PARAMETER")
package es.verdnatura.presentation.view.feature.claim.fragment
@ -171,6 +173,7 @@ class ClaimFragment(
}
private fun showInputClaim() {
customDialogList.setTitle(getString(R.string.insertClaimCode))

283
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -1,12 +1,7 @@
package es.verdnatura.presentation.view.feature.collection.adapter
import android.content.Context
import android.graphics.BlendMode
import android.graphics.BlendModeColorFilter
import android.graphics.Color
import android.graphics.PorterDuff
import android.os.Build
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -15,7 +10,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R
import es.verdnatura.databinding.ItemArticleRowFragmentBinding
import es.verdnatura.domain.toast
import es.verdnatura.presentation.common.*
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
@ -114,7 +108,8 @@ class SaleAdapter(
//ERROR
if (sale.originalQuantity != sale.quantity) {
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")
sale.pickedQuantity = sale.quantity
}
@ -257,221 +252,105 @@ class SaleAdapter(
}
}
/* private fun paintTicketcolorOld(color: String, itemView: View) {
when (color.uppercase()) {
"ROJO" -> itemView.setBackgroundColor(Color.RED)
"AMARILLO" -> itemView.setBackgroundColor(Color.YELLOW)
"VERDE" -> itemView.setBackgroundColor(Color.GREEN)
"AZUL" -> itemView.setBackgroundColor(Color.BLUE)
"BLANCO" -> {
itemView.setBackgroundColor(Color.WHITE)
itemView.setBackgroundResource((R.drawable.border))
}
"NEGRO" -> {
itemView.setBackgroundColor(Color.BLACK)
}
"VIOLETA" -> itemView.setBackgroundColor(0xFF4c2882.toInt())
"GRIS" -> itemView.setBackgroundColor(Color.GRAY)
"ORANGE" -> itemView.setBackgroundColor(
getColor(
context!!,
android.R.color.holo_orange_light
)
)
"MORADO" -> itemView.setBackgroundColor(
getColor(
context!!,
android.R.color.holo_purple
)
)
"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())
"BEIGE" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
"transparente" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
/* private fun paintTicketcolorOld(color: String, itemView: View) {
when (color.uppercase()) {
"ROJO" -> itemView.setBackgroundColor(Color.RED)
"AMARILLO" -> itemView.setBackgroundColor(Color.YELLOW)
"VERDE" -> itemView.setBackgroundColor(Color.GREEN)
"AZUL" -> itemView.setBackgroundColor(Color.BLUE)
"BLANCO" -> {
itemView.setBackgroundColor(Color.WHITE)
itemView.setBackgroundResource((R.drawable.border))
}
"NEGRO" -> {
itemView.setBackgroundColor(Color.BLACK)
}
"VIOLETA" -> itemView.setBackgroundColor(0xFF4c2882.toInt())
"GRIS" -> itemView.setBackgroundColor(Color.GRAY)
"ORANGE" -> itemView.setBackgroundColor(
getColor(
context!!,
android.R.color.holo_orange_light
)
)
"MORADO" -> itemView.setBackgroundColor(
getColor(
context!!,
android.R.color.holo_purple
)
)
"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())
"BEIGE" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
"transparente" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
else -> {
itemView.setBackgroundColor(Color.TRANSPARENT)
itemView.setBackgroundResource(R.drawable.background_item_color)
else -> {
itemView.setBackgroundColor(Color.TRANSPARENT)
itemView.setBackgroundResource(R.drawable.background_item_color)
}
}
}*/
}
}
}*/
private fun paintTicketcolor(color: String, itemView: View) {
when (color.uppercase().trim()) {
"ROJO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(Color.RED, BlendMode.SRC_ATOP)
} else {
itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
}
// itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
"ROJO" ->
itemView.setBackgroundColor(Color.RED)
/*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(Color.RED, BlendMode.SRC_ATOP)
} else {
itemView.background.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
}*/
"AMARILLO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(Color.YELLOW, BlendMode.SRC_ATOP)
} else {
itemView.background.setColorFilter(Color.YELLOW, PorterDuff.Mode.SRC_ATOP)
}
"VERDE" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
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))
"AMARILLO" ->
itemView.setBackgroundColor(Color.YELLOW)
"VERDE" -> itemView.setBackgroundColor(Color.GREEN)
"AZUL" -> itemView.setBackgroundColor(Color.BLUE)
"BLANCO" -> itemView.setBackgroundColor(Color.WHITE)
"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))
}
"VIOLETA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
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)
}
"VIOLETA" -> itemView.setBackgroundColor(0xFF4c2882.toInt())
"GRIS" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
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
)
}
"GRIS" -> itemView.setBackgroundColor(Color.GRAY)
"MORADO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
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
)
}
"ORANGE" -> itemView.setBackgroundColor(0xFFFFBB33.toInt())
"CELESTE" ->if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(0xFF5b85F5.toInt(), BlendMode.SRC_ATOP)
}
"MORADO" -> itemView.setBackgroundColor(0xFFAA66CC.toInt())
"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) {
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
)
}
"BEIGE" -> itemView.setBackgroundColor(0xFFf2e7bf.toInt())
else -> {
// itemView.setBackgroundColor(Color.TRANSPARENT)
itemView.setBackgroundColor(Color.TRANSPARENT)
//itemView.setBackgroundResource(R.drawable.background_item_color)
// itemView.visibility=View.INVISIBLE
}

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

@ -43,6 +43,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.*
import timber.log.Timber
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class CollectionFragment(
var collection: CollectionVO = CollectionVO(),
var type: String = SACADOR
@ -113,7 +114,7 @@ class CollectionFragment(
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
viewModel.ticket_checkFullyControlled(
@ -152,7 +153,7 @@ class CollectionFragment(
customDialog = CustomDialog(requireContext())
customDialogThreeButtons = CustomDialogThreeButtons(requireContext())
ma.hideBottomNavigation(View.GONE)
if (binding.splashProgress != null) binding.splashProgress.visibility = VISIBLE
binding.splashProgress.visibility = VISIBLE
setEvents()
setToolBar()
@ -262,9 +263,7 @@ class CollectionFragment(
}
private fun scanRequest() {
if (binding.scanInput != null) {
binding.scanInput.requestFocus()
}
binding.scanInput.requestFocus()
hideKeyboards()
}
@ -470,19 +469,19 @@ class CollectionFragment(
}
})
placementSuppleyList.observe(viewLifecycleOwner, Observer {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = GONE
if (!goBack) printShelvingResult(it)
goBack = false
})
item.observe(viewLifecycleOwner, Observer {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = GONE
if (!goBack) toastDisponibility(it)
goBack = false
})
responseNew.observe(viewLifecycleOwner, Observer {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = View.GONE
// if (!goBack) {
if (it.isError) {
customDialog.setTitle(getString(R.string.disponibility))
@ -493,8 +492,8 @@ class CollectionFragment(
}.show()
} else {
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
if (!goBack) {
@ -522,7 +521,7 @@ class CollectionFragment(
})
responseCode.observe(viewLifecycleOwner, Observer {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = View.GONE
if (!goBack2) {
if (it.isError) {
customDialog.setTitle(getString(R.string.error))
@ -616,7 +615,7 @@ class CollectionFragment(
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 */
if (!goMistakeBack)
@ -788,7 +787,7 @@ class CollectionFragment(
viewModel.sendChekingPresence(
token = getData(TOKEN),
workerId = salePerson,
message = message, "sendChekingPresence"
message = message
)
}
@ -803,7 +802,7 @@ class CollectionFragment(
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()
tickets = ArrayList()
var observations = ""
@ -886,8 +885,8 @@ class CollectionFragment(
}, object : OnMistakeClickListener {
override fun onMistakeClickListener(sale: SaleVO) {
if (type != "PRECHECKER") {
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
mistakeSale = sale
goMistakeBack=false
viewModel.mistakeType(
@ -1067,8 +1066,8 @@ class CollectionFragment(
/* if (mpok != null) mpok!!.start()
getString(R.string.Ticketaparcado).toast(requireContext())*/
} else {
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
storedPosition = 0
storedBackPosition = 0
// if (type != PRECHECKER) {
@ -1281,7 +1280,7 @@ class CollectionFragment(
private fun showShelving(position: Int, shelvingPosition: Int) {
storedShelvingPosition = shelvingPosition
storedPosition = position
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
binding.splashProgress.visibility = VISIBLE
var quantityGet = "0"
try {
quantityGet =
@ -1354,8 +1353,8 @@ class CollectionFragment(
customDialogList.dismiss()
} else {
itemShelvingFkStored = itemShelvingFk
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
/* var working_in_test = true // sergio: en proves app
if (working_in_test) {*/
@ -1639,8 +1638,8 @@ class CollectionFragment(
) {
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
} else {
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
//sergio datos para mensaje salix
@ -1695,8 +1694,8 @@ class CollectionFragment(
) {
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
} else {
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
binding.splashProgress.visibility =
VISIBLE
dataMessageSalix = DataMessageSalix(
ticket = ticketSelected,
@ -1831,7 +1830,7 @@ class CollectionFragment(
if (binding.mainToolbar.toolbarTitle != null) binding.mainToolbar.toolbarTitle.text =
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
if (totalMark == sales.size) {
@ -2320,8 +2319,8 @@ class CollectionFragment(
viewModel.sendChekingPresence(
token = getData(TOKEN),
workerId = workerId,
message = message,
"sendChekingPresence"
message = message
)
}
@ -2448,7 +2447,7 @@ class CollectionFragment(
}
private fun showMistakeList(list: List<MistakeTypeVO>) {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.GONE
binding.splashProgress.visibility = GONE
listPlacementSupply = ArrayList()
list.forEach {
listPlacementSupply.add(BarcodeVO(code = it.description))
@ -2524,13 +2523,13 @@ class CollectionFragment(
}
LISTO -> {
state += 1
speakOrder()
//speakOrder()
}
VOLVER -> {
}
REPITE -> {
speakOrder()
// speakOrder()
}
OTRO -> {
// speak("Orden no registrada")
@ -2542,7 +2541,7 @@ class CollectionFragment(
}
}
private fun speakOrder() {
/*private fun speakOrder() {
if (type == SACADOR) {
if (state == 0) {
//speak("Colección cargada.")
@ -2675,7 +2674,7 @@ class CollectionFragment(
}
}
}
}
}*/
override fun onDestroy() {
cancelSpeech()

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

@ -867,8 +867,8 @@ class CollectionViewModel(context: Context) : BaseViewModel() {
fun sendChekingPresence(
token: String,
workerId: String,
message: String,
calledFunction: String
message: String
) {
try {
getLoginUserCase.sendChekingPresence(token, workerId.toInt(), message)

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

@ -127,7 +127,7 @@ class CollectionShowTicketFragment(
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 (!binding.scanInput.text.toString().isNullOrEmpty()) {
binding.splashProgress.visibility = VISIBLE
@ -271,7 +271,7 @@ class CollectionShowTicketFragment(
}
binding.mainToolbar.toolbarTitle.text =
collection.collectionFk
if (sales != null) binding.mainToolbar.toolbarSubtitle.text =
binding.mainToolbar.toolbarSubtitle.text =
"" + totalMark + "/" + sales.size
if (totalMark == sales.size) {
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt
View File

@ -70,7 +70,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
}
} catch (e: Exception) {
this.isError = true
if (this.tickets == null || this.tickets.isEmpty()) {
if (this.tickets.isEmpty()) {
this.errorMessage = context.getString(R.string.collectionNoTickets)
} else {
@ -85,6 +85,6 @@ fun CollectionVO.map(context: Context): CollectionVO {
private fun getCalendarFromDate(date: String,context:Context): Calendar {
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
val cal = Calendar.getInstance()
cal.setTime(sdf.parse(date))
cal.time = sdf.parse(date)!!
return cal
}

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

@ -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.sacador.model.CollectionVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ControladorFragment :
BaseFragment<FragmentControladorBinding, ControladorViewModel>(ControladorViewModel::class) {

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

@ -20,6 +20,7 @@ import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class WebFragment(
var entryPoint: String = ""
) : BaseFragment<FragmentWebBinding, ControladorViewModel>(ControladorViewModel::class) {

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

@ -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.sacador.fragment.SacadorFragment
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ControlVehiculoFragment(
var tagName: String = ""
) : BaseFragment<FragmentVehiclecontrolBinding, ControlVehiculoViewModel>(

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

@ -19,6 +19,7 @@ import es.verdnatura.presentation.view.feature.diadeventa.adapter.DayOfSaleAdapt
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class DayOfSaleFragment(
var entryPoint: String = ""
) : BaseFragment<FragmentItemdayofsaleCardBinding, DayOfSaleViewModel>(DayOfSaleViewModel::class) {

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

@ -18,6 +18,7 @@ import es.verdnatura.presentation.view.feature.faltas.adapter.FaltasAdapter
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class FaltasFragment :
BaseFragment<FragmentFaltasBinding, FaltasViewModel>(FaltasViewModel::class) {

7
app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
View File

@ -22,6 +22,7 @@ import java.text.SimpleDateFormat
import java.util.*
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class HistoricoArticuloFragment(
var itemFk: String = ""
) : BaseFragment<FragmentHistoricoBinding, HistoricoArticuloViewModel>(
@ -133,10 +134,10 @@ class HistoricoArticuloFragment(
listHistoryAux.forEach {
if (it.name != null && (it.name.contains(
if (it.name.contains(
binding.filterNameordateitem.text.toString(),
true
))
)
) {
//Log.i("VERDNATURA:","si contiene ${filter_nameordateitem.text.toString()}")
listHistoric.add(it)
@ -179,7 +180,7 @@ class HistoricoArticuloFragment(
// listHistoryAux.add(it)
} else {
if ((it.name != null) && (it.name.contains(filter, true))) {
if (it.name.contains(filter, true)) {
listHistoric.add(it)
// listHistoryAux.add(it)
}

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

@ -14,6 +14,7 @@ package es.verdnatura.presentation.view.feature.historicoshelving.fragment
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class itemShelvingLogFragment(
var entryPoint: String = ""
// ) : BaseFragment<FragmentItemdayofsaleCardBinding, itemShelvingLogViewModel>(itemShelvingLogViewModel::class) {

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

@ -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.main.activity.MainActivity
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class shelvingLogFragment(
var entryPoint: String = ""

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

@ -1,10 +1,9 @@
package es.verdnatura.presentation.view.feature.inventario.fragment
import android.annotation.SuppressLint
import android.content.Context
import android.content.SharedPreferences
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.ImageView
import androidx.lifecycle.Observer
@ -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.inventario.adapter.InventoryAdapter
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.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 var listInvetory:ArrayList<ItemInventaryVO> = ArrayList()
private var listInvetoryAux:ArrayList<ItemInventaryVO> = ArrayList()
private var listInvetory: ArrayList<ItemInventaryVO> = ArrayList()
private var listInvetoryAux: ArrayList<ItemInventaryVO> = ArrayList()
private lateinit var customDialog: CustomDialog
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var reload = false
private var hideLoad = true
private var layoutManager : LinearLayoutManager? = null
// private var reload = false
// private var hideLoad = true
private var layoutManager: LinearLayoutManager? = null
private var firstVisiblePosition = 0
private var secondVisiblePosition = 1
private lateinit var itemClicked: ItemInventaryVO
//sergio : cmbios para insertar lista compradores en inventary en el searchable
private val items=ArrayList<SearchBuyerModel>()
private lateinit var buyerId:String
private val items = ArrayList<SearchBuyerModel>()
private lateinit var buyerId: String
companion object {
@ -57,59 +58,57 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
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() {
binding.filterBuyer.setText(getData(BUYER))
binding.splashProgress.visibility = View.VISIBLE
buyerId=getData(BUYERID)
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
binding.filterBuyer.setOnClickListener{
viewModel.itemShelvingBuyerGet(user = getData(USER), password = getData(PASSWORD))
binding.filterBuyer.text = getData(BUYER)
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,items,
SearchResultListener { baseSearchDialogCompat, nombre, position ->
binding.filterBuyer.setText((nombre.title))
saveBuyer(nombre.getBuyerNickname())
saveBuyerId(nombre.getBuyerId())
buyerId=nombre.getBuyerId()
viewModel.getInventory(getData(USER),getData(PASSWORD),nombre.getBuyerId(),getData(WAREHOUSEFK))
binding.splashProgress.visibility = View.VISIBLE
baseSearchDialogCompat.dismiss()
}).show()
SimpleSearchDialogCompat(context,
getString(R.string.compradores),
getString(R.string.escribirparteNombre),
null,
items,
SearchResultListener { baseSearchDialogCompat, nombre, position ->
binding.filterBuyer.text = (nombre.title)
saveBuyer(nombre.getBuyerNickname())
saveBuyerId(nombre.getBuyerId())
buyerId = nombre.getBuyerId()
viewModel.getInventory(
getData(USER),
getData(PASSWORD),
nombre.getBuyerId(),
getData(WAREHOUSEFK)
)
binding.splashProgress.visibility = View.VISIBLE
baseSearchDialogCompat.dismiss()
}).show()
}
customDialogInput = CustomDialogInput(requireContext())
customDialog = CustomDialog(requireContext())
ma.hideBottomNavigation(View.GONE)
binding.splashProgress.visibility = View.VISIBLE
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemShelvingRadar)
setToolBar()
setEvents()
if (reload){
reload = false
binding.splashProgress.visibility = View.VISIBLE
hideLoad = false
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
}
super.init()
}
private fun setToolBar() {
private fun setToolBar(){
ma.hideBottomNavigation(View.GONE)
val listIcons: ArrayList<ImageView> = ArrayList()
val iconReload = ImageView(context)
@ -121,45 +120,53 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
}
listIcons.add(iconReload)
binding.mainToolbar.toolbarIcons.adapter = ToolBarAdapterTooltip(listIcons,object: OnOptionsSelectedListener{
override fun onOptionsItemSelected(item: Drawable) {
if (item == iconReload.drawable){
binding.splashProgress.visibility = View.VISIBLE
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
viewModel.getInventory(getData(USER),getData(PASSWORD),buyerId,getData(WAREHOUSEFK))
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
override fun onOptionsItemSelected(item: Drawable) {
if (item == iconReload.drawable) {
binding.splashProgress.visibility = View.VISIBLE
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
viewModel.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 {
requireActivity().onBackPressed()
}
binding.filterItemFk.setOnKeyListener { v, keyCode, event ->
if (binding.filterItemFk.text.toString().isNullOrEmpty()){
if (listInvetory.size != listInvetoryAux.size){
if (binding.filterItemFk.text.toString().isEmpty()) {
if (listInvetory.size != listInvetoryAux.size) {
listInvetory.removeAll(listInvetoryAux)
listInvetoryAux.forEach {
listInvetory.add(it)
}
listInvetory.addAll(listInvetoryAux)
}
}else{
} else {
listInvetory.removeAll(listInvetoryAux)
listInvetoryAux.forEach {
if ((it.itemFk.contains(binding.filterItemFk.text.toString(),true)) || (it.producer.contains(binding.filterItemFk.text.toString(),true))){
listInvetory.add(it)
}
}
listInvetory.addAll(listInvetoryAux.filter {
it.itemFk.contains(
binding.filterItemFk.text.toString(),
true
) || it.producer.contains(binding.filterItemFk.text.toString(), true)
})
}
adapter!!.notifyDataSetChanged()
@ -167,7 +174,6 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
}
}
override fun onPause() {
super.onPause()
firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0
@ -175,15 +181,15 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
override fun onResume() {
super.onResume()
if (binding.locationRecyclerview.layoutManager != null){
if (firstVisiblePosition <= listInvetory.size){
if (binding.locationRecyclerview.layoutManager != null) {
if (firstVisiblePosition <= listInvetory.size) {
binding.locationRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
}
}
}
override fun observeViewModel() {
with(viewModel){
with(viewModel) {
//sergio: para compradores
buyersList.observe(viewLifecycleOwner, Observer {
@ -193,100 +199,91 @@ class InventaryFragment : BaseFragment<FragmentInventaryBinding,InventaryViewMod
inventaryList.observe(viewLifecycleOwner, Observer {
if (hideLoad){
binding.splashProgress.visibility = View.GONE
}else{
hideLoad = true
binding.splashProgress.visibility = View.GONE
listInvetory = ArrayList()
listInvetoryAux = ArrayList()
it.list.forEach {
if (it.nicho != "0") {
listInvetory.add(it)
listInvetoryAux.add(it)
}
}
adapter = InventoryAdapter(listInvetory, object : OnInvetoryNichoClickListener {
override fun onInvetoryNichoClickListener(item: ItemInventaryVO) {
customDialog.setTitle(item.itemFk + "\n" + item.longName + " " + item.size)
.setDescription(getString(R.string.quantityReal) + item.nicho + ")")
.setOkButton(getString(R.string.pull)) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemTrash(
item.itemFk,
getData(WAREHOUSEFK),
getData(USER),
getData(PASSWORD),
item.nicho,
"0"
)
itemClicked = item
customDialog.dismiss()
}.setKoButton(getString(R.string.cancel)) {
customDialog.dismiss()
}.show()
listInvetory = ArrayList()
listInvetoryAux = ArrayList()
it.list.forEach {
if (it.nicho != "0"){
listInvetory.add(it)
listInvetoryAux.add(it)
}
}
adapter = InventoryAdapter(listInvetory,object: OnInvetoryNichoClickListener{
override fun onInvetoryNichoClickListener(item: ItemInventaryVO) {
//sergio: cambiado customdialogInput pòr customdialog 6.1.4
customDialog.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription(getString(R.string.quantityReal)+item.nicho+")").setOkButton(getString(R.string.pull)){
//customDialogInput.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton(getString(R.string.pull)){
viewModel.itemTrash(item.itemFk,getData(WAREHOUSEFK),getData(USER),getData(PASSWORD),item.nicho,"0")
//viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,"0","0")
// viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0")
changeOfflineValue(item)
// customDialogInput.dismiss()
customDialog.dismiss()
}.setKoButton(getString(R.string.cancel)){
// customDialogInput.dismiss()
customDialog.dismiss()
}.show()
}
},onPasillerosItemClickListener = pasillerosItemClickListener!!)
}, onPasillerosItemClickListener = pasillerosItemClickListener!!)
binding.locationRecyclerview.adapter = adapter
layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
binding.locationRecyclerview.layoutManager = layoutManager
if (firstVisiblePosition <= listInvetory.size){
binding.locationRecyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition)
}
if (firstVisiblePosition <= listInvetory.size) {
binding.locationRecyclerview.layoutManager!!.scrollToPosition(
firstVisiblePosition
)
}
})
response.observe(viewLifecycleOwner, Observer {
if (it.isError){
ma.messageWithSound(it.errorMessage,true,false)
/* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage).setOkButton(getString(R.string.close)){
customDialog.dismiss()
}.show()*/
binding.splashProgress.visibility = View.GONE
if (it.isError) {
ma.messageWithSound(it.errorMessage, true, true)
} 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
position = 0
listInvetoryAux.forEach {
if (it.itemFk == item.itemFk) {
position = i
}
i = i.plus(1)
}
listInvetoryAux.removeAt(position)
@SuppressLint("NotifyDataSetChanged")
private fun changeOfflineValue(item: ItemInventaryVO) {
listInvetory.removeAt(listInvetory.indexOf(item))
listInvetoryAux.removeAt(listInvetoryAux.indexOf(item))
listInvetory.filter { it.itemFk.contains("996") }
adapter?.notifyDataSetChanged()
reload = true
//reload = true
}
//sergio:añadido para compradores
private fun createBuyerList(list: List<BuyerVO>){
items.clear()
private fun createBuyerList(list: List<BuyerVO>) {
items.clear()
list.forEach { buyer ->
if (!buyer.isError){
if (!buyer.isError) {
try {
items.add(SearchBuyerModel(buyer.nickname,buyer.userFk));
}catch (e:Exception){}
items.add(SearchBuyerModel(buyer.nickname, buyer.userFk))
} catch (e: Exception) {
}
}
}}
}
}
}

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

@ -4,7 +4,6 @@ import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
import es.verdnatura.R
import es.verdnatura.domain.GetInventaryUserCase
import es.verdnatura.domain.GetItemCardUserCase
import es.verdnatura.domain.GetWokerMistakeUSerCase

2
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -316,7 +316,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
} else {
if (!it.list.get(0).isError) {
saveDataInt(PRINTERFK, it.list.get(0).id!!)
saveData(PRINTERNAME, it.list.get(0).name!!)
saveData(PRINTERNAME, it.list.get(0).name)
} else {
it.list.get(0).errorMessage.toast(context)
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
View File

@ -266,7 +266,7 @@ class LoginViewModel(context: Context) : BaseViewModel()
{
_devicelogresponse.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),message)
errorMessage = getMessageFromAllResponse(callFunction,message)
)
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
View File

@ -147,7 +147,7 @@ class ExpeditionPalletDetailFragment(
val c = Calendar.getInstance()
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
c.time = df.parse(date)
c.time = df.parse(date)!!
return df2.format(c.time)
}

3
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
View File

@ -32,6 +32,7 @@ import java.text.SimpleDateFormat
import java.util.*
import kotlin.collections.ArrayList
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ExpeditionPalletFragment(
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null
) : BaseFragment<FragmentExpeditionPalletBinding, ExpeditionPalletViewModel>(
@ -114,7 +115,7 @@ class ExpeditionPalletFragment(
val c = Calendar.getInstance()
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
c.time = df.parse(date)
c.time = df.parse(date)!!
return df2.format(c.time)
}

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

@ -26,6 +26,7 @@ import java.text.SimpleDateFormat
import java.util.*
import kotlin.collections.ArrayList
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ExpeditionScanFragment (
var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null,
var itemPalletVO: ItemPalletVO? = null
@ -110,7 +111,7 @@ class ExpeditionScanFragment (
val c = Calendar.getInstance()
val df = SimpleDateFormat(getString(R.string.dateCompleteFormat))
val df2 = SimpleDateFormat(getString(R.string.timeFormat))
c.time = df.parse(date)
c.time = df.parse(date)!!
return df2.format(c.time)
}
@ -162,13 +163,13 @@ class ExpeditionScanFragment (
binding.splashProgress.visibility = View.GONE
val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
adapter = ExpeditionScanAdapter(it.list,object: OnScanLongClickListener{
override fun onScanLongClickListener(itemExpeditionScanVO: ItemExpeditionScanVO) {
customDialogTwoButtons.setTitle(getString(R.string.ticket)+itemExpeditionScanVO.Ticket+getString(R.string.pallet)+itemPalletVO!!.Pallet)
.setDescription(getString(R.string.expedit)+itemExpeditionScanVO!!.expeditionFk)
override fun onScanLongClickListener(itemExpeditionScan: ItemExpeditionScanVO) {
customDialogTwoButtons.setTitle(getString(R.string.ticket)+itemExpeditionScan.Ticket+getString(R.string.pallet)+itemPalletVO!!.Pallet)
.setDescription(getString(R.string.expedit)+itemExpeditionScan.expeditionFk)
.setOkButton(getString(R.string.delete)){
binding.splashProgress.visibility = View.VISIBLE
viewModel.expeditionScanDel(getData(USER),
getData(PASSWORD),itemExpeditionScanVO.id)
getData(PASSWORD),itemExpeditionScan.id)
customDialogTwoButtons.dismiss()
}.setKoButton(getString(R.string.cancel)){
customDialogTwoButtons.dismiss()

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

@ -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.itemExpedetionState
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ExpeditionStateFragment(
var entryPoint: String = ""
) : BaseFragment<FragmentItemexpeditionstateCardBinding, ExpeditionStateViewModel>(ExpeditionStateViewModel::class) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt
View File

@ -157,7 +157,7 @@ class ExpeditionStateViewModel(context: Context) : BaseViewModel() {
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
expeditionState.forEach {
list.add(itemsExpeditionDynamics(key=it.key,it.value?.toString()))
list.add(itemsExpeditionDynamics(key=it.key, it.value.toString()))
}
return list

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

@ -23,6 +23,7 @@ import java.util.*
import java.util.Calendar.getInstance as getInstance1
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ExpeditionTruckListFragment : BaseFragment<FragmentExpeditionTruckListBinding, ExpeditionTruckListViewModel>(
ExpeditionTruckListViewModel::class) {

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

@ -17,6 +17,7 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter
import org.koin.android.ext.android.bind
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ParkingFragment (var menuOrigin:String): BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
// private lateinit var customDialog: CustomDialog

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

@ -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.parking.adapter.ParkingAdapter
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ParkingSaleFragment : BaseFragment<FragmentParkingBinding,ParkingSaleViewModel>(ParkingSaleViewModel::class) {

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

@ -97,7 +97,7 @@ class PasilleroFragment(
context,
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)
}
}

1
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
View File

@ -13,6 +13,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class PreControladorFragment: BaseFragment<FragmentControladorBinding,ShowTicketViewModel>(ShowTicketViewModel::class) {
private var goBack:Boolean = false
private var onCollectionSelectedListener : OnCollectionSelectedListener? = null

5
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
View File

@ -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.SaleVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class EndSacadorFragment(
var collection: CollectionVO = CollectionVO(),
var type: String = ""
@ -1221,9 +1222,7 @@ class EndSacadorFragment(
}
private fun scanRequest() {
if (binding.scanInput != null) {
binding.scanInput.requestFocus()
}
binding.scanInput.requestFocus()
hideKeyboards()
}

5
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt
View File

@ -36,6 +36,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyList
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class PreSacadorFragment :
BaseFragment<FragmentPreSacadorBinding, PreSacadorViewModel>(PreSacadorViewModel::class) {
var mperror: MediaPlayer? = null
@ -980,9 +981,7 @@ class PreSacadorFragment :
}
private fun scanRequest() {
if (binding.scanInput != null) {
binding.scanInput.requestFocus()
}
binding.scanInput.requestFocus()
hideKeyboards()
}

1
app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
View File

@ -12,6 +12,7 @@ import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class QrFragment(
var entryPoint: String = ""
) : BaseFragment<FragmentQrBinding, QrFragmentViewModel>(QrFragmentViewModel::class) {

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

@ -29,6 +29,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyList
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionViewModel>(
ReposicionViewModel::class
) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/adapter/ReubicatorAdapter.kt
View File

@ -76,7 +76,7 @@ class ReubicatorAdapter(
itemArticlePlacements.apply {
layoutManager = childLayoutManager
adapter = reubication.placements?.let { ReubicatorPlacementAdapter(it, onPasillerosItemClickListener) }
adapter = reubication.placements.let { ReubicatorPlacementAdapter(it, onPasillerosItemClickListener) }
}
//CLICK EVENTS

7
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
View File

@ -22,6 +22,7 @@ import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewMod
//Tarea #3754
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ReubicationCollectionFragment(
var list: List<Reubication>,
var shelving: String
@ -106,7 +107,7 @@ class ReubicationCollectionFragment(
}
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 (!binding.scanInput.text.isNullOrEmpty()) {
@ -128,7 +129,7 @@ class ReubicationCollectionFragment(
var found = false
all_list@ for (items in list) {
for (placements in items.placements!!) {
for (placements in items.placements) {
if (placements.plate == plate ) {
@ -300,7 +301,7 @@ class ReubicationCollectionFragment(
private fun createReubicationsTwo(list: List<Reubication>) {
var listItems= mutableListOf<String>()
//var listItems= mutableListOf<String>()
val reubication=mutableListOf<Reubication>()
for (item in list){

6
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
View File

@ -56,7 +56,7 @@ class ReubicationFragment(var entrypoint: String) :
}
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) {
goBack = false
if (!binding.scanInput.text.isNullOrEmpty()) {
@ -122,7 +122,7 @@ class ReubicationFragment(var entrypoint: String) :
private fun createReubications(list: List<Reubication>) {
var listItems = mutableListOf<String>()
// var listItems = mutableListOf<String>()
val reubication = mutableListOf<Reubication>() as ArrayList
Log.d("VERDNATURA::", "Iniciem llistat")
@ -162,7 +162,7 @@ class ReubicationFragment(var entrypoint: String) :
}
for (item in reubication) {
if (item.placements.isNullOrEmpty()) {
if (item.placements.isEmpty()) {
item.pickingOrder = 0
}else{
//item.pickingOrder=

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
View File

@ -83,7 +83,7 @@ class SacadorFragment :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setFragmentResultListener("requestKey") { requestKey, bundle ->
setFragmentResultListener("requestKey") { _, bundle ->
val result = bundle.getString("tagMode")

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
View File

@ -63,7 +63,7 @@ class SacadorViewModel(context: Context) : BaseViewModel() {
collectionFk: String,
sectorFk: String,
print: String,
type:String,callFunction:String
type:String
){
getSacadorControladorUserCase.collectionTicketGet(
usuario,

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt
View File

@ -24,6 +24,6 @@ fun List<CollectionVO>.toDateFormat(context:Context): ArrayList<CollectionVO> {
private fun getCalendarFromDate(date:String,context:Context): Calendar {
val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
val cal = Calendar.getInstance()
cal.setTime(sdf.parse(date))
cal.time = sdf.parse(date)!!
return cal
}

12
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
View File

@ -1,7 +1,5 @@
package es.verdnatura.presentation.view.feature.sacador.model
import java.util.*
class CollectionListVO(
var list: List<CollectionVO> = listOf()
)
@ -12,7 +10,7 @@ class CollectionVO(
var tickets: List<TicketVO> = listOf(),
var isError: Boolean = false,
var errorMessage: String = "",
var itemPackingTypeFk:String=""
var itemPackingTypeFk: String = ""
)
class TicketVO(
@ -63,11 +61,11 @@ class SaleVO(
var cel2: String = "",
var cel3: String = "",
var saleGroupFk: String = "",
var packingShelve:String="",
var packingShelve: String = "",
var picked:String="",
var picked: String = "",
)
)
class PlacementVO(
var saleFk: String = "",
@ -86,7 +84,7 @@ class PlacementVO(
var itemShelvingSaleFk: String = "",
var ticketFk: String = "",
var id: String = "",
var pickingOrder:Int=0
var pickingOrder: Int = 0
)

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

@ -13,6 +13,7 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.shelvingparking.adapter.ShelvingParkingAdapter
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ShelvingParkingFragment : BaseFragment<FragmentShelvingParkingBinding, ShelvingParkingViewModel>(
ShelvingParkingViewModel::class) {

1
app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt
View File

@ -12,6 +12,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
import es.verdnatura.presentation.view.feature.precontrol.ShowTicketViewModel
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class ShowTicketFragment(var menuOrigin: String) :
BaseFragment<FragmentControladorBinding, ShowTicketViewModel>(
ShowTicketViewModel::class

2
app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/register/RegisterSmartTagsFragment.kt
View File

@ -291,7 +291,7 @@ class RegisterSmartTagsFragment(
customDialogList.getEditText().requestFocus()
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 (!customDialogList.getValue().isEmpty()) {
// Log.i("VERDNATURA:", "scan valor ${customDialogList.getValue()}")

22
app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt
View File

@ -123,9 +123,7 @@ class AssociateSmartTagsFragment(
}
private fun scanRequest() {
if (binding.scanInput != null) {
binding.scanInput.requestFocus()
}
binding.scanInput.requestFocus()
hideKeyboards()
}
@ -179,23 +177,13 @@ class AssociateSmartTagsFragment(
customDialog.dismiss()
}.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 {
listSmartTags.removeAt(listSmartTags.size - 1)
smartAdapter!!.notifyDataSetChanged()
listSmartTags.removeAt(listSmartTags.size - 1)
smartAdapter!!.notifyDataSetChanged()
customDialogList.setValue("")
ma.messageWithSound(getString(R.string.deletedLabel),false,false)
}
customDialogList.setValue("")
ma.messageWithSound(getString(R.string.deletedLabel),false,false)
}
binding.splashProgress.visibility = GONE
})

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

@ -16,6 +16,7 @@ import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class AutomaticAddItemFragment(
var shelvingFk : String = ""
) : BaseFragment<FragmentAutomaticAddItemBinding,AutomaticAddItemViewModel>(AutomaticAddItemViewModel::class) {

53
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -1,5 +1,6 @@
package es.verdnatura.presentation.view.feature.ubicador.fragment
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.drawable.Drawable
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
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class UbicadorFragment(
var shelvingFk: String = ""
) : BaseFragment<FragmentUbicadorBinding, UbicadorViewModel>(
@ -125,6 +127,7 @@ class UbicadorFragment(
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
@SuppressLint("SetTextI18n")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
@ -193,7 +196,7 @@ class UbicadorFragment(
)
parking = customDialogInput.getValue()
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()
customDialogInput.dismiss()
}.setKoButton(getString(R.string.cancel)) {
@ -213,12 +216,8 @@ class UbicadorFragment(
)
customDialogInput.dismiss()
parking = customDialogInput.getValue()
if (binding.mainToolbar.toolbarTitle != null && shelvingFk != null && parking != null && etiquetas != null) {
binding.mainToolbar.toolbarTitle.text =
shelvingFk.uppercase() + "*"+getString(R.string.pUppercase) + parking + "*"+getString(R.string.label) + etiquetas
} else {
binding.mainToolbar.toolbarTitle.text = ""
}
binding.mainToolbar.toolbarTitle.text =
shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(R.string.label) + etiquetas
if (mpok != null) {
mpok!!.start()
}
@ -240,7 +239,7 @@ class UbicadorFragment(
)
shelvingFk = customDialogInput.getValue()
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()
customDialogInput.dismiss()
}.setKoButton(getString(R.string.cancel)) {
@ -260,7 +259,7 @@ class UbicadorFragment(
)
shelvingFk = customDialogInput.getValue()
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()
customDialogInput.dismiss()
return@setOnEditorActionListener true
@ -307,13 +306,14 @@ class UbicadorFragment(
}
}
@SuppressLint("SetTextI18n")
override fun observeViewModel() {
with(viewModel) {
loadShelvingList.observe(viewLifecycleOwner, Observer { event ->
event.getContentIfNotHandled().notNull {
deep = it.list.size
listItems = ArrayList()
var contEtiquetas: Int = 0
var contEtiquetas= 0
it.list.forEach { item ->
try {
contEtiquetas += item.stickers.toInt()
@ -325,7 +325,7 @@ class UbicadorFragment(
}
etiquetas = contEtiquetas.toString()
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)
binding.editPrioridad.setText(it.list[0].priority)
binding.splashProgress.visibility = View.GONE
@ -489,6 +489,8 @@ class UbicadorFragment(
if (!packing.isNullOrEmpty()) {
if (updatePacking == null) {
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty()) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingMake(
getData(USER),
getData(PASSWORD),
@ -501,13 +503,13 @@ class UbicadorFragment(
"1",
groupingPack
)
changeOfflineValue(
/*changeOfflineValue(
ItemUbicadorVO(
item = itemFk,
visible = visible,
packing = packing
)
)
)*/
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
.setEtiquetaValue("").setVisibleValue("")
customDialogUbicador.getEditItem().requestFocus()
@ -516,6 +518,7 @@ class UbicadorFragment(
} else if (!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty()) {
val visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingMake(
getData(USER),
getData(PASSWORD),
@ -528,14 +531,14 @@ class UbicadorFragment(
"1",
groupingPack
)
changeOfflineValue(
/*changeOfflineValue(
ItemUbicadorVO(
item = itemFk,
visible = visible_calc,
packing = packing,
stickers = etiquetas
)
)
)*/
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
.setEtiquetaValue("").setVisibleValue("")
customDialogUbicador.getEditItem().requestFocus()
@ -550,6 +553,7 @@ class UbicadorFragment(
}
} else {
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty() && !updatePacking) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingMakeEdit(
getData(USER),
getData(PASSWORD),
@ -563,13 +567,13 @@ class UbicadorFragment(
itemShelvingFk,
groupingPack
)
changeOfflineValue(
/* changeOfflineValue(
ItemUbicadorVO(
item = itemFk,
visible = visible,
packing = packing
)
)
)*/
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
.setEtiquetaValue("").setVisibleValue("")
customDialogUbicador.getEditItem().requestFocus()
@ -582,6 +586,7 @@ class UbicadorFragment(
visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
} catch (e: Exception) {
}
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingMakeEdit(
getData(USER),
getData(PASSWORD),
@ -595,14 +600,14 @@ class UbicadorFragment(
itemShelvingFk,
groupingPack
)
changeOfflineValue(
/* changeOfflineValue(
ItemUbicadorVO(
item = itemFk,
visible = visible_calc,
packing = packing,
stickers = etiquetas
)
)
)*/
customDialogUbicador.setItemValue("").setPackingValue("").setGroupingValue("")
.setEtiquetaValue("").setVisibleValue("")
customDialogUbicador.getEditItem().requestFocus()
@ -645,11 +650,11 @@ class UbicadorFragment(
}
}*/
private fun changeOfflineValue(item: ItemUbicadorVO) {
if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
/*listItems.add(item)
adapter?.notifyDataSetChanged()*/
}
/*private fun changeOfflineValue(item: ItemUbicadorVO) {
binding.splashProgress.visibility = View.VISIBLE
*//*listItems.add(item)
adapter?.notifyDataSetChanged()*//*
}*/
private fun showMoreOptions(item: ItemUbicadorVO) {
customDialogTwoButtons.setTitle(item.item).setDescription(getString(R.string.selectAction))

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

@ -23,6 +23,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorker
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class WorkermistakeFragment(
var entryPoint: String = ""

29
app/src/main/res/layout/fragment_inventary.xml
View File

@ -42,7 +42,8 @@
android:maxLines="1"
android:textAlignment="center"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
android:textColorHint="#78909C"
tools:ignore="TextContrastCheck" />
<TextView
android:id="@+id/filter_buyer"
@ -53,23 +54,15 @@
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
android:focusable="false"
android:hint="@string/buscarcomprador"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textAlignment="center"
android:textColor="@color/verdnatura_pumpkin_orange"
android:textColorHint="@android:color/darker_gray"
android:visibility="visible" />
android:textColorHint="#78909C"
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>
@ -92,7 +85,8 @@
android:gravity="center"
android:text="@string/ubicado"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
android:textSize="@dimen/body2"
tools:ignore="TextContrastCheck" />
<TextView
android:layout_width="match_parent"
@ -101,7 +95,8 @@
android:gravity="center"
android:text="@string/altillo"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
android:textSize="@dimen/body2"
tools:ignore="TextContrastCheck" />
<TextView
android:layout_width="match_parent"
@ -110,7 +105,8 @@
android:gravity="center"
android:text="@string/sinubicar"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
android:textSize="@dimen/body2"
tools:ignore="TextContrastCheck" />
</LinearLayout>
@ -125,7 +121,8 @@
' <include
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_reubication_collection.xml
View File

@ -26,7 +26,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
android:paddingLeft="@dimen/default_layout_margin"/>
android:importantForAutofill="no" />

10
app/src/main/res/layout/item_inventary_row.xml
View File

@ -27,13 +27,13 @@
android:id="@+id/item_fk"
android:layout_width="match_parent"
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: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

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

@ -253,8 +253,8 @@
<string name="selectDestiny">Introduce el destino para item: </string>
<string name="empty">Vaciar carro</string>
<string name="operationNoReturn">Esta operación no se puede rectificar.</string>
<string name="label"> E: </string>
<string name="pUppercase"> P: </string>
<string name="label">\u0020E: </string>
<string name="pUppercase">\u0020P: </string>
<string name="itemSearch">Consultar artículo</string>
<string name="quantityReal">Cantidad real(</string>
<string name="pull">Tirar</string>
@ -271,13 +271,13 @@
<string name="errorNotNumber">El elemento introducido no es un número</string>
<string name="buyer">Comprador</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="registerOneWagoon">Carro escaneado completamente.¿Registrar otro carro?</string>
<string name="exit">Salir</string>
<string name="scanUpToDown">Escanea matrícula del carro y etiquetas smartTags de arriba a abajo.</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="sectorUpdated">sector actualizado</string>
<string name="logAppName">warehouse</string>
@ -301,12 +301,12 @@
<string name="pendingReview">Pendiente de revisar : </string>
<string name="review">Revisar</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="unityTicket"> unidad/es al ticket </string>
<string name="with"> con </string>
<string name="unityTicket">" \\u0020unidad/es al ticket "</string>
<string name="with"> \u0020con\u0020 </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="quantitySelect">Cantidad que coges:</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="added">Añadida</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="user">Usuario:</string>
<string name="warning">Aviso</string>
@ -436,7 +436,7 @@
<string name="fromItem"> del articulo </string>
<string name="ticketSpaces"> ticket </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="saleParked">Sale/s aparcada/s</string>
<string name="modifiedOriginalQuantityPrevious">Se ha modificado desde previa la cantidad de </string>

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

@ -259,8 +259,8 @@
<string name="selectDestiny">"Introduce item destiny: "</string>
<string name="empty">Empty wagoon</string>
<string name="operationNoReturn">This operation cannot be rectified.</string>
<string name="label"> L: </string>
<string name="pUppercase"> P: </string>
<string name="label">\u0020L: </string>
<string name="pUppercase">\u0020P: </string>
<string name="itemSearch">Consult item</string>
<string name="quantityReal">Real quantity (</string>
<string name="quantity">Quantity</string>
@ -308,12 +308,12 @@
<string name="pendingReview">Pending review : </string>
<string name="review">Review</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="unityTicket"> unity to ticket </string>
<string name="with"> with </string>
<string name="unityTicket">" \\u0020unity to ticket "</string>
<string name="with">" \\u0020with\\u0020"</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="quantitySelect">Amount you take:</string>
<string name="errorMarkLine">Error when marking the line</string>