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

Finish v1_8_6(93)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-10-31 18:02:03 +01:00
commit 61270adb6e
7 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 92
def appVersionName = '1.8.5'
def appVersionCode = 93
def appVersionName = '1.8.6'
signingConfigs {
release {

7
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@ -34,6 +34,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityResources;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.FragmentMainBinding;
import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
@ -80,6 +81,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
init();
initGestMenu();
initVersion();
return mBindings.getRoot();
}
@ -241,4 +243,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
private void onMenuClick(MenuConfiguration.MenuItem menuItem) {
((MainActivity) getActivity()).setMenuItem(menuItem.getID());
}
private void initVersion() {
String appVersion = UtilityResources.getAppVersion();
mBindings.currentAppVersionName.setText("v" + appVersion);
}
}

3
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -478,7 +478,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
}
public void openLU() {
DialogScanOrCreateLU.make(mContext, mtbColt -> {
DialogScanOrCreateLU.make(mContext, false, false, mtbColt -> {
if(mtbColt == null) {
((IPoppableActivity)mContext).pop();
} else {
@ -635,6 +635,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
mtbColrToEditClone
.setQtaCol(value.qtaTot.getBigDecimal())
.setMtbAart(mtbColrToEdit.getMtbAart())
.setOperation(CommonModelConsts.OPERATION.NO_OP);
mtbColt.get().getMtbColr().add(index, mtbColrToEditClone);

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
View File

@ -133,6 +133,10 @@ public class DialogVenditaFiltroAvanzato {
private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) {
IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getIstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA);
// bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> {
// bindings.filledExposedDropdownDataCons.callOnClick();
// });
bindings.filledExposedDropdownDataCons.setOnClickListener(view -> {
Calendar c = UtilityDate.getCalendarInstance();

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

@ -47,6 +47,8 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:nextFocusDown="@id/input_id_viaggio"
android:hint="@string/deposit">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
@ -55,6 +57,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusDown="@id/input_id_viaggio"
app:binding="@{viewmodel.deposito}" />
</com.google.android.material.textfield.TextInputLayout>
@ -73,6 +77,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_num_ords"
app:binding="@{viewmodel.idViaggio}" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,6 +99,8 @@
android:inputType="number|text"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_cliente"
app:binding="@{viewmodel.numOrds}"/>
</com.google.android.material.textfield.TextInputLayout>
@ -112,6 +120,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
app:binding="@{viewmodel.cliente}"/>
</com.google.android.material.textfield.TextInputLayout>
@ -131,6 +141,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_automezzo"
app:binding="@{viewmodel.vettore}"/>
</com.google.android.material.textfield.TextInputLayout>
@ -150,6 +162,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_agente"
app:binding="@{viewmodel.automezzo}"/>
</com.google.android.material.textfield.TextInputLayout>
@ -169,6 +183,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_term_cons"
app:binding="@{viewmodel.agente}"/>
</com.google.android.material.textfield.TextInputLayout>
@ -182,13 +198,13 @@
<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}"/>
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>
@ -201,12 +217,13 @@
android:hint="@string/terms_of_delivery">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
android:id="@+id/filled_exposed_dropdown_term_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:id="@+id/filled_exposed_dropdown_term_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionDone"
app:binding="@{viewmodel.terminiConsegna}"/>
</com.google.android.material.textfield.TextInputLayout>

17
app/src/main/res/layout/fragment_main.xml
View File

@ -54,7 +54,6 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/menu_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -193,6 +192,22 @@
</androidx.cardview.widget.CardView>
<LinearLayout
android:id="@+id/menu_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/current_app_version_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:textAlignment="center"
tools:text="v1.0.0" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>