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

Implementata gestione degli imballi in spedizione

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-04-23 16:32:40 +02:00
parent 55db6d362d
commit e49d35fdbc
34 changed files with 1484 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/ic_baseline_assignment_turned_in_24.xml
View File

@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="@color/colorPrimary">
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>

80
app/src/main/res/layout/activity_spedizione.xml
View File

@@ -213,77 +213,17 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.github.clans.fab.FloatingActionMenu
android:id="@+id/spedizione_fab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
app:layout_anchor="@+id/spedizione_empty_view"
app:layout_anchorGravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:menu_animationDelayPerItem="50"
app:menu_backgroundColor="@color/white_bg_alpha"
app:menu_buttonSpacing="0dp"
app:menu_colorNormal="@color/colorSecondary"
app:menu_colorPressed="@color/colorSecondaryDark"
app:menu_fab_size="normal"
app:menu_labels_colorNormal="@color/white"
app:menu_labels_colorPressed="@color/white_pressed"
app:menu_labels_colorRipple="#66FFFFFF"
app:menu_labels_cornerRadius="3dp"
app:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
app:menu_labels_margin="0dp"
app:menu_labels_padding="8dp"
app:menu_labels_paddingBottom="4dp"
app:menu_labels_paddingLeft="8dp"
app:menu_labels_paddingRight="8dp"
app:menu_labels_paddingTop="4dp"
app:menu_labels_position="left"
app:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
app:menu_labels_showShadow="true"
app:menu_labels_textColor="@color/black_semi_transparent"
app:menu_labels_textSize="18sp"
app:menu_openDirection="up"
app:menu_shadowColor="#66000000"
app:menu_shadowRadius="4dp"
app:menu_shadowXOffset="1dp"
app:menu_shadowYOffset="3dp"
app:menu_showShadow="true"
app:visibility="@{spedizioneView.noLUPresent}">
<com.github.clans.fab.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_assignment_turned_in_24"
app:visibility="@{spedizioneView.closeOrderButtonEnabled}"
app:fab_colorNormal="@color/white"
app:fab_colorPressed="@color/white_pressed"
app:fab_colorRipple="#66FFFFFF"
app:fab_label="@string/action_close_order"
app:onClick="@{() -> spedizioneView.closeOrder()}" />
<com.github.clans.fab.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_box"
app:fab_colorNormal="@color/white"
app:fab_colorPressed="@color/white_pressed"
app:fab_colorRipple="#66FFFFFF"
app:fab_label="@string/action_show_created_ul"
app:onClick="@{() -> spedizioneView.showCreatedUL()}" />
<com.github.clans.fab.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_add_24dp"
app:fab_colorNormal="@color/white"
app:fab_colorPressed="@color/white_pressed"
app:fab_colorRipple="#66FFFFFF"
app:fab_label="@string/action_create_ul"
app:onClick="@{() -> spedizioneView.createNewUL()}" />
</com.github.clans.fab.FloatingActionMenu>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/spedizione_ordine_inevaso_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:onClick="@{() -> spedizioneView.showFabMenu()}"
app:srcCompat="@drawable/ic_add_24dp"
app:visibility="@{spedizioneView.noLUPresent}"
style="?attr/floatingActionButtonPrimaryStyle" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

32
app/src/main/res/layout/array_adapter_two_lines_item.xml Normal file
View File

@@ -0,0 +1,32 @@
<layout>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingVertical="4dp"
android:paddingHorizontal="8dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAllCaps="true"
android:textAppearance="?attr/textAppearanceLabelSmall"
android:textStyle="bold"
tools:text="Small title" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/item_description"
style="@style/AppTheme.NewMaterial.Text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceListItem"
tools:text="Description" />
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>

101
app/src/main/res/layout/dialog_ask_vettore.xml Normal file
View File

@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="viewmodel"
type="it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreViewModel" />
<variable
name="view"
type="it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreView" />
</data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<androidx.appcompat.widget.AppCompatImageView
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_error_white_24dp"
app:tint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/carrier" />
<RelativeLayout
android:id="@+id/button_vettore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/gray_detail_background_round16"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
android:onClick="@{() -> view.togglePopupShow()}"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:visibility="@{view.selectedVettore == null}"
tools:visibility="gone"
android:text="@string/select_a_carrier_action" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:visibility="@{view.selectedVettore != null}">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAllCaps="true"
android:textAppearance="?attr/textAppearanceLabelSmall"
android:textStyle="bold"
android:text="@{view.selectedVettore.codVvet}"
tools:text="Small title" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/item_description"
style="@style/AppTheme.NewMaterial.Text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceListItem"
android:text="@{view.selectedVettore.ragSoc}"
tools:text="Description" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView>
</layout>

6
app/src/main/res/layout/dialog_tracciamento_imballi__list_item_model.xml
View File

@@ -51,9 +51,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/article"
android:inputType="textNoSuggestions"
android:imeOptions="actionNext"
android:singleLine="true" />
android:singleLine="true"
android:inputType="none"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout

20
app/src/main/res/menu/spedizione_ordine_inevaso_fab_menu.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/close_order"
android:icon="@drawable/ic_baseline_assignment_turned_in_24"
android:title="@string/action_close_order" />
<item
android:id="@+id/show_created_ul"
android:icon="@drawable/ic_inventory_2_material3"
android:title="@string/action_show_created_ul" />
<item
android:id="@+id/track_packaging"
android:icon="@drawable/ic_add_to_inbox"
android:title="@string/action_track_packaging" />
<item
android:id="@+id/create_ul"
android:icon="@drawable/ic_add_material3"
android:title="@string/action_create_ul" />
</menu>

2
app/src/main/res/values-it/strings.xml
View File

@@ -70,6 +70,7 @@
<string name="action_delete_ul">Cancella UL</string>
<string name="action_print">Stampa</string>
<string name="confirm">Conferma</string>
<string name="skip">Salta</string>
<string name="action_save">Salva</string>
<string name="hint_additional_notes">Note Aggiuntive</string>
<string name="dialog_message_additional_notes">Inserisci eventuali note aggiuntive della tua UL</string>
@@ -346,6 +347,7 @@
<string name="prod_recupero_materiale_title_fragment">Recupero materiale</string>
<string name="please_select_an_item">Seleziona un elemento per continuare</string>
<string name="select_a_carrier_action">Seleziona un vettore</string>
<string name="select_a_customer_message">Prima di procedere seleziona un <b>cliente</b></string>
<string name="select_a_recipient_message">Prima di procedere seleziona un <b>destinatario</b></string>
<string name="not_valid_customer_error">Cliente non valido</string>

2
app/src/main/res/values/strings.xml
View File

@@ -115,6 +115,7 @@
<string name="action_print_ul">Print LU</string>
<string name="action_print">Print</string>
<string name="confirm">Confirm</string>
<string name="skip">Skip</string>
<string name="action_save">Save</string>
<string name="hint_additional_notes">Additional notes</string>
<string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
@@ -351,6 +352,7 @@
<string name="please_select_an_item">Please select an item before proceed</string>
<string name="select_a_carrier_action">Select a carrier</string>
<string name="select_a_customer_message">Please, select a <b>customer</b> before proceeding</string>
<string name="select_a_recipient_message">Please, select a <b>recipient</b> before proceeding</string>
<string name="not_valid_customer_error">Invalid customer</string>