From 5c2ca531e5be4b3b4250b3482a69e16273c4c145 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 7 Oct 2019 15:48:53 +0200 Subject: [PATCH] [FEAT] Rinominate classi UltimeConsegneFornitori in UltimiArriviFornitori. [FEAT] Modificate stringhe di testo. --- .../integrywmsnative/MainActivity.java | 4 ++-- .../configs/MenuConfiguration.java | 2 +- .../picking_resi/PickingResiActivity.java | 9 +++++++- .../UltimiArriviFornitoreFragment.java} | 23 +++++++++---------- .../UltimiArriviFornitoreListAdapter.java} | 6 ++--- .../UltimiArriviFornitoreRESTConsumer.java} | 4 ++-- .../UltimeConsegneClienteFragment.java | 2 +- .../UltimeConsegneClienteViewModel.java | 3 ++- .../fragment_ultime_consegne_fornitore.xml | 4 ++-- .../main/res/menu/activity_main_drawer.xml | 2 +- app/src/main/res/values-it/strings.xml | 8 ++++--- app/src/main/res/values/strings.xml | 6 +++-- .../extensions/MenuConfigurationIME.java | 2 +- 13 files changed, 43 insertions(+), 32 deletions(-) rename app/src/main/java/it/integry/integrywmsnative/gest/{ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java => ultime_arrivi_fornitore/UltimiArriviFornitoreFragment.java} (81%) rename app/src/main/java/it/integry/integrywmsnative/gest/{ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java => ultime_arrivi_fornitore/core/UltimiArriviFornitoreListAdapter.java} (93%) rename app/src/main/java/it/integry/integrywmsnative/gest/{ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java => ultime_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java} (93%) diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 6157c161..18b580f8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -43,8 +43,8 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMate import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment; import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; +import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment; -import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.UltimeConsegneFornitoreFragment; import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment; import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment; @@ -167,7 +167,7 @@ public class MainActivity extends AppCompatActivity break; case R.id.nav_resi_fornitore: - fragment = UltimeConsegneFornitoreFragment.newInstance(); + fragment = UltimiArriviFornitoreFragment.newInstance(); this.adaptViewToFragment(fragment); break; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index 2990acee..313cb476 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -20,7 +20,7 @@ public class MenuConfiguration extends BaseMenuConfiguration { .addItem(new MenuItem() .setID(R.id.nav_resi_fornitore) - .setTitleText(R.string.fragment_ultime_consegne_fornitore_title) + .setTitleText(R.string.fragment_ultime_arrivi_fornitore_title) .setTitleIcon(R.drawable.ic_latest_delivery)) ).addGroup( new MenuGroup() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index aee7b8d8..0ae26414 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -65,14 +65,17 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC private int barcodeScannerIstanceID = -1; + private String mActivityTitle; private String mDefaultGestioneOfUL; private String mDefaultCodAnagOfUL; private Integer mDefaultSegnoOfUL; - public static void startActivity(Context context, List documentoResoDTOList, Integer segno) { + + public static void startActivity(Context context, String activityTitle, List documentoResoDTOList, Integer segno) { String consegneCacheKey = DataCache.addItem(documentoResoDTOList); Intent intent = new Intent(context, PickingResiActivity.class); + intent.putExtra("activity_title", activityTitle); intent.putExtra("key", consegneCacheKey); intent.putExtra("segno", segno); context.startActivity(intent); @@ -95,6 +98,8 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC mDocumentiResiList = DataCache.retrieveItem(getIntent().getStringExtra("key")); mDefaultSegnoOfUL = getIntent().getIntExtra("segno", +1); + mActivityTitle = getIntent().getStringExtra("activity_title"); + this.initView(); @@ -133,6 +138,8 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC setSupportActionBar(this.mBinding.toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setTitle(mActivityTitle); + this.mBinding.elevatedToolbar.setRecyclerView(this.mBinding.mainList); Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(this); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/UltimiArriviFornitoreFragment.java similarity index 81% rename from app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java rename to app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/UltimiArriviFornitoreFragment.java index 99f0d58e..2498b98e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/UltimiArriviFornitoreFragment.java @@ -1,8 +1,7 @@ -package it.integry.integrywmsnative.gest.ultime_consegne_fornitore; +package it.integry.integrywmsnative.gest.ultime_arrivi_fornitore; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.Context; import android.os.Bundle; @@ -29,14 +28,14 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreBinding; import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; -import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.core.UltimeConsegneFornitoreListAdapter; -import it.integry.integrywmsnative.gest.ultime_consegne_fornitore.rest.UltimeConsegneFornitoreRESTConsumer; +import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.core.UltimiArriviFornitoreListAdapter; +import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.rest.UltimiArriviFornitoreRESTConsumer; import it.integry.integrywmsnative.ui.ElevatedToolbar; /** * A simple {@link Fragment} subclass. */ -public class UltimeConsegneFornitoreFragment extends Fragment implements ITitledFragment, IScrollableFragment { +public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFragment, IScrollableFragment { private Runnable mOnPreDestroy; private ElevatedToolbar mToolbar; @@ -45,12 +44,12 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled private List mItems; - public UltimeConsegneFornitoreFragment() { + public UltimiArriviFornitoreFragment() { // Required empty public constructor } - public static UltimeConsegneFornitoreFragment newInstance() { - UltimeConsegneFornitoreFragment fragment = new UltimeConsegneFornitoreFragment(); + public static UltimiArriviFornitoreFragment newInstance() { + UltimiArriviFornitoreFragment fragment = new UltimiArriviFornitoreFragment(); Bundle args = new Bundle(); fragment.setArguments(args); @@ -82,7 +81,7 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled @Override public void onCreateActionBar(AppCompatTextView titleText, Context context) { - titleText.setText(context.getText(R.string.fragment_ultime_consegne_fornitore_title).toString()); + titleText.setText(context.getText(R.string.ultime_arrivi_fornitore_title).toString()); } @Override @@ -111,7 +110,7 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled private void initList() { Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(getActivity()); - UltimeConsegneFornitoreRESTConsumer.getUltimeConsegneFornitori( + UltimiArriviFornitoreRESTConsumer.getUltimeConsegneFornitori( SettingsManager.i().userSession.depo.getCodMdep(), null, null, @@ -126,7 +125,7 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled } private void initDataAdapter(ArrayList dataset) { - UltimeConsegneFornitoreListAdapter adapter = new UltimeConsegneFornitoreListAdapter(getActivity(), dataset); + UltimiArriviFornitoreListAdapter adapter = new UltimiArriviFornitoreListAdapter(getActivity(), dataset); adapter.setOnSelectionChanged(this::onSingleSelectionChanged); mBinding.recyclerView.setHasFixedSize(true); @@ -164,7 +163,7 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled private void dispatchConsegne() { List selectedConsegne = getSelectedItems(); - PickingResiActivity.startActivity(getActivity(), selectedConsegne, -1); + PickingResiActivity.startActivity(getActivity(), getText(R.string.ultime_arrivi_fornitore_title).toString(), selectedConsegne, -1); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/core/UltimiArriviFornitoreListAdapter.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java rename to app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/core/UltimiArriviFornitoreListAdapter.java index 7ac282dc..ac234b0d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/core/UltimiArriviFornitoreListAdapter.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.gest.ultime_consegne_fornitore.core; +package it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.core; import android.content.Context; import android.view.LayoutInflater; @@ -25,7 +25,7 @@ import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreLi import it.integry.integrywmsnative.databinding.FragmentUltimeConsegneFornitoreListSingleItemBinding; import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; -public class UltimeConsegneFornitoreListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { +public class UltimiArriviFornitoreListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { private Context mContext; private List mDataset; @@ -64,7 +64,7 @@ public class UltimeConsegneFornitoreListAdapter extends SectionedRecyclerViewAda - public UltimeConsegneFornitoreListAdapter(Context context, ArrayList dataset) { + public UltimiArriviFornitoreListAdapter(Context context, ArrayList dataset) { super(); this.mContext = context; this.mDataset = new ArrayList<>(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java index 12c2c4b7..bee860c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.gest.ultime_consegne_fornitore.rest; +package it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.rest; import com.google.gson.reflect.TypeToken; @@ -11,7 +11,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; -public class UltimeConsegneFornitoreRESTConsumer { +public class UltimiArriviFornitoreRESTConsumer { public static void getUltimeConsegneFornitori(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java index f867a612..c850a715 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java @@ -57,7 +57,7 @@ public class UltimeConsegneClienteFragment extends Fragment implements ITitledFr @Override public void onCreateActionBar(AppCompatTextView titleText, Context context) { - titleText.setText(context.getText(R.string.fragment_ultime_consegne_cliente_title).toString()); + titleText.setText(context.getText(R.string.ultime_consegne_cliente_title).toString()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index b52a919b..7d0270a2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -11,6 +11,7 @@ import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; @@ -96,7 +97,7 @@ public class UltimeConsegneClienteViewModel { private void dispatchConsegne() { List selectedConsegne = getSelectedItems(); - PickingResiActivity.startActivity(mContext, selectedConsegne, +1); + PickingResiActivity.startActivity(mContext, mContext.getText(R.string.ultime_consegne_cliente_title).toString(), selectedConsegne, +1); } diff --git a/app/src/main/res/layout/fragment_ultime_consegne_fornitore.xml b/app/src/main/res/layout/fragment_ultime_consegne_fornitore.xml index ed26703d..f74fe924 100644 --- a/app/src/main/res/layout/fragment_ultime_consegne_fornitore.xml +++ b/app/src/main/res/layout/fragment_ultime_consegne_fornitore.xml @@ -6,7 +6,7 @@ + type="it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment" /> @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/white" - tools:context=".gest.ultime_consegne_fornitore.UltimeConsegneFornitoreFragment"> + tools:context=".gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment"> + android:title="@string/fragment_ultime_arrivi_fornitore_title" /> Ordini di accettazione Spedizione Rettifica giacenze - Versamento merce + Posizionamento merce Errore Ops Attenzione @@ -225,8 +225,10 @@ Vuoi procedere con la stampa di una %s Crea nuova UL Apri UL - Ultime consegne - Ultimi arrivi + Resi su ultime consegne + Ultime consegne + Resi su ultimi arrivi + Ultimi arrivi Stampante non trovata diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 18d9559a..0b880457 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -229,8 +229,10 @@ Create new LU Open LU - Latest deliveries - Latest arrivals + Returns on latest deliveries + Latest deliveries + Returns on latest arrivals + Latest arrivals Printer not found diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java index 80298df6..08eb2e70 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java @@ -20,7 +20,7 @@ public class MenuConfigurationIME extends BaseMenuConfiguration { .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_resi_fornitore) - .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_fornitore_title) + .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_arrivi_fornitore_title) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)) ).addGroup( new MenuGroup()