Sistemato background liste con lettura facilitata
This commit is contained in:
parent
f0f03b4de1
commit
924eadeab0
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@ -298,7 +298,9 @@ public class AccettazioneOrdineInevasoHelper {
|
|||||||
if(mtbColrs != null) {
|
if(mtbColrs != null) {
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
|
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
|
||||||
|
|
||||||
List<MtbColr> filteredMtbColrs = Stream.of(mtbColrs).filter(
|
List<MtbColr> filteredMtbColrs = Stream.of(mtbColrs)
|
||||||
|
.filter(x -> x.getNumOrd() != null)
|
||||||
|
.filter(
|
||||||
x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) &&
|
x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) &&
|
||||||
(x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) &&
|
(x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) &&
|
||||||
x.getRigaOrd() == item.rigaOrd &&
|
x.getRigaOrd() == item.rigaOrd &&
|
||||||
|
|||||||
@ -165,9 +165,9 @@ public class MainListOrdineAccettazioneAdapter extends RecyclerView.Adapter<Main
|
|||||||
} else if (rowItem.getQtaRiservata().floatValue() > 0) {
|
} else if (rowItem.getQtaRiservata().floatValue() > 0) {
|
||||||
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
|
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
|
||||||
} else if (visibleElementsCounter % 2 == 1) {
|
} else if (visibleElementsCounter % 2 == 1) {
|
||||||
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
|
|
||||||
} else {
|
|
||||||
groupModelView.setBackgroundColor(Color.WHITE);
|
groupModelView.setBackgroundColor(Color.WHITE);
|
||||||
|
} else {
|
||||||
|
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import java.math.BigDecimal;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import it.integry.integrywmsnative.BR;
|
import it.integry.integrywmsnative.BR;
|
||||||
import it.integry.integrywmsnative.R;
|
import it.integry.integrywmsnative.R;
|
||||||
@ -170,11 +171,20 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
|
|||||||
|
|
||||||
MtbColr currentMtbColr = recoveredMtbColt.getMtbColr().get(i);
|
MtbColr currentMtbColr = recoveredMtbColt.getMtbColr().get(i);
|
||||||
|
|
||||||
|
/*
|
||||||
List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
|
List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
|
||||||
.filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() &&
|
.filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() &&
|
||||||
x.getRigaOrd() == currentMtbColr.getRigaOrd()&&
|
x.getRigaOrd() == currentMtbColr.getRigaOrd()&&
|
||||||
x.getDataOrd().equals(currentMtbColr.getDataOrdD()))
|
x.getDataOrd().equals(currentMtbColr.getDataOrdD()))
|
||||||
.toList();
|
.toList();
|
||||||
|
*/
|
||||||
|
|
||||||
|
List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
|
||||||
|
.filter(x -> Objects.equals(x.mtbAart.getCodMart(), currentMtbColr.getCodMart()) &&
|
||||||
|
Objects.equals(x.getPartitaMag(), currentMtbColr.getPartitaMag()) &&
|
||||||
|
Objects.equals(x.getCodJcom(), currentMtbColr.getCodJcom()))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
|
||||||
if(foundRows != null && foundRows.size() > 0){
|
if(foundRows != null && foundRows.size() > 0){
|
||||||
OrdineAccettazioneDTO.Riga currentRow = foundRows.get(0);
|
OrdineAccettazioneDTO.Riga currentRow = foundRows.get(0);
|
||||||
|
|||||||
@ -70,7 +70,7 @@ public class ListaBancaliActivity extends AppCompatActivity {
|
|||||||
// Make sure the request was successful
|
// Make sure the request was successful
|
||||||
if (resultCode == RESULT_OK) {
|
if (resultCode == RESULT_OK) {
|
||||||
|
|
||||||
MtbColt recoveredMtbColt = data.getParcelableExtra("key");
|
// MtbColt recoveredMtbColt = data.getParcelableExtra("key");
|
||||||
|
|
||||||
|
|
||||||
this.setResult(RESULT_OK, data);
|
this.setResult(RESULT_OK, data);
|
||||||
|
|||||||
@ -157,9 +157,9 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
|
|||||||
} else if (rowItem.getQtaRiservata().floatValue() > 0) {
|
} else if (rowItem.getQtaRiservata().floatValue() > 0) {
|
||||||
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
|
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
|
||||||
} else if (visibleElementsCounter % 2 == 1) {
|
} else if (visibleElementsCounter % 2 == 1) {
|
||||||
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
|
|
||||||
} else {
|
|
||||||
groupModelView.setBackgroundColor(Color.WHITE);
|
groupModelView.setBackgroundColor(Color.WHITE);
|
||||||
|
} else {
|
||||||
|
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
|
||||||
}
|
}
|
||||||
|
|
||||||
final TextView badge1 = groupModelView.findViewById(R.id.vendita_ordine_inevaso_main_list_group_item_badge1);
|
final TextView badge1 = groupModelView.findViewById(R.id.vendita_ordine_inevaso_main_list_group_item_badge1);
|
||||||
|
|||||||
@ -14,6 +14,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:fitsSystemWindows="false"
|
android:fitsSystemWindows="false"
|
||||||
|
android:background="@color/full_white"
|
||||||
xmlns:fab="http://schemas.android.com/apk/res-auto"
|
xmlns:fab="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_gravity="top">
|
android:layout_gravity="top">
|
||||||
|
|
||||||
|
|||||||
@ -171,5 +171,6 @@
|
|||||||
<string name="too_much_lu_found_message">Multiple LU found</string>
|
<string name="too_much_lu_found_message">Multiple LU found</string>
|
||||||
<string name="ask_print_message">Do you want print the label?</string>
|
<string name="ask_print_message">Do you want print the label?</string>
|
||||||
<string name="ask_position_of_lu_message">Please scan a <b>Position</b> barcode</string>
|
<string name="ask_position_of_lu_message">Please scan a <b>Position</b> barcode</string>
|
||||||
|
<string name="title_activity_splash">SplashActivity</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user