diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 7cc9fb08..00000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9c8b9aa4..fe61d7ed 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 246b1bce..e0a9141b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/Integry.jks b/Integry.jks
new file mode 100644
index 00000000..1b30e196
Binary files /dev/null and b/Integry.jks differ
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1..956c004d 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
/build
+/release
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 6cff7d29..0eff41f4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -15,6 +15,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageButton;
+import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -55,7 +56,6 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-// ExceptionsHandler.toCatch(this);
if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
startLoginActivity();
@@ -64,9 +64,6 @@ public class MainActivity extends AppCompatActivity
ButterKnife.bind(this);
-// WaterfallToolbar waterfallToolbar = findViewById(R.id.waterfall_toolbar);
-// waterfallToolbar.set
-
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -76,6 +73,7 @@ public class MainActivity extends AppCompatActivity
drawer.setDrawerListener(toggle);
toggle.syncState();
+
mNavigationView = findViewById(R.id.nav_view);
mNavigationView.setNavigationItemSelectedListener(this);
@@ -261,6 +259,8 @@ public class MainActivity extends AppCompatActivity
}
});
+
+
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
new file mode 100644
index 00000000..4a509d0a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
@@ -0,0 +1,34 @@
+package it.integry.integrywmsnative.core.di;
+
+import android.databinding.BaseObservable;
+
+import org.parceler.Parcel;
+
+@Parcel
+public class BindableInteger extends BaseObservable {
+ Integer value;
+
+ public Integer get() {
+ return get(true);
+ }
+
+ public Integer get(boolean defaultIfNull) {
+
+ if(value == null){
+ if(defaultIfNull) return 0;
+ else return null;
+ } else return value;
+ }
+
+ public void set(Integer value) {
+ if (!Objects.equals(this.value, value)) {
+ this.value = value;
+ notifyChange();
+ }
+ }
+
+ public boolean isEmpty() {
+ return value == null;
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index f6e6d3f5..16c13898 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.TextView;
import net.cachapa.expandablelayout.ExpandableLayout;
@@ -29,6 +30,7 @@ public class MainFragment extends Fragment implements ITitledFragment {
@BindView(R.id.no_connection_top_layout) ExpandableLayout mNoConnectionLayout;
+ @BindView(R.id.current_user_name) TextView currentUsername;
private View mView;
@@ -76,6 +78,10 @@ public class MainFragment extends Fragment implements ITitledFragment {
WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power);
wiFiCheckerViewHolder.startMonitoring();
+
+
+ currentUsername.setText(SettingsManager.i().user.fullname);
+
}
private void collapseNoConnectionLayout(){
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
index 335c1a23..360a6ad9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
+import it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzato;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
@@ -320,7 +321,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR
@Override
public void onFilterClick() {
-
+ DialogVenditaFiltroAvanzato.makeBase(getActivity()).show();
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
index 2933c430..b3c7b445 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
@@ -2,16 +2,42 @@ package it.integry.integrywmsnative.gest.vendita.dialogs;
import android.app.AlertDialog;
import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.view.LayoutInflater;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
public class DialogVenditaFiltroAvanzato {
+
+ private static AlertDialog currentAlert;
private static Context currentContext;
+ private static DialogVenditaFiltroAvanzatoViewModel currentViewModel;
public static AlertDialog makeBase(final Context context) {
currentContext = context;
+ currentViewModel = new DialogVenditaFiltroAvanzatoViewModel();
- return null;
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+
+ DialogVenditaFiltroAvanzatoBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false);
+
+ final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
+ .setView(contentView.getRoot())
+ .setPositiveButton(context.getText(R.string.confirm), null)
+ .setNegativeButton(context.getText(R.string.abort), null);
+
+ contentView.setViewmodel(currentViewModel);
+
+
+
+ currentAlert = alertDialog.create();
+ currentAlert.setCanceledOnTouchOutside(false);
+
+ return currentAlert;
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
new file mode 100644
index 00000000..37755d79
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.gest.vendita.dialogs;
+
+import it.integry.integrywmsnative.core.di.BindableFloat;
+import it.integry.integrywmsnative.core.di.BindableInteger;
+import it.integry.integrywmsnative.core.di.BindableString;
+
+public class DialogVenditaFiltroAvanzatoViewModel {
+
+ public BindableString numOrds = new BindableString();
+ public BindableString cliente = new BindableString();
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index e854da5f..f513d1e4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding;
import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
import it.integry.plugins.barcode_base_library.model.BarcodeType;
@@ -207,13 +208,13 @@ public class DialogInputQuantity {
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
- ViewDataBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
+ DialogInputQuantityArticoloBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
- final TextInputLayout txlInputBatchLot = contentView.getRoot().findViewById(R.id.input_partita_mag);
+ final TextInputLayout txlInputBatchLot = contentView.inputPartitaMag;
- final TextInputLayout txlInputNumDiCnf = contentView.getRoot().findViewById(R.id.input_num_cnf);
- final TextInputLayout txlInputQtaPerCnf = contentView.getRoot().findViewById(R.id.input_qta_cnf);
- final TextInputLayout txlInputQtaTot = contentView.getRoot().findViewById(R.id.input_qta_tot);
+ final TextInputLayout txlInputNumDiCnf = contentView.inputNumCnf;
+ final TextInputLayout txlInputQtaPerCnf = contentView.inputQtaCnf;
+ final TextInputLayout txlInputQtaTot = contentView.inputQtaTot;
txlInputNumDiCnf.getEditText().setSelectAllOnFocus(true);
txlInputQtaPerCnf.getEditText().setSelectAllOnFocus(true);
@@ -229,8 +230,8 @@ public class DialogInputQuantity {
setupQuantityListener(currentQuantityDto, txlInputNumDiCnf, txlInputQtaPerCnf, txlInputQtaTot);
- contentView.setVariable(BR.viewmodel, dto);
- contentView.setVariable(BR.quantityViewModel, currentQuantityDto);
+ contentView.setViewmodel(dto);
+ contentView.setQuantityViewModel(currentQuantityDto);
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
.setView(contentView.getRoot())
diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
index 5f663861..b773e8ba 100644
--- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
@@ -4,14 +4,21 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
+
+
+
+
-
+ android:textColor="@android:color/black"
+ android:layout_marginBottom="12dp"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 66d0d803..5fea7e3c 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -71,6 +71,39 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 5eea9a6f..d2572035 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
+ xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/side_nav_bar"
android:gravity="bottom"
android:orientation="vertical"
@@ -20,10 +21,11 @@
app:srcCompat="@android:drawable/sym_def_app_icon" />
Cod art / Descrizione
Seleziona un fornitore prima
+ Numero ordine
+ Cliente
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da8af156..e7d7ed3e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,4 +144,8 @@
Item code / Description
Please select a supplier first
+
+ Orders number
+ Customer
+