diff --git a/.idea/misc.xml b/.idea/misc.xml
index 97b3f254..63d3027a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -276,7 +276,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8bd6b031..821c8672 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,204 +83,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -420,26 +227,26 @@
- {
+ "keyToString": {
+ "ApkExportedModule": "Gestor_Almacén.app",
+ "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "cidr.known.project.marker": "true",
+ "com.google.services.firebase.aqiPopupShown": "true",
+ "last_opened_file_path": "C:/Users/sergiodt/proyectos/vn-picture/platforms/android",
+ "project.structure.last.edited": "Modules",
+ "project.structure.proportion": "0.17",
+ "project.structure.side.proportion": "0.2",
+ "run.code.analysis.last.selected.profile": "pProject Default",
+ "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
},
- "keyToStringList": {
- "ExportApk.BuildVariants": [
- "release"
+ "keyToStringList": {
+ "ExportApk.BuildVariants": [
+ "release"
]
}
-}]]>
+}
@@ -1065,6 +872,46 @@
123
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 520
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 563
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 566
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 567
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 576
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 610
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 613
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+ 616
+
+
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
index fb4be179..5ecef315 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -516,7 +516,6 @@ abstract class BaseFragment(viewModelCla
PASSWORD -> prefs.getString(PASSWORD, "").toString()
SECTORFK -> prefs.getInt(name, SECTORFKDEFAULT).toString()
WAREHOUSEFK -> prefs.getInt(name, WAREHOUSEFKDEFAULT).toString()
- //VOZ->prefs.getString(name, "NO").toString()
WAGON -> prefs.getInt(name, 2).toString()
TAGSTYPE -> prefs.getString(name, getString(R.string.stickers)).toString()
SECTORDESCRIP -> prefs.getString(name, getString(R.string.Sinsector)).toString()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
index 261783a7..0286d7b6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
@@ -38,7 +38,7 @@ class ItemCardFragment(
private var titleImage: String = ""
private var user = ""
private var password = ""
- private var warehouseFk:Int? = null
+ private var warehouseFk: Int? = null
private var adapter: ItemCardAdapter? = null
private var barcodeAdapter: BarcodeAdapter? = null
private var listItemsRow: ArrayList = ArrayList()
@@ -62,7 +62,7 @@ class ItemCardFragment(
@RequiresApi(Build.VERSION_CODES.O)
override fun init() {
- binding.itemcardLayout.visibility =GONE
+ binding.itemcardLayout.visibility = GONE
ma.hideBottomNavigation(GONE)
setEvents()
@@ -97,7 +97,7 @@ class ItemCardFragment(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp)
iconHistory.tooltipText = getTooltip(R.drawable.ic_history_black_24dp)
- iconSalix.tooltipText= getTooltip(R.drawable.ic_logo_salix)
+ iconSalix.tooltipText = getTooltip(R.drawable.ic_logo_salix)
}
listIcons.add(iconSalix)
listIcons.add(iconReload)
@@ -130,12 +130,19 @@ class ItemCardFragment(
binding.splashProgress.visibility = View.VISIBLE
//getItemCard(itemFk)
- // ma.openFragmentWeb(itemInfoG!!.id)
- var itemId=itemInfoG!!.id
- var entryPoint = Gson().toJson(mutableMapOf("entryPoint" to itemId, "web" to "https://salix.verdnatura.es/#!/item/$itemId/summary"))
+ // ma.openFragmentWeb(itemInfoG!!.id)
+ var itemId = itemInfoG!!.id
+ var entryPoint = Gson().toJson(
+ mutableMapOf(
+ "entryPoint" to itemId,
+ "web" to "https://salix.verdnatura.es/#!/item/$itemId/summary"
+ )
+ )
ma.onPasillerosItemClickListener(
- PasillerosItemVO(title = getString(R.string.titleWebViewer),
- ), entryPoint = entryPoint)
+ PasillerosItemVO(
+ title = getString(R.string.titleWebViewer),
+ ), entryPoint = entryPoint
+ )
}
}
@@ -181,12 +188,7 @@ class ItemCardFragment(
}
private fun getItemCard(itemFk: String) {
-
- user = getData(USER)
- password = getData(PASSWORD)
warehouseFk = getDataInt(WAREHOUSEFK)
- this.itemFk = itemFk
-
binding.splashProgressTwo.visibility = View.VISIBLE
viewModel.getItemCard(itemFk, warehouseFk!!)
//binding.splashProgress.visibility = View.VISIBLE
@@ -204,7 +206,7 @@ class ItemCardFragment(
ma.messageWithSound(it.errorMessage, true, false)
} else {
- if (it.id!=0) {
+ if (it.id != 0) {
binding.itemcardLayout.visibility = View.VISIBLE
setItemCard(it)
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
@@ -235,7 +237,7 @@ class ItemCardFragment(
if (it.isError) {
ma.messageWithSound(it.errorMessage, true, false)
} else {
- getItemCard(itemFk)
+ getItemCard(itemInfoG!!.id.toString())
}
})
@@ -266,7 +268,7 @@ class ItemCardFragment(
binding.itemcardTag2.text = itemInfo.value5
binding.itemcardTag3.text = itemInfo.value6
binding.itemcardTag4.text = itemInfo.value7 + " " + itemInfo.origin
- binding.itemcardBuyer.text =itemInfo.buyer
+ binding.itemcardBuyer.text = itemInfo.buyer
listItemsRow = ArrayList()
//sergio itemcard por item_getInfo
@@ -386,8 +388,8 @@ class ItemCardFragment(
action = "updatePacking"
)
)
- //sergio: quitar de back cuando ya tengan la app actualizada todos
- listItemsRow.add(
+ //sergio: quitar de back cuando ya tengan la app actualizada todos
+ listItemsRow.add(
ItemCardRowVO(
title = getString(R.string.stems),
value = itemInfo.stems,
@@ -413,14 +415,14 @@ class ItemCardFragment(
)
//sergio para itemTypePacking
- /* listItemsRow.add(
- ItemCardRowVO(
- title = getString(R.string.tipodeencajado),
- value = itemInfo.itemPackingTypeFk,
- isEditable = true,
- action = "updateSector"
- )
- )*/
+ /* listItemsRow.add(
+ ItemCardRowVO(
+ title = getString(R.string.tipodeencajado),
+ value = itemInfo.itemPackingTypeFk,
+ isEditable = true,
+ action = "updateSector"
+ )
+ )*/
// listItemsRow.add(ItemCardRowVO(title = "Artículos similares",value = itemInfo.itemPackingTypeFk,isEditable = true, action = "itemProposal"))
@@ -434,7 +436,7 @@ class ItemCardFragment(
ma.onPasillerosItemClickListener(
PasillerosItemVO(
title = getString(R.string.titleSearchSimilarItems)
- ), itemFk
+ ), itemInfoG!!.id.toString()
)
} else {
@@ -443,7 +445,11 @@ class ItemCardFragment(
} else {
if (item.action != "toBarcode" && item.action != "buscarItem" && item.action != "itemStockUpdateAdd" && item.action != "itemStockUpdateRemove") {
customDialogInput.setTitle(item.title!!)
- .setDescription(getString(R.string.currentVAlue) + if(item.value.isNullOrEmpty()) "" else{item.value})
+ .setDescription(
+ getString(R.string.currentVAlue) + if (item.value.isNullOrEmpty()) "" else {
+ item.value
+ }
+ )
.setOkButton(getString(R.string.save)) {
ma.hideKeyboard(customDialogInput.getEditText())
editItemCardRow(item, customDialogInput.getValue().toInt())
@@ -459,7 +465,10 @@ class ItemCardFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
- editItemCardRow(item, customDialogInput.getValue().toInt())
+ editItemCardRow(
+ item,
+ customDialogInput.getValue().toInt()
+ )
customDialogInput.setValue("")
customDialogInput.dismiss()
ma.hideKeyboard(customDialogInput.getEditText())
@@ -493,7 +502,10 @@ class ItemCardFragment(
.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
- editItemCardRow(item, customDialogInput.getValue().toInt())
+ editItemCardRow(
+ item,
+ customDialogInput.getValue().toInt()
+ )
customDialogInput.setValue("")
customDialogInput.dismiss()
ma.hideKeyboard(customDialogInput.getEditText())
@@ -518,7 +530,10 @@ class ItemCardFragment(
.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty())
- editItemCardRow(item, customDialogInput.getValue().toInt())
+ editItemCardRow(
+ item,
+ customDialogInput.getValue().toInt()
+ )
customDialogInput.setValue("")
customDialogInput.dismiss()
ma.hideKeyboard(customDialogInput.getEditText())
@@ -600,7 +615,7 @@ class ItemCardFragment(
.setDescription(getString(R.string.deleteStock))
.setOkButton(getString(R.string.fault)) {
viewModel.itemTrash(
- itemFk = itemFk.toInt(),
+ itemFk = itemInfoG!!.id,
warehouseFk = warehouseFk!!,
newValue = value,
isTrash = false
@@ -612,7 +627,7 @@ class ItemCardFragment(
}.setOkButtonTwo(getString(R.string.trash)) {
viewModel.itemTrash(
- itemFk = itemFk.toInt(),
+ itemFk = itemInfoG!!.id,
warehouseFk = warehouseFk!!,
newValue = value,
isTrash = true
@@ -630,7 +645,7 @@ class ItemCardFragment(
//changeOfflineValue(itemB,value, listBarcodes)
showProgress()
viewModel.itemTrash(
- itemFk = itemFk.toInt(),
+ itemFk = itemInfoG!!.id,
warehouseFk = warehouseFk!!,
newValue = (value * -1),
isTrash = false
@@ -646,13 +661,14 @@ class ItemCardFragment(
private fun prepareBarcodeDialog(itemB: ItemCardRowVO) {
- customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
- ma.hideKeyboard(customDialogList.getEditText())
- if (!customDialogList.getValue().isEmpty())
- updateBarcode(customDialogList.getValue(), false)
- customDialogList.dismiss()
+ customDialogList.setTitle(getString(R.string.barcodes))
+ .setOkButton(getString(R.string.save)) {
+ ma.hideKeyboard(customDialogList.getEditText())
+ if (!customDialogList.getValue().isEmpty())
+ updateBarcode(customDialogList.getValue(), false)
+ customDialogList.dismiss()
- }.setKoButton(getString(R.string.close)) {
+ }.setKoButton(getString(R.string.close)) {
ma.hideKeyboard(customDialogList.getEditText())
customDialogList.dismiss()
}.setValue("").show()
@@ -685,7 +701,7 @@ class ItemCardFragment(
}
private fun updateBarcode(code: String, delete: Boolean) {
- d("VERDNATURA::","El bacode se va actualizar"+code+delete)
+ d("VERDNATURA::", "El bacode se va actualizar" + code + delete)
if (delete) {
var i = 0
var posDelete = 0
@@ -704,7 +720,8 @@ class ItemCardFragment(
listBarcodes.add(BarcodeVO(code))
viewModel.barcodesEditSalix(
itemFk = itemInfoG!!.id,
- barCodeValue = code)
+ barCodeValue = code
+ )
}