diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index ee590adb..b00b35f3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -50,11 +50,11 @@ public class AppContext { FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); if( SettingsManager.isInstanceAvailable() && - (SettingsManager.i().userSession != null && !UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB)) && - (SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname))) { + (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) && + (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) { - crashlytics.setUserId(SettingsManager.i().user.fullname); - crashlytics.setCustomKey("profile_db", SettingsManager.i().userSession.profileDB); + crashlytics.setUserId(SettingsManager.i().getUser().getFullname()); + crashlytics.setCustomKey("profile_db", SettingsManager.i().getUserSession().getProfileDB()); } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java index 7704c36c..25f96b0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.core.model; -import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.settings.SettingsManager; @@ -21,8 +20,8 @@ public class MtbCols extends EntityBase { public MtbCols() { type = "mtb_cols"; - setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); - setModificatoDa(SettingsManager.i().user.fullname); + setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); + setModificatoDa(SettingsManager.i().getUser().getFullname()); setDataMove(UtilityDate.getDateInstance()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 32624df3..9ec32850 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -101,8 +101,8 @@ public class MtbColt extends EntityBase { } public MtbColt initDefaultFields() { - setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); - setPreparatoDa(SettingsManager.i().user.fullname); + setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); + setPreparatoDa(SettingsManager.i().getUser().getFullname()); setOraInizPrep(UtilityDate.getDateInstance()); setCodAnag(SettingsManager.iDB().getDefaultCodAnag()); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index bebc2ee8..bf145ddd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -19,9 +19,9 @@ public class HttpInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { - final String PROFILE_DB = SettingsManager.i().userSession == null ? null : SettingsManager.i().userSession.profileDB; - final String USERNAME = SettingsManager.i().user.username; - final String PASSWORD = SettingsManager.i().user.password; + final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB(); + final String USERNAME = SettingsManager.i().getUser().getUsername(); + final String PASSWORD = SettingsManager.i().getUser().getPassword(); final Request request = chain.request(); final HttpUrl url = request.url().newBuilder() diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java index 4d34814d..71191792 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java @@ -20,12 +20,12 @@ public class RESTBuilder { public static T getService(final Class service) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true); + return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true); } public static T getService(final Class service, int timeout) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout); + return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java index c2200dd7..9309145a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java @@ -21,7 +21,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{ public static void getAvailablePosizioni(RunnableArgs> onComplete, RunnableArgs onFailed) { - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class); posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java index 5feaf24e..e84640f4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java @@ -92,7 +92,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public static void getAvailableProfiles(final ISimpleOperationCallback> callback){ SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class); - service.getAvailableProfiles(SettingsManager.i().user.username, SettingsManager.i().user.password).enqueue(new Callback>>() { + service.getAvailableProfiles(SettingsManager.i().getUser().getUsername(), SettingsManager.i().getUser().getPassword()).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "ProfilesAvailable", callback); @@ -139,7 +139,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public static void sendErrorLogMail(String message, Runnable onComplete, RunnableArgs onFailed) { - String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : " [" + SettingsManager.i().userSession.profileDB + "]"; + String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : " [" + SettingsManager.i().getUserSession().getProfileDB() + "]"; String dest = ""; if(BuildConfig.DEBUG) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java index 2c40d281..9f0071ab 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java @@ -30,8 +30,8 @@ public class ServerStatusChecker { private Runnable runnableCode = new Runnable() { @Override public void run() { - if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().server.host)) { - UtilityServer.isEmsApiAvailable(SettingsManager.i().server.host, SettingsManager.i().server.port, mInternalCallback); + if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) { + UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback); handler.postDelayed(this, MILLIS_DELAY); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e77fe151..d69a26db 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -38,7 +38,7 @@ public class SettingsManager { if(settingsModelIstance == null) { settingsModelIstance = new SettingsModel(); - settingsModelIstance.server = new SettingsModel.Server(); + settingsModelIstance.setServer(new SettingsModel.Server()); //settingsModelIstance.user = new SettingsModel.User(); //settingsModelIstance.userSession = new SettingsModel.UserSession(); @@ -136,10 +136,10 @@ public class SettingsManager { boolean codMdepExistsAnymore = false; - if(settingsModelIstance.userSession.depo != null){ + if(settingsModelIstance.getUserSession().getDepo() != null){ for(AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps){ //Controllo se il codMdep salvato esiste ancora - if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.userSession.depo.getCodMdep())) { + if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) { codMdepExistsAnymore = true; break; } @@ -147,7 +147,7 @@ public class SettingsManager { } if(!codMdepExistsAnymore){ - settingsModelIstance.userSession.depo = availableCodMdeps.get(0); + settingsModelIstance.getUserSession().setDepo(availableCodMdeps.get(0)); } if(onComplete != null) onComplete.run(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java index 03c8554c..cf6fafe1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java @@ -4,9 +4,9 @@ import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; public class SettingsModel { - public Server server; - public User user; - public UserSession userSession; + private Server server; + private User user; + private UserSession userSession; public boolean isUserLoggedIn() { return user != null; @@ -19,9 +19,9 @@ public class SettingsModel { public static class Server { - public String codAzienda; - public String host; - public int port; + private String codAzienda; + private String host; + private int port; public String getCodAzienda() { return codAzienda; @@ -52,9 +52,9 @@ public class SettingsModel { } public static class User { - public String username; - public String password; - public String fullname; + private String username; + private String password; + private String fullname; public String getUsername() { return username; @@ -85,9 +85,9 @@ public class SettingsModel { } public static class UserSession { - public String profileDB; - public AvailableCodMdepsDTO depo; - public Integer defaultOrdinamentoPickingAccettazione = 0; + private String profileDB; + private AvailableCodMdepsDTO depo; + private Integer defaultOrdinamentoPickingAccettazione = 0; public String getProfileDB() { return profileDB; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java index c3d4f623..bb05ffbb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java @@ -36,8 +36,8 @@ public class UpdatesManager { suffix = ""; } - String currentVersionUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/currentVersion"; - String currentDownloadUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/android-release"+suffix+"_v2.apk"; + String currentVersionUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/currentVersion"; + String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release"+suffix+"_v2.apk"; AppUpdater appUpdater = new AppUpdater(context) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java index 6593b960..7f81106e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFirebase.java @@ -8,14 +8,14 @@ import it.integry.integrywmsnative.core.settings.SettingsManager; public class UtilityFirebase { public static Trace getNewPerformanceTrace(String traceName) { - String username = SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname) ? - SettingsManager.i().user.fullname : + String username = SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()) ? + SettingsManager.i().getUser().getFullname() : "N / A"; Trace newTrace = FirebasePerformance.getInstance().newTrace(traceName); newTrace.putAttribute("user_fullame", username); - newTrace.putAttribute("profile_db", SettingsManager.i().userSession.profileDB); + newTrace.putAttribute("profile_db", SettingsManager.i().getUserSession().getProfileDB()); return newTrace; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index dc478f3c..061befef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -73,7 +73,7 @@ public class UtilityLogger { // // message = message.replace("__ERROR_STACKTRACE__", sw.toString()); // -// String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB; +// String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : SettingsManager.i().getUserSession().getProfileDB(); // message = message.replace("__CUSTOMER_NAME__", currentAzienda); // // message = message.replace("__ERROR_DATE__", UtilityDate.formatDate(UtilityDate.getDateInstance(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java index 0f5a9ec4..1c12f951 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySettings.java @@ -7,8 +7,8 @@ public class UtilitySettings { public static void logout(AppDatabase appDatabase){ - SettingsManager.i().user = null; - SettingsManager.i().userSession = null; + SettingsManager.i().setUser(null); + SettingsManager.i().setUserSession(null); UtilityThread.executeParallel(appDatabase::clearAllTables); SettingsManager.update(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index a80b0839..bb9c546c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -35,7 +35,7 @@ public class AccettazioneHelper { } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); service.listOrdiniInevasi(codMdep, "A").enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 96e830da..d85b75f5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -88,7 +88,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC private void init() { - currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione); + currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().getUserSession().getDefaultOrdinamentoPickingAccettazione()); mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this); mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(this::onRowDeleted); @@ -412,7 +412,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC .setTitle(mActivity.getText(R.string.action_orderBy)) .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, currentOrderBy.getVal(), (dialog12, which) -> { currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which); - SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione = which; + SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which); }) .setPositiveButton("Ok", (dialog1, which) -> refreshOrderBy(false)) .create(); @@ -592,7 +592,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC return; } - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, value -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, value -> { if (value.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index b23aea4f..53657ef2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -100,7 +100,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked mContext.bindings.contenutoBancaleFab.close(true); final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, value -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), mPrinterType, value -> { if(value.size() > 0) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index c090af84..91b797c0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -1,25 +1,25 @@ package it.integry.integrywmsnative.gest.login.viewmodel; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.Intent; -import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.text.SpannableString; import android.text.Spanned; +import androidx.appcompat.app.AlertDialog; + import java.net.MalformedURLException; import java.net.URL; import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableString; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityServer; @@ -59,10 +59,10 @@ public class LoginViewModel { loginButtonEnabled.set(true); - codAzienda.set(SettingsManager.i().server.codAzienda); + codAzienda.set(SettingsManager.i().getServer().getCodAzienda()); - customSettingsCheckboxChecked.set(SettingsManager.i().server.host == null); - customSettingsCheckboxEnabled.set(SettingsManager.i().server.host != null); + customSettingsCheckboxChecked.set(SettingsManager.i().getServer().getHost() == null); + customSettingsCheckboxEnabled.set(SettingsManager.i().getServer().getHost() != null); } @@ -120,7 +120,7 @@ public class LoginViewModel { SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles); SettingsManager.i().createUserSession(); - SettingsManager.i().user.fullname = !UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get(); + SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get()); mActivity.runOnUiThread(() -> onLoginSuccess( @@ -157,12 +157,12 @@ public class LoginViewModel { private void loadDepo(String host, int port, Runnable onComplete) { - SettingsManager.i().server.codAzienda = codAzienda.get(); - SettingsManager.i().server.host = host; - SettingsManager.i().server.port = port; + SettingsManager.i().getServer().setCodAzienda(codAzienda.get()); + SettingsManager.i().getServer().setHost(host); + SettingsManager.i().getServer().setPort(port); - SettingsManager.i().user.username = username.get(); - SettingsManager.i().user.password = password.get(); + SettingsManager.i().getUser().setUsername(username.get()); + SettingsManager.i().getUser().setPassword(password.get()); SystemRESTConsumer.getAvailableCodMdeps(new ISimpleOperationCallback>() { @Override @@ -174,7 +174,7 @@ public class LoginViewModel { return; } - SettingsManager.i().userSession.depo = availableCodMdeps.get(0); + SettingsManager.i().getUserSession().setDepo(availableCodMdeps.get(0)); if(onComplete != null) onComplete.run(); @@ -212,7 +212,7 @@ public class LoginViewModel { private void showProfileDBSelectionDialog(final String host, final int port, final List availableProfiles){ if(availableProfiles != null && availableProfiles.size() == 1 ) { - SettingsManager.i().userSession.profileDB = availableProfiles.get(0); + SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(0)); loadDepo(host, port, this::onLoginCompleted); } else { @@ -225,7 +225,7 @@ public class LoginViewModel { String[] profiles = new String[availableProfiles.size()]; profiles = availableProfiles.toArray(profiles); builder.setItems(profiles, (dialog, which) -> { - SettingsManager.i().userSession.profileDB = availableProfiles.get(which); + SettingsManager.i().getUserSession().setProfileDB(availableProfiles.get(which)); loadDepo(host, port, this::onLoginCompleted); }); 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 52dfd9b4..0675aef4 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 @@ -112,8 +112,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab } private void initSessionData() { - mBindings.currentUserName.setText(SettingsManager.i().user.fullname); - mBindings.currentDeposito.setText(String.format("Deposito: %s • %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione())); + mBindings.currentUserName.setText(SettingsManager.i().getUser().getFullname()); + mBindings.currentDeposito.setText(String.format("Deposito: %s • %s", SettingsManager.i().getUserSession().getDepo().getCodMdep(), SettingsManager.i().getUserSession().getDepo().getDescrizione())); if (SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) { // currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index fda8cf1d..3a8cd77d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -644,7 +644,7 @@ public class PickingLiberoViewModel { .setQtaCol(qtaTot) .setPartitaMag(partitaMag) .setDataScadPartita(dataScad) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setCausale(MtbColr.Causale.RETTIFICA) .setDatetimeRow(UtilityDate.getDateInstance()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 30470329..845e1d88 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -215,7 +215,7 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC mtbColt .setGestione(mDefaultGestioneOfUL) .setSegno(mDefaultSegnoOfUL) .setCodAnag(mDefaultCodAnagOfUL) - .setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()) + .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()) .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); @@ -427,7 +427,7 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC DialogAskShouldPrint.make(this, "Packing List", shouldPrint -> { if(shouldPrint) { - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { if (printerList.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 89a51d12..a8110542 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -5,12 +5,6 @@ import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; - -import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; - import android.text.Html; import android.text.SpannableString; import android.view.LayoutInflater; @@ -18,6 +12,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.annimon.stream.Stream; import java.util.ArrayList; @@ -25,12 +24,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; -import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElencoBinding; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; @@ -110,11 +109,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit private void init() { - final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new OrdineProduzioneHelper(getActivity()); - mHelper.loadOrdini(ordini -> { if(ordini != null) { Toast.makeText(getActivity(), "Caricati " + ordini.size() + " ordini", Toast.LENGTH_LONG).show(); @@ -133,8 +130,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); } ); - - } @Override @@ -243,8 +238,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit @Override public void onFilterClick() { - - DialogOrdineProduzioneFiltroAvanzato.make(getActivity(), mOriginalOrderList, mAppliedFilterViewModel, (filteredOrderList, filter) -> { mAppliedFilterViewModel = filter; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java index 485da4fa..c83a21cc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java @@ -29,7 +29,7 @@ public class OrdineProduzioneHelper { mContext = context; } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); service.listOrdiniInevasi(codMdep, "P").enqueue(new Callback>>() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index 0e879fad..37177c7b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -39,7 +39,7 @@ public class ProdOrdineLavorazioneHelper { } public void loadOrdini(RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_ords_lavorazione"); perfTrace.start(); @@ -95,7 +95,7 @@ public class ProdOrdineLavorazioneHelper { // public void retrievePickingList(List orders, RunnableArgs> onComplete, RunnableArgs onFailed){ -// String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); +// String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); // // // Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_lavorazione"); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index 4992573e..77d1d350 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -295,7 +295,7 @@ public class ProdRecuperoMaterialeViewModel { private void printCollo(Dialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { - PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { + PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().getUserSession().getDepo().getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { if (printerList.size() > 0) { try { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index a652f014..2c6d3fe8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -577,7 +577,7 @@ public class RettificaGiacenzeViewModel { .setQtaCol(qtaTot) .setPartitaMag(partitaMag) .setDataScadPartita(dataScad) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setCausale(MtbColr.Causale.RETTIFICA) .setDatetimeRow(UtilityDate.getDateInstance()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java index 100a3a9b..1022a23a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.gest.spedizione; -import javax.inject.Singleton; - import dagger.Module; import dagger.Provides; import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; @@ -16,13 +14,11 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag public class SpedizioneModule { @Provides - @Singleton BottomSheetFragmentLUContentViewModel providesBottomSheetFragmentLUContentViewModel() { return new BottomSheetFragmentLUContentViewModel(); } @Provides - @Singleton SpedizioneViewModel providesSpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer) { return new SpedizioneViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliDataRecoverService, ordiniRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index 3a36e6db..4ee6af45 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -92,7 +92,7 @@ public class UltimeConsegneClienteViewModel { } UltimeConsegneClienteRESTConsumer.getUltimeConsegneClienti( - SettingsManager.i().userSession.depo.getCodMdep(), + SettingsManager.i().getUserSession().getDepo().getCodMdep(), currentCodAnagFilter, null, null, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java index edd936b9..ad4787de 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/core/UltimiArriviFornitoreViewModel.java @@ -110,7 +110,7 @@ public class UltimiArriviFornitoreViewModel { UltimiArriviFornitoreRESTConsumer.getUltimeConsegneFornitori( - SettingsManager.i().userSession.depo.getCodMdep(), + SettingsManager.i().getUserSession().getDepo().getCodMdep(), currentCodAnagFilter, null, null, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java index 6a90c326..67fc0653 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java @@ -141,7 +141,9 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_ords_v"); perfTrace.start(); @@ -88,7 +88,7 @@ public class VenditaHelper { public void retrievePickingList(List barcodeOrdini, String dateCons, RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); String joinedBarcodes = TextUtils.join(",", barcodeOrdini); @@ -133,7 +133,7 @@ public class VenditaHelper { } public void retrievePickingListNew(List orders, RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); + String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); List getPickingListDTOs = Stream.of(orders) .map(x -> new GetPickingListDTO() @@ -243,7 +243,7 @@ public class VenditaHelper { testataCollo.getSerCollo(), testataCollo.getGestione(), GestioneEnum.VENDITA.getText(), - SettingsManager.i().userSession.depo.getCodMdep()) + SettingsManager.i().getUserSession().getDepo().getCodMdep()) .enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index e4ae7bfe..2b9040fc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -290,7 +290,7 @@ public class VersamentoMerceViewModel { .setSerColloRif(null) .setDataColloRif((String) null) .setCausale(MtbColr.Causale.VERSAMENTO) - .setUtente(SettingsManager.i().user.fullname) + .setUtente(SettingsManager.i().getUser().getFullname()) .setQtaCol(stornoSourceMtbColr.getQtaCol().multiply(new BigDecimal(-1))); @@ -315,7 +315,7 @@ public class VersamentoMerceViewModel { .setNumCollo(null) .setDataCollo(null) .setCausale(MtbColr.Causale.VERSAMENTO) - .setUtente(SettingsManager.i().user.fullname); + .setUtente(SettingsManager.i().getUser().getFullname()); mtbColrDestObservableField.add(cloneMtbColr); } diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 51651754..fc48124e 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -24,7 +24,7 @@ public class OrdiniVendita implements IOrdiniVendita { //Se il deposito del collo è diverso dal deposito dell'utente allora sto "evadendo" la merce per una vendita presente //su un altro deposito if(!UtilityString.isNullOrEmpty(codMdepOrder) && - !codMdepOrder.equalsIgnoreCase(SettingsManager.i().userSession.depo.getCodMdep())) { + !codMdepOrder.equalsIgnoreCase(SettingsManager.i().getUserSession().getDepo().getCodMdep())) { ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE,