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

Version 8.3 Diseño grafico, llamadas a Salix y return "Finish"

This commit is contained in:
Sergio De la torre 2022-05-17 13:52:25 +02:00
parent 0595654d86
commit 6db39eb1da
102 changed files with 968 additions and 953 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.idea/misc.xml
View File

@ -11,6 +11,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable-v24/selector_bottombar_text.xml" value="0.13541666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_b_circle_outline.xml" value="0.2359375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/alpha_f_circle_outline.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_and_round.xml" value="0.2185" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_item_color.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_oval_checked.xml" value="0.2359375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/background_oval_unchecked.xml" value="0.30052083333333335" />
@ -44,6 +45,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/component_progress.xml" value="0.11979166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/crane.xml" value="0.23802083333333332" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/custom_ripple.xml" value="0.2175" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/custom_ripple_nomenuinit.xml" value="0.213" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/day_of_sale.xml" value="0.184375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/delete.xml" value="0.19166666666666668" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/drawable_white_circle.xml" value="0.1775" />
@ -60,6 +62,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_barcode_ui_selected.xml" value="0.212" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_baseline_star_24.xml" value="0.1775" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_build_black_24dp.xml" value="0.22708333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_chevron_left.xml" value="0.215" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml" value="0.1775" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_claim_ui.xml" value="0.186" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_claims.xml" value="0.2425" />
@ -118,8 +121,10 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_visibility_black_24dp_white.xml" value="0.2546875" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_visibility_white_24dp.xml" value="0.2546875" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_vn_logo_negativo_app_warehouse.xml" value="0.18" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_worker.xml" value="0.265" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/init_icon.xml" value="0.2635" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/init_selected_icon.xml" value="0.2635" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/list_divider_items.xml" value="0.1985" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/movie_plus_outline.xml" value="0.134375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/pallet_shipping_black.xml" value="0.1" />
@ -140,12 +145,13 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_login.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/activity_main.xml" value="0.17916666666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/buyers_fragment.xml" value="0.18333333333333332" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_dialog.xml" value="0.1490036231884058" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_dialog.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_edit_dialog.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_hour.xml" value="0.1793478260869565" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_hour.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_list_dialog.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_three_dialog.xml" value="0.12817028985507245" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_two_dialog.xml" value="0.1793478260869565" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_two_dialog.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/component_custom_ubicador_dialog.xml" value="0.2453125" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_ajustes.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_automatic_add_item.xml" value="0.20625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_buffer.xml" value="0.1408514492753623" />
@ -154,7 +160,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_buscar_item.xml" value="0.21014492753623187" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_buscar_item_all.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_collection.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_controlador.xml" value="0.20153985507246377" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_controlador.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_expedition_pallet.xml" value="0.1793478260869565" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_expedition_pallet_detail.xml" value="0.15579710144927536" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_expedition_scan.xml" value="0.21666666666666667" />
@ -168,14 +174,14 @@
<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_old.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_item_card.xml" value="0.16666666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemdayofsale_card.xml" value="0.1693840579710145" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemdayofsale_card.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemproposal.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemshelvingdayofsale.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemshelvinglog.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_itemshelvinglog.xml" value="0.28169014084507044" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_login.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_paletizador_menu.xml" value="0.13829787234042554" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_parking.xml" value="0.5" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_parking.xml" value="0.4161849710982659" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_pasillero.xml" value="0.21" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_pre_sacador.xml" value="0.16666666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_qr.xml" value="0.19882246376811594" />
@ -190,7 +196,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" value="0.23052536231884058" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_web.xml" value="0.2463768115942029" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_workermistake.xml" value="0.2265625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ajustes_row.xml" value="0.10009057971014493" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ajustes_row.xml" value="0.16666666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_fragment.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_presacador.xml" value="0.4466666666666667" />
@ -212,9 +218,9 @@
<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" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_main_menu.xml" value="0.15070921985815602" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_main_menu.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_pasilleros_main_menu.xml" value="0.33" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_placement_row.xml" value="0.1793478260869565" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_placement_row.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_proposal_row.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_reposicion.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_shelvingdayofsale_row.xml" value="0.2375" />
@ -230,7 +236,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/shelvinglog_row.xml" value="0.18385416666666668" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar.xml" value="0.15353260869565216" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbarUI.xml" value="0.29846014492753625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar_fragment.xml" value="0.18" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/toolbar_fragment.xml" value="0.22" />
</map>
</option>
</component>

11
app/build.gradle
View File

@ -14,11 +14,14 @@ android {
applicationId "es.verdnatura"
minSdkVersion 21
targetSdkVersion 30
versionCode 112
versionName "8.2" //versionCode 112 : desmarcar, previa update quantity dels carros, afegir P, etc.., impressores
versionCode 116
versionName "8.3" //versionCode 116: versionCode 116: cambios finales en return, diseño grafico...
//versionName "8.2" //versionCode 115: icons
//versionName "8.2" //versionCode 114 : TEST DISSENY GRAFIC SOLUCIONAT COLORS
//versionName "8.2" //versionCode 113 : TEST DISSENY GAFIC
//versionName "8.2" //versionCode 112 : desmarcar, previa update quantity dels carros, afegir P, etc.., impressores
//versionName "8.1" //versionCode 111 de proves . Instal.lat a Ismael y Juan
//versionName "8.1" //VERSION CODE 110, SOLO A V SE LE DESPLAZA LAS LINEAS EN PANTALLA CONTROLADOR
//versionName "8" //VERSION CODE 109, obligado seleccionar impresora, controlador sube el recyclerViewer, controlador ordenado por picked, mensaje error a collectioNew
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

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

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 112,
"versionName": "8.2",
"versionCode": 116,
"versionName": "8.3",
"outputFile": "app-release.apk"
}
],

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

Binary file not shown.

1
app/src/main/java/es/verdnatura/domain/ApiNodeJsUtils.kt
View File

