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

refs #6073 reordenar menus

This commit is contained in:
Sergio De la torre 2023-10-31 10:55:22 +01:00
parent 622d2eeae3
commit 1f1b901047
7 changed files with 304 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFra
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPicker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPickerNew
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreChecker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.WebFragment
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment
@ -556,6 +555,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
when (item.title) {
//BUFFERS
getString(R.string.titlePalletizar) -> {
addFragmentOnTop(ExpeditionTruckListFragment.newInstance())
@ -570,10 +570,27 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
)
)
}
getString(R.string.historicals) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false),
)
}
getString(R.string.titleControllers) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false),
)
}
getString(R.string.titleOther) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false),
)
}
getString(R.string.titleChecker) -> {
addFragmentOnTop(ControladorFragment.newInstance())
}
@ -581,7 +598,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false),
)
}
getString(R.string.titlePrevious) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false),
)
}
getString(R.string.titleExpeditionState) -> {
@ -680,7 +702,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(AutomaticAddItemFragmentTEST.newInstance(entryPoint, item.title))
}
getString(R.string.titleChecker) -> {
getString(R.string.titleControllersAction) -> {
addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title))
}
@ -803,12 +825,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
getString(R.string.titleDelivery) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(
getString(R.string.titleDelivery),
isInitMenu = false
)
RoutesFragment.newInstance(getString(R.string.titleDeliveryRoute)),
getString(R.string.titleDeliverySummary)
)
}
@ -973,7 +995,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(
R.string.titleInfo
)
) || backEntry!!.contains(getString(R.string.titleDeliverySummary))
)
) {
finish()
}
@ -1048,9 +1070,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(EndSacadorFragment.newInstance(collection, type))
}
"SHOWTICKET" -> {
addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type))
}
//Tarea 4711
"PRECHECKER" -> {
addFragmentOnTop(CollectionFragmentPreChecker.newInstance(collection, type))
@ -1188,7 +1207,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
super.onUserInteraction()
if ((System.currentTimeMillis() / 1000 / 3600) - myTimeUserInteraction > 4) {
myTimeUserInteraction = System.currentTimeMillis() / 1000 /3600
myTimeUserInteraction = System.currentTimeMillis() / 1000 / 3600
val loginViewModel = LoginViewModel(application as MobileApplication)
loginViewModel.deviceLog_addSalix(
app = getString(R.string.logAppName),

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

@ -13,28 +13,10 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
val pasillerositem: List<PasillerosItemVO>
get() = _pasillerositem
fun inititializeDefaultData() {
/* _pasillerositem.add(
PasillerosItemVO(20,
R.drawable.barcode_scan,
"Visor web",R.string.SmarttagAssociate)
*/
/* _pasillerositem.add(
PasillerosItemVO(20,
R.drawable.barcode_scan,
"Asociar Sacador SmartTags",R.string.SmarttagAssociate)
) */
/* _pasillerositem.add(
PasillerosItemVO(21,
R.drawable.barcode_scan,
"Registrar SmartTags",R.string.SmarttagRegister)
)
*/
//sergio para que aparezca el nuevo menu
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_streetview_black_24dp,
@ -45,20 +27,10 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
)
//precontrol
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_verified_user_black_24dp_selected,
contextApp.getString(R.string.titlePreControl),
R.string.titlePreControl,
contextApp.getString(
R.string.titlePreControlDescrip
)
)
)
//sergio para que aparezca el nuevo menu
_pasillerositem.add(
PasillerosItemVO(
10,
@ -69,7 +41,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
R.string.titleShowTicketDescrip
)
)
)
)*/
_pasillerositem.add(
PasillerosItemVO(
@ -84,6 +56,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
/*
_pasillerositem.add(
PasillerosItemVO(
@ -94,6 +67,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
contextApp.getString(R.string.titleParkingDescrip)
)
)
*/
_pasillerositem.add(
PasillerosItemVO(
@ -119,44 +93,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_packaging,
contextApp.getString(R.string.titlePackingHolland),
R.string.titlePackingHolland,
contextApp.getString(
R.string.titleUbicatorDescrip
)
)
)
//Tarea 5651
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_advance_ticket,
contextApp.getString(R.string.ticketAdvance),
R.string.ticketAdvance,
contextApp.getString(
R.string.ticketAdvanceDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_reubication,
contextApp.getString(R.string.titleReUbicator),
R.string.titleReUbicator,
contextApp.getString(
R.string.titleReubicatorDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
@ -193,53 +129,20 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
)
//tarea 4585
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_packing_mistake,
contextApp.getString(R.string.titlePackingMistake),
R.string.titlePackingMistake,
41,
R.drawable.ic_historical_menu,
contextApp.getString(R.string.historicals),
R.string.historicals,
contextApp.getString(
R.string.titlePackingMistakeDescrip
R.string.historicalsDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
10,
R.drawable.revision_icon,
contextApp.getString(R.string.titleShelvingHistorical),
R.string.titleShelvingHistorical,
contextApp.getString(
R.string.titleShelvingHistDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_history_orange,
contextApp.getString(R.string.titleLogShelving),
R.string.titleLogShelving,
contextApp.getString(
R.string.titleLogShelvingDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
22,
R.drawable.car_info,
contextApp.getString(R.string.titleHistoricalVehicle),
R.string.titleHistoricalVehicle,
contextApp.getString(
R.string.titleHistVehicleDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
41,
@ -265,6 +168,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
}
fun inititializeDefaultPallet() {
_pasillerositem.add(
@ -313,7 +217,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
//Tarea #3986
_pasillerositem.add(
PasillerosItemVO(
31,
@ -349,7 +252,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
_pasillerositem.add(
/* _pasillerositem.add(
PasillerosItemVO(
33,
R.drawable.qrcode_scan,
@ -357,7 +260,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
R.string.titleQrReader,
contextApp.getString(R.string.titleQrDescrip)
)
)
)*/
}
@ -440,6 +343,18 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
}
fun inititializeDefaultDataInit() {
_pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.ic_previous,
contextApp.getString(R.string.titlePrevious),
R.string.titlePrevious,
contextApp.getString(R.string.titlePreviousDescription)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
@ -476,6 +391,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
}
//sergio para que aparezca el nuevo menu
_pasillerositem.add(
PasillerosItemVO(
10,
@ -501,7 +417,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
_pasillerositem.add(
PasillerosItemVO(
6,
@ -545,6 +460,16 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
_pasillerositem.add(
PasillerosItemVO(
50,
R.drawable.ic_other,
contextApp.getString(R.string.titleOther),
R.string.titleOther,
contextApp.getString(R.string.titleOther)
)
)
val working_in_test = false
if (working_in_test) {
_pasillerositem.add(
@ -575,68 +500,24 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_reubication,
contextApp.getString(R.string.titleReUbicator),
R.string.titleReUbicator,
contextApp.getString(
R.string.titleReubicatorDescrip
)
)
)
}
fun inititializeDefaultDelivery() {
/* _pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.expedition_find,
contextApp.getString(R.string.titleLog),
R.string.titleLog,
contextApp.getString(
R.string.titleLogDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.ic_info,
contextApp.getString(R.string.titleInfo),
R.string.titleInfo,
contextApp.getString(
R.string.titleInfoDescription
)
)
)
/* _pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.ic_delivery_truck,
contextApp.getString(R.string.titleLoadTruck),
R.string.titleLoadTruckInfo,
contextApp.getString(
R.string.titleLoadTruckInfo
)
)
)
_pasillerositem.add(
PasillerosItemVO(
30,
R.drawable.ic_delivery_truck,
contextApp.getString(R.string.titleUnLoadTruck),
R.string.titleUnLoadTruckInfo,
contextApp.getString(
R.string.titleUnLoadTruckInfo
)
)
)
*/
_pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_delivery_truck,
contextApp.getString(R.string.titleDeliverySummary),
R.string.titleDeliverySummary,
contextApp.getString(R.string.titleDeliverySummary)
)
)
*/
_pasillerositem.add(
PasillerosItemVO(
@ -649,4 +530,150 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
}
fun inititializeDefaultPrevia() {
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_streetview_black_24dp,
contextApp.getString(R.string.titlePrePicker),
R.string.titlePrePicker,
contextApp.getString(
R.string.titlePickerDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_verified_user_black_24dp_selected,
contextApp.getString(R.string.titlePreControl),
R.string.titlePreControl,
contextApp.getString(
R.string.titlePreControlDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
10,
R.drawable.ic_ticket,
contextApp.getString(R.string.titleShowTicket),
R.string.titleShowTicket,
contextApp.getString(
R.string.titleShowTicketDescrip
)
)
)
}
fun inititializeDefaultChecker() {
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_verified_user_black_24dp_selected,
contextApp.getString(R.string.titleControllersAction),
R.string.titleControllersAction,
contextApp.getString(
R.string.titleCheckerDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_advance_ticket,
contextApp.getString(R.string.ticketAdvance),
R.string.ticketAdvance,
contextApp.getString(
R.string.ticketAdvanceDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_packing_mistake,
contextApp.getString(R.string.titlePackingMistake),
R.string.titlePackingMistake,
contextApp.getString(
R.string.titlePackingMistakeDescrip
)
)
)
}
fun inititializeDefaultOther() {
_pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_packaging,
contextApp.getString(R.string.titlePackingHolland),
R.string.titlePackingHolland,
contextApp.getString(
R.string.titleUbicatorDescrip
)
)
)
}
fun inititializeDefaultHistorical() {
_pasillerositem.add(
PasillerosItemVO(
10,
R.drawable.revision_icon,
contextApp.getString(R.string.titleShelvingHistorical),
R.string.titleShelvingHistorical,
contextApp.getString(
R.string.titleShelvingHistDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_history_orange,
contextApp.getString(R.string.titleLogShelving),
R.string.titleLogShelving,
contextApp.getString(
R.string.titleLogShelvingDescrip
)
)
)
//Tarea 5186
/* _pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_parking_previa,
contextApp.getString(R.string.titleParkingTicketPrevia),
R.string.titleParkingTicketPrevia,
contextApp.getString(
R.string.titleParkingTicketPrevia
)
)
)*/
_pasillerositem.add(
PasillerosItemVO(
22,
R.drawable.car_info,
contextApp.getString(R.string.titleHistoricalVehicle),
R.string.titleHistoricalVehicle,
contextApp.getString(
R.string.titleHistVehicleDescrip
)
)
)
}
}

10
app/src/main/res/drawable/ic_historical_menu.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
>
<path
android:fillColor="#F7931E"
android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM320,680L400,680L400,520L560,520L560,680L640,680L640,280L560,280L560,440L400,440L400,280L320,280L320,680Z"/>
</vector>

9
app/src/main/res/drawable/ic_historicals.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#F7931E"
android:pathData="M280,680L280,280L360,280L360,440L600,440L600,280L680,280L680,680L600,680L600,520L360,520L360,680L280,680Z"/>
</vector>

9
app/src/main/res/drawable/ic_other.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,480L160,480L160,760Q160,760 160,760Q160,760 160,760L520,760L520,840L160,840ZM320,680Q287,680 263.5,656.5Q240,633 240,600L240,320L320,320L320,600Q320,600 320,600Q320,600 320,600L680,600L680,680L320,680ZM480,520Q447,520 423.5,496.5Q400,473 400,440L400,200Q400,167 423.5,143.5Q447,120 480,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,440Q880,473 856.5,496.5Q833,520 800,520L480,520ZM480,440L800,440Q800,440 800,440Q800,440 800,440L800,280L480,280L480,440Q480,440 480,440Q480,440 480,440Z"/>
</vector>

9
app/src/main/res/drawable/ic_parking_previa.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#F7931E"
android:pathData="M160,840L160,360L480,120L800,360L800,840L720,840L720,400L480,220L240,400L240,840L160,840ZM360,760L600,760L600,680L360,680L360,760ZM360,600L600,600L600,520L360,520L360,600ZM280,840L280,440L680,440L680,840L280,840Z"/>
</vector>

9
app/src/main/res/drawable/ic_previous.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M161,444L81,436Q87,390 101.5,346.5Q116,303 141,264L209,306Q189,337 177.5,372Q166,407 161,444ZM197,760Q164,728 140,689.5Q116,651 101,608L177,582Q189,617 208,647.5Q227,678 253,704L197,760ZM307,208L265,140Q304,115 347.5,100.5Q391,86 437,80L445,160Q408,165 373,176.5Q338,188 307,208ZM479,878Q444,878 409.5,872.5Q375,867 343,854L369,778Q396,787 423,792.5Q450,798 479,798L479,878ZM705,252Q679,226 648.5,207Q618,188 583,176L609,100Q652,115 690.5,139Q729,163 761,196L705,252ZM791,846L679,734L679,838L599,838L599,598L839,598L839,678L735,678L847,790L791,846ZM799,478Q799,449 793.5,422Q788,395 779,368L855,342Q868,374 873.5,408.5Q879,443 879,478L799,478Z"/>
</vector>