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

Implementata creazione del doppio collo A / L in Accettazione.

Browse Source 
Iniziata implementazione del tasto "Aggiungi merce extra" in Spedizione.
This commit is contained in:
Giuseppe Scorrano
2019-06-13 12:21:33 +02:00
parent 787d12ff9b
commit b4b8fac725
21 changed files with 674 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/layout/activity_vendita_ordine_inevaso.xml
View File

@@ -41,6 +41,21 @@
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
android:layout_width="match_parent">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/add_extra_items_toolbar"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="end"
android:background="@drawable/ripple_effect"
android:adjustViewBounds="true"
android:src="@drawable/ic_add_24dp"
app:visibility="@{viewmodel.shouldShowAddExtraItems}"
android:tint="@color/colorPrimaryGray"/>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>

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

@@ -70,7 +70,7 @@
app:iconifiedByDefault="true"
android:layout_gravity="end"/>
<ImageButton
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/main_filter"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -81,7 +81,7 @@
android:src="@drawable/ic_search_black_24dp"
android:tint="@color/colorPrimaryGray"/>
<ImageButton
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/main_select_all"
android:layout_width="wrap_content"
android:layout_height="50dp"

2
app/src/main/res/layout/dialog_base.xml
View File

@@ -86,6 +86,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

82
app/src/main/res/layout/dialog_scan_art.xml Normal file
View File

@@ -0,0 +1,82 @@
<?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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingTop="24dp"
android:paddingBottom="12dp">
<TextView
android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextViewMaterial.DialogTitle"
android:text="@string/extra_item"
android:gravity="center_horizontal"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"
style="@style/AppTheme.NewMaterial.Text"
android:text="@string/scan_item"/>
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
style="@style/Button.DangerOutline"
app:strokeColor="@color/red_400"
app:layout_constraintTop_toTopOf="parent"
android:layout_gravity="center_horizontal"
android:text="@string/abort"/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</layout>

30
app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
View File

@@ -120,15 +120,33 @@
<!--android:hint="@string/customer"-->
<!--app:binding="@{viewmodel.cliente}"/>-->
<com.google.android.material.textfield.TextInputEditText
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_data_cons"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:hint="@string/ship_date"
android:focusable="false"
app:binding="@{viewmodel.dataConsegna}"/>
android:hint="@string/ship_date">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/filled_exposed_dropdown_data_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:focusable="false"
android:singleLine="true"
app:binding="@{viewmodel.dataConsegna}"/>
</com.google.android.material.textfield.TextInputLayout>
<!--<com.google.android.material.textfield.TextInputEditText-->
<!--android:id="@+id/input_data_cons"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:inputType="textNoSuggestions"-->
<!--android:hint="@string/ship_date"-->
<!--android:focusable="false"-->
<!--app:binding="@{viewmodel.dataConsegna}"/>-->