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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Valerio Castellana 2021-11-26 17:46:40 +01:00
commit 016be4799c
5 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 247 def appVersionCode = 249
def appVersionName = '1.20.0' def appVersionName = '1.20.2'
signingConfigs { signingConfigs {
release { release {

32
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
View File

@ -22,8 +22,6 @@ public abstract class BaseFragment extends Fragment {
protected final List<Runnable> mOnPreDestroyList = new ArrayList<>(); protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
public void setScrollToolbar(ElevatedToolbar toolbar) { public void setScrollToolbar(ElevatedToolbar toolbar) {
mToolbar = toolbar; mToolbar = toolbar;
} }
@ -34,10 +32,6 @@ public abstract class BaseFragment extends Fragment {
} }
public void onLoadingStarted() { public void onLoadingStarted() {
new Thread(() -> { new Thread(() -> {
BarcodeManager.disable(); BarcodeManager.disable();
@ -71,23 +65,25 @@ public abstract class BaseFragment extends Fragment {
} }
protected void openProgress() { protected void openProgress() {
getActivity().runOnUiThread(() -> { getActivity().runOnUiThread(() -> {
if (this.mCurrentProgress == null) { if (this.mCurrentProgress == null) {
this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity()); this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
} }
}); });
} }
protected void closeProgress() { protected void closeProgress() {
getActivity().runOnUiThread(() -> { getActivity().runOnUiThread(() -> {
if (mCurrentProgress != null) { if (mCurrentProgress != null) {
mCurrentProgress.dismiss(); mCurrentProgress.dismiss();
mCurrentProgress = null; mCurrentProgress = null;
} }
}); });
} }
protected void popMe() { protected void popMe() {
((IPoppableActivity) requireActivity()).pop(); getActivity().runOnUiThread(() -> {
((IPoppableActivity) requireActivity()).pop();
});
} }
} }

36
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
View File

@ -264,7 +264,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList(); List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
for (FilterChipDTO filterChipDTO : filterList){ for (FilterChipDTO filterChipDTO : filterList) {
FilterChipView filterChipView = new FilterChipView( FilterChipView filterChipView = new FilterChipView(
requireActivity(), requireActivity(),
@ -697,28 +697,29 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
//new Thread(() -> { //new Thread(() -> {
// requireActivity().runOnUiThread(() -> { requireActivity().runOnUiThread(() -> {
List<OrdiniUscitaElencoDTO> tmpList; List<OrdiniUscitaElencoDTO> tmpList;
if (filteredList != null) { if (filteredList != null) {
tmpList = filteredList; tmpList = filteredList;
} else if (mAppliedFilterViewModel != null) { } else if (mAppliedFilterViewModel != null) {
mAppliedFilterViewModel.applyAllTests(); mAppliedFilterViewModel.applyAllTests();
tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
} else { } else {
tmpList = mViewModel.getOrderList().getValue(); tmpList = mViewModel.getOrderList().getValue();
} }
var list = convertDataModelToListModel(tmpList); var list = convertDataModelToListModel(tmpList);
this.mOrdiniInevasiMutableData.clear(); this.mOrdiniInevasiMutableData.clear();
this.mOrdiniInevasiMutableData.addAll(list); this.mOrdiniInevasiMutableData.addAll(list);
fabVisible.set(Stream.of(mOrdiniInevasiMutableData) fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
.anyMatch(y -> y.getSelectedObservable().get())); .anyMatch(y -> y.getSelectedObservable().get()));
// });
this.onLoadingEnded(); this.onLoadingEnded();
});
//}).start(); //}).start();
} }
@ -831,7 +832,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
} }
@Override @Override
public void addOnPreDestroy(Runnable onPreDestroy) { public void addOnPreDestroy(Runnable onPreDestroy) {
this.mOnPreDestroyList.add(onPreDestroy); this.mOnPreDestroyList.add(onPreDestroy);

6
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
View File

@ -325,6 +325,12 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
this.openLU(); this.openLU();
} }
@Override
public void onError(Exception ex, boolean requestClose) {
super.onError(ex);
if(requestClose) popMe();
}
@Override @Override
public void onWarning(String warningText, Runnable action) { public void onWarning(String warningText, Runnable action) {
this.requireActivity().runOnUiThread(() -> { this.requireActivity().runOnUiThread(() -> {

17
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java
View File

@ -77,8 +77,13 @@ public class ProdVersamentoMaterialeViewModel {
mtbDepoPosizione.getPosizione(), mtbDepoPosizione.getPosizione(),
getIdMaterialeFromCollo(mtbColt), getIdMaterialeFromCollo(mtbColt),
ordini -> { ordini -> {
setCurrentOrders(ordini, mtbColt.getMtbColr().get(0)); if(ordini == null || ordini.isEmpty())
this.sendOnLoadingEnded(); this.sendError(new Exception("Nessun ordine compatibile con " + getIdMaterialeFromCollo(mtbColt) + " sulla linea " + mtbDepoPosizione.getPosizione()), true);
else {
setCurrentOrders(ordini, mtbColt.getMtbColr().get(0));
this.sendOnLoadingEnded();
}
}, },
e -> this.sendWarning(e.getMessage(), this::sendRequestLUOpen)); e -> this.sendWarning(e.getMessage(), this::sendRequestLUOpen));
} }
@ -194,7 +199,11 @@ public class ProdVersamentoMaterialeViewModel {
} }
private void sendError(Exception ex) { private void sendError(Exception ex) {
if (this.mListener != null) mListener.onError(ex); if (this.mListener != null) mListener.onError(ex, false);
}
private void sendError(Exception ex, boolean requestClose) {
if (this.mListener != null) mListener.onError(ex, requestClose);
} }
private void sendOnDataSaved() { private void sendOnDataSaved() {
@ -205,7 +214,7 @@ public class ProdVersamentoMaterialeViewModel {
void requestLUOpen(); void requestLUOpen();
void onError(Exception ex); void onError(Exception ex, boolean requestClose);
void onWarning(String warningText, Runnable action); void onWarning(String warningText, Runnable action);