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

Finish v1.20.2(249)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-11-26 16:40:34 +01:00
commit 2e872c23aa
2 changed files with 20 additions and 20 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 = 248 def appVersionCode = 249
def appVersionName = '1.20.1' def appVersionName = '1.20.2'
signingConfigs { signingConfigs {
release { release {

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