[FEAT] Modificato font in Accettazione / Spedizione.

[FEAT] Aggiunto menu Spedizione in build per Frudis.
[FEAT] Aggiunto il salvataggio del tipo collo se in spedizione chiudo una pedana con un solo articolo all'interno.
This commit is contained in:
2019-10-03 10:38:13 +02:00
parent 12a834fbf7
commit 9ed688422a
55 changed files with 733 additions and 334 deletions

View File

@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:tools="http://schemas.android.com/tools">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_main_list_group_clienti_comm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/accettazione_main_list_group_clienti_datacons"
android:layout_toStartOf="@+id/accettazione_main_list_group_clienti_datacons"
android:maxLines="1"
android:ellipsize="end"
android:paddingRight="6dp"
android:text="TextView" />
android:paddingEnd="6dp"
tools:text="TextView"
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_main_list_group_clienti_datacons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:text="TextView" />
android:layout_alignParentEnd="true"
tools:text="TextView"
style="@style/AppTheme.NewMaterial.Text.Small" />
</RelativeLayout>
</layout>

View File

@@ -29,12 +29,13 @@
android:layout_height="wrap_content"
android:layout_toEndOf="@id/accettazione_main_list_group_item_container_checkBox">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_main_list_group_item_container_testata_ord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ord. Prod. 39 del 27 ott 2017"
android:textColor="#000" />
tools:text="Ord. Prod. 39 del 27 ott 2017"
android:textColor="#000"
style="@style/AppTheme.NewMaterial.Text.Small"/>
<LinearLayout

View File

@@ -1,5 +1,4 @@
<layout>
<layout xmlns:tools="http://schemas.android.com/tools">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -39,8 +38,8 @@
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textStyle="bold"
style="@android:style/TextAppearance.Medium"
android:text="NOME GRUPPO"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="NOME GRUPPO"/>
</LinearLayout>

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
@@ -10,11 +10,11 @@
android:background="@color/mainGreen"
android:orientation="vertical">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_descrArtFor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="XXX - DESCR ART FORNITORE"
tools:text="XXX - DESCR ART FORNITORE"
android:padding="8dp"
android:textColor="@android:color/white"
android:textStyle="bold"

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/full_white"
android:padding="8dp">
@@ -15,24 +15,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_badge1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BADGE 1"
tools:text="BADGE 1"
android:background="@drawable/badge1_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:textStyle="bold"/>
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_badge2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BADGE 2"
tools:text="BADGE 2"
android:background="@drawable/badge2_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
@@ -40,14 +41,15 @@
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:layout_marginStart="8dp"
android:textStyle="bold"/>
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="right">
android:gravity="end">
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
@@ -57,45 +59,46 @@
<!--style="@android:style/TextAppearance.Medium"-->
<!--android:text="@string/dispatched"/>-->
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_qta_evasa"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textStyle="bold"
android:textColor="@color/green_700"
style="@android:style/TextAppearance.Medium"
android:text="QTA"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="QTA"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
style="@android:style/TextAppearance.Medium"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:text=" / "/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_qta_tot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
style="@android:style/TextAppearance.Medium"
android:text="QTA"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="QTA"/>
</LinearLayout>
</LinearLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_descrizione"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textSize="16sp"
android:textColor="@android:color/black"
android:text="DESCRIZIONE"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="DESCRIZIONE"/>
</LinearLayout>

View File

@@ -71,15 +71,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@+id/remove_art_filter_list"
android:layout_toStartOf="@+id/remove_art_filter_list"
android:orientation="vertical">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="@string/filtered_arts_in_list" />
<TextView
android:text="@string/filtered_arts_in_list"
style="@style/AppTheme.NewMaterial.Text.Small" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_filter_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -88,6 +89,7 @@
android:textStyle="bold"
android:ellipsize="end"
android:maxLines="1"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="COD_ART_HERE"/>
</LinearLayout>
@@ -116,7 +118,6 @@
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/accettazione_empty_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -37,7 +37,7 @@
tools:title="Contenuto bancale"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</it.integry.integrywmsnative.ui.ElevatedToolbar>>
</it.integry.integrywmsnative.ui.ElevatedToolbar>
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll_view"
@@ -47,7 +47,6 @@
<LinearLayout
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -70,21 +69,23 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Data creazione: "
android:textColor="@android:color/black"
android:textSize="16sp" />
android:textSize="16sp"
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.mtbColt.getDataColloHumanLong()}"
tools:text="22 ottobre 2018"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small" />
</LinearLayout>
<LinearLayout
@@ -92,21 +93,21 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Preparato da "
android:textColor="@android:color/black"
android:textSize="14sp" />
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.mtbColt.getPreparatoDa() != null ? viewModel.mtbColt.getPreparatoDa() : `N/D`}"
tools:text="Vito Falagario"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="italic" />
android:textStyle="italic"
style="@style/AppTheme.NewMaterial.Text.Small" />
</LinearLayout>
<LinearLayout
@@ -115,21 +116,21 @@
android:orientation="horizontal"
android:layout_marginTop="12dp">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Posizione "
android:textColor="@android:color/black"
android:textSize="14sp" />
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.mtbColt.getPosizione() != null ? viewModel.mtbColt.getPosizione() : `N/D`}"
tools:text="A00F00C00L00"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small" />
</LinearLayout>
<LinearLayout
@@ -137,31 +138,31 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Deposito "
android:textColor="@android:color/black"
android:textSize="14sp" />
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.mtbColt.getCodMdep()}"
tools:text="10"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4sp"
android:layout_marginStart="4dp"
android:text="@{viewModel.descrizioneDepo}"
tools:text="(Bari)"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small" />
</LinearLayout>