@ -7,7 +7,6 @@ class ApiNodeJsUtils {
companion object {
//const val BASE_URL:String = "http://192.168.1.108:8000/"
const val BASE_URL:String = "https://smart-tag.verdnatura.es"
//const val BASE_URL:String = "http://192.168.1.154:7777"
fun getApiService():NodeJsService{
val nodeJsRetrofit = Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory(
GsonConverterFactory.create()).build()

4
app/src/main/java/es/verdnatura/domain/ApiUtils.kt
View File

@ -12,9 +12,9 @@ import java.util.concurrent.TimeUnit
class ApiUtils {
companion object {
//const val BASE_URL:String = "http://192.168.1.54:8009/"
const val BASE_URL:String = "https://10.1.3.102/"
//const val BASE_URL:String = "https://10.1.3.102/"
//const val BASE_URL: String = "https://app.verdnatura.es/"
const val BASE_URL: String = "https://app.verdnatura.es/"
fun getApiService(context: Context): VerdnaturaService {

4
app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
View File

@ -150,7 +150,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
itemFk: String,
value: String,
warehouseFk: String
): Call<String> {
): Call<Any> {
val params: ArrayList<String> = ArrayList()
params.add(itemFk)
params.add(value)
@ -171,7 +171,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
itemFk: String,
value: String,
warehouseFk: String
): Call<String> {
): Call<Any> {
val params: ArrayList<String> = ArrayList()
params.add(itemFk)
params.add(value)

1
app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
View File

@ -80,7 +80,6 @@ class GetLoginUserCase(context: Context) : RestClient(context)
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
var working_in_test=false // Enviar a grupo test Android o a los usuarios
if (!working_in_test) {
return salixClient!!.sendChekingPresence(

21
app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
View File

@ -2,6 +2,8 @@ package es.verdnatura.domain
import android.content.Context
import com.google.gson.JsonObject
import es.verdnatura.presentation.view.feature.collection.SalesModified
import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
import es.verdnatura.presentation.view.feature.login.model.workerId
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
@ -242,7 +244,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
password: String,
collectionFk: String,
sectorFk: String
): Call<String> {
): Call<Any> {
val params: ArrayList<String> = ArrayList()
params.add(collectionFk)
params.add(sectorFk)
@ -436,6 +438,23 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
params
)
}
fun get_salesModifiedFromTicket(
usuario: String,
password: String,
ticketFk: String
): Call<List<SalesModified>> {
val params: ArrayList<String> = ArrayList()
params.add(ticketFk)
return restClient!!.get_salesModifiedFromTicket(
"json",
"1",
usuario,
password,
"application/json",
params
)
}
fun getIdFromCode(usuario: String, password: String, code: String): Call<String> {
val params: ArrayList<String> = ArrayList()

20
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -10,6 +10,8 @@ import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
//import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
import es.verdnatura.presentation.view.feature.collection.SalesModified
import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO
@ -411,7 +413,7 @@ interface VerdnaturaService {
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
Call<Any>
@POST("almacennew/ticketCollection_setUsedShelves")//REVISADA
fun ticketCollection_setUsedShelves(
@ -525,6 +527,18 @@ interface VerdnaturaService {
):
Call<Unit>
@POST("almacennew/get_salesModifiedFromTicket")//REVISADA
fun get_salesModifiedFromTicket(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<List<SalesModified>>
@POST("almacennew/barcodeToItem")//REVISADA
fun getIdFromCode(
@Header("aplicacion") aplicacion: String,
@ -701,7 +715,7 @@ interface VerdnaturaService {
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
Call<Any>
@POST("almacennew/buy_updatePacking")//REVISADA
fun updatePacking(
@ -712,7 +726,7 @@ interface VerdnaturaService {
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
Call<Any>
@POST("almacennew/update_ItemPackingType")//REVISADA
fun updatePackingType(

8
app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
View File

@ -18,6 +18,7 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingUtil
@ -27,6 +28,7 @@ import androidx.preference.PreferenceManager
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import es.verdnatura.R
import es.verdnatura.databinding.ToolbarFragmentBinding
import es.verdnatura.domain.ConstAndValues
import es.verdnatura.domain.ConstAndValues.SECTORFKDEFAULT
import es.verdnatura.domain.toast
@ -229,7 +231,7 @@ override fun onViewCreated(view: View, savedInstanceState: Bundle?)
//collection
R.drawable.ic_print_black_24dp->"Imprime ticket"
R.drawable.ic_playlist_add_black_24dp->"Añade ítem"
R.drawable.face_man_outline->"Visualiza la foto del sacador"
R.drawable.ic_worker->"Visualiza la foto del sacador"
R.drawable.phone_call->"Realiza llamada al sacador"
R.drawable.car->"Permite coger vehículo"
R.drawable.car_off->"Permite dejar el vehículo"
@ -495,6 +497,10 @@ override fun onViewCreated(view: View, savedInstanceState: Bundle?)
permissionLauncher.launch(Manifest.permission.CALL_PHONE)
}
fun hideBackButton(tool: ToolbarFragmentBinding) {
tool.backButton.visibility=View.INVISIBLE
}
fun cancelSpeech() {
if (mSpeechRecognizer != null) {
mSpeechRecognizer!!.destroy()

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

@ -11,7 +11,11 @@ abstract class BaseViewModel : ViewModel(), LifecycleObserver
fun nameofFunction(function: Any): String
{
// return Thread.currentThread().stackTrace[1].methodName
return function.javaClass.enclosingMethod!!.name
try {
return function.javaClass.enclosingMethod!!.name
} catch (e: Exception){
return "ActivityMain"
}
}
fun getMessageFromAllResponse(callFunction: String, ResponseMessage: String): String

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

@ -7,12 +7,10 @@ import android.content.Context.CLIPBOARD_SERVICE
import android.content.SharedPreferences
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.ActionBar
import androidx.appcompat.widget.TooltipCompat.setTooltipText
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentAjustesBinding
import es.verdnatura.databinding.ToolbarFragmentBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnAjustesItemClickListener
@ -21,7 +19,6 @@ import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter
import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO
import es.verdnatura.presentation.view.feature.ajustes.model.Printers
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import timber.log.Timber.d
@ -69,7 +66,7 @@ class AjustesFragment :
//ma.hideBottomNavigationFragment(View.VISIBLE)
binding.mainToolbar.toolbarTitle.text="Configuración"
binding.mainToolbar.backButton.visibility=View.INVISIBLE
hideBackButton(binding.mainToolbar)
binding.userText.setText(getData(USER))

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

@ -89,6 +89,9 @@ class ItemCardFragment(
private fun setToolBar() {
binding.mainToolbar.toolbarIcons.visibility=View.VISIBLE
val listIcons: ArrayList<ImageView> = ArrayList()
val iconReload = ImageView(context)
iconReload.setImageResource(R.drawable.ic_autorenew_black_24dp)
@ -180,7 +183,7 @@ class ItemCardFragment(
binding.splashProgress.visibility = View.VISIBLE
var working_in_test=false //sergio:No descomentar fins que Salix puje versió 8.3
var working_in_test=false //sergio:No posar a true fins que Salix puje versió 8.3
if (working_in_test){
viewModel.getItemPackingTypeSalix(getData(TOKEN))
@ -514,14 +517,14 @@ class ItemCardFragment(
// "itemStockUpdate" -> prepareItemStockUpdate(item,value)
"itemStockUpdateAdd" -> prepareItemStockUpdate2(item, value)
"itemStockUpdateRemove" -> prepareItemStockUpdate2(item, value)
"itemPlacementSave" -> viewModel.itemPlacementSave(
/* "itemPlacementSave" -> viewModel.itemPlacementSave(
itemFk = itemFk,
warehouseFk = warehouseFk,
user = user,
password = password,
value = value,
"itemPlacementSave"
)
)*/
"updateGrouping" -> viewModel.updateGrouping(
itemFk = itemFk,
user = user,
@ -776,14 +779,14 @@ class ItemCardFragment(
private fun updateItemPackingType(itemPackingType: String) {
binding.splashProgress.visibility = View.VISIBLE
var working_in_test=true //sergio: en proves app
if (working_in_test){
/* var working_in_test=true //sergio: en proves app
if (working_in_test){*/
viewModel.updatePackingTypeSalix(
getData(TOKEN),
this.itemFk,
itemPackingType,
"item_updatePackingType"
)}else{
)/*}else{
viewModel.updatePackingType(
this.itemFk,
user,
@ -791,7 +794,7 @@ class ItemCardFragment(
itemPackingType,
"item_updatePackingType"
)
}
}*/
}
}

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

@ -187,16 +187,16 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
}
fun updateGrouping(itemFk:String,user:String,password:String,value:String,warehouseFk: String,callFunction:String){
getItemCardUserCase.updateGrouping(user,password,itemFk,value,warehouseFk).enqueue(object : Callback<String>{
override fun onFailure(call: Call<String>, t: Throwable) {
getItemCardUserCase.updateGrouping(user,password,itemFk,value,warehouseFk).enqueue(object : Callback<Any>{
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
override fun onResponse(call: Call<String>, response: Response<String>) {
if (response.body() == null){
override fun onResponse(call: Call<Any>, response: Response<Any>) {
if (!response.isSuccessful()){
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
}else{
_response.value = ResponseItemVO(isError = false,response = response.body()!!)
_response.value = ResponseItemVO(isError = false,response = "Actualizado grouping")
}
}
@ -205,16 +205,16 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
}
fun updatePacking(itemFk:String,user:String,password:String,value:String,warehouseFk: String,callFunction:String){
getItemCardUserCase.updatePacking(user,password,itemFk,value,warehouseFk).enqueue(object : Callback<String>{
override fun onFailure(call: Call<String>, t: Throwable) {
getItemCardUserCase.updatePacking(user,password,itemFk,value,warehouseFk).enqueue(object : Callback<Any>{
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
override fun onResponse(call: Call<String>, response: Response<String>) {
if (response.body() == null){
override fun onResponse(call: Call<Any>, response: Response<Any>) {
if (!response.isSuccessful){
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
}else{
_response.value = ResponseItemVO(isError = false,response = response.body()!!)
_response.value = ResponseItemVO(isError = false,response = "Actualizado packing")
}
}

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

@ -11,41 +11,41 @@ import es.verdnatura.databinding.FragmentBuscarItemBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
class BuscarItemFragment(
var itemFk:String = ""
) : BaseFragment<FragmentBuscarItemBinding,BuscarItemViewModel>(BuscarItemViewModel::class) {
var itemFk: String = ""
) : BaseFragment<FragmentBuscarItemBinding, BuscarItemViewModel>(BuscarItemViewModel::class) {
private var adapter : LocationAdapter? = null
private var adapter: LocationAdapter? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
companion object {
fun newInstance(entryPoint:String) = BuscarItemFragment(entryPoint)
fun newInstance(entryPoint: String) = BuscarItemFragment(entryPoint)
}
override fun onAttach(context: Context) {
if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
super.onAttach(context)
}
override fun getLayoutId(): Int = R.layout.fragment_buscar_item
override fun init() {
ma.hideBottomNavigation(GONE)
binding.mainToolbar.toolbarTitle.text = getString(R.string.getubicaition)
setEvents()
if (!itemFk.isNullOrEmpty()){
if (!itemFk.isNullOrEmpty()) {
getLocations(itemFk)
}
super.init()
}
private fun setEvents(){
private fun setEvents() {
binding.editItemFk.requestFocus()
binding.editItemFk.setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
@ -65,28 +65,30 @@ class BuscarItemFragment(
}
private fun getLocations(itemFk:String){
private fun getLocations(itemFk: String) {
this.itemFk = itemFk
binding.splashProgress.visibility = View.VISIBLE
viewModel.getLocations(getData(USER),getData(PASSWORD),itemFk,"getItemUbication")
viewModel.getLocations(getData(USER), getData(PASSWORD), itemFk, "getItemUbication")
}
override fun observeViewModel() {
with(viewModel){
with(viewModel) {
loadLocationList.observe(viewLifecycleOwner, Observer { event ->
event.getContentIfNotHandled().notNull {
binding.splashProgress.visibility = GONE
adapter = LocationAdapter(it.list,pasillerosItemClickListener!!)
adapter = LocationAdapter(it.list, pasillerosItemClickListener!!)
binding.locationRecyclerview.adapter = adapter
binding.locationRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
binding.locationRecyclerview.layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
var totalVisible = 0
it.list.forEach {
if (!it.visible.isNullOrEmpty())
totalVisible += it.visible.toInt()
}
binding.mainToolbar.toolbarTitle.text = "Item: "+itemFk+ " Total visible: "+totalVisible
binding.mainToolbar.toolbarTitle.text =
"Item: " + itemFk + " Total visible: " + totalVisible
}

16
app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt
View File

@ -1,5 +1,7 @@
package es.verdnatura.presentation.view.feature.collection
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
class ItemVO(
var id : String = "",
var longName : String = "",
@ -12,3 +14,17 @@ class SalixSaleQuantity(
var saleId : Int =0,
var quantity: Int = 0
)
class SalesModified(
var ticketFk:Int=0,
var itemFk:String="",
var concept:String="",
var originalQuantity:Int=0,
var newQuantity:Int=0,
var isError: Boolean=false,
var errorMessage: String=""
)
class SalesModifiedList(
var list: List<SalesModified> = listOf()
)

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

@ -14,7 +14,6 @@ import androidx.core.content.ContextCompat.getColor
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R
import es.verdnatura.databinding.ItemArticleRowBinding
import es.verdnatura.databinding.ItemArticleRowFragmentBinding
import es.verdnatura.domain.toast
import es.verdnatura.presentation.common.*
@ -35,9 +34,12 @@ class SaleAdapter(
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder {
this.context = parent.context
return AjustesItemHolder(
ItemArticleRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
//working_in_design
//ItemArticleRowFragmentBinding.inflate(LayoutInflater.from(parent.context), parent, false)
ItemArticleRowFragmentBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
)
)
}
@ -49,9 +51,7 @@ class SaleAdapter(
}
inner class AjustesItemHolder(
//working_in_design
// val binding: ItemArticleRowFragmentBinding
val binding: ItemArticleRowBinding
val binding: ItemArticleRowFragmentBinding
) : RecyclerView.ViewHolder(binding.root) {
fun bind(sale: SaleVO) {
binding.apply {
@ -125,11 +125,8 @@ class SaleAdapter(
}
paintTicketcolor(sale.level, itemTicketColor)
//working_in_design : modificar llamada cuando no estemos en
//paintTicketcolor(sale.color, itemColor)
paintTicketcolor(sale.level, itemTicketColor)
paintTicketcolor(sale.color, itemColor)
if (!sale.isNew && sale.originalQuantity == sale.quantity) {
@ -260,14 +257,16 @@ class SaleAdapter(
}
}
private fun paintTicketcolorOld(color:String,itemView:View){
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))}
"BLANCO" -> {
itemView.setBackgroundColor(Color.WHITE)
itemView.setBackgroundResource((R.drawable.border))
}
"NEGRO" -> {
itemView.setBackgroundColor(Color.BLACK)
}
@ -305,7 +304,8 @@ class SaleAdapter(
private fun paintTicketcolor(color: String, itemView: View) {
when (color.uppercase()) {
when (color.uppercase().trim()) {
"ROJO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(Color.RED, BlendMode.SRC_ATOP)
@ -352,7 +352,9 @@ class SaleAdapter(
}
"VIOLETA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(Color.parseColor("0xFF4c2882"), BlendMode.SRC_ATOP)
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)
}
@ -365,40 +367,47 @@ class SaleAdapter(
}
"ORANGE" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(getColor(
BlendModeColorFilter(
getColor(
context!!,
android.R.color.holo_orange_light
), BlendMode.SRC_ATOP
)
} else {
itemView.background.setColorFilter(
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)
), PorterDuff.Mode.SRC_ATOP
)
}
"MORADO" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(getColor(
BlendModeColorFilter(
getColor(
context!!,
android.R.color.holo_purple
), BlendMode.SRC_ATOP
)
} else {
itemView.background.setColorFilter(
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)
}
), PorterDuff.Mode.SRC_ATOP
)
}
"CELESTE" -> itemView.setBackgroundColor(0xFF5b85F5.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(),
0xFFfc0fc0.toInt(),
PorterDuff.Mode.SRC_ATOP
)
}
@ -412,7 +421,7 @@ class SaleAdapter(
PorterDuff.Mode.SRC_ATOP
)
}
"MARRON" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
"MARRON" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(0xFF663300.toInt(), BlendMode.SRC_ATOP)
} else {
@ -421,7 +430,7 @@ class SaleAdapter(
PorterDuff.Mode.SRC_ATOP
)
}
"PERLA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
"PERLA" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
itemView.background.colorFilter =
BlendModeColorFilter(0xFFcdcecf.toInt(), BlendMode.SRC_ATOP)
} else {
@ -459,8 +468,9 @@ class SaleAdapter(
}
else -> {
itemView.visibility=View.INVISIBLE
// itemView.setBackgroundColor(Color.TRANSPARENT)
//itemView.setBackgroundResource(R.drawable.background_item_color)
// itemView.visibility=View.INVISIBLE
}
}
// itemTicketColor.setBackgroundResource((R.drawable.rectangle))

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

@ -15,7 +15,6 @@ import android.view.View.*
import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.ImageView
import android.widget.RelativeLayout.TRUE
import android.widget.Toast
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
@ -36,6 +35,7 @@ import es.verdnatura.presentation.view.component.CustomDialogThreeButtons
import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter
import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
import es.verdnatura.presentation.view.feature.collection.ItemVO
import es.verdnatura.presentation.view.feature.collection.SalesModified
import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
@ -127,6 +127,7 @@ class CollectionFragment(
}
if (collection.tickets.isEmpty()) {
viewModel.collectionTicketGet(
getData(USER),
getData(PASSWORD),
@ -137,7 +138,8 @@ class CollectionFragment(
)
}
//sergio:falta subir
// get_salesModifiedFromTicket()
super.onCreate(savedInstanceState)
}
@ -176,7 +178,10 @@ class CollectionFragment(
}
private fun setToolBar() {
binding.mainToolbar.toolbarSubtitle.visibility = View.VISIBLE
binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE
binding.mainToolbar.toolbarIcons.visibility=VISIBLE
binding.mainToolbar.backButton.visibility=VISIBLE
if (!collection.collectionFk.isNullOrEmpty()) {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk
}
@ -187,8 +192,8 @@ class CollectionFragment(
iconPrint.setImageResource(R.drawable.ic_print_black_24dp)
val iconAdd = ImageView(context)
iconAdd.setImageResource(R.drawable.ic_playlist_add_black_24dp)
val iconFace = ImageView(context)
iconFace.setImageResource(R.drawable.face_man_outline)
val iconWorker = ImageView(context)
iconWorker.setImageResource(R.drawable.ic_worker)
val iconPhone = ImageView(context)
iconPhone.setImageResource(R.drawable.phone_call)
val iconParking = ImageView(context)
@ -198,7 +203,7 @@ class CollectionFragment(
iconPrint.tooltipText = getTooltip(R.drawable.ic_print_black_24dp)
iconAdd.tooltipText = getTooltip(R.drawable.ic_playlist_add_black_24dp)
iconFace.tooltipText = getTooltip(R.drawable.face_man_outline)
iconWorker.tooltipText = getTooltip(R.drawable.ic_worker)
iconPhone.tooltipText = getTooltip(R.drawable.phone_call)
iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp)
}
@ -209,7 +214,7 @@ class CollectionFragment(
}
listIcons.add(iconFace)
listIcons.add(iconWorker)
listIcons.add(iconPrint)
listIcons.add(iconAdd)
if (type.equals(PRECHECKER)) {
@ -225,7 +230,7 @@ class CollectionFragment(
when (item) {
iconPrint.drawable -> print()
iconAdd.drawable -> addItem()
iconFace.drawable -> showUser()
iconWorker.drawable -> showUser()
iconPhone.drawable -> getExtensionFromUser()
iconParking.drawable->pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO(
@ -245,16 +250,16 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE
var working_in_test = true // sergio: en proves app
/* var working_in_test = true // sergio: en proves app
if (working_in_test) {
if (working_in_test) {*/
viewModel.sip_getExtensionSalix(getData(TOKEN), workerFkFromTicket, "sip_getExtension")
} else {
/* } else {
viewModel.sip_getExtension(
getData(USER),
getData(PASSWORD), workerFkFromTicket, "sip_getExtension"
)
}
}*/
}
@ -382,6 +387,38 @@ class CollectionFragment(
}
})
responsePrint.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
if (!goBack) {
if (it.isError){
ma.messageWithSound(
it.errorMessage,
it.isError, true
)
}
}
})
salesModifiedList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
if (!goBack) {
if (it.list.get(0).isError){
ma.messageWithSound((it.list.get(0).errorMessage),true,true,"Error",true)
}else{
sendRocketWithSalesModified(it.list)
}
}
goBack=false
})
responseItem_updatePackingShelve.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
ma.messageWithSound(
@ -693,6 +730,26 @@ class CollectionFragment(
}
private fun sendRocketWithSalesModified(list: List<SalesModified>) {
var message=""
for (sales in list){
message=message+"Se ha modificado la cantidad original del artículo ${sales.itemFk} de ${sales.originalQuantity} a ${sales.newQuantity} del ticket ${sales.ticketFk}"
message=message+"\r\n"
}
Log.d("VERDNATURA::","Persona a enviar "+collection.tickets.get(0).salesPersonFk)
Log.d("VERDNATURA::","El message a enviar "+message)
viewModel.sendChekingPresence(
token = getData(TOKEN),
workerId = collection.tickets.get(0).salesPersonFk,
message = message, "sendChekingPresence"
)
}
private fun callPicker(extensionNumber: String) {
@ -766,12 +823,19 @@ class CollectionFragment(
salesList.add(saleVO)
if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty())
tickets.add(saleVO.ticketFk)
//Refactor #4030//
} else if (type == CONTROLADOR || type == PRECHECKER) {
//sergio el type CHECKED =CONTROLADOR
salesList.add(saleVO)
if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty())
tickets.add(saleVO.ticketFk)
}
}//Refactor #4030//
/*else if (type==PRECHECKER){
if (saleVO.saleGroupFk!=""){
salesList.add(saleVO)
if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty())
tickets.add(saleVO.ticketFk)
}
}*/
}
observations = observations + " " + ticket.observations
@ -815,7 +879,7 @@ class CollectionFragment(
if (type == CONTROLADOR || type == PRECHECKER) {// sergio:cuidado , esta es de lo último para marcar colores
markLine(index, type)
//////Log.i("VERDNATURA:","marcamos linea")
/// Log.i("VERDNATURA:","marcamos linea")
} else if (type == SACADOR) {
if (sale.isPrepared == "0" || sale.isPrepared.isNullOrEmpty()) {
@ -1118,7 +1182,8 @@ class CollectionFragment(
if (sales[position].isPrepared == "1") {
sales[position].pickedQuantity = sales[position].quantity
}
} else if (type == CONTROLADOR)
} else if (type == CONTROLADOR )
sales[position].isControlled = if (sales[position].isControlled == "1") "0" else "1"
if (type == PRECHECKER) {
@ -1300,19 +1365,19 @@ class CollectionFragment(
if (binding.splashProgress != null) binding.splashProgress.visibility =
View.VISIBLE
var working_in_test = true // sergio: en proves app
if (working_in_test) {
/* var working_in_test = true // sergio: en proves app
if (working_in_test) {*/
viewModel.getIdFromCodeSalix(
token = getData(USER),
code = customDialogList.getValueTwo(),
)
} else {
/* } else {
viewModel.getIdFromCode(
usuario = getData(USER),
password = getData(PASSWORD),
code = customDialogList.getValueTwo(), "barcodeToItem"
)
}
}*/
customDialogList.dismiss()
}
@ -1380,20 +1445,20 @@ class CollectionFragment(
itemShelvingFkStored = itemShelvingFk
binding.splashProgress.visibility = View.VISIBLE
var working_in_test = true //sergio: en proves app
if (working_in_test) {
/* var working_in_test = true //sergio: en proves app
if (working_in_test) {*/
viewModel.getIdFromCodeSalix(
getData(TOKEN),
code = customDialogList.getValueTwo()
)
/*
} else {
viewModel.getIdFromCode(
getData(USER),
getData(PASSWORD),
code = customDialogList.getValueTwo(), "barcodeToItem"
)
}
}*/
customDialogList.dismiss()
scanRequest()
}
@ -1768,9 +1833,13 @@ class CollectionFragment(
if (it.isControlled == "1" || it.isControlled == "2")
totalMark += 1
}
}/*//Refactor #4030
else if(type==PRECHECKER){//Refactor #4030
if (it.isPreControlled == "1"){totalMark += 1}
}*/
}
//toolbar_title.text = "" + totalMark + "/" + sales.size
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 =
@ -1782,10 +1851,22 @@ class CollectionFragment(
ticketCollection_setUsedShelves()
goBack = false
//showBottomNavigation(View.VISIBLE)
//sergio: se quita porque se realiza desde triggers
changeTicketState()
//get_salesModifiedFromTicket()
}
}
private fun get_salesModifiedFromTicket(){
if (type == CONTROLADOR) {
viewModel.get_salesModifiedFromTicket(
usuario = getData(USER),
password = getData(PASSWORD),
ticketFk = collection.collectionFk
)
}
}
@ -2279,23 +2360,23 @@ class CollectionFragment(
positionIncreaseQuantity = position
quantityIncrease = quantity
var working_in_test = true // sergio: en proves app
/* var working_in_test = true // sergio: en proves app
if (!working_in_test) {
viewModel.collectionIncreaseQuantity(
getData(USER),
getData(PASSWORD),
saleFk = sales[position].saleFk,
quantity = quantity, "collection_increaseQuantity"
)
viewModel.collectionIncreaseQuantity(
getData(USER),
getData(PASSWORD),
saleFk = sales[position].saleFk,
quantity = quantity, "collection_increaseQuantity"
)
} else {
} else {*/
viewModel.collectionIncreaseQuantitySalix(
getData(TOKEN),
saleFk = sales[position].saleFk,
quantity = quantity, "collection_increaseQuantity"
)
}
/* }*/
}
@ -2322,8 +2403,19 @@ class CollectionFragment(
callFunction = "ticket_setState"
)
}
////Refactor #4030
}/*else if (type==PRECHECKER){
tickets.forEach {
viewModel.ticket_setState(
usuario = getData(USER),
password = getData(PASSWORD),
ticketFk = it,
state = "PREVIOUS_CONTROLLED",
callFunction = "ticket_setState"
)
}
}*/
}
/* private fun changeInitTicketState() {

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

@ -11,6 +11,8 @@ import es.verdnatura.domain.GetUbicadorUserCase
import es.verdnatura.presentation.base.*
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.collection.ItemVO
import es.verdnatura.presentation.view.feature.collection.SalesModified
import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
import es.verdnatura.presentation.view.feature.collection.mapper.map
import es.verdnatura.presentation.view.feature.sacador.model.*
import org.json.JSONObject
@ -36,10 +38,20 @@ class CollectionViewModel(context: Context) : BaseViewModel()
val placementSuppleyList: LiveData<PlacementSupplyListVO>
get() = _placementSuppleyList
private val _salesModifiedList by lazy { MutableLiveData<SalesModifiedList>() }
val salesModifiedList: LiveData<SalesModifiedList>
get() = _salesModifiedList
private val _response by lazy { MutableLiveData<ResponseItemVO>() }
val response: LiveData<ResponseItemVO>
get() = _response
private val _responsePrint by lazy { MutableLiveData<ResponseItemVO>() }
val responsePrint: LiveData<ResponseItemVO>
get() = _responsePrint
private val _responseDel by lazy { MutableLiveData<ResponseItemVO>() }
val responseDel: LiveData<ResponseItemVO>
get() = _responseDel
@ -292,24 +304,24 @@ class CollectionViewModel(context: Context) : BaseViewModel()
password,
collectionFk,
sectorFk
).enqueue(object : Callback<String>
).enqueue(object : Callback<Any>
{
override fun onFailure(call: Call<String>, t: Throwable)
override fun onFailure(call: Call<Any>, t: Throwable)
{
_response.value = ResponseItemVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
_responsePrint.value = ResponseItemVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
override fun onResponse(call: Call<String>, response: Response<String>)
override fun onResponse(call: Call<Any>, response: Response<Any>)
{
if (response.body() == null)
if (!response.isSuccessful)
{
_response.value = ResponseItemVO(
_responsePrint.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
} else
{
_response.value = ResponseItemVO(isError = false, response = response.body()!!)
_responsePrint.value = ResponseItemVO(isError = false, response = response.message())
}
}
})
@ -422,35 +434,6 @@ class CollectionViewModel(context: Context) : BaseViewModel()
})
}
/* fun itemGetAvailable(usuario: String, password: String, itemFk: String, warehouseFk: String,callFunction:String)
{
getSacadorControladorUserCase.itemGetAvailable(usuario, password, itemFk, warehouseFk)
.enqueue(object : Callback<ItemVO>
{
override fun onFailure(call: Call<ItemVO>, t: Throwable)
{
_item.value = ItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)
)
}
override fun onResponse(call: Call<ItemVO>, response: Response<ItemVO>)
{
if (response.body() == null)
{
_item.value = ItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
} else
{
_item.value = response.body()
}
}
})
}*/
fun collectionAddItem(
usuario: String,
password: String,
@ -715,6 +698,65 @@ class CollectionViewModel(context: Context) : BaseViewModel()
})
}
fun get_salesModifiedFromTicket(
usuario: String,
password: String,
ticketFk: String,
)
{
getSacadorControladorUserCase.get_salesModifiedFromTicket(usuario, password, ticketFk)
.enqueue(object : Callback<List<SalesModified>>
{
override fun onResponse(call: Call<List<SalesModified>>, response: Response<List<SalesModified>>)
{
if (response.body() != null)
{
_salesModifiedList.value = response.body()?.let { SalesModifiedList(it) }
} else
{
val listError: ArrayList<SalesModified> = ArrayList()
listError.add(
SalesModified(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
)
_salesModifiedList.value = SalesModifiedList(listError)
}
/* if (!response.isSuccessful)
{
_response.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
} else
{
_response.value =
ResponseItemVO(isError = false, response = "Obtenidos registros")
}*/
}
override fun onFailure(call: Call<List<SalesModified>>, t: Throwable) {
val listError: ArrayList<SalesModified> = ArrayList()
listError.add(
SalesModified(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)
)
)
_salesModifiedList.value = SalesModifiedList(listError)
}
})
}
fun getIdFromCode(usuario: String, password: String, code: String,callFunction:String)
{
getSacadorControladorUserCase.getIdFromCode(usuario, password, code)

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

@ -130,7 +130,9 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
) {
val openURL = Intent(Intent.ACTION_VIEW)
openURL.data =
Uri.parse("https://app.verdnatura.es/bin/vn-picking.apk")
// sergio REdmine Tarea #3730
Uri.parse("https://app.verdnatura.es/bin/vn-picking.apk")
// Uri.parse(it.url)
startActivity(openURL)
}

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

@ -290,6 +290,7 @@ class LoginViewModel(context: Context) : BaseViewModel()
it.appname,
it.version,
it.IsVersionCritical,
//it.url,
isError = false,
errorMessage = ""
)

3
app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt
View File

@ -8,6 +8,8 @@ package es.verdnatura.presentation.view.feature.login.model
var errorMessage: String = ""
)*/
private val s = ""
class LoginSalixVO(
val user: String = "",
val password: String = "",
@ -35,6 +37,7 @@ class versionApp(
val appname: String = "",
val version: String = "",
var IsVersionCritical: Int = 0,
// var url: String="",
var isError: Boolean = false,
var errorMessage: String = ""
)

312
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -1,16 +1,16 @@
package es.verdnatura.presentation.view.feature.main.activity
//import kotlinx.android.synthetic.main.activity_main.*
import android.content.SharedPreferences
import android.media.MediaPlayer
import android.util.Log.d
import android.view.Menu
import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.databinding.ktx.BuildConfig
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import com.google.android.material.bottomnavigation.LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
import es.verdnatura.BuildConfig
import es.verdnatura.R
import es.verdnatura.databinding.ActivityMainBinding
import es.verdnatura.domain.ConstAndValues.MAINACTIVITY
@ -88,22 +88,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
customDialog = CustomDialogMainActivity(this)
// working_in_design = para nuevo diseño app
SetisWorkingInDesign(false)
if (isWorkingInDesign()) {
setBottomMenuFragment()
} else {
setBottomMenu()
}
// working_in_design = para nuevo diseño y test de app
//SetisWorkingInDesign(true)
setBottomMenuFragment()
if (haveSector() && havePrinter()) addFragment(
/* working_in_design nuevo diseño*/
// PasilleroFragment.newInstance("Verdnatura_design",true),
PasilleroFragment.newInstance("Verdnatura", false),
PasilleroFragment.newInstance("Main",true),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
@ -156,185 +148,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
private fun setBottomMenu() {
val bottomMenu = binding.mainBottomNavigation
bottomMenu.itemIconTintList = null
GlobalScope.launch(Dispatchers.Main) {
val bottomMenuItems: ArrayList<ItemMenuVO> = ArrayList()
bottomMenuItems.add(
ItemMenuVO(
0,
title = getString(R.string.Pasilleros),
defaultImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_device_hub_black_24dp
),
selectedImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_device_hub_black_24dp_selected
)
)
)
bottomMenuItems.add(
ItemMenuVO(
1,
title = getString(R.string.Sacadores),
defaultImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_local_florist_black_24dp
),
selectedImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_local_florist_black_24dp_selected
)
)
)
bottomMenuItems.add(
ItemMenuVO(
2,
title = getString(R.string.Controladores),
defaultImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_verified_user_black_24dp
),
selectedImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_verified_user_black_24dp_selected
)
)
)
bottomMenuItems.add(
ItemMenuVO(
3,
title = getString(R.string.Paletizadores),
defaultImage = ContextCompat.getDrawable(
applicationContext, R.drawable.pallet_shipping_black
),
selectedImage = ContextCompat.getDrawable(
applicationContext, R.drawable.pallet_shipping_selected
)
)
)
bottomMenuItems.add(
ItemMenuVO(
4,
title = getString(R.string.Ajustes),
defaultImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_build_black_24dp
),
selectedImage = ContextCompat.getDrawable(
applicationContext, R.drawable.ic_build_black_24dp_selected
)
)
)
// Add al items to menu view
bottomMenuItems.forEach {
bottomMenu.menu.add(Menu.NONE, it.id, Menu.NONE, it.title).icon = it.defaultImage
}
if (haveSector()) {
// Select first item by default
firstItem = bottomMenuItems.first()
bottomMenu.selectedItemId = firstItem!!.id
bottomMenu.menu.findItem(firstItem!!.id).icon = firstItem!!.selectedImage
lastBottomMenuItemSelected = firstItem
} else {
// Select last item by default
val lastItem = bottomMenuItems.last()
bottomMenu.selectedItemId = lastItem.id
bottomMenu.menu.findItem(lastItem.id).icon = lastItem.selectedImage
lastBottomMenuItemSelected = lastItem
}
bottomMenu.setOnNavigationItemSelectedListener { menuItem ->
// Get selected item from itemList and apply ui changes to menu view
val selectedItemMenu = bottomMenuItems.find { menuItem.itemId == it.id }
menuItem.icon = selectedItemMenu?.selectedImage
// Get last selected item and disable it
bottomMenu.menu.findItem(lastBottomMenuItemSelected?.id!!).icon =
lastBottomMenuItemSelected?.defaultImage
lastBottomMenuItemSelected = selectedItemMenu
when (selectedItemMenu?.title) {
getString(R.string.Pasilleros) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
PasilleroFragment.newInstance("Verdnatura", isInitMenu = false),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
)
//true
}
getString(R.string.Sacadores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
// addFragment(SacadorFragment.newInstance(),R.id.main_frame_layout, SacadorFragment.TAG,false)
addFragment(
ControlVehiculoFragment.newInstance(MAINACTIVITY),
R.id.main_frame_layout,
MAINACTIVITY.TAG,
false
)
//true
}
getString(R.string.Controladores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
ControladorFragment.newInstance(),
R.id.main_frame_layout,
ControladorFragment.TAG,
false
)
/* addFragment(
CollectionFragment.newInstance(type = "CHECKER", collection = CollectionVO()),
R.id.main_frame_layout,
ControladorFragment.TAG,
false)*/
// true
}
getString(R.string.Paletizadores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
//addFragment(ExpeditionTruckListFragment.newInstance(),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false)
addFragment(
PasilleroFragment.newInstance("Paletizadores", isInitMenu = false),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
)
// true
}
getString(R.string.Ajustes) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
AjustesFragment.newInstance(),
R.id.main_frame_layout,
AjustesFragment.TAG,
false
)
}
//else -> false
}
true
}
bottomMenu.setOnNavigationItemReselectedListener {
}
}
}
fun setBottomMenuFragment() {
val bottomMenu = binding.mainBottomNavigation
//iconos abajo sin texto
@ -436,29 +249,19 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
PasilleroFragment.newInstance("Verdnatura_design", true),
PasilleroFragment.newInstance("Main", true),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
)
}
getString(R.string.Sacadores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
ControlVehiculoFragment.newInstance(MAINACTIVITY),
R.id.main_frame_layout,
MAINACTIVITY.TAG,
false
)
}
getString(R.string.verticket) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
ShowTicketFragment.newInstance(),
ShowTicketFragment.newInstance("main"),
R.id.main_frame_layout,
MAINACTIVITY.TAG,
false
@ -469,7 +272,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
ParkingFragment.newInstance(),
ParkingFragment.newInstance("main"),
R.id.main_frame_layout,
MAINACTIVITY.TAG,
false
@ -493,15 +296,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
true
}
/* working_in_design: para cuando son seleccionados de nuevo */
/* sergio: de esta manera no repinta el icono del menu seleccionado */
bottomMenu.setOnNavigationItemReselectedListener {
when (it.title){
/*bottomMenu.setOnNavigationItemReselectedListener {
when (it.title){
getString(R.string.Pasilleros) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
PasilleroFragment.newInstance("Verdnatura_design",true),
PasilleroFragment.newInstance("Main",true),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
@ -510,14 +314,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
}
}*/
}
}
}
private fun delete_Fragments() {
fm.getFragments().forEach {
///Log.i("VERDNATURA:", "si esta ${it.tag.toString()}")
var fragment: Fragment? = supportFragmentManager.findFragmentByTag(it.tag.toString())
if (fragment != null) supportFragmentManager
.beginTransaction().remove(fragment)
@ -544,39 +347,22 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
getString(R.string.Paletizadores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
// delete_Fragments()
//addFragment(ExpeditionTruckListFragment.newInstance(),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false)
addFragment(
PasilleroFragment.newInstance(
getString(R.string.Paletizadores),
isInitMenu = false
),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
)
addFragmentOnTop(PasilleroFragment.newInstance(getString(R.string.Paletizadores),
isInitMenu = false))
}
getString(R.string.Controladores) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
ControladorFragment.newInstance(),
R.id.main_frame_layout,
ControladorFragment.TAG,
false
)
addFragmentOnTop(ControladorFragment.newInstance())
}
getString(R.string.Pasilleros) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments()
addFragment(
PasilleroFragment.newInstance("Verdnatura", isInitMenu = false),
R.id.main_frame_layout,
PasilleroFragment.TAG,
false
addFragmentOnTop(PasilleroFragment.newInstance("Pasilleros", isInitMenu = false),
)
}
getString(R.string.ExpeditionState) -> {
@ -595,6 +381,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
)
)
}
"Reclamaciones"->{
addFragmentOnTop(
PasilleroFragment.newInstance(
"Reclamaciones",
isInitMenu = false
)
)
}
"Control de usuario de vehículo" -> {
addFragmentOnTop(ControlVehiculoUsuarioFragment.newInstance(entryPoint))
@ -609,7 +404,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
"Ver Ticket" -> {
addFragmentOnTop(ShowTicketFragment.newInstance())
addFragmentOnTop(ShowTicketFragment.newInstance("main"))
}
"Historial del vehículo" -> {
addFragmentOnTop(ControlVehiculoFragment.newInstance(HistoricoVehiculoFragment.TAG))
@ -628,7 +423,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
"Parking" -> {
addFragmentOnTop(ParkingFragment.newInstance())
addFragmentOnTop(ParkingFragment.newInstance(""))
}
@ -741,17 +536,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
fm.popBackStackImmediate()
} else {
customDialog.setTitle("Cerrar sesión")
.setDescription("¿Estás seguro de cerrar la sesión?").setOkButton("Salir") {
customDialog.dismiss()
finish()
}.setKoButton("Cancelar") {
customDialog.dismiss()
}.show()
}
else {
customDialog.setTitle("Cerrar sesión")
.setDescription("¿Estás seguro de cerrar la sesión?").setOkButton("Salir") {
customDialog.dismiss()
finish()
}.setKoButton("Cancelar") {
customDialog.dismiss()
}.show()
}
}
override fun onTruckClickListener(item: ItemExpeditionTruckVO, entryPoint: String) {
@ -785,8 +581,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
when (type) {
PREITEMPICKER -> {
// d("VERDNATURA::"," entrando en preitempicker")
// d("VERDNATURA::"," entrando en preitempicker, la colecc es "+collection.collectionFk)
addFragmentOnTop(EndSacadorFragment.newInstance(collection, type))
}
"SHOWTICKET" -> {
@ -797,16 +592,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(CollectionFragment.newInstance(collection, type))
}
}
/*if (type.equals(PREITEMPICKER)){
d("VERDNATURA::"," entrando en preitempicker")
addFragmentOnTop(PreSacadorFragment.newInstance(collection,type))
}
if (type.equals("SHOWTICKET")) {
addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type))
} else {
addFragmentOnTop(CollectionFragment.newInstance(collection, type))
}*/
}

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

@ -47,7 +47,7 @@ class ExpeditionTruckListFragment : BaseFragment<FragmentExpeditionTruckListBin
customDialogHor = CustomDialogHour(requireContext())
binding.splashProgress.visibility = View.VISIBLE
binding.mainToolbar.toolbarTitle.text = "PScan: "+getCURDATE()
binding.mainToolbar.backButton.visibility = View.GONE
//binding.mainToolbar.backButton.visibility = View.GONE
setToolBar()
////Log.i("VERDNATURA:","1-cargamos expediciones")
viewModel.expeditionTruckList(getData(USER),

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

@ -15,8 +15,9 @@ import es.verdnatura.presentation.common.hideKeyboard
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
import org.koin.android.ext.android.bind
class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
class ParkingFragment (var menuOrigin:String): BaseFragment<FragmentParkingBinding,ParkingViewModel>(ParkingViewModel::class) {
// private lateinit var customDialog: CustomDialog
private var scanerList:ArrayList<BarcodeVO> = ArrayList()
@ -28,18 +29,20 @@ class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(Pa
override fun getLayoutId(): Int = R.layout.fragment_parking
companion object {
fun newInstance() = ParkingFragment()
fun newInstance(menuOrigin: String) = ParkingFragment(menuOrigin = menuOrigin)
}
override fun init() {
setEvents()
binding.mainToolbar.toolbarTitle.text = getString(R.string.Parking)
if (menuOrigin =="main"){hideBackButton(binding.mainToolbar)}
//sergio: después de las últimas actualizaciones se queda activo. Se cambia opción visibilidad.
//viewModel.hideProgressLoading()
binding.splashProgress.visibility=View.GONE
setList()
//customDialog = CustomDialog(requireContext())
super.init()
}
@ -73,6 +76,7 @@ class ParkingFragment : BaseFragment<FragmentParkingBinding,ParkingViewModel>(Pa
customDialog.dismiss()
}.show()*/
}else{
ma.messageWithSound(message="Parking ok", isError = false,isPlayed = false, isToasted = true)
numParking -= 1
if (numParking <= 0) {
// binding.splashProgress.visibility = View.GONE

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

@ -29,7 +29,7 @@ class ParkingSaleFragment : BaseFragment<FragmentParkingBinding,ParkingSaleViewM
override fun getLayoutId(): Int = R.layout.fragment_parking
companion object {
fun newInstance(SaleVO: Any?) = ParkingFragment()
fun newInstance(SaleVO: Any?) = ParkingFragment("")
}
@ -71,9 +71,11 @@ class ParkingSaleFragment : BaseFragment<FragmentParkingBinding,ParkingSaleViewM
customDialog.dismiss()
}.show()*/
}else{
ma.messageWithSound(it.errorMessage,false,false, isToasted = true)
numParking -= 1
if (numParking <= 0) {
//viewModel.hideProgressLoading()
mpok?.start()
setList()
}

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

@ -55,13 +55,10 @@ class ParkingSaleViewModel(context: Context) : BaseViewModel() {
override fun onResponse(call: Call<String>, response: Response<String>) {
ProgressLoading(GONE)
if (response.body() == null){
if (!response.isSuccessful){
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
}else{
if (response.body() == "Finish")
_response.value = ResponseItemVO(isError = false,response = response.body()!!)
else
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
_response.value = ResponseItemVO(isError = false,response = "Parking ok")
}
}
})

22
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt
View File

@ -42,24 +42,6 @@ class PasillerosAdapter (
PasillerosItemHolder(binding as ItemPasillerosMainMenuBinding)
}
/* return if (!isMenuInit){
PasillerosItemHolder(
//sergio working_in_design : modificar vista
//ItemPasillerosMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false)
ItemPasillerosMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false)
)
}else{
PasillerosItemHolder(
//sergio working_in_design : modificar vista
// ItemMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false)
ItemMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false)
)
}*/
}
override fun getItemViewType(position: Int): Int {
@ -84,11 +66,7 @@ class PasillerosAdapter (
inner class PasillerosItemHolder(
//sergio working_in_design : modificar vista
//val binding: ItemMainMenuBinding
val binding: ViewDataBinding
//val binding_: ItemPasillerosMainMenuBinding
) : RecyclerView.ViewHolder(binding.root){

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

@ -3,12 +3,8 @@ package es.verdnatura.presentation.view.feature.pasillero.fragment
import android.content.Context
import android.os.Bundle
import android.view.View
import android.widget.LinearLayout.VERTICAL
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.HORIZONTAL
import es.verdnatura.R
import es.verdnatura.databinding.FragmentPasilleroBinding
import es.verdnatura.presentation.base.BaseFragment
@ -38,57 +34,28 @@ class PasilleroFragment(
override fun init() {
ma.hideBottomNavigation(View.VISIBLE)
if (!ma.isWorkingInDesign()) {
binding.mainToolbar.toolbarTitle.text = tagName
binding.mainToolbar.backButton.visibility = View.VISIBLE
binding.mainToolbarDesign.toolbarTitle.visibility = View.GONE
binding.mainToolbarDesign.toolbarSubtitle.visibility = View.GONE
binding.mainToolbarDesign.backButton.visibility = View.GONE
when (tagName) {
"Verdnatura" -> {
binding.mainToolbar.backButton.visibility = View.GONE
}
"Paletizadores" -> {
binding.mainToolbar.backButton.visibility = View.GONE
}
"Controlar ticket" -> {
binding.mainToolbar.backButton.visibility = View.GONE
}
"Verdnatura_design" -> {
binding.mainToolbar.backButton.visibility = View.GONE
}
else-> binding.mainToolbar.backButton.visibility = View.VISIBLE
}
} else {
when (tagName) {
"Verdnatura_design" -> {
"Main" -> {
binding.mainToolbarDesign.imageViewMenu.visibility = View.VISIBLE
binding.mainToolbarDesign.backButton.visibility = View.GONE
binding.mainToolbar.backButton.visibility = View.GONE
//binding.mainToolbar.backButton.visibility = View.GONE
}
tagName -> {
if (tagName == "Pasilleros") {
binding.mainToolbarDesign.backButton.visibility = View.GONE
}
binding.mainToolbarDesign.backButton.visibility = View.VISIBLE
binding.mainToolbarDesign.toolbarTitle.text = tagName
binding.mainToolbarDesign.imageViewMenu.visibility = View.GONE
}
}
/* binding.mainToolbarDesign.toolbarTitle.visibility = View.VISIBLE
binding.mainToolbar.toolbarTitle.visibility = View.GONE
binding.mainToolbar.toolbarSubtitle.visibility = View.GONE
binding.mainToolbar.toolbarTitleSeparator.visibility = View.GONE*/
binding.mainToolbarDesign.backButton.visibility=View.INVISIBLE
binding.mainToolbarDesign.backButton.setOnClickListener {
requireActivity().onBackPressed()
}
}
@ -101,10 +68,17 @@ class PasilleroFragment(
when (tagName) {
"Verdnatura" -> {viewModel.inititializeDefaultData()}
"Pasilleros" -> {
viewModel.inititializeDefaultData()
}
/*"Verdnatura" -> {
viewModel.inititializeDefaultData()
}*/
"Paletizadores" -> viewModel.inititializeDefaultPallet()
"Gestión de buffer" -> viewModel.inititializeDefaultBuffer()
"Verdnatura_design" -> viewModel.inititializeDefaultDataInit()
"Main" -> viewModel.inititializeDefaultDataInit()
//"Verdnatura_design" -> viewModel.inititializeDefaultDataInit()
"Reclamaciones" -> viewModel.inititializeDefaultClaim()
}
@ -114,18 +88,28 @@ class PasilleroFragment(
override fun observeViewModel() {
with(viewModel) {
/* val mLayoutManager: RecyclerView.LayoutManager = GridLayoutManager(
activity,
requireActivity()!!.resources.getInteger(R.integer.number_of_grid_items)
)*/
/* val mLayoutManager: RecyclerView.LayoutManager = GridLayoutManager(
activity,
requireActivity()!!.resources.getInteger(R.integer.number_of_grid_items)
)*/
binding.pasillerosItems.adapter =
PasillerosAdapter(pasillerositem, pasillerosItemClickListener!!, isInitMenu)
binding.pasillerosItems.layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
if (!isInitMenu) {
val dividerItemDecoration = DividerItemDecoration(
context,
LinearLayoutManager.VERTICAL
)
dividerItemDecoration.setDrawable(requireContext().resources.getDrawable(R.drawable.list_divider_items))
binding.pasillerosItems.addItemDecoration(dividerItemDecoration)
}
}
super.observeViewModel()
}

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

@ -328,4 +328,17 @@ class PasilleroViewModel : BaseViewModel() {
}
fun inititializeDefaultClaim() {
_pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.ic_claims,
"Ubicación de Reclamación", R.string.claim, "Ubicación de reclamaciones"
)
)
}
}

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

@ -110,7 +110,7 @@ class EndSacadorFragment(
setToolBar()
setEvents()
// Log.d("VERDNATURA","La col "+collection.collectionFk+ " y el type "+type)
Log.d("VERDNATURA","La col "+collection.collectionFk+ " y el type "+type)
searchSaleCollection()
super.init()
@ -1162,6 +1162,9 @@ class EndSacadorFragment(
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
override fun onOptionsItemSelected(item: Drawable) {
goBack=false
/*if (item == iconEraser) {
} else*/
@ -1172,6 +1175,7 @@ class EndSacadorFragment(
), ""
)
}
}
@ -1180,7 +1184,6 @@ class EndSacadorFragment(
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
private fun scanRequest() {
if (binding.scanInput != null) {
binding.scanInput.requestFocus()

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

@ -144,9 +144,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel()
password,
collectionFk,
sectorFk
).enqueue(object : Callback<String>
).enqueue(object : Callback<Any>
{
override fun onFailure(call: Call<String>, t: Throwable)
override fun onFailure(call: Call<Any>, t: Throwable)
{
_response.value = ResponseItemVO(
isError = true,
@ -154,7 +154,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel()
)
}
override fun onResponse(call: Call<String>, response: Response<String>)
override fun onResponse(call: Call<Any>, response: Response<Any>)
{
if (response.body() == null)
{
@ -164,7 +164,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel()
)
} else
{
_response.value = ResponseItemVO(isError = false, response = response.body()!!)
_response.value = ResponseItemVO(isError = false, response = response.message()!!)
}
}
})

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

@ -54,14 +54,15 @@ class SacadorFragment :
setToolBar()
setEvents()
var working_in_test=false //sergio: Ok en app
if (!working_in_test) {
/*var working_in_test=false //sergio: Ok en app
if (!working_in_test) {*/
viewModel.collectionGetSalix(token = getData(TOKEN))
}else{
/* }else{
viewModel.collectionGet( getData(USER),
getData(PASSWORD),"collection_get")
}
}*/
super.init()
@ -79,7 +80,7 @@ class SacadorFragment :
resultTagMode=result
Log.d("VERDNATURA::","el result es "+result)
if (result.equals("complete") && getData(TAGSTYPE).equals("SmartTags")) {
viewModel.collection_new_wagon(getData(USER),
viewModel.collection_new_smarttag(getData(USER),
getData(PASSWORD), getData(SECTORFK), getData(WAGON), getData(TAGSTYPE),"collection_new_wagon")
}
@ -93,9 +94,8 @@ class SacadorFragment :
private fun setToolBar() {
// requireActivity().main_bottom_navigation.visibility = View.VISIBLE
ma.hideBottomNavigation(View.VISIBLE)
binding.mainToolbar.backButton.visibility = View.GONE
val listIcons: ArrayList<ImageView> = ArrayList()
/*val iconAdd: Drawable =
@ -124,9 +124,9 @@ class SacadorFragment :
iconAdd.drawable -> {
binding.splashProgress.visibility = View.VISIBLE
// checkTagsMode()
viewModel.collection_new_wagon(getData(USER),
getData(PASSWORD),getData(SECTORFK),getData(WAGON),getData(TAGSTYPE),"collection_new_wagon")
checkTagsMode()
/* viewModel.collection_new_wagon(getData(USER),
getData(PASSWORD),getData(SECTORFK),getData(WAGON),getData(TAGSTYPE),"collection_new_wagon")*/
}
iconVehicleIn.drawable-> ma.onVehicleSelected(SacadorFragment.TAG)
}
@ -151,7 +151,6 @@ class SacadorFragment :
private fun checkTagsMode() {
if (getData(TAGSTYPE).equals("Stickers")) {
viewModel.collectionNew(getData(USER),
getData(PASSWORD), getData(SECTORFK), getData(WAGON),"collection_new_wagon")
@ -160,6 +159,9 @@ class SacadorFragment :
if (resultTagMode.equals("complete")) {
viewModel.collection_new_wagon(getData(USER),
getData(PASSWORD), getData(SECTORFK), getData(WAGON), getData(TAGSTYPE),"collection_new_wagon")
/* viewModel.collectionNew(getData(USER),
getData(PASSWORD), getData(SECTORFK), getData(WAGON),"collection_new_wagon")
*/
} else {
requireActivity().addFragment(
AssociateSmartTagsFragment.newInstance(AssociateSmartTagsFragment.TAG),
@ -208,20 +210,28 @@ class SacadorFragment :
goBack = false
//sergio:para asegurarnos que aparece en pantalla.
var working_in_test=false //sergio: ok en app SACADOR
if (!working_in_test) {
/* var working_in_test=false //sergio: ok en app SACADOR
if (!working_in_test) {*/
viewModel.collectionGetSalix(token=getData(TOKEN))
}else{
/*}else{
viewModel.collectionGet(getData(USER),getData(PASSWORD),"collection_get")
}
/*viewModel.collectionGetSalix(token=getData(TOKEN))*/
*/
})
responseCollectionSmarttag.observe(viewLifecycleOwner, Observer {
if (it.isError) {
ma.messageWithSound(it.errorMessage,true,false)
} else {
ma.messageWithSound(it.errorMessage,false,false)
goBack = false}
})
registerSmarttagInsert.observe(viewLifecycleOwner, Observer {
if (!goBack){
@ -260,8 +270,8 @@ class SacadorFragment :
}
if (isNew) {
collectionsList.add(CollectionVO(collectionFk = collection, created = "Nuevo"))
Log.d("VERDNATURA::","llamada nodejs insert")
viewModel.smartTagInsertTicket(collection)
//Log.d("VERDNATURA::","llamada nodejs insert")
//viewModel.smartTagInsertTicket(collection)
adapter?.notifyDataSetChanged()
} else {

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

@ -45,6 +45,11 @@ class SacadorViewModel(context: Context) : BaseViewModel() {
val response: LiveData<ResponseItemVO>
get() = _response
private val _responseCollectionSmarttag by lazy { MutableLiveData<ResponseItemVO>() }
val responseCollectionSmarttag: LiveData<ResponseItemVO>
get() = _responseCollectionSmarttag
private val _registerSmarttagInsert by lazy { MutableLiveData<SmartTagRegister>() }
val registerSmarttagInsert: LiveData<SmartTagRegister>
get() = _registerSmarttagInsert
@ -150,6 +155,35 @@ class SacadorViewModel(context: Context) : BaseViewModel() {
})
}
fun collection_new_smarttag(usuario: String, password: String, sectorFk: String, wagons: String,tagtype:String,callFunction:String){
getSacadorControladorUserCase.collectionNew(usuario, password, sectorFk, wagons,tagtype).enqueue(
object :
Callback<String> {
override fun onFailure(call: Call<String>, t: Throwable) {
_responseCollectionSmarttag.value =
ResponseItemVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
override fun onResponse(
call: Call<String>,
response: Response<String>
) {
if (response.body() != null) {
_responseCollectionSmarttag.value =
ResponseItemVO(isError = false, response = response.body()!!)
} else {
_responseCollectionSmarttag.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
}
}
})
}
fun collectionGet(usuario: String, password: String,callFunction:String){
//////Log.i("VERDNATURA:","collectionGet para coger tickets")

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

@ -13,7 +13,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
import es.verdnatura.presentation.view.feature.precontrol.ShowTicketViewModel
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
class ShowTicketFragment : BaseFragment<FragmentControladorBinding, ShowTicketViewModel>(
class ShowTicketFragment(var menuOrigin: String) : BaseFragment<FragmentControladorBinding, ShowTicketViewModel>(
ShowTicketViewModel::class
) {
@ -22,8 +22,9 @@ class ShowTicketFragment : BaseFragment<FragmentControladorBinding, ShowTicketVi
override fun getLayoutId(): Int = R.layout.fragment_controlador
private var type = ""
companion object {
fun newInstance() = ShowTicketFragment()
fun newInstance(menuOrigin: String) = ShowTicketFragment(menuOrigin=menuOrigin)
}
override fun onAttach(context: Context) {
@ -35,9 +36,10 @@ class ShowTicketFragment : BaseFragment<FragmentControladorBinding, ShowTicketVi
binding.splashProgress.visibility = View.GONE
binding.mainToolbar.toolbarTitle.text = getString(R.string.verticket)
binding.mainToolbar.backButton.visibility=View.VISIBLE
if (menuOrigin =="main"){hideBackButton(binding.mainToolbar)}
setEvents()
super.init()
}

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

@ -92,7 +92,7 @@ class AssociateSmartTagsFragment(
private fun setToolBar() {
binding.mainToolbar.toolbarTitle.text = entryPoint
binding.mainToolbar.toolbarTitle.text = "Asociar smartTag"
}

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

@ -62,7 +62,7 @@ class WorkermistakeFragment( var entryPoint: String = ""
override fun onCreate(savedInstanceState: Bundle?) {
var working_in_test=false //sergio:No descomentar fins que Salix puje versió 8.3
var working_in_test=false //sergio:No posar a true fins que Salix puje versió 8.3
if (!working_in_test){
viewModel.department_getHasMistake(usuario = getData(USER),password = getData(PASSWORD))

20
app/src/main/res/drawable/background_and_round.xml Normal file
View File

@ -0,0 +1,20 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="2dp"
android:color="@color/verdnatura_pumpkin_orange" >
</stroke>
<corners
android:radius="25dp"/>
<solid android:color="@color/verdnatura_black" />
<padding
android:top="5dp"
android:bottom="5dp"
android:left="5dp"
android:right="5dp"/>
</shape>

5
app/src/main/res/drawable/background_item_color.xml
View File

@ -2,10 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="#FFF" >
</stroke>
<corners
android:radius="10dp"/>

8
app/src/main/res/drawable/background_round.xml
View File

@ -2,12 +2,12 @@
android:shape="rectangle">
<stroke
android:width="2dp"
android:color="#FFF" >
android:width="1dp"
android:color="@color/verdnatura_white" >
</stroke>
<solid android:color="@color/verdnatura_background_item_picker" />
<corners
android:radius="10dp"/>
android:radius="5dp"/>
<padding
android:top="5dp"

2
app/src/main/res/drawable/background_round_square.xml
View File

@ -5,7 +5,7 @@
android:useLevel="false"
android:innerRadius="2dp"
android:visible="true">
<solid android:color="@color/verdnatura_brown_grey"/>
<solid android:color="@color/verdnatura_background_item_picker"/>
<corners android:radius="10dp" />
<size

12
app/src/main/res/drawable/custom_ripple_nomenuinit.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/verdnatura_pumpkin_orange">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/verdnatura_white" />
</shape>
</item>
</ripple>

8
app/src/main/res/drawable/ic_chevron_left.xml Normal file
View File

@ -0,0 +1,8 @@
<!-- drawable/chevron_left.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#FFF" android:pathData="M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z" />
</vector>

4
app/src/main/res/drawable/ic_worker.xml Normal file
View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="32"
android:viewportWidth="32" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#fff" android:pathData="M9.3,14.2c-1.4,0 -2.5,1.1 -2.5,2.6s1.1,2.6 2.5,2.6 2.5,-1.1 2.5,-2.6 -1.1,-2.6 -2.5,-2.6zM9.3,20c-1.7,0 -5.1,0.9 -5.1,2.6v1.9h10.2v-1.9c0,-1.7 -3.4,-2.6 -5.1,-2.6zM27.5,16.1h-9.9c-0.5,0 -0.9,-0.4 -0.9,-0.9s0.4,-0.9 0.9,-0.9h9.9c0.5,0 0.8,0.4 0.8,0.9s-0.4,0.9 -0.8,0.9zM27.5,24.5h-9.9c-0.5,0 -0.9,-0.4 -0.9,-0.8s0.4,-0.8 0.9,-0.8h9.9c0.5,0 0.8,0.4 0.8,0.8s-0.4,0.8 -0.8,0.8zM27.5,20.3h-9.9c-0.5,0 -0.9,-0.4 -0.9,-0.8s0.4,-0.8 0.9,-0.8h9.9c0.5,0 0.8,0.4 0.8,0.8s-0.4,0.8 -0.8,0.8zM19.5,1.5v7.4c0,0.8 -0.7,1.5 -1.5,1.5h-4.1c-0.8,0 -1.5,-0.7 -1.5,-1.5v-7.4c0,-0.8 0.7,-1.5 1.5,-1.5h4.1c0.9,0 1.5,0.7 1.5,1.5zM32,9.2v20c0,1.6 -1.3,2.8 -2.8,2.8h-26.4c-1.5,0 -2.8,-1.3 -2.8,-2.8v-20c0,-1.6 1.3,-2.8 2.8,-2.8h8.6v1.7h-8.6c-0.6,0 -1.1,0.5 -1.1,1.1v20c0,0.6 0.5,1.1 1.1,1.1h26.3c0.6,0 1.1,-0.5 1.1,-1.1v-20c0,-0.6 -0.5,-1.1 -1.1,-1.1h-8.6v-1.7h8.6c1.6,0 2.9,1.2 2.9,2.8z"/>
</vector>

5
app/src/main/res/drawable/list_divider_items.xml Normal file
View File

@ -0,0 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<size android:height="1dp" />
<solid android:color="#ffffff" />
</shape>

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

@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -2,13 +2,7 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_gravity="left"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:openDrawer="start">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -47,5 +41,5 @@
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</layout>

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

@ -23,7 +23,7 @@
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

34
app/src/main/res/layout/component_custom_edit_dialog.xml
View File

@ -34,35 +34,12 @@
android:layout_height="wrap_content"
android:textAlignment="center"
android:textColor="@color/verdnatura_white"
android:layout_marginBottom="@dimen/layout_margin_1"
android:textSize="@dimen/body1"
android:visibility="gone"
tools:text="Este cambio no podrá deshacerse a no ser que vuelvas a vincular el dispositivo"
tools:visibility="visible" />
<!--working_in_design : esto es lo nuevo
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
android:layout_width="match_parent"
android:layout_height="50dp"
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/default_layout_margin"
android:background="@drawable/background_round">
android:hint="@string/Nuevovalor" -->
<!-- <com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_dialog_value"
style="@style/InputLineTextSearch"
android:layout_width="match_parent"
android:layout_height="30dp"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>-->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
android:layout_width="match_parent"
@ -70,21 +47,18 @@
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/default_layout_margin">
<com.google.android.material.textfield.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_dialog_value"
style="@style/InputLineTextSearch"
style="@style/DefaultButton.NormalButton"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Nuevovalor"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:background="@drawable/background_round"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/custom_dialog_button_ok"
style="@style/DefaultButton.NormalButton"

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

@ -54,7 +54,7 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_dialog_value"
style="@style/InputLineTextSearch"
style="@style/DefaultButton.TransparentButton"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:inputType="text"

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

@ -81,7 +81,7 @@
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

21
app/src/main/res/layout/fragment_buffer.xml
View File

@ -7,32 +7,25 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"/>
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_buffer_load.xml
View File

@ -8,9 +8,9 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_buffer_loadexpedition.xml
View File

@ -8,9 +8,9 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

20
app/src/main/res/layout/fragment_buscar_item.xml
View File

@ -16,26 +16,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:paddingTop="@dimen/toolbar_height">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray">
>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_itemFk"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
android:textColor="@color/verdnatura_white" />
<LinearLayout
android:layout_width="match_parent"
@ -100,9 +92,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_buscar_item_all.xml
View File

@ -92,9 +92,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

18
app/src/main/res/layout/fragment_collection.xml
View File

@ -16,19 +16,16 @@
<EditText
android:id="@+id/scan_input"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaner"
android:inputType="textVisiblePassword"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray"
android:textSize="@dimen/body2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_toolbar"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
android:paddingLeft="@dimen/default_layout_margin"/>
@ -42,12 +39,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scan_input">
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_sacador_collections"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
tools:listitem="@layout/item_article_row" />
tools:listitem="@layout/item_article_row_fragment" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/splash_progress"
@ -67,11 +67,9 @@
app:lottie_speed="2" />
</LinearLayout>
<!--working_in_design toolbar/fragment-->
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

22
app/src/main/res/layout/fragment_controlador.xml
View File

@ -7,33 +7,25 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:textColorHint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="textVisiblePassword"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"/>
<!-- working_in_design modificar a toolbar_design-->
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_expedition_pallet.xml
View File

@ -66,9 +66,9 @@
tools:listitem="@layout/item_expeditionpallet_row" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_expedition_pallet_detail.xml
View File

@ -77,9 +77,9 @@
tools:listitem="@layout/item_expedition_view_row" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_expedition_scan.xml
View File

@ -87,9 +87,9 @@
tools:listitem="@layout/item_expeditionscan_row" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_expedition_truck_list.xml
View File

@ -55,9 +55,9 @@
tools:listitem="@layout/item_expeditiontruck_row" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_expeditionscan_sorter.xml
View File

@ -8,9 +8,9 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_faltas.xml
View File

@ -91,9 +91,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_general_black.xml
View File

@ -9,9 +9,9 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_historico.xml
View File

@ -117,9 +117,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_historicovehiculo.xml
View File

@ -71,9 +71,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -125,9 +125,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_inventary_old.xml
View File

@ -93,9 +93,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -23,25 +23,16 @@
android:orientation="vertical" >
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_itemFk"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/toolbar_height">
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:textColor="@color/verdnatura_white"
android:textColorHint="@color/verdnatura_white"
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_itemFk"
style="@style/InputLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
/>
@ -184,9 +175,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

17
app/src/main/res/layout/fragment_itemdayofsale_card.xml
View File

@ -26,25 +26,20 @@
android:orientation="vertical" >
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/toolbar_height">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -126,9 +121,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

19
app/src/main/res/layout/fragment_itemexpeditionstate_card.xml
View File

@ -26,26 +26,15 @@
android:orientation="vertical" >
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/toolbar_height">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_itemFk"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
/>
<LinearLayout
@ -84,9 +73,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_itemproposal.xml
View File

@ -70,9 +70,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

19
app/src/main/res/layout/fragment_itemshelvinglog.xml
View File

@ -26,25 +26,18 @@
android:orientation="vertical" >
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
android:layout_marginTop="@dimen/toolbar_height">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -132,9 +125,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_paletizador_menu.xml
View File

@ -23,9 +23,9 @@
tool:listitem="@layout/item_pasilleros_main_menu"
android:paddingTop="@dimen/toolbar_height"/>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

26
app/src/main/res/layout/fragment_parking.xml
View File

@ -14,28 +14,24 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaner"
android:inputType="textCapCharacters"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray"
android:imeOptions="actionDone"/>
</com.google.android.material.textfield.TextInputLayout>
android:imeOptions="actionDone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
/>
<TextView
android:id="@+id/textView"
@ -50,7 +46,7 @@
android:textSize="@dimen/body2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scan" />
app:layout_constraintTop_toBottomOf="@+id/scan_input" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_parking_scan_list"
@ -66,7 +62,7 @@
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

21
app/src/main/res/layout/fragment_pasillero.xml
View File

@ -17,19 +17,12 @@
>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_white"
app:layout_constraintBottom_toBottomOf="@+id/main_toolbar_design"/>
<View
android:id="@+id/divider_two"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_white"
app:layout_constraintBottom_toBottomOf="@+id/main_toolbar"/>
<androidx.recyclerview.widget.RecyclerView
@ -40,7 +33,6 @@
android:isScrollContainer="false"
android:paddingTop="@dimen/toolbar_height"
android:splitMotionEvents="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
@ -49,22 +41,13 @@
app:stackFromEnd="false"
tool:listitem="@layout/item_pasilleros_main_menu" />
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tool:visibility="visible"/>
<!--working_in_design poner visibility a visible o viceversa -->
<include
android:id="@+id/main_toolbar_design"
layout="@layout/toolbar_fragment"
android:visibility="gone"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tool:visibility="gone" />
tool:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

4
app/src/main/res/layout/fragment_pre_sacador.xml
View File

@ -47,9 +47,9 @@
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

20
app/src/main/res/layout/fragment_qr.xml
View File

@ -9,32 +9,24 @@
android:layout_height="match_parent"
android:background="@color/verdnatura_black">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/scan_input"
style="@style/InputLineTextSearch"
style="@style/ScanLineTextSearch"
android:layout_width="match_parent"
android:backgroundTint="@android:color/white"
android:hint="@string/Escaneaetiqueta"
android:inputType="textVisiblePassword"
android:lines="1"
android:maxLines="1"
android:textColor="@color/verdnatura_white"
android:textColorHint="@android:color/darker_gray" />
</com.google.android.material.textfield.TextInputLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_toolbar"/>
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -29,7 +29,7 @@
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -11,7 +11,7 @@
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_shelving_parking.xml
View File

@ -123,9 +123,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_shelvinglog.xml
View File

@ -124,9 +124,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_transferencia.xml
View File

@ -116,9 +116,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_ubicador.xml
View File

@ -102,9 +102,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_vehiclecontrol.xml
View File

@ -31,9 +31,9 @@
</com.google.android.material.textfield.TextInputLayout>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_vehiclecontrol_user.xml
View File

@ -162,9 +162,9 @@
</LinearLayout>
</ScrollView>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_web.xml
View File

@ -31,9 +31,9 @@
</com.google.android.material.textfield.TextInputLayout>
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/fragment_workermistake.xml
View File

@ -116,9 +116,9 @@
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

6
app/src/main/res/layout/item_ajustes_row.xml
View File

@ -12,7 +12,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/LayoutClickable">
style="@style/LayoutClickable"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
@ -21,7 +23,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_black_5"
android:background="@color/verdnatura_background_items_menus"
android:padding="@dimen/pasilleros_margin_main_menu">
<TextView

185
app/src/main/res/layout/item_article_row_fragment.xml
View File

@ -18,19 +18,21 @@
android:id="@+id/linear_main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="@dimen/layout_margin_1"
android:layout_marginBottom="@dimen/layout_margin_min"
android:background="@drawable/background_round"
>
android:orientation="vertical"
>
<!--CABECERA=================================================-->
<LinearLayout
android:id="@+id/item_row_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
@ -39,57 +41,59 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_white"
android:padding="@dimen/layout_margin_min"
android:orientation="vertical"
android:textColor="@color/verdnatura_black">
android:padding="@dimen/layout_margin_min"
android:textColor="@color/verdnatura_black"
>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/verdnatura_black"
android:layout_marginRight="@dimen/layout_margin_min"
android:text="@string/Nivel"
android:textSize="@dimen/h8"
android:layout_marginRight="@dimen/layout_margin_min"/>
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h8" />
<TextView
android:id="@+id/level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor ="@color/verdnatura_black"
android:layout_marginRight="@dimen/layout_margin_min"
android:text="@{sale.level}"
tool:text="2"
android:textStyle="bold"
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h8"
android:layout_marginRight="@dimen/layout_margin_min"/>
android:textStyle="bold"
tool:text="2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/verdnatura_black"
android:layout_marginRight="@dimen/layout_margin_min"
android:text="@string/Ticket"
android:textSize="@dimen/h8"
android:layout_marginRight="@dimen/layout_margin_min"/>
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/verdnatura_black"
android:text="@{sale.ticketFk}"
tool:text="123456789"
android:textStyle="bold"
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h8"
android:textStyle="bold"
tool:text="123456789"
/>
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:orientation="horizontal">
<ImageView
android:id="@+id/imageErrorMessage"
@ -105,30 +109,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{sale.agencyName}"
tool:text="MRW"
android:textStyle="bold"
android:textSize="@dimen/h8"
android:layout_marginRight="@dimen/layout_margin_min"
android:visibility="gone"/>
android:text="@{sale.agencyName}"
android:textSize="@dimen/h8"
android:textStyle="bold"
android:visibility="gone"
tool:text="MRW" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_background_item_picker"
android:paddingTop="@dimen/layout_margin_min"
android:paddingBottom="@dimen/layout_margin_min"
android:background="@color/verdnatura_black"
>
android:paddingBottom="@dimen/layout_margin_min">
<!--SEMAFORO=================================================-->
<LinearLayout
android:id="@+id/linearLayout3"
@ -136,22 +141,21 @@
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
>
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/item_article_row_semaforo_pre"
android:layout_width="match_parent"
android:layout_height="@dimen/semaforo_height"
android:background="@color/verdnatura_warm_grey"
android:layout_marginBottom="1dp"/>
android:layout_marginBottom="1dp"
android:background="@color/verdnatura_warm_grey" />
<View
android:id="@+id/item_article_row_semaforo_sac"
android:layout_width="match_parent"
android:layout_height="@dimen/semaforo_height"
android:background="@color/verdnatura_warm_grey"
android:layout_marginBottom="1dp"/>
android:layout_marginBottom="1dp"
android:background="@color/verdnatura_warm_grey" />
<View
android:id="@+id/item_article_row_semaforo_con"
@ -170,58 +174,62 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin_min"
android:layout_marginEnd="@dimen/layout_margin_min"
android:maxLines="1"
android:text="@{sale.itemFk}"
tool:text="85478"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textSize="@dimen/body1"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/linearLayout3"
app:layout_constraintStart_toEndOf="@+id/linearLayout3"
app:layout_constraintTop_toTopOf="parent"
android:maxLines="1"/>
tool:text="85478" />
<TextView
android:id="@+id/item_packing_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="@dimen/layout_margin_min"
android:maxLines="1"
android:paddingTop="2dp"
android:text="En balda:"
tool:text="En balda:"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/item_packing_itemFk"
app:layout_constraintStart_toEndOf="@+id/item_article_itemFk"
app:layout_constraintTop_toTopOf="parent"
android:maxLines="1"/>
tool:text="En balda:" />
<TextView
android:id="@+id/item_packing_itemFk"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.packingShelve}"
tool:text="Number"
android:maxLines="1"
android:paddingTop="2dp"
android:text="@{sale.packingShelve}"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity_picked"
app:layout_constraintStart_toEndOf="@+id/item_packing_text"
app:layout_constraintTop_toTopOf="parent"
android:maxLines="1"/>
tool:text="Number" />
<TextView
android:id="@+id/item_article_quantity_picked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.pickedQuantity}"
tool:text="0"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/txtde"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tool:text="0" />
<TextView
android:id="@+id/txtde"
android:layout_width="wrap_content"
@ -232,21 +240,22 @@
android:textSize="@dimen/body2"
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_article_quantity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.quantity}"
tool:text="10"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@{sale.quantity}"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
tool:text="10" />
<TextView
android:id="@+id/item_article_quantity_line1"
android:layout_width="0dp"
@ -255,25 +264,25 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@{sale.line1}"
tool:text="información de la linea 1"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textSize="@dimen/body1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/linearLayout3"
app:layout_constraintTop_toBottomOf="@+id/item_article_itemFk"
/>
tool:text="información de la linea 1" />
<TextView
android:id="@+id/item_article_cel1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.cel1}"
tool:text="cel1"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line1"
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line1" />
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line1"
tool:text="cel1" />
<TextView
android:id="@+id/item_article_quantity_line2"
@ -283,12 +292,12 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@{sale.line2}"
tool:text="información de la linea 2"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/linearLayout3"
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line1" />
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line1"
tool:text="información de la linea 2" />
<TextView
@ -297,12 +306,12 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.cel2}"
tool:text="cel2"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2" />
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
tool:text="cel2" />
<TextView
@ -310,7 +319,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin_1"
android:layout_marginStart="@dimen/layout_margin_min"
android:ellipsize="end"
android:maxLines="1"
android:text="@{sale.line3}"
@ -323,13 +332,13 @@
<View
android:id="@+id/item_color"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/background_item_color"
android:layout_marginBottom="1dp"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"
android:background="@drawable/background_item_color"
app:layout_constraintStart_toEndOf="@+id/item_article_quantity_line3"
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line3" />
app:layout_constraintBottom_toBottomOf="@+id/item_article_quantity_line3" />
/>
@ -339,12 +348,12 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.cel3}"
tool:text="cel3"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="@+id/content_layout"
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line3" />
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line3"
tool:text="cel3" />
<LinearLayout
android:id="@+id/linearLayoutColor"
@ -352,48 +361,46 @@
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
>
app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/item_ticketColor"
android:layout_width="5dp"
android:layout_height="@dimen/ticketColor_height"
android:background="@drawable/border"
android:layout_marginBottom="1dp"/>
android:layout_marginBottom="1dp"
android:background="@drawable/border" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/layout_error"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:visibility="gone">
<TextView
android:id="@+id/txt_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/verdnatura_white"
android:background="@color/verdnatura_red"
tool:text="Cantidad original 100"/>
android:textColor="@color/verdnatura_white"
tool:text="Cantidad original 100" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_white">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_white"></LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/item_article_placements"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@color/verdnatura_background_item_picker"
android:clipToPadding="false"
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_placement_row"
tools:orientation="horizontal" />

12
app/src/main/res/layout/item_main_menu.xml
View File

@ -13,14 +13,17 @@
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="70dp"
android:orientation="vertical"
android:layout_marginTop="15dp"
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_height="65dp"
android:orientation="horizontal"
android:padding="@dimen/pasilleros_margin_main_menu"
android:background="@drawable/background_round_square"
@ -43,9 +46,10 @@
android:gravity="center_vertical"
android:text="@{title}"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h7"
android:textSize="@dimen/h6"
android:layout_weight="1"
android:drawableEnd="@drawable/ic_chevron_right_black_24dp"
/>
<!-- <ImageView

5
app/src/main/res/layout/item_pasilleros_main_menu.xml
View File

@ -15,13 +15,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/LayoutClickable">
style="@style/LayoutClickable"
android:foreground="@drawable/custom_ripple_nomenuinit">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_black_5"
android:background="@color/verdnatura_background_item_picker"
android:padding="@dimen/pasilleros_margin_main_menu">

6
app/src/main/res/layout/item_placement_row.xml
View File

@ -15,10 +15,12 @@
android:orientation="vertical"
android:padding="@dimen/layout_margin_1"
android:gravity="center"
android:layout_marginEnd="@dimen/layout_margin_min">
android:layout_marginEnd="@dimen/layout_margin_min"
android:background="@color/verdnatura_background_item_picker">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"

4
app/src/main/res/layout/qauality_fragment.xml
View File

@ -38,9 +38,9 @@
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/item_buyer_row" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/reposicion_fragment.xml
View File

@ -79,9 +79,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<include
' <include
android:id="@+id/main_toolbar"
layout="@layout/toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

5
app/src/main/res/layout/toolbar.xml
View File

@ -6,7 +6,8 @@
<androidx.appcompat.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:background="@color/verdnatura_black_8_alpha_6">
android:background="@color/verdnatura_black_8_alpha_6"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
@ -18,7 +19,7 @@
android:layout_width="40dp"
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="visible"
android:visibility="invisible"
android:src="@drawable/ic_arrow_back_black_24dp" />
<View

79
app/src/main/res/layout/toolbar_fragment.xml
View File

@ -3,14 +3,19 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/tool"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:background="@color/verdnatura_black_8_alpha_6"
android:background="@color/verdnatura_black"
android:visibility="visible"
tool:visibility="visible"
>
<ImageView
android:id="@+id/imageViewMenu"
@ -19,84 +24,92 @@
android:visibility="gone"
app:srcCompat="@drawable/ic_vn_logo_negativo_app_warehouse" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tool:visibility="visible">
>
<ImageView
android:id="@+id/backButton"
android:layout_width="40dp"
android:layout_width="20dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/layout_margin_1"
android:scaleType="center"
android:visibility="invisible"
android:src="@drawable/ic_arrow_back_black_24dp"
android:visibility="visible"
android:src="@drawable/ic_chevron_left"
/>
<View
android:id="@+id/toolbar_title_separator"
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/default_layout_margin"
android:layout_marginBottom="@dimen/default_layout_margin"
android:background="@color/verdnatura_pumpkin_orange"
android:visibility="gone"
tool:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="@dimen/layout_margin_min"
>
<TextView
android:id="@+id/toolbar_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/layout_margin_3"
android:layout_weight="1"
android:gravity="left|center_vertical"
android:gravity="center|center_vertical"
android:maxLines="1"
android:text="Title fragment"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6"
android:textStyle="bold" />
android:textStyle="bold"
/>
<TextView
android:id="@+id/toolbar_subtitle"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/layout_margin_min"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_gravity="right"
android:maxLines="1"
android:text=""
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6"
android:visibility="gone"
android:visibility="invisible"
app:autoSizeTextType="uniform"
app:autoSizeMinTextSize="12sp"
app:autoSizeMaxTextSize="100sp"
tool:text="10/20"
tool:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/toolbar_icons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_min"
tool:listitem="@layout/item_toolbar_row"
tool:visibility="visible" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/toolbar_icons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tool:listitem="@layout/item_toolbar_row"
tool:visibility="visible" />
</LinearLayout>
</RelativeLayout>
</androidx.appcompat.widget.Toolbar>
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_white"/>
</LinearLayout>
</layout>

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

@ -31,14 +31,14 @@
<string name="Faltas">Faltas</string>
<string name="Versión">Versión</string>
<string name="Usuario">Usuario</string>
<string name="Escaneaetiqueta">Escanea etiqueta</string>
<string name="Escaneaetiqueta">Escanear etiqueta</string>
<string name="Filtro">Filtro</string>
<string name="Nuevovalor">Nuevo Valor</string>
<string name="Hora">Hora</string>
<string name="Etiquetas">Etiquetas</string>
<string name="Escaneamatricula">Escanea matricula</string>
<string name="Escaneashelving">Escanea shelving</string>
<string name="Escaner">Escaner</string>
<string name="Escaner">Escáner</string>
<string name="Nuevacantidad">Nueva cantidad</string>
<string name="cantidad">cantidad</string>
<string name="carrodeorigen">carro de origen</string>

Some files were not shown because too many files have changed in this diff Show More