Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FEAT] Rinominate classi UltimeConsegneFornitori in UltimiArriviFornitori.

Browse Source 
[FEAT] Modificate stringhe di testo.
This commit is contained in:
Giuseppe Scorrano 2019-10-07 15:48:53 +02:00
parent 8ad044a1b1
commit 5c2ca531e5
13 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/MainActivity.java
View File

@ -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;

2
app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
View File

@ -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()

9
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
View File

@ -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<DocumentoResoDTO> documentoResoDTOList, Integer segno) {
public static void startActivity(Context context, String activityTitle, List<DocumentoResoDTO> 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);

23
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java → app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/UltimiArriviFornitoreFragment.java
View File

@ -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<DocumentoResoDTO> 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<DocumentoResoDTO> 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<DocumentoResoDTO> selectedConsegne = getSelectedItems();
PickingResiActivity.startActivity(getActivity(), selectedConsegne, -1);
PickingResiActivity.startActivity(getActivity(), getText(R.string.ultime_arrivi_fornitore_title).toString(), selectedConsegne, -1);
}
}

6
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java → app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/core/UltimiArriviFornitoreListAdapter.java
View File

@ -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<UltimeConsegneFornitoreListAdapter.SubheaderHolder, UltimeConsegneFornitoreListAdapter.SingleItemViewHolder> implements SectionTitleProvider {
public class UltimiArriviFornitoreListAdapter extends SectionedRecyclerViewAdapter<UltimiArriviFornitoreListAdapter.SubheaderHolder, UltimiArriviFornitoreListAdapter.SingleItemViewHolder> implements SectionTitleProvider {
private Context mContext;
private List<DocumentoResoDTO> mDataset;
@ -64,7 +64,7 @@ public class UltimeConsegneFornitoreListAdapter extends SectionedRecyclerViewAda
public UltimeConsegneFornitoreListAdapter(Context context, ArrayList<DocumentoResoDTO> dataset) {
public UltimiArriviFornitoreListAdapter(Context context, ArrayList<DocumentoResoDTO> dataset) {
super();
this.mContext = context;
this.mDataset = new ArrayList<>();

4
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java → app/src/main/java/it/integry/integrywmsnative/gest/ultime_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java
View File

@ -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<ArrayList<DocumentoResoDTO>> onComplete, RunnableArgs<Exception> onFailed) {

2
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java
View File

@ -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

3
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java
View File

@ -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<DocumentoResoDTO> selectedConsegne = getSelectedItems();
PickingResiActivity.startActivity(mContext, selectedConsegne, +1);
PickingResiActivity.startActivity(mContext, mContext.getText(R.string.ultime_consegne_cliente_title).toString(), selectedConsegne, +1);
}

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

@ -6,7 +6,7 @@
<data>
<variable
name="viewmodel"
type="it.integry.integrywmsnative.gest.ultime_consegne_fornitore.UltimeConsegneFornitoreFragment" />
type="it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment" />
</data>
@ -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">
<RelativeLayout
android:background="@android:color/white"

2
app/src/main/res/menu/activity_main_drawer.xml
View File

@ -29,7 +29,7 @@
<item
android:id="@+id/nav_resi_fornitore"
android:icon="@drawable/ic_black_latest_delivery"
android:title="@string/fragment_ultime_consegne_fornitore_title" />
android:title="@string/fragment_ultime_arrivi_fornitore_title" />
<item
android:id="@+id/nav_resi_cliente"
android:icon="@drawable/ic_black_latest_delivery"

8
app/src/main/res/values-it/strings.xml
View File

@ -18,7 +18,7 @@
<string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
<string name="vendita_title_fragment">Spedizione</string>
<string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
<string name="versamento_merce_fragment_title">Versamento merce</string>
<string name="versamento_merce_fragment_title">Posizionamento merce</string>
<string name="error">Errore</string>
<string name="ops">Ops</string>
<string name="warning">Attenzione</string>
@ -225,8 +225,10 @@
<string name="message_print_packing_list">Vuoi procedere con la stampa di una %s</string>
<string name="button_create_new_ul">Crea nuova UL</string>
<string name="title_open_lu">Apri UL</string>
<string name="fragment_ultime_consegne_cliente_title">Ultime consegne</string>
<string name="fragment_ultime_consegne_fornitore_title">Ultimi arrivi</string>
<string name="fragment_ultime_consegne_cliente_title">Resi su ultime consegne</string>
<string name="ultime_consegne_cliente_title">Ultime consegne</string>
<string name="fragment_ultime_arrivi_fornitore_title">Resi su ultimi arrivi</string>
<string name="ultime_arrivi_fornitore_title">Ultimi arrivi</string>
<string name="exception_printer_not_found">Stampante non trovata</string>

6
app/src/main/res/values/strings.xml
View File

@ -229,8 +229,10 @@
<string name="button_create_new_ul">Create new LU</string>
<string name="title_open_lu">Open LU</string>
<string name="fragment_ultime_consegne_cliente_title">Latest deliveries</string>
<string name="fragment_ultime_consegne_fornitore_title">Latest arrivals</string>
<string name="fragment_ultime_consegne_cliente_title">Returns on latest deliveries</string>
<string name="ultime_consegne_cliente_title">Latest deliveries</string>
<string name="fragment_ultime_arrivi_fornitore_title">Returns on latest arrivals</string>
<string name="ultime_arrivi_fornitore_title">Latest arrivals</string>
<string name="exception_printer_not_found">Printer not found</string>

2
dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java
View File

@ -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()