View File

@@ -61,7 +61,7 @@
app:layout_constraintRight_toLeftOf="@+id/guideline_right_progress"
app:layout_constraintTop_toBottomOf="@id/imageView" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_version_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -71,6 +71,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="@android:color/white"
android:layout_marginBottom="24dp"/>
android:layout_marginBottom="24dp"
style="@style/AppTheme.NewMaterial.Text.Small"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

View File

@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.cardview.widget.CardView
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:cardCornerRadius="12dp"
app:cardElevation="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextViewMaterial.DialogTitle"
android:text="@string/loading"
android:gravity="center_horizontal"/>
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="24dp"/>
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="32dp"-->
<!-- android:layout_marginBottom="40dp"-->
<!-- android:layout_marginStart="40dp"-->
<!-- android:layout_marginEnd="40dp"-->
<!-- android:paddingStart="4dp"-->
<!-- android:paddingEnd="4dp"-->
<!-- android:backgroundTint="@color/white_bg_alpha"-->
<!-- android:background="@drawable/circular_background">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/progressBar"-->
<!-- style="?android:attr/progressBarStyleHorizontal"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="20dp"-->
<!-- android:indeterminate="true"-->
<!-- android:layout_marginTop="-5dp"-->
<!-- android:layout_marginBottom="-5dp"/>-->
<!-- </RelativeLayout>-->
</LinearLayout>
</androidx.cardview.widget.CardView>
</layout>

View File

@@ -33,9 +33,9 @@
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
tools:text="COD MART"
style="@style/AppTheme.NewMaterial.Text.Small" />
<androidx.appcompat.widget.AppCompatTextView
@@ -44,32 +44,31 @@
android:ellipsize="end"
android:text='@{!UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? mtbColr.mtbAart.diacod : ""}'
android:textColor="@color/red_600"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
tools:text="DIACOD HERE"/>
tools:text="DIACOD HERE"
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/posizione_collo"
android:ellipsize="end"
android:maxLines="1"
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
tools:text="Descrizione lunga articolo" />
tools:text="Descrizione lunga articolo"
style="@style/AppTheme.NewMaterial.Text.Small" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
tools:text="Lotto: ABCDE" />
tools:text="Lotto: ABCDE"
style="@style/AppTheme.NewMaterial.Text.Small" />
</LinearLayout>
@@ -97,7 +96,8 @@
android:textSize="16sp"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="280.45\nCONF" />
tools:text="280.45\nCONF"
style="@style/AppTheme.NewMaterial.Text.Small" />
</RelativeLayout>

View File

@@ -16,18 +16,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_badge1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BADGE 1"
tools:text="BADGE 1"
android:background="@drawable/badge1_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:textStyle="bold"/>
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small"/>
<LinearLayout
@@ -44,17 +46,17 @@
<!--style="@android:style/TextAppearance.Medium"-->
<!--android:text="@string/dispatched"/>-->
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_qta_evasa"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textStyle="bold"
android:textColor="@color/green_700"
style="@android:style/TextAppearance.Medium"
android:text="QTA"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="QTA"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
@@ -62,26 +64,27 @@
style="@android:style/TextAppearance.Medium"
android:text=" / "/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_qta_tot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
style="@android:style/TextAppearance.Medium"
android:text="QTA"/>
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="QTA"/>
</LinearLayout>
</LinearLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_descrizione"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textSize="16sp"
android:textColor="@android:color/black"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="DESCRIZIONE"/>
<RelativeLayout
@@ -96,29 +99,31 @@
android:layout_alignParentStart="true"
android:layout_toStartOf="@+id/vendita_ordine_inevaso_main_list_group_item_badge2">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_subdescrizione1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="SUB DESCRIZIONE"/>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_subdescrizione2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="SUB DESCRIZIONE"/>
</LinearLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list_group_item_badge2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BADGE 2"
tools:text="BADGE 2"
android:background="@drawable/badge2_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
@@ -127,7 +132,8 @@
android:paddingRight="6dp"
android:layout_marginStart="8dp"
android:textStyle="bold"
android:layout_alignParentEnd="true"/>
android:layout_alignParentEnd="true"
style="@style/AppTheme.NewMaterial.Text.Small"/>
</RelativeLayout>

View File

@@ -10,7 +10,7 @@
android:background="@color/mainGreen"
android:orientation="vertical">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_ordine_inevaso_main_list__descrizione_gruppo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -19,7 +19,8 @@
android:textColor="@android:color/white"
android:textStyle="bold"
android:maxLines="1"
android:ellipsize="end" />
android:ellipsize="end"
style="@style/AppTheme.NewMaterial.Text.Medium" />
<LinearLayout