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

Version 9.1Beta-Compilada versión y formateado Ajustes

This commit is contained in:
Sergio De la torre 2022-09-23 12:48:05 +02:00
parent 2cf223ff8b
commit efb565d32c
3 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 131,
"versionName": "9Beta",
"versionCode": 132,
"versionName": "9.1Beta",
"outputFile": "app-release.apk"
}
],

BIN
app/release/vn-picking.apk
View File

Binary file not shown.

100
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
View File

@ -6,7 +6,6 @@ import android.content.ClipboardManager
import android.content.Context.CLIPBOARD_SERVICE
import android.content.SharedPreferences
import android.os.Bundle
import android.util.Log
import android.view.View
import androidx.appcompat.widget.TooltipCompat.setTooltipText
import androidx.recyclerview.widget.LinearLayoutManager
@ -33,7 +32,7 @@ class AjustesFragment :
private var trainsList: List<Train> = listOf()
private var prefs: SharedPreferences? = null
private var ajustesAdapter: AjustesAdapter? = null
private var isWorkerAllowed:Boolean=false
private var isWorkerAllowed: Boolean = false
private var itemPackingList: List<ItemPackingType> = listOf()
//añadido
@ -59,7 +58,7 @@ class AjustesFragment :
override fun init() {
binding.mainToolbar.toolbarTitle.text = getString(R.string.settings)
binding.splashProgress.visibility=View.VISIBLE
binding.splashProgress.visibility = View.VISIBLE
hideBackButton(binding.mainToolbar)
viewModel.worker_isF11Allowed(getData(USER), getData(PASSWORD))
@ -94,54 +93,60 @@ class AjustesFragment :
ajustesAdapter = AjustesAdapter(ajustesitem, object : OnAjustesItemClickListener {
override fun onAjustesItemClickListener(item: AjustesItemVO) {
if (item.action) {
if (item.action) {
if (item.id == 0) {
binding.splashProgress.visibility = View.VISIBLE
// viewModel.getSectors(getData(USER),getData(PASSWORD))
viewModel.getSectorsSalix(getData(TOKEN))
} else if (item.id == 5) {
requireActivity().onBackPressed()
} else if (item.id == 1) {
//Tarea 4351 quitar parte de mostrar los carros y quitar del layout el ">" del final
if (item.id == 0) {
binding.splashProgress.visibility = View.VISIBLE
// viewModel.getSectors(getData(USER),getData(PASSWORD))
viewModel.getSectorsSalix(getData(TOKEN))
} else if (item.id == 5) {
requireActivity().onBackPressed()
} else if (item.id == 1) {
//Tarea 4351 quitar parte de mostrar los carros y quitar del layout el ">" del final
ma.messageWithSound("El número de carros ahora solo se puede modificar por los encargados", true, true,"Información",false)
/* val listCarros: ArrayList<String> = ArrayList()
listCarros.add("1")
listCarros.add("2")
listCarros.add("3")
listCarros.add("4")
listCarros.add("5")
listCarros.add("6")
wagonList = listCarros
ma.messageWithSound(
"El número de carros ahora solo se puede modificar por los encargados",
true,
true,
"Información",
false
)
/* val listCarros: ArrayList<String> = ArrayList()
listCarros.add("1")
listCarros.add("2")
listCarros.add("3")
listCarros.add("4")
listCarros.add("5")
listCarros.add("6")
wagonList = listCarros
val array = arrayOfNulls<String>(listCarros.size)
val array = arrayOfNulls<String>(listCarros.size)
showDialogCarros(array = listCarros.toArray(array))*/
showDialogCarros(array = listCarros.toArray(array))*/
} else if (item.id == 2) {
viewModel.printer_get(getData(USER), getData(PASSWORD))
} else if (item.id == 2) {
viewModel.printer_get(getData(USER), getData(PASSWORD))
} else if (item.id == 3) {
val listTagsType: ArrayList<String> = ArrayList()
listTagsType.add(getString(R.string.stickers))
// listTagsType.add(getString(R.string.smarttags))
tagsList = listTagsType
val array = arrayOfNulls<String>(listTagsType.size)
showItemPickerType(array = listTagsType.toArray(array))
} else if (item.id == 4) {
ma.onPasillerosItemClickListener(
PasillerosItemVO(
title = getString(R.string.titleUserControlVehicle)
), getData(USERFK)
)
} else if (item.id == 3) {
val listTagsType: ArrayList<String> = ArrayList()
listTagsType.add(getString(R.string.stickers))
// listTagsType.add(getString(R.string.smarttags))
tagsList = listTagsType
val array = arrayOfNulls<String>(listTagsType.size)
showItemPickerType(array = listTagsType.toArray(array))
} else if (item.id == 4) {
ma.onPasillerosItemClickListener(
PasillerosItemVO(
title = getString(R.string.titleUserControlVehicle)
), getData(USERFK)
)
}else if (item.id==6){
viewModel.train_get(getData(USER), getData(PASSWORD))
}else if (item.id==7){
viewModel.getItemPackingTypeSalix(getData(TOKEN))
}
}
} else if (item.id == 6) {
viewModel.train_get(getData(USER), getData(PASSWORD))
} else if (item.id == 7) {
viewModel.getItemPackingTypeSalix(getData(TOKEN))
}
}
}
})
@ -194,7 +199,7 @@ class AjustesFragment :
ma.messageWithSound(it.errorMessage, it.isError, true)
} else {
isWorkerAllowed=it.response.toBoolean()
isWorkerAllowed = it.response.toBoolean()
}
setSettings(isWorkerAllowed)
@ -353,7 +358,7 @@ class AjustesFragment :
super.observeViewModel()
}
private fun setSettings(actionIsAllowed:Boolean=false) {
private fun setSettings(actionIsAllowed: Boolean = false) {
viewModel.inititializeDefaultAjusts(
getData(SECTORDESCRIP),
@ -367,7 +372,7 @@ class AjustesFragment :
getData(ITEMPACKING),
actionIsAllowed = actionIsAllowed
)
)
}
private fun showDialogPrinters(array: Array<String>) {
@ -433,6 +438,7 @@ class AjustesFragment :
val dialog = builder.create()
dialog.show()
}
private fun showDialogSector(array: Array<String>) {
val builder = AlertDialog.Builder(this.context)