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

Fix in rettifica giacenze.

Browse Source 
Aggiunto version name in main.
This commit is contained in:
Giuseppe Scorrano 2019-10-31 17:11:12 +01:00
parent a4f866842a
commit 2f207e2f11
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);

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>