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

Completata implementazione DialogInfoSituazioneArticolo.

Browse Source 
Fix per articoli ean8 in Documenti interni.
This commit is contained in:
Giuseppe Scorrano
2023-03-16 19:25:38 +01:00
parent a1d8e98dfe
commit cd2c04ad0c
15 changed files with 599 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/res/drawable/badge_round_corner.xml
View File

@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<level-list>
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<solid android:color="@color/white" />
<padding
android:left="6dp"
android:right="6dp"
android:top="1dp" />
<padding
android:left="6dp"
android:right="6dp"
android:top="1dp" />
<corners android:radius="12dp" />
</shape>
<corners android:radius="12dp" />
</shape>
</item>
</level-list>

8
app/src/main/res/drawable/badge_round_corner_without_padding.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/white" />
<corners android:radius="12dp" />
</shape>

9
app/src/main/res/drawable/ic_calendar_schedule.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="96dp"
android:height="96dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M6,0C2.7,0 0,2.7 0,6C0,9.3 2.7,12 6,12C9.3,12 12,9.3 12,6C12,2.7 9.3,0 6,0zM6,2C8.2,2 10,3.8 10,6C10,8.2 8.2,10 6,10C3.8,10 2,8.2 2,6C2,3.8 3.8,2 6,2zM17,2C16.448,2 16,2.448 16,3L16,4L13.738,4C13.903,4.64 14,5.308 14,6C14,7.062 13.788,8.073 13.412,9L19,9L19.002,20L5,20L5,15C5,14.448 4.552,14 4,14C3.448,14 3,14.448 3,15L3,20C3,21.105 3.895,22 5,22L19,22C20.105,22 21,21.105 21,20L21,6C21,4.895 20.105,4 19,4L18,4L18,3C18,2.448 17.552,2 17,2zM6.9,3.199L5.199,6.1L7.4,8.301L8.301,7.301L6.801,5.9L8,3.801L6.9,3.199z"
android:fillColor="#5B5B5B"/>
</vector>

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

@@ -45,9 +45,10 @@
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/incoming_label"
style="@style/TextAppearance.Material3.TitleMedium"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/yellow_200"
android:backgroundTint="@color/gray_200"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -68,12 +69,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/available_label"
style="@style/TextAppearance.Material3.TitleMedium"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/green_200"
android:backgroundTint="@color/gray_200"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:paddingHorizontal="12dp"

156
app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
View File

@@ -5,18 +5,17 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="androidx.core.content.ContextCompat" />
<import type="it.integry.integrywmsnative.R" />
<import type="android.view.View" />
<variable
name="item"
type="it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario" />
type="it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.ui.DialogInfoSituazioneArticoloAvailableListItem" />
</data>
@@ -45,15 +44,68 @@
tools:text="UL 109467 del 17 mar 2023" />
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- style="@style/TextAppearance.AppCompat.Small"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:ellipsize="end"-->
<!-- android:maxLines="2"-->
<!-- android:text="@{UtilityString.isNull(item.descrizioneEstesa, &quot;Nessuna descrizione&quot;)}"-->
<!-- tools:text="Descrizione lunga articolo" />-->
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- style="@style/TextAppearance.AppCompat.Small"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:ellipsize="end"-->
<!-- android:maxLines="2"-->
<!-- android:text="@{UtilityString.isNull(item.descrizioneEstesa, &quot;Nessuna descrizione&quot;)}"-->
<!-- tools:text="Descrizione lunga articolo" />-->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner_without_padding"
android:backgroundTint="@color/green_200"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="@{item.partitaMag != null ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.partitaMagMatch ? R.color.green_200 : R.color.white)}"
android:gravity="center_vertical"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_info_78dp"
android:tint="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.partitaMag}"
android:textColor="@android:color/black"
tools:text="PARTITA" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="8dp"
android:visibility="@{item.dataScad != null ? View.VISIBLE : View.GONE}"
android:src="@drawable/ic_calendar_schedule"
android:tint="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:visibility="@{item.dataScad != null ? View.VISIBLE : View.GONE}"
android:text="@{UtilityDate.formatDate(item.dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textColor="@android:color/black"
tools:text="17 mag 2023" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
@@ -64,57 +116,75 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner"
android:background="@drawable/badge_round_corner_without_padding"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="@{item.posizione != null ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
android:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.posizione}"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="POSIZIONE" />
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/position_label_icon"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
android:tint="@android:color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.posizione}"
app:layout_constraintStart_toEndOf="@id/position_label_icon"
tools:text="POSIZIONE" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"
android:background="@drawable/badge_round_corner"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner_without_padding"
android:backgroundTint="@color/red_300"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="@{item.codJcom != null ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
android:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="COMMESSA" />
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.commessaMatch ? R.color.red_300 : R.color.white)}"
android:gravity="center_vertical"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
android:tint="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
tools:text="COMMESSA" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -142,7 +212,7 @@
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, 2)}"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textStyle="bold"