diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..603b1407 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..dfebefaf --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Gestor Almacén \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..88ea3aa1 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..fb7f4a8a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..ed9c379e --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..23704740 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..860da66a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..e497da99 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..9e0f9ea1 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,91 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.crashlytics' + + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "es.verdnatura" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 60 + // versionName "5.4.4" + versionName "6.1.3" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + dataBinding { + enabled = true + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar']) + releaseImplementation fileTree(dir: 'libs/release', include: ['*.jar']) + + // Kotlin and Android + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'com.squareup.retrofit2:retrofit:2.0.2' + implementation 'com.squareup.retrofit2:converter-gson:2.0.2' + implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' + implementation "com.airbnb.android:lottie:$lottieVersion" + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' + + + // Architecture components + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + + // Koin for DI + implementation "org.koin:koin-core:$koin" + implementation "org.koin:koin-android:$koin" + implementation "org.koin:koin-androidx-scope:$koin" + implementation "org.koin:koin-androidx-viewmodel:$koin" + + + // Image libraries + implementation "io.coil-kt:coil:$coil" + implementation "com.github.bumptech.glide:glide:$glide" + implementation "com.github.bumptech.glide:okhttp3-integration:$glide" + kapt "com.github.bumptech.glide:compiler:$glide" + + // Add the Firebase Crashlytics SDK. + implementation 'com.google.firebase:firebase-analytics:17.5.0' + implementation 'com.google.firebase:firebase-crashlytics:17.2.1' + + //search + implementation 'com.github.mirrajabi:search-dialog:1.1' + +} diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 00000000..57c27ec5 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,40 @@ +{ + "project_info": { + "project_number": "519813071137", + "firebase_url": "https://gestoralmacen-bfa2a.firebaseio.com", + "project_id": "gestoralmacen-bfa2a", + "storage_bucket": "gestoralmacen-bfa2a.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:519813071137:android:3de54686c580a6f79dfe60", + "android_client_info": { + "package_name": "es.verdnatura" + } + }, + "oauth_client": [ + { + "client_id": "519813071137-5099s9mme9juufnrkm88ajt5n7cmluqh.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyA74wQCwDCpCjWs49lCX5m2SsdqcYb_J8s" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "519813071137-5099s9mme9juufnrkm88ajt5n7cmluqh.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/release/20210611-vn-picking.apk b/app/release/20210611-vn-picking.apk new file mode 100644 index 00000000..207aa4d4 Binary files /dev/null and b/app/release/20210611-vn-picking.apk differ diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 00000000..5ab975f7 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 00000000..162516f0 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "es.verdnatura", + "variantName": "processReleaseResources", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 60, + "versionName": "6.1.3", + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 00000000..439b2143 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"5.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/release/vn-picking-old-old.apk b/app/release/vn-picking-old-old.apk new file mode 100644 index 00000000..6995a4da Binary files /dev/null and b/app/release/vn-picking-old-old.apk differ diff --git a/app/release/vn-picking-old.apk b/app/release/vn-picking-old.apk new file mode 100644 index 00000000..65960acf Binary files /dev/null and b/app/release/vn-picking-old.apk differ diff --git a/app/release/vn-picking-test(delete_fragments).apk b/app/release/vn-picking-test(delete_fragments).apk new file mode 100644 index 00000000..8e543fd4 Binary files /dev/null and b/app/release/vn-picking-test(delete_fragments).apk differ diff --git a/app/release/vn-picking.apk b/app/release/vn-picking.apk new file mode 100644 index 00000000..5ab975f7 Binary files /dev/null and b/app/release/vn-picking.apk differ diff --git a/app/release/vn-picking_deletefragments.apk b/app/release/vn-picking_deletefragments.apk new file mode 100644 index 00000000..8e543fd4 Binary files /dev/null and b/app/release/vn-picking_deletefragments.apk differ diff --git a/app/src/androidTest/java/es/verdnatura/ExampleInstrumentedTest.kt b/app/src/androidTest/java/es/verdnatura/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..6a6e2eb3 --- /dev/null +++ b/app/src/androidTest/java/es/verdnatura/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package es.verdnatura + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("es.verdnatura", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..ee231f59 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..e6d54026 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/es/verdnatura/MobileApplication.kt b/app/src/main/java/es/verdnatura/MobileApplication.kt new file mode 100644 index 00000000..20f831ea --- /dev/null +++ b/app/src/main/java/es/verdnatura/MobileApplication.kt @@ -0,0 +1,20 @@ +package es.verdnatura + +import android.app.Application +import es.verdnatura.di.viewModelModule +import org.koin.android.ext.koin.androidContext +import org.koin.core.context.loadKoinModules +import org.koin.core.context.startKoin + +class MobileApplication: Application() { + override fun onCreate() { + super.onCreate() + + startKoin { androidContext(this@MobileApplication) + val moduleList = listOf(viewModelModule) + loadKoinModules(moduleList) + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/di/viewModelModule.kt b/app/src/main/java/es/verdnatura/di/viewModelModule.kt new file mode 100644 index 00000000..f1681139 --- /dev/null +++ b/app/src/main/java/es/verdnatura/di/viewModelModule.kt @@ -0,0 +1,140 @@ +package es.verdnatura.di + +import es.verdnatura.presentation.view.feature.ajustes.fragment.AjustesViewModel +import es.verdnatura.presentation.view.feature.articulo.fragment.ItemCardViewModel +import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemViewModel +import es.verdnatura.presentation.view.feature.buscaritemall.fragment.BuscarItemAllViewModel +import es.verdnatura.presentation.view.feature.calidad.fragment.BuyersViewModel +import es.verdnatura.presentation.view.feature.calidad.fragment.QaualityViewModel +import es.verdnatura.presentation.view.feature.collection.fragment.CollectionViewModel +import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorViewModel +import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasViewModel +import es.verdnatura.presentation.view.feature.historico.fragment.HistoricoViewModel +import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel +import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailViewModel +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletViewModel +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanViewModel +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionTruckListViewModel +import es.verdnatura.presentation.view.feature.parking.fragment.ParkingViewModel +import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel +import es.verdnatura.presentation.view.feature.presacador.fragment.PreSacadorViewModel +import es.verdnatura.presentation.view.feature.reposicion.fragment.ReposicionViewModel +import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorViewModel +import es.verdnatura.presentation.view.feature.shelvingparking.fragment.ShelvingParkingViewModel +import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemViewModel +import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewModel +import org.koin.android.ext.koin.androidContext +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.dsl.module + +val viewModelModule = module{ + // Login + viewModel { + LoginViewModel(androidContext()) + } + + // Pasilleros + viewModel { + PasilleroViewModel(androidContext()) + } + + // Pasilleros / Item Card + viewModel { + ItemCardViewModel(androidContext()) + } + + // Pasilleros / Item Card / Historico + viewModel { + HistoricoViewModel(androidContext()) + } + + // Pasilleros / Buscar Item + viewModel { + BuscarItemViewModel(androidContext()) + } + + // Pasilleros / Buscar Item 2 + viewModel { + BuscarItemAllViewModel(androidContext()) + } + + // Pasilleros / Inventario + viewModel { + InventaryViewModel(androidContext()) + } + // Pasilleros / Faltas + viewModel { + FaltasViewModel(androidContext()) + } + + // ShelvingParking + viewModel { + ShelvingParkingViewModel(androidContext()) + } + + // Ubicador + viewModel { + UbicadorViewModel(androidContext()) + } + + // Ubicador // Automatic + viewModel { + AutomaticAddItemViewModel(androidContext()) + } + + // Ajustes + viewModel { + AjustesViewModel(androidContext()) + } + + // PALETIZADOR + viewModel { + ExpeditionTruckListViewModel(androidContext()) + } + + viewModel { + ExpeditionPalletViewModel(androidContext()) + } + + viewModel { + ExpeditionPalletDetailViewModel(androidContext()) + } + + viewModel { + ExpeditionScanViewModel(androidContext()) + } + + // SACADOR + viewModel { + SacadorViewModel(androidContext()) + } + + viewModel { + CollectionViewModel(androidContext()) + } + + viewModel { + ControladorViewModel(androidContext()) + } + + viewModel { + ParkingViewModel(androidContext()) + } + + viewModel { + PreSacadorViewModel(androidContext()) + } + + viewModel { + ReposicionViewModel(androidContext()) + } + + viewModel { + BuyersViewModel(androidContext()) + } + + viewModel { + QaualityViewModel(androidContext()) + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt new file mode 100644 index 00000000..d9a70a43 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt @@ -0,0 +1,16 @@ +package es.verdnatura.domain + +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class ApiSalixUtils { + companion object { + //const val BASE_URL:String = "http://192.168.1.108:8000/" + const val BASE_URL:String = "https://salix.verdnatura.es/api/" + fun getApiService():SalixService{ + val salixRetrofit = Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory( + GsonConverterFactory.create()).build() + return salixRetrofit.create(SalixService::class.java) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/ApiUtils.kt b/app/src/main/java/es/verdnatura/domain/ApiUtils.kt new file mode 100644 index 00000000..d24b7ddd --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/ApiUtils.kt @@ -0,0 +1,65 @@ +package es.verdnatura.domain + +import android.content.Context +import android.content.SharedPreferences +import android.preference.PreferenceManager +import android.util.Log +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import java.util.concurrent.TimeUnit + + +class ApiUtils { + companion object { + //const val BASE_URL:String = "http://192.168.1.54:8009/" + const val BASE_URL:String = "https://app.verdnatura.es/" + //const val BASE_URL:String = "https://test-app.verdnatura.es/" + //const val BASE_URL:String = "http://10.1.4.186/" + + fun getApiService(context: Context):VerdnaturaService{ + val retrofit = Retrofit.Builder() + .baseUrl(getBaseUrlLocal(context)) + .addConverterFactory(GsonConverterFactory.create()) + .client(getRequestHeader()) + .build() + return retrofit.create(VerdnaturaService::class.java) + } + + fun getBaseUrlLocal(context: Context): String { + var url = this.getDefaults("base_url",context) + if (url.isNullOrEmpty()){ + setDefaults("base_url", BASE_URL,context) + }else{ + if (!url.contains("http")){ + url = "https://"+url + } + } + + return if (url.isNullOrEmpty()) BASE_URL else url + } + + fun getRequestHeader(): OkHttpClient? { + val client = OkHttpClient.Builder() + .connectTimeout(10, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) + .readTimeout(40, TimeUnit.SECONDS) + .build() + return client + } + + fun setDefaults(key: String?, value: String?, context: Context?) { + val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val editor = preferences.edit() + editor.putString(key, value) + editor.commit() + } + + fun getDefaults(key: String?, context: Context?): String? { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + return preferences.getString(key, null) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt new file mode 100644 index 00000000..e530c1a8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt @@ -0,0 +1,13 @@ +package es.verdnatura.domain + +object ConstAndValues { + const val SACADOR = "PREPARED" + const val CONTROLADOR = "CHECKED" + const val OK = "OK" + const val PREPARED = "PREPARED" + const val ON_PREPARATION = "ON_PREPARATION" + const val CHECKED = "CHECKED" + const val PRESACADOR = "PRESACADOR" + const val ON_CHECKING = "ON_CHECKING" +} + diff --git a/app/src/main/java/es/verdnatura/domain/Extensions.kt b/app/src/main/java/es/verdnatura/domain/Extensions.kt new file mode 100644 index 00000000..f2e18a59 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/Extensions.kt @@ -0,0 +1,12 @@ +package es.verdnatura.domain + +import android.content.Context +import android.widget.Toast + +fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast { + return Toast.makeText(context, this.toString(), duration).apply { show() } +} + +fun T?.notNull(f: (it: T) -> Unit) { + if (this != null) f(this) +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt new file mode 100644 index 00000000..3a5a2f55 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt @@ -0,0 +1,14 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import retrofit2.Call + +class GetAjustesUserCase(context: Context) : RestClient(context) { + + fun getSectors(usuario:String,password:String) : Call> { + return restClient!!.getSectors("json","1",usuario,password,"application/json") + } + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt new file mode 100644 index 00000000..590ed25b --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt @@ -0,0 +1,15 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll +import retrofit2.Call + +class GetBuscarItemAllUserCase(context: Context) : RestClient(context) { + + fun searchItemsUbicadorAll(usuario:String,password:String,itemFk:String) : Call> { + val params:ArrayList = ArrayList() + params.add(itemFk) + return restClient!!.searchItemsUbicadorAll("json","1",usuario,password,"application/json",params = params) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt new file mode 100644 index 00000000..5448f6bc --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt @@ -0,0 +1,15 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import retrofit2.Call + +class GetBuscarItemUserCase(context: Context) : RestClient(context) { + + fun searchItemsUbicador(usuario:String,password:String,itemFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(itemFk) + return restClient!!.searchItemsUbicador("json","1",usuario,password,"application/json",params = params) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt new file mode 100644 index 00000000..2e61ba27 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt @@ -0,0 +1,44 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import retrofit2.Call + +class GetInventaryUserCase(context: Context) : RestClient(context) { + + fun itemShelvingRadar(usuario:String,password:String,sectorFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(sectorFk) + return restClient!!.itemShelvingRadar("json","1",usuario,password,"application/json",params = params) + } + + fun itemShelvingRadarFilterBuyer(usuario:String,password:String,buyerFk:String,warehouseFk: String) : Call> { + val params:ArrayList = ArrayList(); + params.add(buyerFk) + params.add(warehouseFk) + return restClient!!.itemShelvingRadarFilterBuyer("json","1",usuario,password,"application/json",params = params) + } + + fun faultsReview(usuario:String,password:String,warehouseFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(warehouseFk) + return restClient!!.faultsReview("json","1",usuario,password,"application/json",params = params) + } + + fun faultsReview_isChecked(usuario:String,password:String,itemFk:String,warehouseFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + return restClient!!.faultsReview_isChecked("json","1",usuario,password,"application/json",params = params) + } + + + fun itemShelvingBuyerGet(usuario:String,password:String) : Call> { + return restClient!!.itemShelvingBuyerGet("json","1",usuario,password,"application/json") + } + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt new file mode 100644 index 00000000..814a2d25 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt @@ -0,0 +1,94 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO +import retrofit2.Call + +class GetItemCardUserCase(context: Context) : RestClient(context) { + + fun getItemCard(usuario:String,password:String,itemFk:String,warehouseFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + return restClient!!.getItemCard("json","1",usuario,password,"application/json",params = params) + } + + fun getItemPackingType(usuario:String,password:String) : Call> { + val params:ArrayList = ArrayList(); + return restClient!!.getItemPackingType("json","1",usuario,password,"application/json",params = params) + } + + fun itemStockUpdate(usuario:String,password:String,itemFk:String,warehouseFk:String,newVisible:String,isTrash:String ) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + params.add(newVisible) + params.add(isTrash) + return restClient!!.itemStockUpdate("json","1",usuario,password,"application/json",params = params) + } + + fun itemTrash(usuario:String,password:String,itemFk:String,warehouseFk:String,newVisible:String,isTrash:String ) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + params.add(newVisible) + params.add(isTrash) + return restClient!!.itemTrash("json","1",usuario,password,"application/json",params = params) + } + + fun itemPlacementSave(usuario:String,password:String,itemFk:String,warehouseFk:String,value:String ) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + params.add(value) + return restClient!!.itemPlacementSave("json","1",usuario,password,"application/json",params = params) + } + + fun updateGrouping(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(value) + params.add(warehouseFk) + return restClient!!.updateGrouping("json","1",usuario,password,"application/json",params = params) + } + + fun updatePacking(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(value) + params.add(warehouseFk) + return restClient!!.updatePacking("json","1",usuario,password,"application/json",params = params) + } + + fun updatePackingType(usuario:String,password:String,itemFk:String,ItemPackingType:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(ItemPackingType) + return restClient!!.updatePackingType("json","1",usuario,password,"application/json",params = params) + } + + + fun itemSaveMin(usuario:String,password:String,itemFk:String,value:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(value) + return restClient!!.itemSaveMin("json","1",usuario,password,"application/json",params = params) + } + + fun barcodes_edit(usuario:String,password:String,itemFk:String,value:String, delete:String) : Call { + val params:ArrayList = ArrayList(); + params.add(value) + params.add(itemFk) + params.add(delete) + return restClient!!.barcodes_edit("json","1",usuario,password,"application/json",params = params) + } + + fun itemDiary(usuario:String,password:String,itemFk:String,warehouseFk: String) : Call> { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(warehouseFk) + return restClient!!.itemDiary("json","1",usuario,password,"application/json",params = params) + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt new file mode 100644 index 00000000..65402d08 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt @@ -0,0 +1,38 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO +import es.verdnatura.presentation.view.feature.login.model.SalixMessageVO +import es.verdnatura.presentation.view.feature.login.model.versionApp +import retrofit2.Call + +class GetLoginUserCase(context: Context) : RestClient(context) { + + fun login(usuario:String,password:String) : Call{ + val params:ArrayList = ArrayList() + params.add(usuario) + params.add(password) + return restClient!!.login("json","1",usuario,password,"application/json",params) + } + + fun salixLogin(usuario:String,password:String) : Call{ + return salixClient!!.login("application/json", LoginSalixVO(usuario,password)) + } + + fun checkVersion_old(usuario:String,password:String,version:String) : Call { + val params:ArrayList = ArrayList() + params.add(version) + return restClient!!.version("json","1",usuario,password,"application/json",params) + } + + fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{ + return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message)) + } + + fun checkVersion(usuario:String,password:String,nameApp:String) : Call { + val params:ArrayList = ArrayList() + params.add(nameApp) + return restClient!!.version2("json","1",usuario,password,"application/json",params) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt new file mode 100644 index 00000000..24d54c8d --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt @@ -0,0 +1,86 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.paletizador.model.* +import retrofit2.Call + +class GetPaletizadoresUserCase(context: Context) : RestClient(context) { + + fun expeditionTruckList(usuario:String,password:String) : Call> { + val params:ArrayList = ArrayList(); + return restClient!!.expeditionTruckList("json","1",usuario,password,"application/json") + } + + fun expeditionTruckAdd(usuario:String,password:String,vHour:String,vDescription:String) : Call { + val params:ArrayList = ArrayList() + params.add(vHour) + params.add(vDescription) + // ////Log.i("VERDNATURA"," La hora es $vHour y descrip $vDescription") + return restClient!!.expeditionTruckAdd("json","1",usuario,password,"application/json",params) + } + + fun expeditionPallet_List(usuario:String,password:String,vTruckFk:String) : Call> { + val params:ArrayList = ArrayList() + params.add(vTruckFk) + return restClient!!.expeditionPallet_List("json","1",usuario,password,"application/json",params) + } + + fun expeditionScanAdd(usuario:String,password:String,vPalletFk:String,vTruckFk:String) : Call> { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + params.add(vTruckFk) + return restClient!!.expeditionScanAdd("json","1",usuario,password,"application/json",params) + } + + fun expeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String) : Call { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + params.add(vExpeditionFk) + return restClient!!.expeditionScanPut("json","1",usuario,password,"application/json",params) + } + fun checkRouteExpeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String) : Call { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + params.add(vExpeditionFk) + return restClient!!.checkRouteExpeditionScanPut("json","1",usuario,password,"application/json",params) + } + + + + fun expeditionPalletView(usuario:String,password:String,vPalletFk:String) : Call> { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + return restClient!!.expeditionPalletView("json","1",usuario,password,"application/json",params) + } + + fun expeditionPalletDel(usuario:String,password:String,vPalletFk:String) : Call { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + return restClient!!.expeditionPalletDel("json","1",usuario,password,"application/json",params) + } + + fun expeditionScanList(usuario:String,password:String,vPalletFk:String) : Call> { + val params:ArrayList = ArrayList() + params.add(vPalletFk) + return restClient!!.expeditionScanList("json","1",usuario,password,"application/json",params) + } + + fun expeditionScanDel(usuario:String,password:String,vScanFk:String) : Call { + val params:ArrayList = ArrayList() + params.add(vScanFk) + return restClient!!.expeditionScanDel("json","1",usuario,password,"application/json",params) + } + + fun expeditionPalletPrintSet( + usuario: String, + password: String, + vPalletFk: String, + vSectorFk: String + ) : Call { + val params:ArrayList = ArrayList(); + params.add(vPalletFk) + params.add(vSectorFk) + return restClient!!.expeditionPalletPrintSet("json","1",usuario,password,"application/json",params) + } + +} diff --git a/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt new file mode 100644 index 00000000..4880ed77 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt @@ -0,0 +1,31 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import retrofit2.Call + +class GetPreSacadorUseCase(context: Context) : RestClient(context) { + + fun ticketToPrePrepare(usuario:String,password:String,ticketFk:String,sectorFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(ticketFk) + params.add(sectorFk) + return restClient!!.ticketToPrePrepare("json","1",usuario,password,"application/json",params) + } + + fun itemPlacementSupplyGetOrder(usuario:String,password:String,sectorFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(sectorFk) + return restClient!!.itemPlacementSupplyGetOrder("json","1",usuario,password,"application/json",params) + } + + fun itemPlacementSupplyCloseOrder(usuario:String,password:String,id:String,quantity:String) : Call { + val params:ArrayList = ArrayList(); + params.add(id) + params.add(quantity) + return restClient!!.itemPlacementSupplyCloseOrder("json","1",usuario,password,"application/json",params) + } + + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt new file mode 100644 index 00000000..ee2264f8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt @@ -0,0 +1,26 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO +import retrofit2.Call + +class GetQualityUserCase(context: Context) : RestClient(context) { + + fun itemShelvingBuyerGet(usuario:String,password:String) : Call> { + return restClient!!.itemShelvingBuyerGet("json","1",usuario,password,"application/json") + } + + fun itemShelvingBuyerTask(usuario:String,password:String, userFk: String) : Call> { + val params:ArrayList = ArrayList(); + params.add(userFk) + return restClient!!.itemShelvingBuyerTask("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingStarsUpdate(usuario:String,password:String, vId: String,vStars: String) : Call { + val params:ArrayList = ArrayList(); + params.add(vId) + params.add(vStars) + return restClient!!.itemShelvingStarsUpdate("json","1",usuario,password,"application/json",params) + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt new file mode 100644 index 00000000..f16bda0d --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt @@ -0,0 +1,150 @@ +package es.verdnatura.domain + +import android.content.Context +import android.util.Log +import es.verdnatura.presentation.view.feature.collection.ItemVO +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO +import retrofit2.Call + +class GetSacadorControladorUserCase(context: Context) : RestClient(context) { + + fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,print:String) : Call { + val params:ArrayList = ArrayList(); + params.add(collectionFk) + params.add(sectorFk) + params.add(print) + return restClient!!.collectionTicketGet("json","1",usuario,password,"application/json",params) + } + + fun collectionNew(usuario:String,password:String,sectorFk:String,carros:String) : Call { + val params:ArrayList = ArrayList(); + params.add(sectorFk) + params.add(carros) + return restClient!!.collectionNew("json","1",usuario,password,"application/json",params) + + } + + + fun collectionGet(usuario:String,password:String) : Call> { + val params:ArrayList = ArrayList(); + return restClient!!.collectionGet("json","1",usuario,password,"application/json") + } + + fun saleTrackingReplace(usuario:String,password:String,saleFk:String,vOriginalQuantity:String,vStateFk:String,vIsChecked:String,vBuyFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(saleFk) + params.add(vOriginalQuantity) + params.add(vStateFk) + params.add(vIsChecked) + params.add(vBuyFk) + return restClient!!.saleTrackingReplace("json","1",usuario,password,"application/json",params) + } + + fun itemPlacementSupplyAiming(usuario:String,password:String,shelvingFk:String,quantity:String,itemFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(shelvingFk) + params.add(quantity) + params.add(itemFk) + return restClient!!.itemPlacementSupplyAiming("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingSaleSupplyAdd(usuario:String,password:String,itemShelvingFk:String,saleFk:String,quantity:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemShelvingFk) + params.add(saleFk) + params.add(quantity) + return restClient!!.itemShelvingSaleSupplyAdd("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingPlacementSupplyAdd(usuario:String,password:String,itemShelvingFk:String,itemPlacementSupplyFk:String,quantity:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemShelvingFk) + params.add(itemPlacementSupplyFk) + params.add(quantity) + return restClient!!.itemShelvingPlacementSupplyAdd("json","1",usuario,password,"application/json",params) + } + + fun collectionStickerPrint(usuario:String,password:String,collectionFk: String,sectorFk: String) : Call { + val params:ArrayList = ArrayList() + params.add(collectionFk) + params.add(sectorFk) + return restClient!!.collectionStickerPrint("json","1",usuario,password,"application/json",params) + } + + fun itemGetAvailable(usuario:String,password:String,itemFk: String,warehouseFk: String) : Call { + val params:ArrayList = ArrayList() + params.add(itemFk) + params.add(warehouseFk) + return restClient!!.itemGetAvailable("json","1",usuario,password,"application/json",params) + } + + fun collectionAddItem(usuario:String,password:String,itemFk: String,quantityFk: String,ticketFk: String,warehouseFk: String) : Call { + val params:ArrayList = ArrayList() + params.add(itemFk) + params.add(quantityFk) + params.add(ticketFk) + params.add(warehouseFk) + return restClient!!.collectionAddItem("json","1",usuario,password,"application/json",params) + } + + fun saleMove(usuario:String,password:String,saleFk: String,quantity: String,originalQuantity:String) : Call { + val params:ArrayList = ArrayList() + params.add(saleFk) + params.add(quantity) + params.add(originalQuantity) + return restClient!!.saleMove("json","1",usuario,password,"application/json",params) + } + + fun collectionMissingTrash(usuario:String,password:String,saleFk: String,quantity: String,type:String,warehouseFk:String,originalQuantity: String) : Call { + val params:ArrayList = ArrayList() + params.add(saleFk) + params.add(quantity) + params.add(type) + params.add(warehouseFk) + params.add(originalQuantity) + return restClient!!.collectionMissingTrash("json","1",usuario,password,"application/json",params) + } + + fun saleTrackingDel(usuario:String,password:String,saleFk: String) : Call { + val params:ArrayList = ArrayList() + params.add(saleFk) + return restClient!!.saleTrackingDel("json","1",usuario,password,"application/json",params) + } + + fun collectionUpdateState(usuario:String,password:String,collectionFk: String,state : String) : Call { + val params:ArrayList = ArrayList() + params.add(collectionFk) + params.add(state) + return restClient!!.collectionUpdateState("json","1",usuario,password,"application/json",params) + } + + fun getIdFromCode(usuario:String,password:String,code: String) : Call { + val params:ArrayList = ArrayList() + params.add(code) + return restClient!!.getIdFromCode("json","1",usuario,password,"application/json",params) + } + + fun collectionIncreaseQuantity(usuario:String,password:String,saleFk: String, quantity: String) : Call { + val params:ArrayList = ArrayList() + params.add(saleFk) + params.add(quantity) + return restClient!!.collectionIncreaseQuantity("json","1",usuario,password,"application/json",params) + } + + fun saleMistakeAdd(usuario:String,password:String,vSaleFk: String, vUserFk: String, vTypeFk: String) : Call { + val params:ArrayList = ArrayList() + params.add(vSaleFk) + params.add(vUserFk) + params.add(vTypeFk) + return restClient!!.saleMistakeAdd("json","1",usuario,password,"application/json",params) + } + + fun mistakeType(usuario:String,password:String) : Call> { + val params:ArrayList = ArrayList(); + return restClient!!.mistakeType("json","1",usuario,password,"application/json") + } + + +} diff --git a/app/src/main/java/es/verdnatura/domain/GetShelvingParkingUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetShelvingParkingUserCase.kt new file mode 100644 index 00000000..5e8d499e --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetShelvingParkingUserCase.kt @@ -0,0 +1,17 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO +import retrofit2.Call + +class GetShelvingParkingUserCase(context: Context) : RestClient(context) { + + fun shelvingParking_get(usuario:String,password:String,vShelvingFk:String,vWarehouseFk:String,vDayRange:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(vShelvingFk) + params.add(vWarehouseFk) + params.add(vDayRange) + return restClient!!.shelvingParking_get("json","1",usuario,password,"application/json",params) + } +} + diff --git a/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt new file mode 100644 index 00000000..e2565189 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt @@ -0,0 +1,91 @@ +package es.verdnatura.domain + +import android.content.Context +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO +import retrofit2.Call + +class GetUbicadorUserCase(context: Context) : RestClient(context) { + + fun itemShelvingList(usuario:String,password:String,vShelvingFk:String) : Call> { + val params:ArrayList = ArrayList(); + params.add(vShelvingFk) + return restClient!!.itemShelvingList("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingMake(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String) : Call { + val params:ArrayList = ArrayList(); + params.add(shelving) + params.add(item) + params.add(deep) + params.add(quantity) + params.add(packing) + params.add(warehouse) + params.add(level) + return restClient!!.itemShelvingMake("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingMakeEdit(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String,itemShelvingFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(shelving) + params.add(item) + params.add(deep) + params.add(quantity) + params.add(packing) + params.add(warehouse) + params.add(level) + params.add(itemShelvingFk) + return restClient!!.itemShelvingMakeEdit("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingMake_multi(usuario:String,password:String,shelving:String,items:List,deep:String,warehouse:String,level:String) : Call { + val params:ArrayList = ArrayList(); + params.add(shelving) + params.add(items) + params.add(deep) + params.add(warehouse) + params.add(level) + return restClient!!.itemShelvingMake_multi("json","1",usuario,password,"application/json",params) + } + + fun shelvingPriorityUpdate(usuario:String,password:String,priority:String,shelving:String) : Call { + val params:ArrayList = ArrayList(); + params.add(priority) + params.add(shelving) + return restClient!!.shelvingPriorityUpdate("json","1",usuario,password,"application/json",params) + } + + fun shelvingPark(usuario:String,password:String,shelving:String,parking:String) : Call { + val params:ArrayList = ArrayList(); + params.add(shelving) + params.add(parking) + return restClient!!.shelvingPark("json","1",usuario,password,"application/json",params) + } + + fun shelvingChange(usuario:String,password:String,origen:String,destino:String) : Call { + val params:ArrayList = ArrayList(); + params.add(origen) + params.add(destino) + return restClient!!.shelvingChange("json","1",usuario,password,"application/json",params) + } + + fun clearShelvingList(usuario:String,password:String,shelvingFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(shelvingFk) + return restClient!!.clearShelvingList("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingTransfer(usuario:String,password:String,itemFk:String,shelvingFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + params.add(shelvingFk) + return restClient!!.itemShelvingTransfer("json","1",usuario,password,"application/json",params) + } + + fun itemShelvingDelete(usuario:String,password:String,itemFk:String) : Call { + val params:ArrayList = ArrayList(); + params.add(itemFk) + return restClient!!.itemShelvingDelete("json","1",usuario,password,"application/json",params) + } +} + + diff --git a/app/src/main/java/es/verdnatura/domain/RestClient.kt b/app/src/main/java/es/verdnatura/domain/RestClient.kt new file mode 100644 index 00000000..79c36af2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/RestClient.kt @@ -0,0 +1,15 @@ +package es.verdnatura.domain + +import android.content.Context + +open class RestClient(context:Context) { + var restClient:VerdnaturaService? = null + var salixClient:SalixService? = null + + init { + restClient = ApiUtils.getApiService(context) + salixClient = ApiSalixUtils.getApiService() + } + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt new file mode 100644 index 00000000..37382f7e --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -0,0 +1,23 @@ +package es.verdnatura.domain + +import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO +import es.verdnatura.presentation.view.feature.login.model.SalixMessageVO +import retrofit2.Call +import retrofit2.http.Body +import retrofit2.http.Header +import retrofit2.http.POST + +interface SalixService { + + @POST("Accounts/login") + fun login(@Header("Content-Type") content_type: String, + @Body params: LoginSalixVO): + Call + + @POST("chats/sendCheckingPresence") + fun sendChekingPresence( + @Header("Content-Type") content_type: String, + @Header("Authorization") authorization: String, + @Body params: SalixMessageVO): + Call +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt new file mode 100644 index 00000000..bc2be372 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -0,0 +1,666 @@ +package es.verdnatura.domain + + + +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType +import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO +import es.verdnatura.presentation.view.feature.collection.ItemVO +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import es.verdnatura.presentation.view.feature.login.model.versionApp +import es.verdnatura.presentation.view.feature.paletizador.model.* +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO +import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO +import retrofit2.Call +import retrofit2.http.Body +import retrofit2.http.Header +import retrofit2.http.POST + + +@JvmSuppressWildcards +interface VerdnaturaService { + + //LOGIN ========================================================================> + @POST("security/login") + fun login(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/version") + fun version(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("/security/getVersion") + fun version2(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + + //AJUSTES ========================================================================> + @POST("almacennew/sector_get") + fun getSectors(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String): + Call> + + + //PRESACADORES ========================================================================> + + @POST("almacennew/ticketToPrePrepare") + fun ticketToPrePrepare(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + + @POST("almacennew/itemPlacementSupplyGetOrder") + fun itemPlacementSupplyGetOrder(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/itemPlacementSupplyCloseOrder") + fun itemPlacementSupplyCloseOrder(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + + + //SACADORES / CONTROLADORES ========================================================================> + @POST("almacennew/collectionGet") + fun collectionGet(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String): + Call> + + @POST("almacennew/collectionNew") + fun collectionNew(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionTicketGet") + fun collectionTicketGet(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/saleTrackingReplace") + fun saleTrackingReplace(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemPlacementSupplyAiming") + fun itemPlacementSupplyAiming(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/itemShelvingSaleSupplyAdd") + fun itemShelvingSaleSupplyAdd(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingPlacementSupplyAdd") + fun itemShelvingPlacementSupplyAdd(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionStickerPrint") + fun collectionStickerPrint(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemGetAvailable") + fun itemGetAvailable(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionAddItem") + fun collectionAddItem(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/saleMove") + fun saleMove(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionMissingTrash") + fun collectionMissingTrash(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/saleTrackingDel") + fun saleTrackingDel(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionUpdateState") + fun collectionUpdateState(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/barcodeToItem") + fun getIdFromCode(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/collectionIncreaseQuantity") + fun collectionIncreaseQuantity(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + @POST("almacennew/saleMistakeAdd") + fun saleMistakeAdd(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/mistakeType") + fun mistakeType(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String): + Call> + + //PASILLEROS ========================================================================> + + //CONSULTAR ARTICULO ========================================================================> + @POST("almacennew/itemDiary") + fun itemDiary(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/item_card") + fun getItemCard(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/get_ItemPackingType") + fun getItemPackingType(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + + + @POST("almacennew/itemStockUpdate") + fun itemStockUpdate(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemTrash") + fun itemTrash(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/item_placement_save") + fun itemPlacementSave(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/buy_updateGrouping") + fun updateGrouping(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/buy_updatePacking") + fun updatePacking(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/update_ItemPackingType") + fun updatePackingType(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemSaveMin") + fun itemSaveMin(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + @POST("almacennew/barcodes_edit") + fun barcodes_edit(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + //BUSCAR ITEM ========================================================================> + @POST("almacennew/getItemUbication") + fun searchItemsUbicador(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + +// BUSCAR ITEM ALL + @POST("almacennew/getItemUbication") + fun searchItemsUbicadorAll(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + //INVENTARIO ========================================================================> + + + @POST("almacennew/itemShelvingRadar") + fun itemShelvingRadar(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/itemShelving_filterBuyer") + fun itemShelvingRadarFilterBuyer(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/faultsReview") + fun faultsReview(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/faultsReview_isChecked") + fun faultsReview_isChecked(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + //SHELVING PARKING ========================================================================> + @POST("almacennew/shelvingParking_get") + fun shelvingParking_get(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + + + //UBICADOR ========================================================================> + @POST("almacennew/itemShelvingList") + fun itemShelvingList(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/shelvingPriorityUpdate") + fun shelvingPriorityUpdate(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingMake") + fun itemShelvingMake(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingMakeEdit") + fun itemShelvingMakeEdit(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingMake_multi") + fun itemShelvingMake_multi(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/shelvingPark") + fun shelvingPark(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/shelvingChange") + fun shelvingChange(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/clearShelvingList") + fun clearShelvingList(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingTransfer") + fun itemShelvingTransfer(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/itemShelvingDelete") + fun itemShelvingDelete(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + //PALETIZADORES ========================================================================> + @POST("almacennew/expeditionTruckList") + fun expeditionTruckList(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String): + Call> + + @POST("almacennew/expeditionTruckAdd") + fun expeditionTruckAdd(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/expeditionPalletList") + fun expeditionPallet_List(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/expeditionScanAdd") + fun expeditionScanAdd(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/expeditionScanPut") + fun expeditionScanPut(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/checkRouteExpeditionScanPut") + fun checkRouteExpeditionScanPut(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + + @POST("almacennew/expeditionPalletView") + fun expeditionPalletView(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/expeditionPalletDel") + fun expeditionPalletDel(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/expeditionScanList") + fun expeditionScanList(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/expeditionScanDel") + fun expeditionScanDel(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + @POST("almacennew/expeditionPalletPrintSet") + fun expeditionPalletPrintSet(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + //CALIDAD + @POST("almacennew/itemShelvingBuyerGet") + fun itemShelvingBuyerGet(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String): + Call> + + @POST("almacennew/itemShelvingBuyerTask") + fun itemShelvingBuyerTask(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call> + + @POST("almacennew/itemShelvingStarsUpdate") + fun itemShelvingStarsUpdate(@Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List): + Call + + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/base/BR.kt b/app/src/main/java/es/verdnatura/presentation/base/BR.kt new file mode 100644 index 00000000..295f0e87 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/base/BR.kt @@ -0,0 +1,27 @@ +package es.verdnatura.presentation.base + +object BR { + const val _all = 0 + const val focused = 1 + const val rating = 2 + const val resumePosition = 3 + const val favorite = 4 + const val selected = 5 + const val toolBarItem = 6 + const val item = 7 + const val loadingInfo = 8 + const val color = 9 + const val icon = 10 + const val episode = 11 + const val title = 12 + const val content = 13 + const val onOptionsItemSelected = 14 + const val vpsActionListener = 15 + const val numberEpisodes = 16 + const val seasonColor = 17 + const val viewModel = 18 + const val action = 19 + const val liveProgram = 20 + const val loadingEpisodes = 21 + const val ratio = 22 +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt new file mode 100644 index 00000000..6688943f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt @@ -0,0 +1,41 @@ +package es.verdnatura.presentation.base + +import android.content.Context +import android.os.Bundle +import android.view.View +import android.view.inputmethod.InputMethodManager +import androidx.annotation.LayoutRes +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import androidx.databinding.ViewDataBinding + +abstract class BaseActivity : AppCompatActivity() { + + + protected lateinit var binding: T + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(getLayoutId()) + initDataBinding() + init() + } + + @LayoutRes + abstract fun getLayoutId(): Int + open fun addBindingVariables() {} + abstract fun init() + + + private fun initDataBinding() { + binding = DataBindingUtil.setContentView(this, getLayoutId()) + binding.lifecycleOwner = this + addBindingVariables() + } + + fun hideKeyboard(view: View){ + val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(view.windowToken, 0) + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt new file mode 100644 index 00000000..cb22ffdc --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -0,0 +1,446 @@ +package es.verdnatura.presentation.base + +import android.Manifest +import android.app.AlarmManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences +import android.content.pm.PackageManager +import android.media.AudioManager +import android.os.Build +import android.os.Bundle +import android.speech.RecognitionListener +import android.speech.RecognizerIntent +import android.speech.SpeechRecognizer +import android.speech.tts.TextToSpeech +import android.speech.tts.UtteranceProgressListener +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.annotation.LayoutRes +import androidx.databinding.DataBindingUtil +import androidx.databinding.ViewDataBinding +import androidx.fragment.app.Fragment +import es.verdnatura.domain.toast +import es.verdnatura.presentation.common.mediaCurrentVolume +import es.verdnatura.presentation.common.mediaMaxVolume +import org.koin.androidx.viewmodel.ext.android.viewModel +import java.util.* +import kotlin.reflect.KClass + + +abstract class BaseFragment(viewModelClass: KClass) : + Fragment(), TextToSpeech.OnInitListener , RecognitionListener{ + + protected val TAG="VERDNATURA" + protected val PREFS_USER = "es.verdnatura.user.prefs" + protected val USERFK = "userFk" + protected val USER = "user" + protected val PASSWORD = "password" + protected val TOKEN = "token" + protected val SECTORDESCRIP = "sectordescrip" + protected val SECTORFK = "sectorFk" + protected val WAREHOUSEFK = "warehouseFk" + protected val RECORDAR = "recordar" + protected val VOZ = "voz" + //nuevo campo número carros ajustes y campos para guardar el buyerid y buyernickname + protected val BUYER = "buyernickname" + protected val BUYERID="buyerid" + protected val CARRO="carro" + protected val WAREHOUSEFK_DEFAULT=60 + + protected val viewModel: V by viewModel(viewModelClass) + protected lateinit var binding: T + private var isOnReadyForSpeech = false + + + + private var textToSpeech: TextToSpeech? = null + private var mAudioManager:AudioManager? = null + protected var mSpeechRecognizer: SpeechRecognizer? = null + private var mSpeechRecognizerIntent: Intent? = null + + protected val NEW_COLLECTION = 0 + protected val LISTO = 1 + protected val CANCEL = 2 + protected val VOLVER = 3 + protected val REPITE = 4 + protected val OTRO = 5 + protected val FALTA = 6 + protected val ERROR = -1 + + val allowedStrings = + Arrays.asList( + "cero", "uno", "dos", "tres", "cuatro", "cinco", "seis", "siete", + "ocho", "nueve", "diez", "once", "doce", "trece", "catorce", + "quince", "dieziseis", "diezisiete", "dieziocho", "diezinueve", "veinte", + "treinta", "cuarenta", "cincuenta", "sesenta", "setenta", "ochenta", "noventa", + "cien", "mil" + ) + + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? = inflater.inflate(getLayoutId(), container, false) + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + initDataBinding() + getBundleArguments() + observeViewModel() + runSound() + requestRecordAudioPermission() + init() + } + + @LayoutRes + abstract fun getLayoutId(): Int + open fun init() {} + open fun observeViewModel() {} + open fun getBundleArguments() {} + open fun addBindingVariables() {} + + open fun setSpeak() { + //VOZ + textToSpeech = TextToSpeech(requireContext(),this) + mAudioManager = requireActivity().getSystemService(Context.AUDIO_SERVICE) as AudioManager + } + + open fun restartapp(f : Fragment){ + val mStartActivity = Intent(context, f::class.java) + val mPendingIntentId = 123456 + val mPendingIntent = PendingIntent.getActivity( + context, + mPendingIntentId, + mStartActivity, + PendingIntent.FLAG_CANCEL_CURRENT + ) + val mgr = context!!.getSystemService(Context.ALARM_SERVICE) as AlarmManager + mgr[AlarmManager.RTC, System.currentTimeMillis() + 100] = mPendingIntent + System.exit(0) + } + + + open fun initialize(){ + //ESCUCHA + try { + mSpeechRecognizer = SpeechRecognizer.createSpeechRecognizer(requireContext()) + mSpeechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) + mSpeechRecognizerIntent!!.putExtra( + RecognizerIntent.EXTRA_LANGUAGE_MODEL, + RecognizerIntent.LANGUAGE_MODEL_FREE_FORM + ) + mSpeechRecognizerIntent!!.putExtra( + RecognizerIntent.EXTRA_LANGUAGE, + Locale.getDefault() + ) + mSpeechRecognizerIntent!!.putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, false) + mSpeechRecognizer?.setRecognitionListener(this) + isOnReadyForSpeech = false; + startListening() + }catch (e:Exception){ + cancelSpeech() + } + } + + private fun initDataBinding() { + binding = DataBindingUtil.bind(view!!)!! + binding.lifecycleOwner = viewLifecycleOwner + binding.setVariable(BR.viewModel, this@BaseFragment.viewModel) + lifecycle.addObserver(this@BaseFragment.viewModel) + addBindingVariables() + } + + + override fun onInit(status: Int) { + if (status == TextToSpeech.SUCCESS) { + val spanish = Locale("es", "ES") + textToSpeech!!.language = spanish + textToSpeech!!.setOnUtteranceProgressListener(object: UtteranceProgressListener() { + override fun onDone(utteranceId: String?) { + Log.i("SPEEAK","on done") + requireActivity().runOnUiThread(Runnable { + if (mSpeechRecognizer != null){ + mSpeechRecognizer!!.destroy() + mSpeechRecognizer = null + } + initialize() + + }) + } + + override fun onError(utteranceId: String?) { + "Error to speak".toast(requireContext()) + } + + override fun onStart(utteranceId: String?) { + Log.i("SPEEAK","on start") + runSound() + + } + + }) + }else{ + "La voz no se ha podido iniciar".toast(requireContext()) + } + } + + private fun runSound(){ + // Get the maximum media/music volume + val maxVolume = mAudioManager?.mediaMaxVolume + // mAudioManager?.setMediaVolume(maxVolume!!) + } + + private fun muteSound() { + if (mAudioManager?.mediaCurrentVolume != 0){ + // mAudioManager?.setMediaVolume(0) + } + + } + + fun speak(frase:String) { + textToSpeech!!.speak(frase, TextToSpeech.QUEUE_FLUSH, null, "frase") + } + + open fun startListening() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + muteSound() + } + mSpeechRecognizer!!.startListening(mSpeechRecognizerIntent) + } + + + override fun onReadyForSpeech(params: Bundle?) { + isOnReadyForSpeech = true; + Log.i("Speech", "onReadyForSpeech") + } + + override fun onBeginningOfSpeech() { + Log.i("Speech", "onBeginningOfSpeech") + } + + override fun onRmsChanged(rmsdB: Float) {} + + override fun onBufferReceived(buffer: ByteArray?) { + Log.i("Speech", "onBufferReceived") + } + + override fun onEndOfSpeech() { + Log.i("Speech", "onEndOfSpeech") + } + + override fun onError(error: Int) { + if (!isOnReadyForSpeech && error == SpeechRecognizer.ERROR_NO_MATCH) { + ("Problemas con la velocidad de internet. No se puede usar la voz").toast(requireContext()) + return + }else{ + Log.i("Speech", "onError "+error) + if (mSpeechRecognizer != null) mSpeechRecognizer!!.destroy() + mSpeechRecognizer = null + initialize() + } + + } + + override fun onResults(results: Bundle) {} + + override fun onPartialResults(partialResults: Bundle?) { + Log.i("Speech", "onPartialResults") + } + + override fun onEvent(eventType: Int, params: Bundle?) { + Log.i("Speech", "onEvent") + } + + open fun checkText(text: String): Int { + + //check for nuevo + val nuevo = getMatch(text, "nuevo") + + //check for listo + val listo = getMatch(text, "listo") + + //check for cancelar + val cancelar = getMatch(text, "cancelar") + + //check for volver + val volver = getMatch(text, "volver") + + //check for repite + val repite = getMatch(text, "repite") + + //check for siguiente + val otro = getMatch(text, "otro") + + //check for FALTA + val falta = getMatch(text, "falta") + val words = IntArray(7) + words[0] = nuevo + words[1] = listo + words[2] = cancelar + words[3] = volver + words[4] = repite + words[5] = otro + words[6] = falta + return getMax(words) + } + + private fun getMax(a: IntArray): Int { + var max = a[0] + var pos = 0 + for (i in a.indices) { + if (a[i] > max) { + max = a[i] + pos = i + } + } + return if (max < 80) { + -1 + } else pos + } + + private fun getMatch(a: String, b: String): Int { + var count = 0 + val cha = a.toCharArray() + val chb = b.toCharArray() + for (i in cha) { + for (x in chb) { + if (x == i) { + count += 1 + break + } + } + } + val numChar = a.length + if (numChar != 0) + return count * 100 / numChar + else + return 100 + } + + private fun requestRecordAudioPermission() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + val requiredPermission: String = Manifest.permission.RECORD_AUDIO + val res = context!!.checkCallingOrSelfPermission(requiredPermission) + // If the user previously denied this permission then show a message explaining why + // this permission is needed + if (res == PackageManager.PERMISSION_DENIED) { + requestPermissions(arrayOf(requiredPermission), 101) + } + } + } + + fun cancelSpeech(){ + if (mSpeechRecognizer != null){ + mSpeechRecognizer!!.destroy() + mSpeechRecognizer = null + } + } + fun saveBuyer(buyernickname: String) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putString(BUYER, buyernickname) + editor.apply() + } + fun saveBuyerId(buyerid: String) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putString(BUYERID, buyerid) + editor.apply() + } + + + /*open fun wordToNumber(input: String?): Int { + var input = input + var isValidInput = true + var result = 0 + var finalResult = 0 + if (input != null && input.length > 0) { + input = input.replace("-".toRegex(), " ") + input = input.toLowerCase().replace(" and".toRegex(), " ") + val splittedParts = + input.trim { it <= ' ' }.split("\\s+".toRegex()).toTypedArray() + for (str in splittedParts) { + if (!es.verdnatura.warehouse.UTILS.Utils.allowedStrings.contains(str)) { + isValidInput = false + return -1 + } + } + if (isValidInput) { + for (str in splittedParts) { + if (str.equals("cero", ignoreCase = true)) { + result += 0 + } else if (str.equals("uno", ignoreCase = true)) { + result += 1 + } else if (str.equals("dos", ignoreCase = true)) { + result += 2 + } else if (str.equals("tres", ignoreCase = true)) { + result += 3 + } else if (str.equals("cuatro", ignoreCase = true)) { + result += 4 + } else if (str.equals("cinco", ignoreCase = true)) { + result += 5 + } else if (str.equals("seis", ignoreCase = true)) { + result += 6 + } else if (str.equals("siete", ignoreCase = true)) { + result += 7 + } else if (str.equals("ocho", ignoreCase = true)) { + result += 8 + } else if (str.equals("nueve", ignoreCase = true)) { + result += 9 + } else if (str.equals("diez", ignoreCase = true)) { + result += 10 + } else if (str.equals("once", ignoreCase = true)) { + result += 11 + } else if (str.equals("doce", ignoreCase = true)) { + result += 12 + } else if (str.equals("trece", ignoreCase = true)) { + result += 13 + } else if (str.equals("catorce", ignoreCase = true)) { + result += 14 + } else if (str.equals("quince", ignoreCase = true)) { + result += 15 + } else if (str.equals("dieziseis", ignoreCase = true)) { + result += 16 + } else if (str.equals("diezisiete", ignoreCase = true)) { + result += 17 + } else if (str.equals("dieziocho", ignoreCase = true)) { + result += 18 + } else if (str.equals("diezinueve", ignoreCase = true)) { + result += 19 + } else if (str.equals("veinte", ignoreCase = true)) { + result += 20 + } else if (str.equals("treinta", ignoreCase = true)) { + result += 30 + } else if (str.equals("cuarenta", ignoreCase = true)) { + result += 40 + } else if (str.equals("cincuenta", ignoreCase = true)) { + result += 50 + } else if (str.equals("sesenta", ignoreCase = true)) { + result += 60 + } else if (str.equals("setenta", ignoreCase = true)) { + result += 70 + } else if (str.equals("ochenta", ignoreCase = true)) { + result += 80 + } else if (str.equals("noventa", ignoreCase = true)) { + result += 90 + } else if (str.equals("cien", ignoreCase = true)) { + result *= 100 + } else if (str.equals("mil", ignoreCase = true)) { + result *= 1000 + finalResult += result + result = 0 + } + } + finalResult += result + return finalResult + } + } + return finalResult + }*/ +} + diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt new file mode 100644 index 00000000..b39bd015 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt @@ -0,0 +1,6 @@ +package es.verdnatura.presentation.base + +import androidx.lifecycle.LifecycleObserver +import androidx.lifecycle.ViewModel + +abstract class BaseViewModel : ViewModel(), LifecycleObserver \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/common/BindingAdapter.kt b/app/src/main/java/es/verdnatura/presentation/common/BindingAdapter.kt new file mode 100644 index 00000000..b52460bf --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/common/BindingAdapter.kt @@ -0,0 +1,22 @@ +package es.verdnatura.presentation.common + +import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE +import androidx.databinding.BindingAdapter +import org.koin.core.KoinComponent + +object BindingAdapter : KoinComponent { + + /** + * Set view visibility depending boolean + * + * @param isVisible - If true, set view to VISIBLE, else set view to GONE + */ + @BindingAdapter("isVisible") + @JvmStatic + fun View.isVisible(isVisible: Boolean) { + visibility = if (isVisible) VISIBLE else GONE + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/common/Event.kt b/app/src/main/java/es/verdnatura/presentation/common/Event.kt new file mode 100644 index 00000000..f0714d4f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/common/Event.kt @@ -0,0 +1,24 @@ +package es.verdnatura.presentation.common + +open class Event(private val content: T) { + + var hasBeenHandled = false + private set // Allow external read but not write + + /** + * Returns the content and prevents its use again. + */ + fun getContentIfNotHandled(): T? { + return if (hasBeenHandled) { + null + } else { + hasBeenHandled = true + content + } + } + + /** + * Returns the content, even if it's already been handled. + */ + fun peekContent(): T = content +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt b/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt new file mode 100644 index 00000000..dc9c22c2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt @@ -0,0 +1,7 @@ +package es.verdnatura.presentation.common + +class ResponseItemVO ( + var response:String = "", + var isError: Boolean = false, + var errorMessage: String = "" +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt new file mode 100644 index 00000000..6d59c112 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt @@ -0,0 +1,105 @@ +package es.verdnatura.presentation.common + +import android.graphics.drawable.Drawable +import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO + +interface OnOptionsSelectedListener { + fun onOptionsItemSelected(item: Drawable) +} + +interface OnPasillerosItemClickListener { + fun onPasillerosItemClickListener(item: PasillerosItemVO,entryPoint:String) +} + +interface OnAjustesItemClickListener { + fun onAjustesItemClickListener(item: AjustesItemVO) +} + + +interface OnItemCardRowClickListener { + fun onItemCardRowClickListener(item: ItemCardRowVO) +} + +interface OnBarcodeRowClickListener { + fun onBarcodeRowClickListener(item: BarcodeVO) +} + +interface OnLocationRowClickListener { + fun onLocationRowClickListener(item: ItemLocationVO) +} + +interface OnInvetoryNichoClickListener { + fun onInvetoryNichoClickListener(item: ItemInventaryVO) +} + +interface OnFaltasNichoClickListener { + fun onFaltasNichoClickListener(item: ItemFaltasVO) +} + +interface OnFaltasReviewClickListener { + fun onFaltasReviewClickListener(item: ItemFaltasVO) +} + +interface OnAutomaticItemClickListener { + fun onAutomaticItemClickListener(position: Int) +} + +interface OnVisibleClickListener { + fun onVisibleClickListener(item: ItemUbicadorVO) +} + +interface OnMoreClickListener { + fun onMoreClickListener(item: ItemUbicadorVO) +} + +interface OnTruckClickListener { + fun onTruckClickListener(item: ItemExpeditionTruckVO,entryPoint: String) +} + +interface OnPalletClickListener { + fun onPalletClickListener(itemTruck: ItemExpeditionTruckVO,itemPallet: ItemPalletVO) +} + +interface OnComprobarPalletViewClickListener { + fun onComprobarPalletViewClickListener(itemTruck: ItemExpeditionTruckVO,itemPallet: ItemPalletVO) +} + +interface OnScanLongClickListener { + fun onScanLongClickListener(ItemExpeditionScanVO: ItemExpeditionScanVO) +} + +interface OnCollectionSelectedListener { + fun onCollectionSelected(collection: CollectionVO,type:String) +} + +interface OnQuantityClickListener { + fun onQuantityClick(sale: SaleVO) +} + +interface OnSaleClickListener { + fun onSaleClick(sale: SaleVO) +} + +interface OnMistakeClickListener { + fun onMistakeClickListener(sale:SaleVO) +} + +interface OnBuyerSelectedListener { + fun onBuyerSelected(userFk:String) +} + +interface OnStarSelectedListener { + fun onStarSelected(vId:String, vStars:String) +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt b/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt new file mode 100644 index 00000000..ce59a4c6 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt @@ -0,0 +1,164 @@ +package es.verdnatura.presentation.common + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.drawable.Drawable +import android.media.AudioManager +import android.os.Bundle +import android.view.View +import android.view.ViewGroup +import android.view.ViewTreeObserver +import android.view.inputmethod.InputMethodManager +import android.widget.ImageView +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentTransaction +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.request.target.CustomTarget +import com.bumptech.glide.request.transition.Transition +import java.util.* + + +inline fun FragmentManager.inTransaction(func: FragmentTransaction.() -> FragmentTransaction) = + beginTransaction().func().commit() + + +fun Context.openActivity(it: Class, extras: Bundle.() -> Unit = {}) { + val intent = Intent(this, it) + intent.putExtras(Bundle().apply(extras)) + startActivity(intent) +} + +fun FragmentActivity.replaceFragment( + fragment: Fragment, + frameId: Int, + tag: String, + addToBackStack: Boolean = false +) { + supportFragmentManager.inTransaction { + replace(frameId, fragment, tag) + if (addToBackStack) addToBackStack(tag) + setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out) + } +} + +fun FragmentActivity.addFragment( + fragment: Fragment, + frameId: Int, + tag: String = "", + addToBackStack: Boolean = false +) { + supportFragmentManager.inTransaction { + add(frameId, fragment, tag) + if (addToBackStack) addToBackStack(tag) + setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out) + } +} + +fun View.setDimensions(width: Int, height: Int) { + val layoutParams = this.layoutParams + layoutParams?.width = width + layoutParams?.height = height + this.layoutParams = layoutParams +} +fun View.setMargins(left: Int, top: Int, right: Int, bottom: Int) { + val mlp = this.layoutParams as ViewGroup.MarginLayoutParams + mlp.setMargins(left, top, right, bottom) +} + +fun ImageView.loadUrl(url: String) { + Glide.with(context) + .asBitmap() + .load(url) + .into(object : CustomTarget() { + + override fun onLoadCleared(placeholder: Drawable?) {} + + override fun onResourceReady(resource: Bitmap, transition: Transition?) { + setImageBitmap(resource) + } + }) +} + +inline val T.TAG: String + get() = T::class.java.canonicalName ?: T::class.simpleName ?: T::class.java.simpleName + +fun Calendar.convertToDateString(): String { + var dayOfWeek = "" + var dayOfMonth = "" + val day = this[Calendar.DATE] + + when (this[Calendar.DAY_OF_WEEK]) { + 1 -> dayOfWeek = "Dom" + 2 -> dayOfWeek = "Lun" + 3 -> dayOfWeek = "Mar" + 4 -> dayOfWeek = "Mie" + 5 -> dayOfWeek = "Jue" + 6 -> dayOfWeek = "Vie" + 7 -> dayOfWeek = "Sab" + } + + when (this[Calendar.MONTH]) { + 0 -> dayOfMonth = "Ene" + 1 -> dayOfMonth = "Feb" + 2 -> dayOfMonth = "Mar" + 3 -> dayOfMonth = "Abr" + 4 -> dayOfMonth = "May" + 5 -> dayOfMonth = "Jun" + 6 -> dayOfMonth = "Jul" + 7 -> dayOfMonth = "Ago" + 8 -> dayOfMonth = "Sep" + 9 -> dayOfMonth = "Oct" + 10 -> dayOfMonth = "Nov" + 11 -> dayOfMonth = "Dic" + } + + return dayOfWeek + " " + day + " " + dayOfMonth +} + +fun RecyclerView.addViewObserver(function: () -> Unit) { + val view = this + view.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { + override fun onGlobalLayout() { + view.viewTreeObserver.removeOnGlobalLayoutListener(this) + function.invoke() + } + }) +} + +fun Fragment.hideKeyboard() { + view?.let { activity?.hideKeyboard(it) } +} + +fun Activity.hideKeyboard() { + hideKeyboard(currentFocus ?: View(this)) +} + +fun Context.hideKeyboard(view: View) { + val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager + val hideSoftInputFromWindow = inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) +} + +// Extension function to change media volume programmatically +fun AudioManager.setMediaVolume(volumeIndex:Int) { + // Set media volume level + this.setStreamVolume( + AudioManager.STREAM_MUSIC, // Stream type + volumeIndex, // Volume index + AudioManager.FLAG_SHOW_UI// Flags + ) +} + + +// Extension property to get media maximum volume index +val AudioManager.mediaMaxVolume:Int + get() = this.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + + +// Extension property to get media/music current volume index +val AudioManager.mediaCurrentVolume:Int + get() = this.getStreamVolume(AudioManager.STREAM_MUSIC) diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialog.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialog.kt new file mode 100644 index 00000000..39bf05ef --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialog.kt @@ -0,0 +1,42 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_dialog.* + +class CustomDialog(context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_dialog) + } + + + fun setTitle(title: String): CustomDialog { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(description: String): CustomDialog { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = description + return this + } + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialog { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialog { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogHour.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogHour.kt new file mode 100644 index 00000000..5ac7a84b --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogHour.kt @@ -0,0 +1,84 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.app.TimePickerDialog +import android.content.Context +import android.view.View +import com.google.android.material.textfield.TextInputEditText +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_hour.* +import java.text.SimpleDateFormat +import java.util.* + + +class CustomDialogHour(context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_hour) + } + + fun getDestinoEditText(): TextInputEditText { + return custom_dialog_destino_value + } + + fun getDestinoValue(): String { + return custom_dialog_destino_value.text.toString() + } + + fun setDestinoValue(value: String): CustomDialogHour { + custom_dialog_destino_value.setText(value) + custom_dialog_destino_value.visibility = View.VISIBLE + return this + } + + + fun getHoraEditText(): TextInputEditText { + return custom_dialog_hour_value + } + + fun getHoraValue(): String { + return custom_dialog_hour_value.text.toString() + } + + fun setHoraValue(value: String): CustomDialogHour { + custom_dialog_hour_value.setText(value) + custom_dialog_hour_value.visibility = View.VISIBLE + ib_obtener_hora.setOnClickListener { + val cal = Calendar.getInstance() + val timeSetListener = TimePickerDialog.OnTimeSetListener { timePicker, hour, minute -> + cal.set(Calendar.HOUR_OF_DAY, hour) + cal.set(Calendar.MINUTE, minute) + custom_dialog_hour_value.setText(SimpleDateFormat("HH:mm").format(cal.time)) + } + TimePickerDialog(context, timeSetListener, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true).show() + } + return this + } + + fun setTitle(title: String): CustomDialogHour { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(description: String): CustomDialogHour { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = description + return this + } + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogHour { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogHour { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogInput.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogInput.kt new file mode 100644 index 00000000..50ade35e --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogInput.kt @@ -0,0 +1,60 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import com.google.android.material.textfield.TextInputEditText +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_dialog.custom_dialog_button_ko +import kotlinx.android.synthetic.main.component_custom_dialog.custom_dialog_button_ok +import kotlinx.android.synthetic.main.component_custom_dialog.custom_dialog_description +import kotlinx.android.synthetic.main.component_custom_dialog.custom_dialog_title +import kotlinx.android.synthetic.main.component_custom_edit_dialog.* + +class CustomDialogInput (context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_edit_dialog) + } + + fun getEditText() : TextInputEditText { + return custom_dialog_value + } + + fun getValue() : String { + return custom_dialog_value.text.toString() + } + + fun setValue(value : String): CustomDialogInput{ + custom_dialog_value.setText(value) + custom_dialog_value.visibility = View.VISIBLE + return this + } + + fun setTitle(title: String): CustomDialogInput { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(description: String): CustomDialogInput { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = description + return this + } + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogInput { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogInput { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt new file mode 100644 index 00000000..56414203 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt @@ -0,0 +1,97 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.textfield.TextInputEditText +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_list_dialog.* + + +class CustomDialogList (context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_list_dialog) + } + + fun getRecyclerView() : RecyclerView { + return item_recyclerview + } + + fun getEditText() : TextInputEditText { + return custom_dialog_value + } + + fun getEditTextTwo() : TextInputEditText { + return custom_dialog_value_two + } + + fun getValue() : String { + return custom_dialog_value.text.toString() + } + + fun setValue(value : String): CustomDialogList{ + custom_dialog_value.setText(value) + textinputlayout_username.visibility = View.VISIBLE + return this + } + + fun getValueTwo() : String { + return custom_dialog_value_two.text.toString() + } + + fun setValueTwo(value : String): CustomDialogList{ + custom_dialog_value_two.setText(value) + textinputlayout_two.visibility = View.VISIBLE + return this + } + + fun setTitle(title: String): CustomDialogList { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(title: String): CustomDialogList { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = title + return this + } + + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogList { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogList { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + + fun setHintValue(text:String): CustomDialogList{ + custom_dialog_value.hint = text + return this + } + + fun setHintValueTwo(text:String): CustomDialogList{ + custom_dialog_value_two.hint = text + return this + } + + fun setTextTwoGone():CustomDialogList{ + textinputlayout_two.visibility = View.GONE + return this + } + + fun hideDialog():CustomDialogList{ + custom_dialog_value.visibility = View.GONE + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogThreeButtons.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogThreeButtons.kt new file mode 100644 index 00000000..8ed425d6 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogThreeButtons.kt @@ -0,0 +1,90 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import com.google.android.material.textfield.TextInputEditText +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_three_dialog.* +import kotlinx.android.synthetic.main.component_custom_two_dialog.custom_dialog_button_ko +import kotlinx.android.synthetic.main.component_custom_two_dialog.custom_dialog_button_ok +import kotlinx.android.synthetic.main.component_custom_two_dialog.custom_dialog_button_ok_two +import kotlinx.android.synthetic.main.component_custom_two_dialog.custom_dialog_description +import kotlinx.android.synthetic.main.component_custom_two_dialog.custom_dialog_title + +class CustomDialogThreeButtons (context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_three_dialog) + } + + + fun setTitle(title: String): CustomDialogThreeButtons { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(description: String): CustomDialogThreeButtons { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = description + return this + } + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + + fun getValue() : String { + return custom_dialog_value.text.toString() + } + + fun getEditText() : TextInputEditText { + return custom_dialog_value + } + fun setValue(value : String): CustomDialogThreeButtons{ + custom_dialog_value.setText(value) + textinputlayout.visibility = View.VISIBLE + return this + } + + fun setOkButtonTwo(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_ok_two.visibility = View.VISIBLE + custom_dialog_button_ok_two.text = text + custom_dialog_button_ok_two.setOnClickListener { onButtonClicked() } + return this + } + + fun setOkButtonThree(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_ok_three.visibility = View.VISIBLE + custom_dialog_button_ok_three.text = text + custom_dialog_button_ok_three.setOnClickListener { onButtonClicked() } + return this + } + + fun setOkButtonFour(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_ok_four.visibility = View.VISIBLE + custom_dialog_button_ok_four.text = text + custom_dialog_button_ok_four.setOnClickListener { onButtonClicked() } + return this + } + + fun setOkButtonAdd(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_add.visibility = View.VISIBLE + custom_dialog_button_add.text = text + custom_dialog_button_add.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogThreeButtons { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogTwoButtons.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogTwoButtons.kt new file mode 100644 index 00000000..d308aa3a --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogTwoButtons.kt @@ -0,0 +1,49 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_two_dialog.* + +class CustomDialogTwoButtons (context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_two_dialog) + } + + + fun setTitle(title: String): CustomDialogTwoButtons { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + fun setDescription(description: String): CustomDialogTwoButtons { + custom_dialog_description.visibility = View.VISIBLE + custom_dialog_description.text = description + return this + } + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogTwoButtons { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setOkButtonTwo(text: String, onButtonClicked: () -> Unit): CustomDialogTwoButtons { + custom_dialog_button_ok_two.visibility = View.VISIBLE + custom_dialog_button_ok_two.text = text + custom_dialog_button_ok_two.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogTwoButtons { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogUbicador.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogUbicador.kt new file mode 100644 index 00000000..d878c07c --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogUbicador.kt @@ -0,0 +1,97 @@ +package es.verdnatura.presentation.view.component + +import android.app.Dialog +import android.content.Context +import android.view.View +import com.google.android.material.textfield.TextInputEditText +import es.verdnatura.R +import kotlinx.android.synthetic.main.component_custom_ubicador_dialog.* + +class CustomDialogUbicador (context: Context) : Dialog(context, R.style.DialogTheme) { + + init { + setContentView(R.layout.component_custom_ubicador_dialog) + } + + + fun setTitle(title: String): CustomDialogUbicador { + custom_dialog_title.visibility = View.VISIBLE + custom_dialog_title.text = title + return this + } + + + fun setItemValue(value : String) : CustomDialogUbicador{ + custom_dialog_item.setText(value) + custom_dialog_item.visibility = View.VISIBLE + return this + } + + fun getItemValue() : String{ + return custom_dialog_item.text.toString() + } + + fun getEditItem() : TextInputEditText { + return custom_dialog_item + } + + + fun setEtiquetaValue(value : String) : CustomDialogUbicador{ + custom_dialog_etiquetas.setText(value) + custom_dialog_etiquetas.visibility = View.VISIBLE + return this + } + + fun getEtiquetaValue() : String{ + return custom_dialog_etiquetas.text.toString() + } + + fun getEtiquetaItem() : TextInputEditText { + return custom_dialog_etiquetas + } + + + fun setPackingValue(value : String) : CustomDialogUbicador{ + custom_dialog_packing.setText(value) + custom_dialog_packing.visibility = View.VISIBLE + return this + } + + fun getPackingValue() : String{ + return custom_dialog_packing.text.toString() + } + + fun getPackingItem() : TextInputEditText { + return custom_dialog_packing + } + + fun setVisibleValue(value : String) : CustomDialogUbicador{ + custom_dialog_visible.setText(value) + custom_dialog_visible.visibility = View.VISIBLE + return this + } + + fun getVisibleValue() : String{ + return custom_dialog_visible.text.toString() + } + + fun getVisibleItem() : TextInputEditText { + return custom_dialog_visible + } + + + fun setOkButton(text: String, onButtonClicked: () -> Unit): CustomDialogUbicador { + custom_dialog_button_ok.visibility = View.VISIBLE + custom_dialog_button_ok.text = text + custom_dialog_button_ok.setOnClickListener { onButtonClicked() } + return this + } + + fun setKoButton(text: String, onButtonClicked: () -> Unit): CustomDialogUbicador { + custom_dialog_button_ko.visibility = View.VISIBLE + custom_dialog_button_ko.text = text + custom_dialog_button_ko.setOnClickListener { onButtonClicked() } + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.kt new file mode 100644 index 00000000..0b90bf37 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.kt @@ -0,0 +1,41 @@ +package es.verdnatura.presentation.view.feature.ajustes.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemAjustesRowBinding +import es.verdnatura.presentation.common.OnAjustesItemClickListener +import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO + +class AjustesAdapter ( + private val items: List, + private val onAjustesItemClickListener: OnAjustesItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + return AjustesItemHolder( + ItemAjustesRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onAjustesItemClickListener.onAjustesItemClickListener(items[position]) + } + } + + + class AjustesItemHolder( + val binding: ItemAjustesRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(item: AjustesItemVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt new file mode 100644 index 00000000..57882a6c --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt @@ -0,0 +1,260 @@ +package es.verdnatura.presentation.view.feature.ajustes.fragment + +import android.app.AlarmManager +import android.app.AlertDialog +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences +import android.os.Bundle +import android.preference.PreferenceManager +import android.util.Log +import android.view.KeyEvent +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentAjustesBinding +import es.verdnatura.domain.notNull +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnAjustesItemClickListener +import es.verdnatura.presentation.common.hideKeyboard +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter +import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import es.verdnatura.presentation.view.feature.login.activity.LoginActivity +import es.verdnatura.presentation.view.feature.login.fragment.LoginFragment +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_ajustes.* +import kotlinx.android.synthetic.main.fragment_ajustes.splash_progress +import kotlinx.android.synthetic.main.fragment_login.* + +class AjustesFragment : BaseFragment(AjustesViewModel::class) { + + private var user:String? = "" + private var password:String? = "" + private lateinit var customDialog: CustomDialog + private var sectorListVO:List = listOf() + private var vozList:List = listOf() + private var prefs: SharedPreferences? = null + private var ajustesAdapter: AjustesAdapter? = null + //añadido + private var carroList:List = listOf() + + companion object { + fun newInstance() = AjustesFragment() + } + override fun getLayoutId(): Int = R.layout.fragment_ajustes + + override fun onCreate(savedInstanceState: Bundle?) { + prefs = activity!!.getSharedPreferences(PREFS_USER,0) + customDialog = CustomDialog(requireContext()) + +//modificat el InitilializeAjusts + viewModel.inititializeDefaultAjusts(prefs!!.getString(SECTORDESCRIP,getString(R.string.Sinsector)).toString(),prefs!!.getInt(SECTORFK,0),prefs!!.getInt(WAREHOUSEFK,0),prefs!!.getString(VOZ,"NO").toString(),prefs!!.getString(CARRO,"2").toString()) + super.onCreate(savedInstanceState) + } + + override fun init() { + activity!!.main_bottom_navigation.visibility = View.VISIBLE + user_text.setText(prefs!!.getString(USERFK,"")) + val versionName = activity!!.packageManager.getPackageInfo(activity!!.packageName,0).versionName + item_version.setText(versionName) + user = prefs!!.getString(USER,"") + password = prefs!!.getString(PASSWORD,"") + + + txtserver.setText(this.getDefaults("base_url",this.requireContext())) + txtserver.setOnKeyListener(View.OnKeyListener { v, keyCode, event -> + if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) { + this.setDefaults("base_url",txtserver.text.toString(),this.requireContext()) + // sergio: se comenta línea de abajo porque da fallo en la app// + // this.setDefaults("base_url", edittext_server.text.toString(), this.requireContext()) + this.hideKeyboard() + //sergio:creada restartapp en BaseFragment por si es necesario utilizarla de nuevo. + // se hace un restart por si se cambia el servidor para que tome nuevos valores + + restartapp(this) + + return@OnKeyListener false + } + + false + }) + + super.init() + } + + + override fun observeViewModel() { + with(viewModel){ + ajustesAdapter = AjustesAdapter(ajustesitem,object: OnAjustesItemClickListener{ + override fun onAjustesItemClickListener(item: AjustesItemVO) { + if (item.id == 0){ + splash_progress.visibility = View.VISIBLE + viewModel.getSectors(user!!,password!!) + } else if (item.id == 1){ + activity!!.onBackPressed() + }else if (item.id == 2){ + // ////Log.i("VERDNATURA","Carros pulsados") + val listCarros : ArrayList = ArrayList() + listCarros.add("1") + listCarros.add("2") + listCarros.add("3") + listCarros.add("4") + listCarros.add("5") + listCarros.add("6") + carroList = listCarros + + val array= arrayOfNulls(listCarros.size) + + showDialogCarros(array=listCarros.toArray(array)) + + // getString(R.string.Nodisponibleenestaversión).toast(requireContext()) + // getString(R.string.enbreveDisponible).toast(requireContext()) + }else if (item.id == 3){ + val listVoz : ArrayList = ArrayList() + listVoz.add("NO") + listVoz.add("YES") + vozList = listVoz + val array = arrayOfNulls(listVoz.size) + showDialogVoz(array = listVoz.toArray(array)) + } + } + }) + ajustess_items.adapter = ajustesAdapter + ajustess_items.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + loadSectorList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.INVISIBLE + if (it.list != null && it.list.size > 0 && it.list.get(0).isError){ + customDialog.setTitle("Error").setDescription(it.list.get(0).errorMessage).setOkButton(getString(R.string.Cerrar)){ + customDialog.dismiss() + }.show() + }else{ + + if (it.list != null && it.list.size > 0){ + val listSectores : ArrayList = ArrayList() + it.list.forEach { + listSectores.add(it.description) + } + val array = arrayOfNulls(listSectores.size) + sectorListVO = it.list + showDialogSector(listSectores.toArray(array)) + + }else{ + customDialog.setTitle("Sectores").setDescription(getString(R.string.Noexistessectores)).setOkButton(getString(R.string.Cerrar)){ + customDialog.dismiss() + }.show() + } + + } + } + }) + } + super.observeViewModel() + } + + private fun showDialogSector(array:Array){ + val builder = AlertDialog.Builder(this.context) + + + builder.setTitle(getString(R.string.Seleccionaunsector)) + builder.setItems(array) { _, which -> + val selected = array[which] + sectorListVO.forEach { + if (it.description.equals(selected)){ + val editor = prefs!!.edit() + editor.putString(SECTORDESCRIP,it.description) + editor.putInt(SECTORFK,it.id) + it.warehouseFk?.let { it1 -> editor.putInt(WAREHOUSEFK, it1) } + editor.apply() + + viewModel.ajustesitem.get(0).sectorFk = it.id + viewModel.ajustesitem.get(0).warehouse = it.warehouseFk + viewModel.ajustesitem.get(0).selected = it.description + ajustesAdapter!!.notifyDataSetChanged() + + return@forEach + } + } + + } + val dialog = builder.create() + dialog.show() + } + + private fun showDialogVoz(array:Array){ + val builder = AlertDialog.Builder(this.context) + + + builder.setTitle(getString(R.string.Seleccionaunsector)) + builder.setItems(array) { _, which -> + val selected = array[which] + vozList.forEach { + if (it.equals(selected)){ + val editor = prefs!!.edit() + editor.putString(VOZ,it) + editor.apply() + viewModel.ajustesitem.get(3).selected = it + ajustesAdapter!!.notifyDataSetChanged() + + return@forEach + } + } + + + } + + val dialog = builder.create() + dialog.show() + } + + + //sergio : guardar datos + private fun showDialogCarros(array:Array){ + val builder = AlertDialog.Builder(this.context) + + + builder.setTitle(getString(R.string.Seleccionauncarro)) + builder.setItems(array) { _, which -> + val selected = array[which] + carroList.forEach { + if (it.equals(selected)){ + val editor = prefs!!.edit() + editor.putString(CARRO,it) + editor.apply() + + viewModel.ajustesitem.get(2).selected = it + ajustesAdapter!!.notifyDataSetChanged() + + return@forEach + } + } + + + } + + val dialog = builder.create() + dialog.show() + } + + + + fun setDefaults(key: String?, value: String?, context: Context?) { + val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val editor = preferences.edit() + editor.putString(key, value) + editor.commit() + } + + fun getDefaults(key: String?, context: Context?): String? { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + return preferences.getString(key, null) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt new file mode 100644 index 00000000..8c3d55f1 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt @@ -0,0 +1,95 @@ +package es.verdnatura.presentation.view.feature.ajustes.fragment + + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetAjustesUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import es.verdnatura.presentation.view.feature.ajustes.model.SectorListVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + + +class AjustesViewModel(context: Context) : BaseViewModel() { + + private val getAjustesUserCase:GetAjustesUserCase = GetAjustesUserCase(context) + val version : String = "5.0.0"; + + private val _ajustesitem by lazy { ArrayList() } + val ajustesitem: List + get() = _ajustesitem + + private val _sectorList by lazy { MutableLiveData() } + val sectorList: LiveData + get() = _sectorList + + + val loadSectorList = Transformations.map(_sectorList) {Event(it)} + + + + + fun inititializeDefaultAjusts(sectorDescrip: String,sectorFk : Int, warehouseFk : Int,vozDescrip:String,carroDescrip:String) { + _ajustesitem.add( + AjustesItemVO(0, + "Sector", + sectorDescrip, + sectorFk, + warehouseFk) + ) + + _ajustesitem.add( + AjustesItemVO(1, + "Cerrar Sesión", + "", + 0, + 0) + ) + _ajustesitem.add( + AjustesItemVO(2, + "Carros", + carroDescrip, + 0, + 0) + ) + _ajustesitem.add( + AjustesItemVO(3, + "Voz", + vozDescrip, + 0, + 0) + ) + + } + + fun getSectors(user:String,password:String){ + getAjustesUserCase.getSectors(user,password).enqueue(object : Callback>{ + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(SectorItemVO(0,"",0,true,t.message!!)) + _sectorList.value = SectorListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _sectorList.value = response.body()?.let { SectorListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(SectorItemVO(0,"",0,true,"Error en la llamada sector_get")) + _sectorList.value = SectorListVO(listError) + } + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.kt new file mode 100644 index 00000000..2b293657 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.kt @@ -0,0 +1,21 @@ +package es.verdnatura.presentation.view.feature.ajustes.model + +class AjustesItemVO ( + var id: Int, + var title: String = "", + var selected: String = "", + var sectorFk : Int?, + var warehouse: Int? +) + +class SectorItemVO ( + var id: Int, + var description:String = "", + val warehouseFk:Int?, + val isError : Boolean = false, + var errorMessage : String = "" +) + +class SectorListVO ( + var list: List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/BarcodeAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/BarcodeAdapter.kt new file mode 100644 index 00000000..bd9c73a8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/BarcodeAdapter.kt @@ -0,0 +1,48 @@ +package es.verdnatura.presentation.view.feature.articulo.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemBarcodeRowBinding +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO + +class BarcodeAdapter( + private val items: List, + private val onBarcodeRowClickListener: OnBarcodeRowClickListener, + private var showDelete: Boolean = true +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemBarcodeRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + + holder.binding.root.setOnClickListener { + onBarcodeRowClickListener.onBarcodeRowClickListener(items[position]) + } + + } + + + inner class ItemHolder( + val binding: ItemBarcodeRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: BarcodeVO) { + binding.apply { + this.item = item + if (showDelete) itemImage.visibility = View.VISIBLE + else itemImage.visibility = View.GONE + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemCardAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemCardAdapter.kt new file mode 100644 index 00000000..f270fc82 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemCardAdapter.kt @@ -0,0 +1,60 @@ +package es.verdnatura.presentation.view.feature.articulo.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemCardRowBinding +import es.verdnatura.presentation.common.OnItemCardRowClickListener +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO + +class ItemCardAdapter ( + private val items: List, + private val onItemCardRowClickListener: OnItemCardRowClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemCardRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + if (items[position].isEditable){ + holder.binding.root.setOnClickListener { + onItemCardRowClickListener.onItemCardRowClickListener(items[position]) + } + } + } + + + class ItemHolder( + val binding: ItemCardRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemCardRowVO) { + binding.apply { + if (item.barcodes.isNotEmpty()){ + item.value = "" + item.barcodes.forEach { + item.value = item.value + it.code + "\n" + } + } + this.item = item + if (item.isEditable){ + itemImage.visibility = View.VISIBLE + itemRowLayout.setBackgroundColor(res.getColor(R.color.verdnatura_black_5)) + }else{ + itemImage.visibility = View.INVISIBLE + itemRowLayout.setBackgroundColor(res.getColor(R.color.verdnatura_black_9)) + } + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt new file mode 100644 index 00000000..d474cca5 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -0,0 +1,517 @@ +package es.verdnatura.presentation.view.feature.articulo.fragment + + + +import android.app.AlertDialog +import android.content.Intent +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentItemCardBinding +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.common.OnItemCardRowClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.loadUrl +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.component.CustomDialogTwoButtons +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.adapter.ItemCardAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType +import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO +import es.verdnatura.presentation.view.feature.imageview.activity.ImageViewActivity +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.inventario.fragment.SearchBuyerModel +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.buyers_fragment.* +import kotlinx.android.synthetic.main.fragment_item_card.* +import kotlinx.android.synthetic.main.fragment_item_card.splash_progress +import kotlinx.android.synthetic.main.toolbar.* + +class ItemCardFragment( + var itemFk:String = "" +) : BaseFragment(ItemCardViewModel::class) { + + private var urlLarge:String = "" + private var titleImage:String = "" + private var user = "" + private var password = "" + private var warehouseFk = "" + private var adapter : ItemCardAdapter? = null + private var barcodeAdapter : BarcodeAdapter? = null + private var listItemsRow:ArrayList = ArrayList() + private var listBarcodes:ArrayList = ArrayList() + private var itemsPackingType:ArrayList = ArrayList() + + + + private var itemInfoG:ItemCardVO? = null + + companion object { + fun newInstance(entryPoint:String) = ItemCardFragment(entryPoint) + } + private lateinit var customDialog: CustomDialog + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogList: CustomDialogList + private lateinit var customDialogTwo: CustomDialogTwoButtons + + private val _buyersList by lazy { MutableLiveData() } + val buyersList: LiveData + get() = _buyersList + + + override fun getLayoutId(): Int = R.layout.fragment_item_card + + override fun init() { + itemcard_layout.visibility = View.GONE + activity!!.main_bottom_navigation.visibility = View.GONE + setEvents() + toolbar_title.text = getString(R.string.ConsultarArticulo) + customDialog = CustomDialog(requireContext()) + customDialogInput = CustomDialogInput(requireContext()) + customDialogList = CustomDialogList(requireContext()) + customDialogTwo = CustomDialogTwoButtons(requireContext()) + //sergio: se le pasa el item desde otros fragments + if (!itemFk.isNullOrEmpty()){ + getItemCard(itemFk) + } + setToolBar() + super.init() + } + + + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + val iconHistory : Drawable = resources.getDrawable(R.drawable.ic_history_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + listIcons.add(iconHistory) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + getItemCard(itemFk) + } + if (item == iconHistory){ + if (itemFk.isNullOrEmpty()){ + "Escanea un item".toast(activity!!) + }else{ + (activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Historico"),itemFk) + } + + } + } + + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + edit_itemFk.requestFocus() + edit_itemFk.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_itemFk.text.toString().isNullOrEmpty()) + getItemCard(edit_itemFk.text.toString()) + edit_itemFk.setText("") + (activity as MainActivity).hideKeyboard(edit_itemFk) + return@setOnEditorActionListener true + } + false + } + + + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + itemcard_image.setOnClickListener { + val i:Intent = Intent(activity,ImageViewActivity::class.java) + i.putExtra("url",urlLarge) + i.putExtra("title",titleImage) + startActivity(i) + } + } + + private fun getItemCard(itemFk:String){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + this.itemFk = itemFk + splash_progress.visibility = View.VISIBLE + viewModel.getItemCard(itemFk,warehouseFk,user!!,password!!) + viewModel.getItemPackingType(user!!,password!!) + } + + override fun observeViewModel() { + with(viewModel){ + itemcard.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (it.isError){ + itemcard_layout.visibility = View.GONE + toolbar_title.text = "ItemCard" + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + if (it.id != "0"){ + itemcard_layout.visibility = View.VISIBLE + setItemCard(it) + }else{ + itemcard_layout.visibility = View.GONE + toolbar_title.text = "ItemCard" + customDialog.setTitle("Sin resultados").setDescription("No hemos podido encontrar el articulo. Revisa el sector.").setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + + } + }) + + itemspackinglist.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + // Log.i("VERDNATURA","el code es $it.code") + // Log.i("VERDNATURA","la descrip es $it.description") + createItemTypeTypeList(it.list) + }) + + response.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + getItemCard(itemFk) + } + }) + } + } + + private fun createItemTypeTypeList(list: List) { + itemsPackingType.clear() + list.forEach { item -> + if (!item.isError){ + try { + itemsPackingType.add(ItemPackingType(item.code,item.description)); + // Log.i("VERDNATURA","Nombre encajado ${item.code} : ${item.description}") + }catch (e:Exception){} + } + }} + + + + + private fun setItemCard(itemInfo:ItemCardVO){ + itemInfoG = itemInfo + toolbar_title.text = itemInfo.id+"-"+itemInfo.longName + titleImage = itemInfo.id+"-"+itemInfo.longName + itemcard_image.setImageDrawable(resources.getDrawable(R.drawable.loadphoto,resources.newTheme())) + itemcard_image.loadUrl(itemInfo.urlImage200) + urlLarge = itemInfo.urlImage + itemcard_tag1.text = itemInfo.size + itemcard_tag2.text = itemInfo.value5 + itemcard_tag3.text = itemInfo.value6 + itemcard_tag4.text = itemInfo.value7 + " " + itemInfo.origin + listItemsRow = ArrayList() + listItemsRow.add(ItemCardRowVO(title = getString(R.string.total),value = itemInfo.total,isEditable = false)) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.Disponible),value = itemInfo.available,isEditable = false)) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.Ubicado),value = itemInfo.enAltillo,isEditable = false)) + + //EDITABLES + listItemsRow.add(ItemCardRowVO(title = getString(R.string.SINUBICAR),value = itemInfo.enNicho,isEditable = false, action = "itemStockUpdate")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARALTA),value = "",isEditable = true, action = "itemStockUpdateAdd")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.DARBAJA),value = "",isEditable = true, action = "itemStockUpdateRemove")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.BUSCARITEM),value = "",isEditable = true, action = "buscarItem")) + //listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave")) + // listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.Grouping),value = itemInfo.grouping,isEditable = true, action = "updateGrouping")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.Packing),value = itemInfo.packing,isEditable = true, action = "updatePacking")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.MINIMO),value = itemInfo.min,isEditable = true, action = "itemSaveMin")) + listItemsRow.add(ItemCardRowVO(title = getString(R.string.Barcode),barcodes = itemInfo.barcodes,isEditable = true, action = "toBarcode")) + //sergio para itemTypePacking + listItemsRow.add(ItemCardRowVO(title = getString(R.string.tipodeencajado),value = itemInfo.itemPackingTypeFk,isEditable = true, action = "updateSector")) + + listBarcodes = itemInfo.barcodes as ArrayList + + adapter = ItemCardAdapter(listItemsRow,object: OnItemCardRowClickListener{ + override fun onItemCardRowClickListener(item: ItemCardRowVO) { + + if (item.action=="updateSector"){ showDialogSelectItemTypePacking() + }else{ + if(item.action != "toBarcode" && item.action != "buscarItem" && item.action != "itemStockUpdateAdd" && item.action != "itemStockUpdateRemove"){ + customDialogInput.setTitle(item.title!!).setDescription("Valor actual: "+item.value!!).setOkButton("Guardar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.dismiss() + + }.setKoButton("Cancelar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.setValue("") + customDialogInput.dismiss() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + return@setOnEditorActionListener true + } + false + } + }else if(item.action == "toBarcode"){ + //BARCODE ROW + prepareBarcodeDialog(item) + }else if(item.action == "buscarItem"){ + (activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Buscar item"),itemFk) + }else if(item.action == "itemStockUpdateAdd"){ + customDialogInput.setTitle(item.title!!).setDescription("Indica la cantidad a dar de alta").setOkButton("Guardar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.dismiss() + + }.setKoButton("Cancelar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.setValue("") + customDialogInput.dismiss() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + return@setOnEditorActionListener true + } + false + } + }else if(item.action == "itemStockUpdateRemove"){ + customDialogInput.setTitle(item.title!!).setDescription("Indica la cantidad a dar de baja ").setOkButton("Guardar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.dismiss() + + }.setKoButton("Cancelar"){ + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) + editItemCardRow(item,customDialogInput.getValue()) + customDialogInput.setValue("") + customDialogInput.dismiss() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + return@setOnEditorActionListener true + } + false + }} + } + + } + }) + itemcard_recyclerview.adapter = adapter + itemcard_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + scroll_view.post(Runnable { + val position = IntArray(2) + if (itemcard_image != null){ + itemcard_image.getLocationInWindow(position) + scroll_view.scrollTo(0, position[1]) + } + }) + + } + + private fun editItemCardRow(item:ItemCardRowVO,value:String){ + + when (item.action){ + "itemStockUpdate" -> prepareItemStockUpdate(item,value) + "itemStockUpdateAdd" -> prepareItemStockUpdate2(item,value) + "itemStockUpdateRemove" -> prepareItemStockUpdate2(item,value) + "itemPlacementSave" -> viewModel.itemPlacementSave(itemFk = itemFk, warehouseFk = warehouseFk, user = user, password = password, value = value) + "updateGrouping" -> viewModel.updateGrouping(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk) + "updatePacking" -> viewModel.updatePacking(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk) + "itemSaveMin" -> viewModel.itemSaveMin(itemFk = itemFk, user = user, password = password, value = value) + + } + if(item.action != "itemStockUpdate") + changeOfflineValue(item,value, listBarcodes) + } + + private fun changeOfflineValue(item:ItemCardRowVO,newValue:String, barcodes:List){ + + splash_progress.visibility = View.VISIBLE + /*var i = 0 + var position = 0 + listItemsRow.forEach { + if (it.title == item.title) { + position = i + } + i = i.plus(1) + } + if (listItemsRow.get(position).title != "BARCODE") listItemsRow.get(position).value = newValue + else listItemsRow.get(position).barcodes = barcodes + adapter?.notifyDataSetChanged()*/ + } + + private fun prepareItemStockUpdate(itemB:ItemCardRowVO,value:String){ + try{ + + if (itemB.value!!.toInt() > value.toInt()) { + customDialogTwo.setTitle(itemB.title!!).setDescription("Indica la causa de eliminar stock:").setOkButton("Falta"){ + viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0") + changeOfflineValue(itemB,value, listBarcodes) + customDialogTwo.dismiss() + + }.setOkButtonTwo("Basura"){ + viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "1") + changeOfflineValue(itemB,value, listBarcodes) + customDialogTwo.dismiss() + + }.setKoButton("Cancelar"){ + + customDialogTwo.dismiss() + }.show() + }else{ + changeOfflineValue(itemB,value, listBarcodes) + viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0") + } + }catch (e:Exception){ + itemcard_layout.visibility = View.GONE + customDialog.setTitle("Error").setDescription("El elemento introducido no es un número").setKoButton("Cancelar"){ + customDialog.dismiss() + }.show() + } + + } + + private fun prepareItemStockUpdate2(itemB:ItemCardRowVO,value:String){ + try{ + + if (itemB.action == "itemStockUpdateRemove") { + customDialogTwo.setTitle(itemB.title!!).setDescription("Indica la causa de eliminar stock:").setOkButton("Falta"){ + viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0") + changeOfflineValue(itemB,value, listBarcodes) + customDialogTwo.dismiss() + + }.setOkButtonTwo("Basura"){ + viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "1") + changeOfflineValue(itemB,value, listBarcodes) + customDialogTwo.dismiss() + + }.setKoButton("Cancelar"){ + + customDialogTwo.dismiss() + }.show() + }else{ + changeOfflineValue(itemB,value, listBarcodes) + viewModel.itemTrash(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = (value.toInt() * -1).toString(),isTrash = "0") + } + }catch (e:Exception){ + itemcard_layout.visibility = View.GONE + customDialog.setTitle("Error").setDescription("El elemento introducido no es un número").setKoButton("Cancelar"){ + customDialog.dismiss() + }.show() + } + } + + private fun prepareBarcodeDialog(itemB:ItemCardRowVO){ + + customDialogList.setTitle("Barcodes").setOkButton("Guardar"){ + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + if (!customDialogList.getValue().isNullOrEmpty()) + updateBarcode(customDialogList.getValue(),"0",itemB) + customDialogList.dismiss() + + }.setKoButton("Cerrar"){ + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + customDialogList.dismiss() + }.setValue("").show() + + + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + customDialogList.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogList.getValue().isNullOrEmpty()) + updateBarcode(customDialogList.getValue(),"0",itemB) + customDialogList.setValue("") + customDialogList.dismiss() + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + return@setOnEditorActionListener true + } + false + } + + barcodeAdapter = BarcodeAdapter(listBarcodes,object: OnBarcodeRowClickListener{ + override fun onBarcodeRowClickListener(item: BarcodeVO) { + updateBarcode(item.code!!,"1",itemB) + } + }) + customDialogList.getRecyclerView().adapter = barcodeAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + } + + private fun updateBarcode(code:String,delete:String,item:ItemCardRowVO){ + if (delete == "1"){ + var i = 0 + var posDelete = 0 + listBarcodes.forEach { + if (it.code == code) + posDelete = i + i+=1 + } + listBarcodes.removeAt(posDelete) + }else{ + listBarcodes.add(BarcodeVO(code)) + } + viewModel.barcodesEdit(itemFk = itemFk, user = user, password = password, value = code, delete = delete) + barcodeAdapter!!.notifyDataSetChanged() + changeOfflineValue(item,"", listBarcodes) + } + + private fun showDialogSelectItemTypePacking(){ + + var array= arrayOfNulls(itemsPackingType.size) + for (indice in array.indices){ + array[indice]=itemsPackingType[indice].code + " : "+itemsPackingType[indice].description + } + val builder = AlertDialog.Builder(this.context) + builder.setTitle(getString(R.string.mensajeseleccionencajado)) + .setItems(array + ) { dialog, position -> + updateItemPackingType(itemsPackingType[position].code.toString()); + } + + builder.create().show() + } + + private fun updateItemPackingType(itemPackingType:String) { + splash_progress.visibility = View.VISIBLE + viewModel.updatePackingType(this.itemFk,user,password,itemPackingType) + } + +} + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt new file mode 100644 index 00000000..fea38fe2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt @@ -0,0 +1,226 @@ +package es.verdnatura.presentation.view.feature.articulo.fragment + + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetItemCardUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingTypeList +import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerListVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ItemCardViewModel(context: Context) : BaseViewModel() { + private val getItemCardUserCase:GetItemCardUserCase = GetItemCardUserCase(context) + val version : String = "5.0.0"; + + private val _itemcard by lazy { MutableLiveData() } + val itemcard: LiveData + get() = _itemcard + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _itemspackinglist by lazy { MutableLiveData() } + val itemspackinglist: LiveData + get() = _itemspackinglist + + + fun getItemCard(itemFk:String,warehouseFk:String,user:String,password:String) { + getItemCardUserCase.getItemCard(user,password,itemFk,warehouseFk).enqueue(object :Callback{ + override fun onFailure(call: Call, t: Throwable) { + _itemcard.value = ItemCardVO(isError = true,errorMessage = "Error al OBTENER "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() != null){ + _itemcard.value = response.body()!! + }else{ + _itemcard.value = ItemCardVO(isError = true,errorMessage = "Error al llamar a vn.itemCard") + } + } + + }) + } + + fun getItemPackingType(user:String,password:String) { + getItemCardUserCase.getItemPackingType(user,password).enqueue(object : + Callback>{ + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemPackingType(isError = true,errorMessage = t.message!!)) + _itemspackinglist.value = ItemPackingTypeList(listError) + } + + override fun onResponse(call: Call>, response: Response>) { + if (response.body() != null){ + _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } + + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemPackingType(isError = true,errorMessage = "Error en la llamada de getItemPackingType")) + _itemspackinglist.value = ItemPackingTypeList(listError) + } + } + + }) + } + + + + fun itemStockUpdate(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ + getItemCardUserCase.itemStockUpdate(user,password,itemFk,warehouseFk,newValue,isTrash).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar STOCK "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemStockUpdate") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun itemTrash(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ + getItemCardUserCase.itemTrash(user,password,itemFk,warehouseFk,newValue,isTrash).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar STOCK "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemTrash") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun itemPlacementSave(itemFk:String,warehouseFk:String,user:String,password:String,value:String){ + getItemCardUserCase.itemPlacementSave(user,password,itemFk,warehouseFk,value).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar NICHO "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemPlacementSave") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun updateGrouping(itemFk:String,user:String,password:String,value:String,warehouseFk: String){ + getItemCardUserCase.updateGrouping(user,password,itemFk,value,warehouseFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar GROUPING "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada updateGrouping") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun updatePacking(itemFk:String,user:String,password:String,value:String,warehouseFk: String){ + getItemCardUserCase.updatePacking(user,password,itemFk,value,warehouseFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar PACKING "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada updatePacking") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + //sergio ver como solucionar el tema del "Finish" + fun updatePackingType(itemFk:String,user:String,password:String,itemPackingType:String){ + getItemCardUserCase.updatePackingType(user,password,itemFk,itemPackingType).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar PackingType "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada updatePackingType") + }else{ + //if (response.body()=="Finish"){ + // Log.i("VERDNATURA","Fisnih encontrado")} + _response.value = ResponseItemVO(isError = false,response = response.body()!!.toString()) + } + + } + + }) + } + + fun itemSaveMin(itemFk:String,user:String,password:String,value:String){ + getItemCardUserCase.itemSaveMin(user,password,itemFk,value).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar MIN "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada updatePacking") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun barcodesEdit(itemFk:String,user:String,password:String,value:String,delete:String){ + getItemCardUserCase.barcodes_edit(user,password,itemFk,value,delete).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar BARCODES "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemBarcode_update") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt new file mode 100644 index 00000000..3c1db21d --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt @@ -0,0 +1,51 @@ +package es.verdnatura.presentation.view.feature.articulo.model + +class ItemCardVO ( + var id:String = "0", + var longName:String = "0", + var value5:String = "", + var value6:String = "0", + var value7:String = "0", + var image:String = "0", + var size:String = "0", + var stems:String = "0", + var category:String = "0", + var producer:String = "0", + var origin:String = "0", + var nicho:String = "0", + var reserva:String = "0", + var enNicho:String = "0", + var available:String = "0", + var enAltillo:String = "0", + var repo:String = "0", + var total:String = "0", + var min:String = "0", + var grouping:String = "0", + var packing:String = "0", + var barcodes:List = listOf(), + var tag5:String = "", + var tag6:String = "", + var tag7:String = "", + var isError: Boolean = false, + var errorMessage:String = "", + var urlImage200:String = "", + var urlImage:String = "", + var itemPackingTypeFk:String =" " +) + +class ItemCardRowVO ( + var title:String? = "", + var value:String? = "", + var isEditable:Boolean = true, + var action:String = "", + var barcodes: List = listOf() +) + +class BarcodeVO( + var code:String? = "" +) + + + + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemPackingType.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemPackingType.kt new file mode 100644 index 00000000..a6f45b78 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemPackingType.kt @@ -0,0 +1,15 @@ +package es.verdnatura.presentation.view.feature.articulo.model + + + +class ItemPackingType ( + + var code:String= "", + var description:String = "", + var isError: Boolean = false, + var errorMessage:String = "" +) + +class ItemPackingTypeList ( + var list: List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt new file mode 100644 index 00000000..c9c26853 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt @@ -0,0 +1,43 @@ +package es.verdnatura.presentation.view.feature.buscaritem.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemLocationRowBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class LocationAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemLocationRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Ubicador"),items[position].Matricula) + } + + } + + class ItemHolder( + val binding: ItemLocationRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemLocationVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt new file mode 100644 index 00000000..c8778942 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt @@ -0,0 +1,108 @@ +package es.verdnatura.presentation.view.feature.buscaritem.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentBuscarItemBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_buscar_item.* +import kotlinx.android.synthetic.main.toolbar.* + +class BuscarItemFragment( + var itemFk:String = "" +) : BaseFragment(BuscarItemViewModel::class) { + + private var user = "" + private var password = "" + private var warehouseFk = "" + private var adapter : LocationAdapter? = null + private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + + companion object { + fun newInstance(entryPoint:String) = BuscarItemFragment(entryPoint) + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + override fun getLayoutId(): Int = R.layout.fragment_buscar_item + + override fun init() { + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getString(R.string.getubicaition) + customDialog = CustomDialog(requireContext()) + setEvents() + if (!itemFk.isNullOrEmpty()){ + getLocations(itemFk) + } + super.init() + } + + + private fun setEvents(){ + edit_itemFk.requestFocus() + edit_itemFk.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_itemFk.text.toString().isNullOrEmpty()) + getLocations(edit_itemFk.text.toString()) + edit_itemFk.setText("") + (activity as MainActivity).hideKeyboard(edit_itemFk) + return@setOnEditorActionListener true + } + false + } + + + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + } + + private fun getLocations(itemFk:String){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + this.itemFk = itemFk + splash_progress.visibility = View.VISIBLE + viewModel.getLocations(user,password,itemFk) + } + + override fun observeViewModel() { + with(viewModel){ + loadLocationList.observe(viewLifecycleOwner, Observer { event -> + + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE + adapter = LocationAdapter(it.list,pasillerosItemClickListener!!) + + location_recyclerview.adapter = adapter + location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + var totalVisible:Int = 0 + it.list.forEach { + if (!it.visible.isNullOrEmpty()) + totalVisible += it.visible.toInt() + } + toolbar_title.text = "Item: "+itemFk+ " Total visible: "+totalVisible + + + } + }) + } + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt new file mode 100644 index 00000000..5446e2ae --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt @@ -0,0 +1,52 @@ +package es.verdnatura.presentation.view.feature.buscaritem.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetBuscarItemUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import es.verdnatura.presentation.view.feature.buscaritem.model.LocationListVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class BuscarItemViewModel(context: Context) : BaseViewModel() { + private val getBuscarItemUserCase: GetBuscarItemUserCase = GetBuscarItemUserCase(context) + + + private val _locationList by lazy { MutableLiveData() } + val locationList: LiveData + get() = _locationList + + + val loadLocationList = Transformations.map(_locationList) { Event(it) } + + + fun getLocations(user:String,password:String,itemFk:String){ + getBuscarItemUserCase.searchItemsUbicador(user,password,itemFk).enqueue(object : Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemLocationVO(isError = true,errorMessage = t.message!!)) + _locationList.value = LocationListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _locationList.value = response.body()?.let { LocationListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemLocationVO(isError = true,errorMessage = "Error en la llamada de searchItemsUbicador")) + _locationList.value = LocationListVO(listError) + } + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt new file mode 100644 index 00000000..9b6e6ec7 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt @@ -0,0 +1,18 @@ +package es.verdnatura.presentation.view.feature.buscaritem.model + + +class ItemLocationVO ( + var Parking:String = "", + var Matricula:String = "", + var visible:String = "", + var Disponible:String = "", + var level:String = "", + var created:String = "", + var itemFk:String = "", + val isError : Boolean = false, + var errorMessage : String = "" +) + +class LocationListVO ( + var list: List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/adapter/LocationAdapterAll.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/adapter/LocationAdapterAll.kt new file mode 100644 index 00000000..0db9a888 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/adapter/LocationAdapterAll.kt @@ -0,0 +1,44 @@ +package es.verdnatura.presentation.view.feature.buscaritemall.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemLocationAllRowBinding +import es.verdnatura.databinding.ItemLocationRowBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class LocationAdapterAll ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolderAll{ + return ItemHolderAll( + ItemLocationAllRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolderAll, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Ubicador"),items[position].Matricula) + } + + } + + class ItemHolderAll( + val binding: ItemLocationAllRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemLocationAll) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllFragment.kt new file mode 100644 index 00000000..3d19047d --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllFragment.kt @@ -0,0 +1,143 @@ +package es.verdnatura.presentation.view.feature.buscaritem.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentBuscarItemAllBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.buscaritemall.adapter.LocationAdapterAll +import es.verdnatura.presentation.view.feature.buscaritemall.fragment.BuscarItemAllViewModel +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_buscar_item.* +import kotlinx.android.synthetic.main.fragment_buscar_item.edit_itemFk +import kotlinx.android.synthetic.main.fragment_buscar_item.location_recyclerview +import kotlinx.android.synthetic.main.fragment_buscar_item.splash_progress +import kotlinx.android.synthetic.main.fragment_buscar_item_all.* +import kotlinx.android.synthetic.main.fragment_inventary.* +import kotlinx.android.synthetic.main.toolbar.* + +class BuscarItemAllFragment( + var itemFk:String = "" +) : BaseFragment(BuscarItemAllViewModel::class) { + + private var user = "" + private var password = "" + private var warehouseFk = "" + private var adapter : LocationAdapterAll? = null + private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + + companion object { + fun newInstance(entryPoint:String) = BuscarItemAllFragment(entryPoint) + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + override fun getLayoutId(): Int = R.layout.fragment_buscar_item_all + + override fun init() { + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getString(R.string.getubicaition) + customDialog = CustomDialog(requireContext()) + setEvents() + if (!itemFk.isNullOrEmpty()){ + getLocations(itemFk) + } + super.init() + } + + + private fun setEvents(){ + edit_itemFk.requestFocus() + edit_itemFk.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_itemFk.text.toString().isNullOrEmpty()) + getLocations(edit_itemFk.text.toString()) + edit_itemFk.setText("") + (activity as MainActivity).hideKeyboard(edit_itemFk) + return@setOnEditorActionListener true + } + false + } + + edit_itemFk.setOnKeyListener { v, keyCode, event -> + Log.i("VERDNATURA","text") + return@setOnKeyListener false} + /*if (filter_itemFk.text.toString().isNullOrEmpty()){ + if (listInvetory.size != listInvetoryAux.size){ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + listInvetory.add(it) + } + + } + + }else{ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + if ((it.itemFk.contains(filter_itemFk.text.toString(),true)) || (it.producer?.contains(filter_itemFk.text.toString(),true))){ + listInvetory.add(it) + } + } + + + } + LocationAdapterAll!!.notifyDataSetChanged() + return@setOnKeyListener false + }*/ + + + + + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + } + + private fun getLocations(itemFk:String){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + this.itemFk = itemFk + splash_progress.visibility = View.VISIBLE + viewModel.getLocationsAll(user,password,itemFk) + } + + override fun observeViewModel() { + with(viewModel){ + loadLocationListAll.observe(viewLifecycleOwner, Observer { event -> + + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE + adapter = LocationAdapterAll(it.list,pasillerosItemClickListener!!) + + location_all_recyclerview.adapter = adapter + location_all_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + var totalVisible:Int = 0 + it.list.forEach { + if (!it.visible.isNullOrEmpty()) + totalVisible += it.visible.toInt() + } + toolbar_title.text = "Item: "+itemFk+ " Total visible: "+totalVisible + + + } + }) + } + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllViewModel.kt new file mode 100644 index 00000000..961fb1d6 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllViewModel.kt @@ -0,0 +1,53 @@ +package es.verdnatura.presentation.view.feature.buscaritemall.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetBuscarItemAllUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll +import es.verdnatura.presentation.view.feature.buscaritemall.model.LocationListAll + +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class BuscarItemAllViewModel(context: Context) : BaseViewModel() { + private val getBuscarItemAllUserCase: GetBuscarItemAllUserCase = GetBuscarItemAllUserCase(context) + + + private val _locationListAll by lazy { MutableLiveData() } + val locationListAll: LiveData + get() = _locationListAll + + + val loadLocationListAll = Transformations.map(_locationListAll) { Event(it) } + + + fun getLocationsAll(user:String,password:String,itemFk:String){ + getBuscarItemAllUserCase.searchItemsUbicadorAll(user,password,itemFk).enqueue(object : Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemLocationAll(isError = true,errorMessage = t.message!!)) + _locationListAll.value = LocationListAll(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _locationListAll.value = response.body()?.let { LocationListAll(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemLocationAll(isError = true,errorMessage = "Error en la llamada de searchItemsUbicadorAll")) + _locationListAll.value = LocationListAll(listError) + } + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/model/ItemLocationAll.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/model/ItemLocationAll.kt new file mode 100644 index 00000000..16698f65 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/model/ItemLocationAll.kt @@ -0,0 +1,18 @@ +package es.verdnatura.presentation.view.feature.buscaritemall.model + + +class ItemLocationAll ( + var Parking:String = "", + var Matricula:String = "", + var visible:String = "", + var Disponible:String = "", + var level:String = "", + var created:String = "", + var itemFk:String = "", + val isError : Boolean = false, + var errorMessage : String = "" +) + +class LocationListAll ( + var list: List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/adapter/ItemBuyersAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/adapter/ItemBuyersAdapter.kt new file mode 100644 index 00000000..5da2a6fc --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/adapter/ItemBuyersAdapter.kt @@ -0,0 +1,124 @@ +package es.verdnatura.presentation.view.feature.calidad.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemBuyerRowBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnStarSelectedListener +import es.verdnatura.presentation.common.convertToDateString +import es.verdnatura.presentation.common.loadUrl +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import java.text.SimpleDateFormat +import java.util.* + +class ItemBuyersAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener, + private val onStarSelectedListener: OnStarSelectedListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BuyersItemHolder { + return BuyersItemHolder( + ItemBuyerRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: BuyersItemHolder, position: Int) { + holder.bind(items[position]) + + } + + + inner class BuyersItemHolder( + val binding: ItemBuyerRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(item: ItemBuyerVO) { + binding.apply { + this.itemBuyer = item + if (item != null && item.image != "") + imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.image); + else + imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.itemFk); + + imgItem.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk) + } + + if (item.showStars) layoutStars.visibility = View.VISIBLE + else layoutStars.visibility = View.GONE + + + s1.setOnClickListener { + onStarSelectedListener.onStarSelected(item.id,"1") + } + + s2.setOnClickListener { + onStarSelectedListener.onStarSelected(item.id,"2") + } + + s3.setOnClickListener { + onStarSelectedListener.onStarSelected(item.id,"3") + } + + s4.setOnClickListener { + onStarSelectedListener.onStarSelected(item.id,"4") + } + + s5.setOnClickListener { + onStarSelectedListener.onStarSelected(item.id,"5") + } + + if (item.stars != null && item.stars != ""){ + try { + val punt = item.stars.toInt() + if (punt == 1){ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceKo) + s3.setImageResource(item.iconResourceKo) + s4.setImageResource(item.iconResourceKo) + s5.setImageResource(item.iconResourceKo) + }else if (punt == 2){ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceOk) + s3.setImageResource(item.iconResourceKo) + s4.setImageResource(item.iconResourceKo) + s5.setImageResource(item.iconResourceKo) + }else if (punt == 3){ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceOk) + s3.setImageResource(item.iconResourceOk) + s4.setImageResource(item.iconResourceKo) + s5.setImageResource(item.iconResourceKo) + }else if (punt == 4){ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceOk) + s3.setImageResource(item.iconResourceOk) + s4.setImageResource(item.iconResourceOk) + s5.setImageResource(item.iconResourceKo) + }else if (punt == 5){ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceOk) + s3.setImageResource(item.iconResourceOk) + s4.setImageResource(item.iconResourceOk) + s5.setImageResource(item.iconResourceOk) + }else{ + s1.setImageResource(item.iconResourceOk) + s2.setImageResource(item.iconResourceOk) + s3.setImageResource(item.iconResourceOk) + s4.setImageResource(item.iconResourceOk) + s5.setImageResource(item.iconResourceOk) + } + }catch (e:Exception){} + } + } + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersFragment.kt new file mode 100644 index 00000000..b00c92d6 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersFragment.kt @@ -0,0 +1,127 @@ +package es.verdnatura.presentation.view.feature.calidad.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.BuyersFragmentBinding +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnAjustesItemClickListener +import es.verdnatura.presentation.common.OnBuyerSelectedListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter +import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.buyers_fragment.* +import kotlinx.android.synthetic.main.buyers_fragment.splash_progress +import kotlinx.android.synthetic.main.fragment_ajustes.* +import kotlinx.android.synthetic.main.toolbar.* + +class BuyersFragment : BaseFragment(BuyersViewModel::class) { + + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private lateinit var customDialog: CustomDialog + private var onBuyerSelectedListener : OnBuyerSelectedListener? = null + private var buyersAdapter: AjustesAdapter? = null + + companion object { + fun newInstance() = BuyersFragment() + } + + override fun getLayoutId(): Int = R.layout.buyers_fragment + + override fun onAttach(context: Context) { + if (context is OnBuyerSelectedListener) onBuyerSelectedListener = context + super.onAttach(context) + } + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + viewModel.itemShelvingBuyerGet(user = user,password = password) + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + splash_progress.visibility = View.VISIBLE + toolbar_title.text = getString(R.string.quality) + setToolBar() + setEvents() + super.init() + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingBuyerGet(user = user,password = password) + + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + } + + override fun observeViewModel() { + with(viewModel) { + buyersList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + createBuyerList(it.list) + }) + } + } + + private fun createBuyerList(list:List){ + var buyers = ArrayList() + list.forEach { buyer -> + if (!buyer.isError){ + try { + buyers.add( + AjustesItemVO( + id = buyer.userFk.toInt(), + title = buyer.nickname, + sectorFk = 0, + warehouse = 0 + ) + ) + }catch (e:Exception){} + } + } + buyersAdapter = AjustesAdapter(buyers,object: OnAjustesItemClickListener { + override fun onAjustesItemClickListener(item: AjustesItemVO) { + onBuyerSelectedListener?.onBuyerSelected(item.id.toString()) + } + }) + buyers_items.adapter = buyersAdapter + buyers_items.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt new file mode 100644 index 00000000..2892ff93 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt @@ -0,0 +1,49 @@ +package es.verdnatura.presentation.view.feature.calidad.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetQualityUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.inventario.model.InventaryListVO +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class BuyersViewModel(context: Context) : BaseViewModel() { + + private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) + + private val _buyersList by lazy { MutableLiveData() } + val buyersList: LiveData + get() = _buyersList + + fun itemShelvingBuyerGet(user:String,password:String){ + getQualityUserCase.itemShelvingBuyerGet(user,password).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(BuyerVO(isError = true,errorMessage = t.message!!)) + _buyersList.value = BuyerListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _buyersList.value = response.body()?.let { BuyerListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(BuyerVO(isError = true,errorMessage = "Error en la llamada de itemShelving_buyerGet")) + _buyersList.value = BuyerListVO(listError) + } + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt new file mode 100644 index 00000000..6fcc818e --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt @@ -0,0 +1,211 @@ +package es.verdnatura.presentation.view.feature.calidad.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.QaualityFragmentBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.calidad.adapter.ItemBuyersAdapter +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_collection.* +import kotlinx.android.synthetic.main.qauality_fragment.* +import kotlinx.android.synthetic.main.qauality_fragment.scan_input +import kotlinx.android.synthetic.main.qauality_fragment.splash_progress +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList + +class QaualityFragment( + var userFk : String = "0" +) : BaseFragment(QaualityViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private lateinit var customDialog: CustomDialog + private var buyersAdapter: ItemBuyersAdapter? = null + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + private var onStarSelectedListener : OnStarSelectedListener? = null + private var listItems:List = listOf() + private var lm : LinearLayoutManager? = null + private var storedPosition: Int = 0 + private var goBack:Boolean = false + + + companion object { + fun newInstance(userFk:String) = QaualityFragment(userFk) + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.qauality_fragment + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + viewModel.itemShelvingBuyerTask(user = user,password = password,userFk = userFk) + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + splash_progress.visibility = View.VISIBLE + toolbar_title.text = "itemShelving_BuyerTask" + setToolBar() + setEvents() + super.init() + } + + override fun onPause() { + super.onPause() + goBack = true + storedPosition = lm?.findFirstVisibleItemPosition() ?: 0 + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingBuyerTask(user = user,password = password,userFk = userFk) + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + //ESCANER ========= + hideKeyboards() + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!scan_input.text.toString().isNullOrEmpty()){ + findSale(scan_input.text.toString()) + } + scan_input.setText("") + hideKeyboards() + return@setOnEditorActionListener true + } + true + } + } + + private fun hideKeyboards(){ + try{ + requireActivity().hideKeyboard() + }catch (e:Exception){} + } + + override fun observeViewModel() { + with(viewModel) { + buyersList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + createBuyerList(it.list) + }) + + response.observe(viewLifecycleOwner, Observer { + viewModel.itemShelvingBuyerTask(user = user,password = password,userFk = userFk) + }) + } + } + + private fun createBuyerList(list:List){ + list.forEach { item -> + if (!goBack){ + if (item.created != null && item.created != ""){ + item.created = getCalendarFromDate(item.created).convertToDateString() + } + } + + if (item.visible.contains("Visible:",ignoreCase = true)){ + item.visible = item.visible + }else{ + item.visible = "Visible: "+item.visible + } + + item.iconResourceOk = R.drawable.ic_start_ok + item.iconResourceKo = R.drawable.ic_star_ko + } + goBack = false + listItems = list + buyersAdapter = ItemBuyersAdapter(listItems,pasillerosItemClickListener!!,object: OnStarSelectedListener{ + override fun onStarSelected(vId: String, vStars: String) { + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingStarsUpdate(user,password,vId,vStars) + } + + }) + shelving_buyers_items.adapter = buyersAdapter + lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + shelving_buyers_items.layoutManager = lm + + if (storedPosition < listItems.size) + goToPosition(storedPosition) + } + + private fun getCalendarFromDate(date:String): Calendar { + val sdf = SimpleDateFormat("yyyy-MM-dd") + val cal = Calendar.getInstance() + cal.setTime(sdf.parse(date)) + return cal + } + + private fun findSale(matricula:String){ + var isSearch = false + var index = 0 + var position = 0 + listItems.forEach { item -> + if (item.shelvingFk.toUpperCase() == matricula.toUpperCase()){ + item.showStars = true + if (!isSearch){ + position = index + isSearch = true + } + }else{ + item.showStars = false + } + index += 1 + } + + storedPosition = position + goToPosition(position) + + buyersAdapter?.notifyDataSetChanged() + } + + private fun goToPosition(position:Int){ + if (shelving_buyers_items != null){ + shelving_buyers_items.addViewObserver { + lm!!.scrollToPositionWithOffset(position,0) + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt new file mode 100644 index 00000000..a29dcc76 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt @@ -0,0 +1,71 @@ +package es.verdnatura.presentation.view.feature.calidad.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetQualityUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerListVO +import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class QaualityViewModel(context: Context) : BaseViewModel() { + + private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) + + private val _buyersList by lazy { MutableLiveData() } + val buyersList: LiveData + get() = _buyersList + + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + + fun itemShelvingBuyerTask(user:String,password:String,userFk:String){ + getQualityUserCase.itemShelvingBuyerTask(user,password,userFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemBuyerVO(isError = true,errorMessage = t.message!!)) + _buyersList.value = ItemBuyerListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _buyersList.value = response.body()?.let { ItemBuyerListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemBuyerVO(isError = true,errorMessage = "Error en la llamada de itemShelvingBuyerTask")) + _buyersList.value = ItemBuyerListVO(listError) + } + } + + }) + } + + fun itemShelvingStarsUpdate(usuario:String,password:String, vId: String,vStars: String) { + getQualityUserCase.itemShelvingStarsUpdate(usuario,password,vId,vStars).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingStarsUpdate") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/model/BuyerVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/model/BuyerVO.kt new file mode 100644 index 00000000..f94a889a --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/model/BuyerVO.kt @@ -0,0 +1,36 @@ +package es.verdnatura.presentation.view.feature.calidad.model + +//import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO + +class BuyerVO ( + var userFk:String = "", + var nickname:String= "", + var isError:Boolean = false, + var errorMessage:String = "" +) + + +class BuyerListVO ( + var list: List = listOf() +) + +class ItemBuyerVO ( + var id:String = "", + var itemFk:String = "", + var longName:String = "", + var image:String = "", + var parking:String = "", + var shelvingFk:String = "", + var visible:String = "", + var created:String = "", + var stars:String = "", + var isError:Boolean = false, + var errorMessage:String = "", + var showStars:Boolean = false, + var iconResourceOk: Int = 0, + var iconResourceKo: Int = 0 +) + +class ItemBuyerListVO( + var list: List = listOf() +) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt new file mode 100644 index 00000000..445d89bc --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt @@ -0,0 +1,10 @@ +package es.verdnatura.presentation.view.feature.collection + +class ItemVO( + var id : String = "", + var longName : String = "", + var visible : String = "", + var available : String = "", + var isError: Boolean = false, + var errorMessage: String = "" +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt new file mode 100644 index 00000000..04482862 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt @@ -0,0 +1,46 @@ +package es.verdnatura.presentation.view.feature.collection.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemPlacementRowBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementVO + +class PlacementAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + var context: Context? = null + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + this.context = parent.context + return AjustesItemHolder( + ItemPlacementRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class AjustesItemHolder( + val binding: ItemPlacementRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(placement: PlacementVO) { + binding.apply { + if (placement.placement.isNullOrEmpty()) + placement.placement = placement.parking + if (placement.visible.isNullOrEmpty()) + placement.visible = "("+placement.stockTotal+")" + this.item = placement + itemRootLayout.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Ubicador"),placement.shelving) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt new file mode 100644 index 00000000..407cd2fc --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt @@ -0,0 +1,139 @@ +package es.verdnatura.presentation.view.feature.collection.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemArticleRowBinding +import es.verdnatura.presentation.common.OnMistakeClickListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnQuantityClickListener +import es.verdnatura.presentation.common.OnSaleClickListener +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO + +class SaleAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener, + private val onQuantityClick: OnQuantityClickListener, + private val onSaleClickListener: OnSaleClickListener, + private val onMistakeClickListener: OnMistakeClickListener +): RecyclerView.Adapter () { + var context:Context? = null + var position:Int = 0 + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + this.context = parent.context + return AjustesItemHolder( + ItemArticleRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + this.position = position + holder.bind(items[position]) + } + + inner class AjustesItemHolder( + val binding: ItemArticleRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(sale: SaleVO) { + binding.apply { + if (sale.pickedQuantity.isNullOrEmpty()) + sale.pickedQuantity = "0" + + val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) + + itemArticlePlacements.apply { + layoutManager = childLayoutManager + adapter = PlacementAdapter(sale.placements,onPasillerosItemClickListener) + } + + //CLICK EVENTS + contentLayout.setOnClickListener { + onSaleClickListener.onSaleClick(sale) + } + + itemArticleItemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),sale.itemFk) + } + + + itemArticleQuantity.setOnClickListener { + onQuantityClick.onQuantityClick(sale) + } + + itemArticleQuantityPicked.setOnClickListener { + onQuantityClick.onQuantityClick(sale) + } + + txtde.setOnClickListener { + onQuantityClick.onQuantityClick(sale) + } + + contentLayout.setOnLongClickListener { + onMistakeClickListener.onMistakeClickListener(sale) + false + } + + //ERROR + if (sale.originalQuantity != sale.quantity){ + layoutError.visibility = View.VISIBLE + txtError.text = "Cantidad original: "+sale.originalQuantity + if (sale.isPrepared == "1" || sale.isControlled == "1") + sale.pickedQuantity = sale.quantity + } + + if (sale.isNew){ + layoutError.visibility = View.VISIBLE + txtError.text = "Artículo nuevo" + + } + + if (!sale.isNew && sale.originalQuantity == sale.quantity){ + layoutError.visibility = View.GONE + } + + + //SEMAFORO + if (sale.isPreviousPrepared == "1"){ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_warm_grey)) + } + + if (sale.isPrepared == "1"){ + itemArticleRowSemaforoSac.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_pumpkin_orange)) + }else{ + itemArticleRowSemaforoSac.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_warm_grey)) + } + + if (sale.isControlled == "1"){ + itemArticleRowSemaforoCon.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_mint)) + }else{ + itemArticleRowSemaforoCon.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_warm_grey)) + } + + if (sale.isControlled == "1"){ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_mint)) + }else if (sale.isPrepared == "1"){ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_pumpkin_orange)) + }else if (sale.isPreviousPrepared == "1"){ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_black)) + } + + + //ASIGNAMOS VALOR A LA VSITA + this.sale = sale + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt new file mode 100644 index 00000000..d28cf171 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt @@ -0,0 +1,1613 @@ +package es.verdnatura.presentation.view.feature.collection.fragment + +import android.app.KeyguardManager +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.speech.SpeechRecognizer +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.FragmentCollectionBinding +import es.verdnatura.domain.ConstAndValues.CHECKED +import es.verdnatura.domain.ConstAndValues.CONTROLADOR +import es.verdnatura.domain.ConstAndValues.OK +import es.verdnatura.domain.ConstAndValues.ON_CHECKING +import es.verdnatura.domain.ConstAndValues.ON_PREPARATION +import es.verdnatura.domain.ConstAndValues.PREPARED +import es.verdnatura.domain.ConstAndValues.SACADOR +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.component.CustomDialogThreeButtons +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.collection.ItemVO +import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.sacador.model.* +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_collection.* +import kotlinx.android.synthetic.main.toolbar.* + + +class CollectionFragment( + var collection : CollectionVO = CollectionVO(), + var type:String = SACADOR +) : BaseFragment(CollectionViewModel::class){ + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var token = "" + private var voz = "" + private var sales:List = listOf() + private var saleAdapter:SaleAdapter? = null + private var lm : LinearLayoutManager? = null + private var storedPosition: Int = 0 + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + private lateinit var customDialogList: CustomDialogList + private var placementSupplyAdapter : BarcodeAdapter? = null + private var listPlacementSupply:ArrayList = ArrayList() + private var storedShelvingPosition:Int = 0 + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogThreeButtons: CustomDialogThreeButtons + private var ticketSelected:String = "" + private lateinit var customDialog: CustomDialog + private var goBack:Boolean = false + private var goBack2:Boolean = false + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + private var itemShelvingFkStored : String = "" + private var storedBackPosition : Int = 0 + private var tickets:ArrayList = ArrayList() + private var mistakeSale:SaleVO? = null + + private var myKM: KeyguardManager? = null + + private var state = 0 + + private var mIsListening = false + private var placementPicked:PlacementVO? = null + + private var lastPlacementPicked: PlacementVO? = null + + private var originalItemScan: String = "" + + + companion object { + fun newInstance(collection:CollectionVO,type:String) = CollectionFragment(collection,type) + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_collection + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + token = prefs.getString(TOKEN,"").toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + voz = prefs.getString(VOZ,"NO").toString() + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + if (collection.tickets.isEmpty()){ + viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk) + Log.i("VERDNATURA","La collection es ${collection.collectionFk}") + } + + + + + super.onCreate(savedInstanceState) + } + + override fun onResume() { + super.onResume() + scanRequest() + } + + override fun init() { + customDialogList = CustomDialogList(requireContext()) + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + customDialogThreeButtons = CustomDialogThreeButtons(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + toolbar_title.text = "collectionTicket_get" + setToolBar() + setEvents() + + // Log.i("VERDNATURA","el type es $type") + if (type == SACADOR && voz != "NO"){ + setSpeak() + } + + if (collection.tickets.isNotEmpty()){ + createCollectionList() + } + super.init() + } + + override fun onPause() { + super.onPause() + goBack = true + goBack2 = true + } + + private fun setToolBar(){ + toolbar_subtitle.visibility = View.VISIBLE + + val listIcons:ArrayList = ArrayList() + val iconPrint : Drawable = resources.getDrawable(R.drawable.ic_print_black_24dp,resources.newTheme()) + val iconSearch : Drawable = resources.getDrawable(R.drawable.ic_visibility,resources.newTheme()) + val iconAdd : Drawable = resources.getDrawable(R.drawable.ic_playlist_add_black_24dp,resources.newTheme()) + + listIcons.add(iconPrint) + listIcons.add(iconSearch) + listIcons.add(iconAdd) + + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconPrint){ + print() + }else if (item == iconSearch){ + showDisponibility() + }else if (item == iconAdd){ + addItem() + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun scanRequest(){ + if (scan_input != null) { + scan_input.requestFocus() + } + hideKeyboards() + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + //ESCANER ========= + hideKeyboards() + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED) + if (!scan_input.text.toString().isNullOrEmpty()){ + ////Log.i("VERDNATURA","Pita o no pita si encuentra. Diferencia si es matricula o no") + findSale(scan_input.text.toString()) + } + scan_input.setText("") + hideKeyboards() + return@setOnEditorActionListener true + } + true + } + + hideKeyboards() + + //LISTA ========= + collection_swipe.setOnRefreshListener { + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk) + Log.i("VERDNATURA","La collection es ${collection.collectionFk}") + collection_swipe.isRefreshing = false + } + } + + private fun hideKeyboards(){ + try{ + requireActivity().hideKeyboard() + }catch (e:Exception){} + } + + override fun observeViewModel() { + with(viewModel){ + + collectionTicketList.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!it.isError){ + if(it.tickets.isNotEmpty()){ + collection = it + createCollectionList() + }else{ + toolbar_subtitle.text = "0/0" + } + }else{ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Aceptar"){ + customDialog.dismiss() + if (activity != null) activity!!.onBackPressed() + }.show() + } + + + }) + + placementSuppleyList.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!goBack) printShelvingResult(it) + goBack = false + }) + + item.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!goBack) toastDisponibility(it) + goBack = false + }) + + responseNew.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!goBack){ + if (it.isError){ + customDialog.setTitle("Disponibilidad").setDescription(it.errorMessage).setKoButton("Cerrar"){ + scanRequest() + customDialog.dismiss() + }.show() + }else{ + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk) + Log.i("VERDNATURA","La collection es ${collection.collectionFk}") + } + } + + goBack = false + + }) + + responseCode.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!goBack2){ + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setKoButton("Cerrar"){ + scanRequest() + customDialog.dismiss() + }.show() + }else{ + if (checkItemScan(it.response)){ + scanRequest() + customDialogList.dismiss() + mpok?.start() + onQuantityOfShelvingSelected(itemShelvingFkStored) + }else{ + customDialogList.setValueTwo("") + showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response) + if (mperror != null) mperror?.start() + } + } + } + + goBack2 = false + + }) + + responseIncQuantity.observe(viewLifecycleOwner, Observer { + /* splash_progress.visibility = View.VISIBLE + viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk)*/ + }) + + mistakeList.observe(viewLifecycleOwner, Observer { + if (splash_progress != null) splash_progress.visibility = View.GONE + if (!goBack) showMistakeList(it.list) + goBack = false + }) + + } + } + + //CREATE LIST + private fun createCollectionList(){ + state = 0 + if (type == SACADOR && voz != "NO"){ + // initialize() + speak("Colección cargada, diga listo para empezar.") + } + + toolbar_title.text = collection.collectionFk + if (splash_progress != null) splash_progress.visibility = View.GONE + var salesList:ArrayList = ArrayList() + tickets = ArrayList() + var observations = "" + collection.tickets.forEach { ticket -> + ticket.sales.forEach {saleVO -> + if (type == SACADOR && saleVO.quantity != "0"){ + salesList.add(saleVO) + if (tickets.firstOrNull { it == saleVO.ticketFk}.isNullOrEmpty()) + tickets.add(saleVO.ticketFk) + }else if (type == CONTROLADOR){ + //sergio el type CHECKED =CONTROLADOR + salesList.add(saleVO) + if (tickets.firstOrNull { it == saleVO.ticketFk}.isNullOrEmpty()) + tickets.add(saleVO.ticketFk) + } + } + + observations = observations + " " + ticket.observations + } + + sales = salesList.sortedWith(compareBy({ it.saleOrder })) + saleAdapter = SaleAdapter(sales,pasillerosItemClickListener!!,object: OnQuantityClickListener{ + override fun onQuantityClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.saleFk == sale.saleFk){ + showQuantityDialog(index) + + } + } + + } + + },object : OnSaleClickListener{ + override fun onSaleClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.saleFk == sale.saleFk){ + if (type == CONTROLADOR) { + markLine(index,type) + ////Log.i("VERDNATURA","marcamos linea") + } else if (type == SACADOR){ + if (sale.isPrepared == "0"){ + showScanner(index,sale) + }else{ + unMarkLine(index, OK) + } + + } + + } + } + } + + },object: OnMistakeClickListener{ + override fun onMistakeClickListener(sale: SaleVO) { + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + mistakeSale = sale + viewModel.mistakeType(usuario = user, password = password) + } + }) + lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + fragment_sacador_collections.adapter = saleAdapter + fragment_sacador_collections.layoutManager = lm + setTotalLines() + if (storedPosition != 0) + setListPosition(storedPosition,true) + else if (storedBackPosition != 0) + setListPosition(storedBackPosition,true) + + setScrollListener(lm!!) + //sergio: se quita porque se realiza desde triggers + // changeInitTicketState() + + printObservations(observations) + } + + private fun setScrollListener(lm: LinearLayoutManager){ + fragment_sacador_collections.addOnScrollListener(object : RecyclerView.OnScrollListener(){ + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + storedBackPosition = lm.findFirstVisibleItemPosition() + super.onScrolled(recyclerView, dx, dy) + } + }) + } + + + private fun printObservations(observations: String){ + if (observations.trim().isNotEmpty()){ + customDialog.setTitle("Observaciones").setDescription(observations).setOkButton("Aceptar"){ + customDialog.hide() + customDialog.dismiss() + }.show() + } + } + //SEARCH AND MARK + private fun findSale(txtscan:String){ + goBack = false + var index = 0 + var isBreak = false + var isOk = false + goBack = false + goBack2 = false + + if (type == SACADOR){ + for (saleVO in sales) { + //sergio: pita si encuentra ticket + ////Log.i("VERDNATURA","SE busca en sales ${saleVO.ticketFk}") + + if (saleVO.ticketFk==txtscan){ + isOk=true + if ((isOk) && mpok != null) mpok!!.start() + //Log.i("VERDNTURA","ENCONTRADO") + break; + + } + + if(saleVO.isPrepared != "1" && saleVO.isPreviousPrepared != "1"){ + //1- Por itemFk + /* if (txtscan == saleVO.itemFk){ + mpok!!.start() + isOk = true + markLine(index,type) + break + }*/ + //2- Por carro + if (saleVO.placements != null){ + var shelvingIndex = 0 + for (placementVO in saleVO.placements){ + // para comprobar si es igual a una matricula + if (placementVO.shelving != null && placementVO.visible != null && txtscan.toUpperCase() == placementVO.shelving.toUpperCase() && placementVO.visible != "(0)"){ + if (mpok != null) mpok!!.start() + isOk = true + ////Log.i("VERDNATURA","encontrado producto") + showShelving(index,shelvingIndex) + isBreak = true + break + } + shelvingIndex+=1 + } + if (isBreak) break + } + + //3- Por barcode + /*saleVO.Barcodes.forEach { barcode -> + if (txtscan == barcode){ + mpok!!.start() + isOk = true + markLine(index,type) + isBreak = true + } + } + if (isBreak) break*/ + } + index += 1 + } + if (!isOk) { + if (txtscan.contains("-")){ + if (tickets.size > 0) { + viewModel.parking( + usuario = user, + password = password, + ticketFk = tickets[0], + parking = txtscan + ) + } + if (mpok != null) mpok!!.start() + "Ticket aparcado".toast(requireContext()) + }else{ + if (mperror != null) mperror!!.start() + } + + } + }else if(type == CONTROLADOR){ + ////Log.i("VERDNATURA","El tipo es controlador") + for (saleVO in sales) { + if(saleVO.isControlled == "0"){ + //1- Por itemFk + if (txtscan == saleVO.itemFk){ + if (mpok != null) mpok!!.start() + isOk = true + markLine(index,type) + break + } + //2- Por barcode + saleVO.Barcodes.forEach { barcode -> + if (txtscan == barcode){ + if (mpok != null) mpok!!.start() + isOk = true + markLine(index,type) + isBreak = true + } + } + if (isBreak) break + } + index += 1 + } + //Lo escaneado no encontrado miramos si es parking o ticket + if (!isOk){ + if (txtscan.contains("-")){ + if (tickets.size > 0) { + viewModel.parking( + usuario = user, + password = password, + ticketFk = tickets[0], + parking = txtscan + ) + } + if (mpok != null) mpok!!.start() + getString(R.string.Ticketaparcado).toast(requireContext()) + }else{ + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + storedPosition = 0 + storedBackPosition = 0 + viewModel.collectionTicketGet(user,password,txtscan,sectorFk) + Log.i("VERDNATURA","La collection es ${txtscan}") + } + } + } + + } + + private fun findSale(txtscan:String,position: Int){ + var isOk = false + if (type == SACADOR){ + var saleVO = sales[position] + + if(saleVO.isPrepared != "1" && saleVO.isPreviousPrepared != "1"){ + //1- Por itemFk + /*if (txtscan == saleVO.itemFk){ + if (mpok != null) mpok!!.start() + isOk = true + markLine(position,type) + + }*/ + if (!isOk){ + //2- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.placements){ + if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ + if (mpok != null) mpok!!.start() + isOk = true + showShelving(position,shelvingIndex) + break + } + shelvingIndex+=1 + } + } + /* + if (!isOk){ + //3- Por barcode + saleVO.Barcodes.forEach { barcode -> + if (txtscan == barcode){ + if (mpok != null) mpok!!.start() + isOk = true + markLine(position,type) + } + } + }*/ + } + if (!isOk) { + if (txtscan.contains("-")){ + tickets.forEach { + viewModel.parking( + usuario = user, + password = password, + ticketFk = it, + parking = txtscan + ) + } + if (mpok != null) mpok!!.start() + "Ticket aparcado".toast(requireContext()) + }else{ + if (mperror != null) mperror!!.start() + } + + } + } + + } + + private fun markLine(position:Int,newType: String){ + state = 0 + ////Log.i("VERDNATURA","Marcamos linea y enviamos saleTracking") + if (type == SACADOR){ + sales[position].isPrepared = if (sales[position].isPrepared == "1") "0" else "1" + if (sales[position].isPrepared == "1"){ + sales[position].pickedQuantity = sales[position].quantity + } + }else if (type == CONTROLADOR) + sales[position].isControlled = if (sales[position].isControlled == "1") "0" else "1" + + saleAdapter!!.notifyDataSetChanged() + + setListPosition(position,false) + saleTrackingReplace(position,newType) + setTotalLines() + } + + private fun setListPosition(position:Int,isFromBack:Boolean){ + storedPosition = position + if (type == SACADOR){ + if (fragment_sacador_collections != null){ + fragment_sacador_collections.addViewObserver { + lm!!.scrollToPositionWithOffset(position,0) + } + } + + }else if (isFromBack){ + if (fragment_sacador_collections != null) { + fragment_sacador_collections.addViewObserver { + lm!!.scrollToPositionWithOffset(position, 0) + } + } + } + + } + + private fun saleTrackingReplace(position: Int,type: String){ + ////Log.i("VERDNATURA","POSICION $position y el tipo $type") + ////Log.i("VERDNATURA","El buyfk que no es real es $originalItemScan") + viewModel.saleTrackingReplace( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + vIsChecked = if (type == SACADOR) sales[position].isPrepared else if(type == CONTROLADOR) sales[position].isControlled else "1", + vOriginalQuantity = sales[position].pickedQuantity, + vStateFk = type.toString(), + vBuyFk = originalItemScan + ) + //Log.i("VERDNATURA","POSICION $position y el tipo $type") + //Log.i("VERDNATURA","El buyfk que no es real es $originalItemScan") + + + } + + private fun unMarkLine(position: Int,newType: String){ + state = 0 + if (sales[position].isPrepared == "1"){ + customDialog.setTitle("Desmarcar linea").setDescription("Vas a desmarcar la linea: "+sales[position].itemFk+ " ¿Estás seguro?").setOkButton("Desmarcar"){ + sales[position].isPrepared = "0" + sales[position].pickedQuantity = "0" + saleAdapter!!.notifyDataSetChanged() + setListPosition(position,false) + viewModel.saleTrackingDel( + usuario = user, + password = password, + saleFk = sales[position].saleFk + ) + setTotalLines() + scanRequest() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + scanRequest() + customDialog.dismiss() + }.show() + } + + + + } + + + //SHELVINGS + private fun showShelving(position:Int,shelvingPosition:Int){ + storedShelvingPosition = shelvingPosition + storedPosition = position + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + var quantityGet = "0" + try{ + quantityGet = (sales[position].quantity.toInt() - sales[position].pickedQuantity.toInt()).toString() + }catch (e:Exception){} + ////Log.i("VERDNATURA","Aparece para enviar") + viewModel.itemPlacementSupplyAiming( + usuario = user, + password = password, + itemFk = sales[position].itemFk, + quantity = quantityGet, + shelvingFk = sales[position].placements[shelvingPosition].shelving + ) + } + + private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO){ + ////Log.i("VERDNATURA","Print CustomDialog") + var shelving = "" + var item = "" + var longName = "" + var total = "0" + var itemShelvingFk = "0" + if (!placementSupplyListVO.list.isEmpty()){ + var placement:PlacementSupplyVO? = null + placementSupplyListVO.list.forEach { placementVO -> + if (placementVO.stock != "0" && placement == null) + placement = placementVO + } + if (placement != null){ + shelving = placement!!.shelving + item = placement!!.itemFk + longName = placement!!.longName + total = placement!!.total + itemShelvingFk = placement!!.itemShelvingFk + } + + } + listPlacementSupply = ArrayList() + placementSupplyListVO.list.forEach { + if (it.stock != "0") + listPlacementSupply.add(BarcodeVO(code = it.proposal)) + ////Log.i("VERDNATURA","Array de placementsupply") + } + try { + ////Log.i("VERDNATURA","Pulso COGER-1") + customDialogList.setTitle("$shelving($item) $total dee $longName").setOkButton("Coger") { + ////Log.i("VERDNATURA","Pulso COGER-2") + if (customDialogList.getValueTwo().isNotEmpty()) { + if (isNumber(customDialogList.getValue()) && isNumber(total) && customDialogList.getValue().toInt() > total.toInt()) { + "La cantidad supera a la disponible".toast(requireContext()) + } else if (isNumber(customDialogList.getValue())) { + originalItemScan = customDialogList.getValueTwo() + // Log.i("VERDATURA","Le pasamos el siguiente item $originalItemScan que es el escaneado") + if (checkItemScan(customDialogList.getValueTwo())) { + onQuantityOfShelvingSelected(itemShelvingFk) + ////Log.i("VERDNATURA","Cantidad seleccionada") + mpok?.start() + customDialogList.dismiss() + } else { + itemShelvingFkStored = itemShelvingFk + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + scanRequest() + hideKeyboards() + }else{ + "cantidad introducida erronea".toast(requireContext()) + } + + } else { + "Escanea item para validar".toast(requireContext()) + } + + + }.setKoButton("Cerrar") { + scanRequest() + hideKeyboards() + customDialogList.dismiss() + }.setHintValue("Cantidad que coges:").setValue(total).setHintValueTwo("Escanea item") + .setValueTwo("").show() + }catch (e:Exception){ + ////Log.i("VERDNATURA","${e.message.toString()}") + } + try{ + customDialogList.getEditTextTwo().post(Runnable { + customDialogList.getEditTextTwo().requestFocusFromTouch() + if (activity != null) { + val lManager: InputMethodManager = + activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + lManager.hideSoftInputFromWindow(customDialogList.getEditTextTwo().windowToken, InputMethodManager.SHOW_FORCED) + } + + }) + }catch (e:Exception){} + try { + customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (customDialogList.getValueTwo().isNotEmpty()) { + try { + if (isNumber(customDialogList.getValue()) && customDialogList.getValue().toInt() > total.toInt()) { + "La cantidad supera a la disponible".toast(requireContext()) + } else if (isNumber(customDialogList.getValue())) { + originalItemScan = customDialogList.getValueTwo() + if (checkItemScan(customDialogList.getValueTwo())) { + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + } else { + itemShelvingFkStored = itemShelvingFk + splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + scanRequest() + } + }else{ + "cantidad introducida erronea".toast(requireContext()) + } + + }catch (e:Exception){ + + } + + } else { + "Escanea item para validar".toast(requireContext()) + } + scanRequest() + hideKeyboards() + return@setOnEditorActionListener true + + } + false + } + }catch (e:Exception){} + + placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + placementSupplyListVO.list.forEach { + if (it.proposal == item.code){ + customDialogList.setValue(it.total) + total = it.total + itemShelvingFk = it.itemShelvingFk + } + } + + } + },showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + } + private fun checkItemScan(valueToCheck:String):Boolean{ + ////Log.i("VERDNATURA","Entramos a comprobar el CheckItemScan $valueToCheck") + if (storedPosition >= 0 && sales.size > storedPosition) { + val saleToCheck = sales[storedPosition] + //////Log.i("VERDNATURA","Entramos a comprobar si lo escaneado es el item $saleToCheck.itemFk escaneado:$valueToCheck") + if (saleToCheck.itemFk == valueToCheck) + return true + else { + saleToCheck.Barcodes.forEach { barcode -> + ////Log.i("VERDNATURA","Mirando barcode ${barcode.toString()}") + if (barcode == valueToCheck) + return true + } + } + } + return false + } + + private fun onQuantityOfShelvingSelected(itemShelvingFk:String,quantity:String = "0"){ + //1 - MODIFICAR CANTIDAD DEL CARRO + try { + val shelvingVisible = sales[storedPosition].placements[storedShelvingPosition].visible.substring(1,sales[storedPosition].placements[storedShelvingPosition].visible.indexOf(")")) + + if (quantity == "0"){ + sales[storedPosition].placements[storedShelvingPosition].visible = "("+(shelvingVisible.toInt() - customDialogList.getValue().toInt()).toString()+")" + }else{ + sales[storedPosition].placements[storedShelvingPosition].visible = "("+(shelvingVisible.toInt() - quantity.toInt()).toString()+")" + } + + viewModel.itemShelvingSaleSupplyAdd( + usuario = user, + password = password, + itemShelvingFk = itemShelvingFk, + saleFk = sales[storedPosition].saleFk, + quantity = if (quantity != "0") quantity else customDialogList.getValue() + ) + + }catch (e:Exception){} + + //2- MODIFICAR EL PICKED DEL SALE + try{ + if (quantity == "0") { + sales[storedPosition].pickedQuantity = + (sales[storedPosition].pickedQuantity.toInt() + customDialogList.getValue() + .toInt()).toString() + }else{ + sales[storedPosition].pickedQuantity = + (sales[storedPosition].pickedQuantity.toInt() +quantity + .toInt()).toString() + } + }catch (e:Exception){} + + //3- MARCAR LINEA + if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity){ + sales[storedPosition].isPrepared = "1" + markLine(storedPosition, OK) + }else{ + markLine(storedPosition, type) + } + + + } + + //OPTIONS + private fun print(){ + viewModel.collectionStickerPrint( + usuario = user, + password = password, + collectionFk = collection.collectionFk, + sectorFk = sectorFk + ) + getString(R.string.Imprimiendo).toast(requireContext()) + } + + private fun addItem(){ + listPlacementSupply = ArrayList() + collection.tickets.forEach { + listPlacementSupply.add(BarcodeVO(code = it.ticketFk)) + } + if (listPlacementSupply.size == 1){ + ticketSelected = listPlacementSupply[0].code!! + } + + customDialogList.setTitle(getString(R.string.Agregarartículoparaticket)+" "+ticketSelected).setOkButton(getString(R.string.Agregar)){ + if (ticketSelected.isNullOrEmpty()){ + getString(R.string.Seleccionaunticketdelaista).toast(requireContext()) + }else if (customDialogList.getValue().isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()) { + getString(R.string.Todosloscampossonobligatorios).toast(requireContext()) + }else{ + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.collectionAddItem( + usuario = user, + password = password, + itemFk = customDialogList.getValue(), + ticketFk = ticketSelected, + quantityFk = customDialogList.getValueTwo(), + warehouseFk = warehouseFk + ) + scanRequest() + customDialogList.dismiss() + } + + + }.setKoButton("Cerrar"){ + scanRequest() + customDialogList.dismiss() + }.setHintValue(getString(R.string.Artículo)).setValue("").setHintValueTwo(getString(R.string.Cantidad)).setValueTwo("").show() + + customDialogList.getEditText().requestFocus() + hideKeyboards() + + customDialogList.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!customDialogList.getValue().isNullOrEmpty()){ + customDialogList.getEditTextTwo().requestFocus() + } + hideKeyboards() + return@setOnEditorActionListener true + } + false + } + + customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!customDialogList.getValueTwo().isNullOrEmpty()){ + if (ticketSelected.isNullOrEmpty()){ + getString(R.string.Seleccionaunticketdelaista).toast(requireContext()) + }else if (customDialogList.getValue().isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()) { + getString(R.string.Todosloscampossonobligatorios).toast(requireContext()) + }else{ + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.collectionAddItem( + usuario = user, + password = password, + itemFk = customDialogList.getValue(), + ticketFk = ticketSelected, + quantityFk = customDialogList.getValueTwo(), + warehouseFk = warehouseFk + ) + scanRequest() + customDialogList.dismiss() + } + } + hideKeyboards() + return@setOnEditorActionListener true + scanRequest() + customDialogList.dismiss() + } + false + } + + placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + customDialogInput.setTitle(getString(R.string.ArtículoparaTicket)+" "+item.code!!) + ticketSelected = item.code!! + customDialogList.setTitle(getString(R.string.Agregarartículoparaticket)+" "+ticketSelected) + } + },showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + + } + + private fun showDisponibility(){ + + customDialogInput.setTitle(getString(R.string.Verdisponible)).setDescription(getString(R.string.Escaneaetiqueta)).setOkButton(getString(R.string.Buscar)){ + try{ + if (splash_progress != null){ + splash_progress.visibility = View.VISIBLE + } + + }catch (e:Exception){} + + hideKeyboards() + viewModel.itemGetAvailable( + usuario = user, + password = password, + itemFk = customDialogInput.getValue(), + warehouseFk = warehouseFk + ) + scanRequest() + customDialogInput.dismiss() + + }.setKoButton("Cancelar"){ + if (splash_progress != null){ + splash_progress.visibility = View.GONE + } + hideKeyboards() + scanRequest() + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + viewModel.itemGetAvailable( + usuario = user, + password = password, + itemFk = customDialogInput.getValue(), + warehouseFk = warehouseFk + ) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + return@setOnEditorActionListener true + } + false + } + } + + private fun toastDisponibility(item:ItemVO){ + if (item.available.isNullOrEmpty()){ + item.available = "0" + } + + customDialog.setTitle("Artículo: "+item.id).setDescription("Disponible: "+item.available).setOkButton("Aceptar"){ + scanRequest() + customDialog.dismiss() + }.show() + + } + + private fun setTotalLines(){ + var totalMark = 0 + sales.forEach { + if (type == SACADOR){ + if (it.isPrepared == "1" || it.isControlled == "1" || it.isPreviousPrepared == "1") { + totalMark += 1 + }else if (it.quantity == "0"){ + totalMark += 1 + } + }else if (type == CONTROLADOR){ + if (it.isControlled == "1") + totalMark += 1 + } + } + //toolbar_title.text = "" + totalMark + "/" + sales.size + if (toolbar_title != null) toolbar_title.text = if (collection.collectionFk != null )collection.collectionFk else "" + if (toolbar_subtitle != null && totalMark != null && sales != null) toolbar_subtitle.text = "" +totalMark + "/" + sales.size + if (totalMark == sales.size) { + getString(R.string.Coleccióncompleta).toast(this.context,Toast.LENGTH_SHORT) + //sergio: se quita porque se realiza desde triggers + //changeTicketState() + } + } + + //FALTAS / BASURA / SPLIT + private fun showQuantityDialog(position:Int) { + // Log.i("VERDNATURA","Aparece CustomDialog") + customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)).setValue("") + .setOkButton(getString(R.string.Faltas)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + trash(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setOkButtonTwo(getString(R.string.BasuraRechazar)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + missing(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setOkButtonThree(getString(R.string.Reject)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + reject(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + + }.setOkButtonFour("Split"){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + split(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + + }.setOkButtonAdd(getString(R.string.Agregar)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + increaseQuantity(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setKoButton("Cancelar"){ + scanRequest() + customDialogThreeButtons.dismiss() + }.show() + } + + private fun split(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].quantity.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.saleMove( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + quantity = totalQuantity.toString(), + originalQuantity = sales[position].quantity + ) + //sales[position].originalQuantity = quantity + sales[position].quantity = quantity + //sales[position].startQuantity = quantity + + if (quantity == "0") + markLine(position,type) + saleAdapter!!.notifyDataSetChanged() + + + //enviar mensaje a salix + val ticket = "[" + sales[position].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].ticketFk + "/summary)" + val message = "Se ha enviado a Split el articulo "+sales[position].itemFk+" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].salePersonFk,message = message) + + + } + + private fun trash(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].quantity.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "FALSE", + originalQuantity = quantity + ) + //sales[position].originalQuantity = quantity + sales[position].quantity = quantity + //sales[position].startQuantity = quantity + saleAdapter!!.notifyDataSetChanged() + if (quantity == "0") + markLine(position,type) + + + //enviar mensaje a salix + val ticket = "[" + sales[position].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].ticketFk + "/summary)" + val message = "Se ha enviado a Faltas la cantidad de "+ totalQuantity +" del articulo "+sales[position].itemFk+" ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].salePersonFk,message = message) + } + + private fun missing(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].quantity.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "TRUE", + originalQuantity = quantity + ) + //sales[position].originalQuantity = quantity + sales[position].quantity = quantity + //sales[position].startQuantity = quantity + + if (quantity == "0") + markLine(position,type) + saleAdapter!!.notifyDataSetChanged() + + + //enviar mensaje a salix + val ticket = "[" + sales[position].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].ticketFk + "/summary)" + val message = "Se ha enviado a Basura "+ totalQuantity +" del articulo "+sales[position].itemFk+" ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].salePersonFk,message = message) + } + + private fun reject(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].quantity.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "reject", + originalQuantity = quantity + ) + //sales[position].originalQuantity = quantity + sales[position].quantity = quantity + //sales[position].startQuantity = quantity + saleAdapter!!.notifyDataSetChanged() + if (quantity == "0") + markLine(position,type) + + + //enviar mensaje a salix + val ticket = "[" + sales[position].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].ticketFk + "/summary)" + val message = "Se ha modificado la cantidad original "+sales[position].originalQuantity+" del artículo "+sales[position].itemFk+" a nueva cantidad: "+ sales[position].quantity +" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].salePersonFk,message = message) + } + + private fun increaseQuantity(position:Int,quantity:String){ + viewModel.collectionIncreaseQuantity( + usuario = user, + password = password, + saleFk = sales[position].saleFk, + quantity = quantity + ) + try { + //val quantityPicked = (quantity.toInt() - sales[position].quantity.toInt()).toString() + //sales[position].originalQuantity = quantity + sales[position].quantity = quantity + /*if (type == CONTROLADOR){ + showShelving(position,0,quantityPicked) + }*/ + }catch (e:Exception){} + saleAdapter?.notifyDataSetChanged() + + + //enviar mensaje a salix + val ticket = "[" + sales[position].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].ticketFk + "/summary)" + val message = "Se ha modificado la cantidad original "+sales[position].originalQuantity+" del artículo "+sales[position].itemFk+" a nueva cantidad: "+ sales[position].quantity +" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].salePersonFk,message = message) + } + + + //ESTADOS + private fun changeTicketState(){ + if (type == CONTROLADOR){ + tickets.forEach { + viewModel.collectionUpdateState( + usuario = user, + password = password, + collectionFk = it, + state = CHECKED + ) + } + }else if (type == SACADOR){ + tickets.forEach { + viewModel.collectionUpdateState( + usuario = user, + password = password, + collectionFk = it, + state = PREPARED + ) + } + + } + } + + private fun changeInitTicketState(){ + if (type == CONTROLADOR){ + tickets.forEach { + viewModel.collectionUpdateState( + usuario = user, + password = password, + collectionFk = it, + state = ON_CHECKING + ) + } + }else if (type == SACADOR){ + tickets.forEach { + viewModel.collectionUpdateState( + usuario = user, + password = password, + collectionFk = it, + state = ON_PREPARATION + ) + } + } + } + + + //OTROS + private fun showScanner(index:Int, sale:SaleVO){ + customDialogInput.setTitle(""+sale.itemFk).setDescription(getString(R.string.Escaneaelcarroparaelitemseleccionado)).setOkButton("Aceptar"){ + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + return@setOnEditorActionListener true + } + false + } + + } + + private fun showErrorMessage(text:String){ + customDialog.setTitle("Error al marcar la linea").setDescription(text).setKoButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + + private fun showMistakeList(list:List){ + if (splash_progress != null) splash_progress.visibility = View.GONE + listPlacementSupply = ArrayList() + list.forEach { + listPlacementSupply.add(BarcodeVO(code = it.description)) + } + + + customDialogList.setTitle("Causa de error").setKoButton("Cerrar") { + scanRequest() + hideKeyboards() + customDialogList.dismiss() + }.hideDialog().show() + + + placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + list.forEach { + if (it.description == item.code){ + viewModel.saleMistakeAdd(usuario = user,password = password,vSaleFk = mistakeSale?.saleFk!!,vUserFk = mistakeSale?.workerFk!!,vTypeFk = it.id) + "Causa del error registrado".toast(requireContext()) + customDialogList.dismiss() + } + } + + } + },showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + } + + fun isNumber(num:String) : Boolean{ + var numberInt = 0 + try{ + numberInt = num.toInt() + return true + }catch (e: Exception){ + return false + } + } + + //VOZ + override fun onResults(results: Bundle) { + super.onResults(results) + Log.i("Speech", "onResults") + val matches = results + .getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION) + if (matches != null) { + Log.i("RESPUESTA", matches[0]) + mIsListening = false + mSpeechRecognizer!!.cancel() + getText(matches[0]) + } + } + + private fun getText(text:String){ + val pos = checkText(text) + when (pos) { + NEW_COLLECTION -> { + + } + CANCEL -> { + + } + LISTO -> { + state += 1 + speakOrder() + } + VOLVER -> { + + } + REPITE -> { + speakOrder() + } + OTRO -> { + speak("Orden no registrada") + } + FALTA -> { + speak("Orden no registrada") + } + else -> speak("Orden no registrada") + } + } + + private fun speakOrder(){ + if (type == SACADOR){ + if (state == 0){ + speak("Colección cargada.") + }else{ + var index = 0 + for (sale in sales){ + if (sale.isPrepared == "0" && sale.isPreviousPrepared == "0" && sale.isControlled == "0"){ + if (state == 1){ + //cantar pasillo + if (sale.placements.size > 0){ + var placementIndex = 0 + for (placement in sale.placements){ + var visible = placement.visible + visible = visible.replace("(","") + visible = visible.replace(")","") + var quantityVisible = 0 + try { + quantityVisible = visible.toInt() + }catch (e:Exception){} + + if (quantityVisible > 0){ + val pasillo = placement.placement.subSequence(0,sale.placements[0].placement.indexOf("-")).toString() + val sector = placement.placement.subSequence(sale.placements[0].placement.indexOf("-")+1,sale.placements[0].placement.length).toString() + var letras:ArrayList = ArrayList() + val carro = placement.shelving + var carroSeparate:StringBuilder = StringBuilder("") + for (l in carro){ + carroSeparate.append(l) + carroSeparate.append(" ") + } + + + placementPicked = placement + storedShelvingPosition = placementIndex + + if (lastPlacementPicked == null || lastPlacementPicked!!.placement != placement.placement){ + lastPlacementPicked = placement + try { + speak("Pasillo "+pasillo.toInt()+ ", Sector "+sector.toInt()+ ", "+carroSeparate.toString()) + }catch (e:Exception){ + speak("Pasillo "+pasillo+ " Sector "+sector+" Carro "+carro) + } + }else if(lastPlacementPicked != null && lastPlacementPicked!!.shelving != placement.shelving){ + speak(" Carro "+carro) + }else{ + state = 2 + speakOrder() + } + + break + } + + placementIndex += 1 + } + + + }else{ + speak("El item "+sale.itemFk+" no se encuentra disponible. Se necesita actuación manual.") + } + + }else if (state == 2){ + //cantar articulo + try { + val item = sale.itemFk + val cantidad = sale.quantity.toInt() - sale.pickedQuantity.toInt() + val listtext = sale.longName.split(" ") + var nombre = "" + if (listtext.isNotEmpty()){ + nombre = listtext.get(0)+ " "+ sale.color + }else{ + nombre = sale.longName+ " "+ sale.color + } + + speak("Item "+item.toInt()+ " "+nombre+" , Cantidad: "+cantidad) + }catch (e:Exception){ + speak("Se necesita actuación manual") + } + }else if (state == 3){ + //marcar linea + var visible = placementPicked!!.visible + visible = visible.replace("(","") + visible = visible.replace(")","") + var quantityVisible = 0 + try { + quantityVisible = visible.toInt() + }catch (e:Exception){} + + var needPicked = 0 + try { + needPicked = sale.quantity.toInt() - sale.pickedQuantity.toInt() + }catch (e:Exception){} + + storedPosition = index + if (quantityVisible < needPicked){ + onQuantityOfShelvingSelected(itemShelvingFk = placementPicked!!.shelving,quantity = quantityVisible.toString()) + }else{ + onQuantityOfShelvingSelected(itemShelvingFk = placementPicked!!.shelving,quantity = needPicked.toString()) + } + + state = 0 + //speak("Acción registrada. Diga listo para continuar") + speak("Registrada") + + } + + break + + } + + index += 1 + } + + if (index >= sales.size){ + speak("Colección completada.") + } + } + } + } + + override fun onDestroy() { + cancelSpeech() + super.onDestroy() + } + +} + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt new file mode 100644 index 00000000..861a89d1 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -0,0 +1,354 @@ +package es.verdnatura.presentation.view.feature.collection.fragment + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetLoginUserCase +import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.collection.ItemVO +import es.verdnatura.presentation.view.feature.collection.mapper.map +import es.verdnatura.presentation.view.feature.sacador.model.* +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class CollectionViewModel(context: Context) : BaseViewModel() { + + val emptyMessage = "La colección no tiene tickets"; + + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) + + private val _collectionTicketList by lazy { MutableLiveData() } + val collectionTicketList: LiveData + get() = _collectionTicketList + + private val _placementSuppleyList by lazy { MutableLiveData() } + val placementSuppleyList: LiveData + get() = _placementSuppleyList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _responseNew by lazy { MutableLiveData() } + val responseNew: LiveData + get() = _responseNew + + private val _responseCode by lazy { MutableLiveData() } + val responseCode: LiveData + get() = _responseCode + + private val _responseIncQuantity by lazy { MutableLiveData() } + val responseIncQuantity: LiveData + get() = _responseIncQuantity + + private val _mistakeList by lazy { MutableLiveData() } + val mistakeList: LiveData + get() = _mistakeList + + + + private val _item by lazy { MutableLiveData() } + val item: LiveData + get() = _item + + + fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String){ + getSacadorControladorUserCase.collectionTicketGet(usuario,password,collectionFk,sectorFk,"0").enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _collectionTicketList.value = CollectionVO(isError = true,errorMessage = t.message!!) + } + override fun onResponse( + call: Call, + response: Response + ) { + if (response.body() != null){ + _collectionTicketList.value = response.body()?.let { it.map() } + }else{ + _collectionTicketList.value = CollectionVO(isError = true,errorMessage = "Error en la llamada de collection_get") + } + } + }) + } + + fun saleTrackingReplace(usuario:String,password:String,saleFk:String,vOriginalQuantity:String,vStateFk:String,vIsChecked:String,vBuyFk:String){ + getSacadorControladorUserCase.saleTrackingReplace(usuario,password,saleFk,vOriginalQuantity,vStateFk,vIsChecked,vBuyFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada saleTracking_Replace") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemPlacementSupplyAiming(usuario:String,password:String,shelvingFk:String,quantity:String,itemFk:String){ + getSacadorControladorUserCase.itemPlacementSupplyAiming(usuario,password,shelvingFk,quantity,itemFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = t.message!!)) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _placementSuppleyList.value = response.body()?.let { PlacementSupplyListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = "Error en la llamada de itemPlacementSupplyAiming")) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + } + }) + } + + fun itemShelvingSaleSupplyAdd(usuario:String,password:String,itemShelvingFk:String,saleFk:String,quantity:String){ + getSacadorControladorUserCase.itemShelvingSaleSupplyAdd(usuario,password,itemShelvingFk,saleFk,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingSaleSupplyAdd") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionStickerPrint(usuario:String,password:String,collectionFk: String,sectorFk: String){ + getSacadorControladorUserCase.collectionStickerPrint(usuario,password,collectionFk,sectorFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionStickerPrint") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemGetAvailable(usuario:String,password:String,itemFk: String,warehouseFk: String){ + getSacadorControladorUserCase.itemGetAvailable(usuario,password,itemFk,warehouseFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _item.value = ItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _item.value = ItemVO(isError = true,errorMessage = "Error en la llamada item_GetVisibleAvailable") + }else{ + _item.value = response.body() + } + } + }) + } + + fun collectionAddItem(usuario:String,password:String,itemFk: String,quantityFk: String,ticketFk: String,warehouseFk: String){ + getSacadorControladorUserCase.collectionAddItem(usuario,password,itemFk,quantityFk,ticketFk,warehouseFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseNew.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseNew.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionAddItem") + }else{ + _responseNew.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun saleMove(usuario:String,password:String,saleFk: String,quantity: String,originalQuantity : String){ + getSacadorControladorUserCase.saleMove(usuario,password,saleFk,quantity,originalQuantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada saleMove") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionMissingTrash(usuario:String,password:String,saleFk: String,quantity: String,type:String,warehouseFk:String,originalQuantity: String){ + getSacadorControladorUserCase.collectionMissingTrash(usuario,password,saleFk,quantity,type,warehouseFk,originalQuantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionMissingTrash") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + + fun saleTrackingDel(usuario:String,password:String,saleFk: String){ + getSacadorControladorUserCase.saleTrackingDel(usuario,password,saleFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionMissingTrash") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun parking(usuario: String,password: String,ticketFk: String,parking:String){ + getUbicadorUserCase.shelvingPark(usuario,password,ticketFk,parking).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPark") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionUpdateState(usuario:String,password:String,collectionFk: String,state : String){ + getSacadorControladorUserCase.collectionUpdateState(usuario,password,collectionFk,state).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionUpdateState") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun getIdFromCode(usuario:String,password:String,code: String){ + getSacadorControladorUserCase.getIdFromCode(usuario,password,code).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseCode.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseCode.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada barcodeToItem") + }else{ + _responseCode.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionIncreaseQuantity(usuario:String,password:String,saleFk: String,quantity: String){ + getSacadorControladorUserCase.collectionIncreaseQuantity(usuario,password,saleFk,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseIncQuantity.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseIncQuantity.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionIncreaseQuantity") + }else{ + _responseIncQuantity.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun sendChekingPresence(token:String,workerId:String,message:String){ + try{ + getLoginUserCase.sendChekingPresence(token,workerId.toInt(),message).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + Log.i("Salix","Mensaje enviado a salix") + } + + override fun onFailure(call: Call, t: Throwable) { + Log.i("Salix Error",""+t.message) + } + }) + }catch (e:Exception){} + + } + + fun saleMistakeAdd(usuario:String,password:String,vSaleFk: String, vUserFk: String, vTypeFk: String){ + getSacadorControladorUserCase.saleMistakeAdd(usuario,password,vSaleFk,vUserFk,vTypeFk).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + override fun onResponse( + call: Call, + response: Response + ) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada saleMistakeAdd") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun mistakeType(usuario:String,password:String){ + getSacadorControladorUserCase.mistakeType(usuario,password).enqueue(object : Callback>{ + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(MistakeTypeVO("0","")) + _mistakeList.value = MistakeTypeListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _mistakeList.value = response.body()?.let { MistakeTypeListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(MistakeTypeVO("0","")) + _mistakeList.value = MistakeTypeListVO(listError) + } + } + + }) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt new file mode 100644 index 00000000..06350462 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt @@ -0,0 +1,61 @@ +package es.verdnatura.presentation.view.feature.collection.mapper + +import es.verdnatura.presentation.common.convertToDateString +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import java.text.SimpleDateFormat +import java.util.* + +fun CollectionVO.map() : CollectionVO{ + try { + this.tickets.forEach { ticket -> + ticket.sales.forEach { + it.ticketFk = ticket.ticketFk + it.level = ticket.level + it.salePersonFk = ticket.salesPersonFk + it.agencyName = ticket.agencyName + it.quantity = it.quantity.substring(0, it.quantity.indexOf(".")) + it.isNew = it.isAdded == "1" + it.originalQuantity = + if (it.originalQuantity != "-1") it.originalQuantity.substring( + 0, + it.originalQuantity.indexOf(".") + ) else it.quantity + it.pickedQuantity = + if (it.isPrepared == "1" || it.isPreviousPrepared == "1" || it.isControlled == "1") it.quantity else it.pickedQuantity + if (!it.placements.isNullOrEmpty()) { + it.placements.forEachIndexed { index, placement -> + if (index == 0) { + try { + it.saleOrder = placement.saleOrder.toInt() + } catch (e: NumberFormatException) { + it.saleOrder = 9999 + } + } + placement.created = + getCalendarFromDate(placement.created).convertToDateString() + placement.visible = "(" + (if(placement.visible.toInt() > 0) placement.visible else "0") + ")" + } + } else { + it.placements = listOf() + } + + } + } + }catch (e:Exception){ + this.isError = true + if (this.tickets == null || this.tickets.isEmpty()){ + this.errorMessage = "La colección no tiene tickets" + }else{ + this.errorMessage = "Error al construir la colección" + } + + } + return this +} + +private fun getCalendarFromDate(date:String): Calendar { + val sdf = SimpleDateFormat("yyyy-MM-dd") + val cal = Calendar.getInstance() + cal.setTime(sdf.parse(date)) + return cal +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt new file mode 100644 index 00000000..e0c067b0 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt @@ -0,0 +1,110 @@ +package es.verdnatura.presentation.view.feature.controlador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import es.verdnatura.R +import es.verdnatura.databinding.FragmentControladorBinding +import es.verdnatura.domain.ConstAndValues +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnCollectionSelectedListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import kotlinx.android.synthetic.main.fragment_controlador.* +import kotlinx.android.synthetic.main.toolbar.* + +class ControladorFragment : BaseFragment(ControladorViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var goBack:Boolean = false + private var onCollectionSelectedListener : OnCollectionSelectedListener? = null + override fun getLayoutId(): Int = R.layout.fragment_controlador + private lateinit var customDialog: CustomDialog + + companion object { + fun newInstance() = ControladorFragment() + } + + override fun onAttach(context: Context) { + super.onAttach(context) + if (context is OnCollectionSelectedListener) onCollectionSelectedListener = context + } + + override fun init() { + + + splash_progress.visibility = View.GONE + customDialog = CustomDialog(requireContext()) + toolbar_title.text = getString(R.string.getcollection) + setEvents() + super.init() + } + + override fun onPause() { + goBack = true + super.onPause() + } + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + super.onCreate(savedInstanceState) + } + + private fun setEvents(){ + + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!scan_input.text.isNullOrEmpty()) { + splash_progress.visibility = View.VISIBLE + viewModel.collectionTicketGet( + usuario = user, + password = password, + sectorFk = sectorFk, + collectionFk = scan_input.text.toString() + ) + Log.i("VERDNATURA","La collection es ${scan_input.text.toString()}") + } + scan_input.setText("") + (activity as MainActivity).hideKeyboard(scan_input) + return@setOnEditorActionListener true + } + false + } + } + + override fun observeViewModel() { + with(viewModel){ + collectionTicketList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Aceptar"){ + customDialog.dismiss() + }.show() + }else{ + if (!goBack)navigateToCollectionList(it) + goBack = false + } + + }) + } + } + + private fun navigateToCollectionList(collection: CollectionVO){ + onCollectionSelectedListener?.onCollectionSelected(collection, ConstAndValues.CONTROLADOR) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt new file mode 100644 index 00000000..aed5770b --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt @@ -0,0 +1,43 @@ +package es.verdnatura.presentation.view.feature.controlador.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.view.feature.collection.mapper.map +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ControladorViewModel(context: Context) : BaseViewModel() { + + private val _collectionTicketList by lazy { MutableLiveData() } + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) + + val collectionTicketList: LiveData + get() = _collectionTicketList + + + fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String){ + getSacadorControladorUserCase.collectionTicketGet(usuario,password,collectionFk,sectorFk,"0").enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _collectionTicketList.value = CollectionVO(isError = true,errorMessage = t.message!!) + } + override fun onResponse( + call: Call, + response: Response + ) { + if (response.body() != null){ + _collectionTicketList.value = response.body()?.let { it.map() } + }else{ + _collectionTicketList.value = CollectionVO(isError = true,errorMessage = "No hay tickets para sacar") + } + } + }) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/adapter/FaltasAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/adapter/FaltasAdapter.kt new file mode 100644 index 00000000..2e9a0d60 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/adapter/FaltasAdapter.kt @@ -0,0 +1,64 @@ +package es.verdnatura.presentation.view.feature.faltas.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemFaltasRowBinding +import es.verdnatura.presentation.common.OnFaltasNichoClickListener +import es.verdnatura.presentation.common.OnFaltasReviewClickListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class FaltasAdapter ( + private val items: List, + private val onFaltasNichoClickListener: OnFaltasNichoClickListener, + private val onFaltasReviewClickListener:OnFaltasReviewClickListener, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemFaltasRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemFaltasRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemFaltasVO) { + binding.apply { + this.item = item + if(item.producer.isNullOrEmpty()){ + itemProducer.visibility = View.GONE + }else{ + itemProducer.visibility = View.VISIBLE + } + itemNicho.setOnClickListener { + onFaltasNichoClickListener.onFaltasNichoClickListener(item) + } + itemFaltas.setOnClickListener { + onFaltasReviewClickListener.onFaltasReviewClickListener(item) + } + itemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk) + } + itemUp.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + itemDown.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt new file mode 100644 index 00000000..1c45ef69 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt @@ -0,0 +1,220 @@ +package es.verdnatura.presentation.view.feature.faltas.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentFaltasBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnFaltasNichoClickListener +import es.verdnatura.presentation.common.OnFaltasReviewClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.feature.faltas.adapter.FaltasAdapter +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_faltas.* +import kotlinx.android.synthetic.main.toolbar.* + +class FaltasFragment : BaseFragment(FaltasViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : FaltasAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private var listInvetory:ArrayList = ArrayList() + private var listInvetoryAux:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + private var reload = false + private var hideLoad = true + + companion object { + fun newInstance() = FaltasFragment() + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_faltas + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + viewModel.getFaltas(user,password,warehouseFk) + super.onCreate(savedInstanceState) + } + + override fun init() { + splash_progress.visibility = View.VISIBLE + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getString(R.string.faultsReview) + setToolBar() + + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + setEvents() + if (reload){ + reload = false + hideLoad = false + splash_progress.visibility = View.VISIBLE + viewModel.getFaltas(user,password,warehouseFk) + } + super.init() + } + + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.getFaltas(user,password,warehouseFk) + } + } + + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + filter_itemFk.setOnKeyListener { v, keyCode, event -> + if (filter_itemFk.text.toString().isNullOrEmpty()){ + if (listInvetory.size != listInvetoryAux.size){ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + listInvetory.add(it) + } + + } + + }else{ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + if (it.itemFk.contains(filter_itemFk.text.toString(),true)){ + listInvetory.add(it) + } + } + + + } + adapter!!.notifyDataSetChanged() + return@setOnKeyListener false + } + } + + override fun observeViewModel() { + with(viewModel){ + faltasList.observe(viewLifecycleOwner, Observer { + if (hideLoad){ + splash_progress.visibility = View.GONE + }else{ + hideLoad = true + } + listInvetory = ArrayList() + listInvetoryAux = ArrayList() + it.list.forEach { + listInvetory.add(it) + listInvetoryAux.add(it) + } + + adapter = FaltasAdapter(listInvetory,object: OnFaltasNichoClickListener { + override fun onFaltasNichoClickListener(item: ItemFaltasVO) { + customDialogInput.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton("Tirar"){ + viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0") + changeOfflineValue(item) + customDialogInput.dismiss() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.setValue("0").show() + + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()){ + viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0") + changeOfflineValue(item) + } + customDialogInput.setValue("") + customDialogInput.dismiss() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + return@setOnEditorActionListener true + } + false + } + + } + },object: OnFaltasReviewClickListener{ + override fun onFaltasReviewClickListener(item: ItemFaltasVO) { + viewModel.faultsReview_isChecked(user,password,item.itemFk,warehouseFk) + changeOfflineValue(item) + } + + },pasillerosItemClickListener!!) + location_recyclerview.adapter = adapter + location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + }) + + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + }) + } + } + + private fun changeOfflineValue(item: ItemFaltasVO){ + var i = 0 + var position = 0 + listInvetory.forEach { + if (it.itemFk == item.itemFk) { + position = i + } + i = i.plus(1) + } + listInvetory.removeAt(position) + + i = 0 + position = 0 + listInvetoryAux.forEach { + if (it.itemFk == item.itemFk) { + position = i + } + i = i.plus(1) + } + listInvetoryAux.removeAt(position) + adapter?.notifyDataSetChanged() + + reload = true + + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt new file mode 100644 index 00000000..a0206bd3 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt @@ -0,0 +1,98 @@ +package es.verdnatura.presentation.view.feature.faltas.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetInventaryUserCase +import es.verdnatura.domain.GetItemCardUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasListVO +import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class FaltasViewModel(context: Context) : BaseViewModel() { + + + private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context) + private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) + + + private val _faltasList by lazy { MutableLiveData() } + val faltasList: LiveData + get() = _faltasList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + + val loadFaltasList = Transformations.map(_faltasList) { Event(it) } + + + fun getFaltas(user:String,password:String,warehouseFk:String){ + getInventaryUserCase.faultsReview(user,password,warehouseFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemFaltasVO(isError = true,errorMessage = t.message!!)) + _faltasList.value = ItemFaltasListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _faltasList.value = response.body()?.let { ItemFaltasListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemFaltasVO(isError = true,errorMessage = "Error en la llamada de faultsReview")) + _faltasList.value = ItemFaltasListVO(listError) + } + } + + }) + } + + fun itemStockUpdate(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ + getItemCardUserCase.itemStockUpdate(user,password,itemFk,warehouseFk,newValue,isTrash).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar STOCK "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemStockUpdate") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun faultsReview_isChecked(user:String,password:String,itemFk:String,warehouseFk:String){ + getInventaryUserCase.faultsReview_isChecked(user,password,itemFk,warehouseFk).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error faultsReview_isChecked "+itemFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada faultsReview_isChecked") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/model/ItemFaltasVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/model/ItemFaltasVO.kt new file mode 100644 index 00000000..b990f8ea --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/model/ItemFaltasVO.kt @@ -0,0 +1,19 @@ +package es.verdnatura.presentation.view.feature.faltas.model + +class ItemFaltasVO ( + var itemFk:String = "", + var longName:String= "", + var size:String= "", + var producer:String= "", + var downstairs:String= "", + var upstairs:String= "", + var nicho:String= "", + var faltas:String= "", + var isError:Boolean = false, + var errorMessage:String = "" +) + + +class ItemFaltasListVO ( + var list: List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historico/adapter/HistoricoAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/adapter/HistoricoAdapter.kt new file mode 100644 index 00000000..6852e06d --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/adapter/HistoricoAdapter.kt @@ -0,0 +1,46 @@ +package es.verdnatura.presentation.view.feature.historico.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemHistoricoRowBinding +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO +import java.text.SimpleDateFormat +import java.util.* + +class HistoricoAdapter ( + private val items: List +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemHistoricoRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemHistoricoRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemHistoricoVO) { + binding.apply { + this.item = item + val sdf = SimpleDateFormat("yyyy-MM-dd") + val currentDate = sdf.format(Date()) + if (currentDate == item.shipped){ + historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_pumpkin_orange)) + }else{ + historicoDate.setBackgroundColor(res.getColor(R.color.verdnatura_black_5)) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoFragment.kt new file mode 100644 index 00000000..c5723224 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoFragment.kt @@ -0,0 +1,94 @@ +package es.verdnatura.presentation.view.feature.historico.fragment + +import android.content.SharedPreferences +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentHistoricoBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.feature.historico.adapter.HistoricoAdapter +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoListVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_historico.* +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* + +class HistoricoFragment( + var itemFk:String = "" +) : BaseFragment( + HistoricoViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : HistoricoAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialog: CustomDialog + + + companion object { + fun newInstance(entryPoint:String) = HistoricoFragment(entryPoint) + } + + override fun getLayoutId(): Int = R.layout.fragment_historico + + + override fun init() { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + viewModel.itemDiary(user,password,itemFk,warehouseFk) + toolbar_title.text = getString(R.string.itemdiary) + setEvents() + super.init() + } + + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + } + + override fun observeViewModel() { + with(viewModel){ + loadHistoricoList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE + adapter = HistoricoAdapter(it.list) + historico_recyclerview.adapter = adapter + historico_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + navigateToToday(it) + + } + }) + } + } + + private fun navigateToToday(it:ItemHistoricoListVO){ + var positionToday = 0 + val sdf = SimpleDateFormat("yyyy-MM-dd") + val currentDate = sdf.format(Date()) + + for (item in it.list){ + if (currentDate == item.shipped){ + break + } + positionToday += 1 + } + + historico_recyclerview.scrollToPosition(positionToday) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoViewModel.kt new file mode 100644 index 00000000..b945c868 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoViewModel.kt @@ -0,0 +1,53 @@ +package es.verdnatura.presentation.view.feature.historico.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetItemCardUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoListVO +import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class HistoricoViewModel(context: Context) : BaseViewModel() { + private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) + + + + private val _historicoList by lazy { MutableLiveData() } + val historicoList: LiveData + get() = _historicoList + + + val loadHistoricoList = Transformations.map(_historicoList) { Event(it) } + + + fun itemDiary(usuario:String,password:String,itemFk:String,vWarehouseFk:String){ + getItemCardUserCase.itemDiary(usuario,password,itemFk,vWarehouseFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemHistoricoVO(isError = true,errorMessage = t.message!!)) + _historicoList.value = ItemHistoricoListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _historicoList.value = response.body()?.let { ItemHistoricoListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemHistoricoVO(isError = true,errorMessage = "Error en la llamada de shelvingParking_get")) + _historicoList.value = ItemHistoricoListVO(listError) + } + } + + }) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historico/model/ItemHistoricoVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/model/ItemHistoricoVO.kt new file mode 100644 index 00000000..9171ad67 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historico/model/ItemHistoricoVO.kt @@ -0,0 +1,19 @@ +package es.verdnatura.presentation.view.feature.historico.model + +class ItemHistoricoVO ( + var shipped:String = "", + var stateName:String = "", + var origin:String = "", + var reference: String = "", + var clientFk: String = "", + var name:String = "", + var invalue:String = "-", + var out:String = "-", + var balance:String = "-", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class ItemHistoricoListVO( + var list:List = listOf() +) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt new file mode 100644 index 00000000..64b58521 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt @@ -0,0 +1,25 @@ +package es.verdnatura.presentation.view.feature.imageview.activity + +import es.verdnatura.R +import es.verdnatura.databinding.ActivityImageviewBinding +import es.verdnatura.presentation.base.BaseActivity +import es.verdnatura.presentation.common.loadUrl +import kotlinx.android.synthetic.main.activity_imageview.* +import kotlinx.android.synthetic.main.toolbar.* + + +class ImageViewActivity : BaseActivity(){ + override fun getLayoutId(): Int = R.layout.activity_imageview + + override fun init() { + toolbar_title.text = (intent.getStringExtra("title")) + imgView.loadUrl(intent.getStringExtra("url")) + + backButton.setOnClickListener { + onBackPressed() + } + } + + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt new file mode 100644 index 00000000..b9bdf6ca --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt @@ -0,0 +1,59 @@ +package es.verdnatura.presentation.view.feature.inventario.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemInventaryRowBinding +import es.verdnatura.presentation.common.OnInvetoryNichoClickListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class InventoryAdapter ( + private val items: List, + private val onInvetoryNichoClickListener: OnInvetoryNichoClickListener, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemInventaryRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemInventaryRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemInventaryVO) { + binding.apply { + this.item = item + if(item.producer.isNullOrEmpty()){ + itemProducer.visibility = View.GONE + }else{ + itemProducer.visibility = View.VISIBLE + } + itemNicho.setOnClickListener { + onInvetoryNichoClickListener.onInvetoryNichoClickListener(item) + } + itemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk) + } + itemUp.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + itemDown.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/ToolBarAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/ToolBarAdapter.kt new file mode 100644 index 00000000..c4cdb4e8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/ToolBarAdapter.kt @@ -0,0 +1,41 @@ +package es.verdnatura.presentation.view.feature.inventario.adapter + +import android.graphics.drawable.Drawable +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemToolbarRowBinding +import es.verdnatura.presentation.common.OnOptionsSelectedListener + +class ToolBarAdapter ( + private val items: List, + private val onOptionsSelectedListener: OnOptionsSelectedListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemToolbarRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemToolbarRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: Drawable) { + binding.apply { + imagebuttonIcon.setImageDrawable(item) + imagebuttonIcon.setOnClickListener { + onOptionsSelectedListener.onOptionsItemSelected(item) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt new file mode 100644 index 00000000..8fb95f1f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt @@ -0,0 +1,325 @@ +package es.verdnatura.presentation.view.feature.inventario.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentInventaryBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnInvetoryNichoClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.inventario.adapter.InventoryAdapter +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat +import ir.mirrajabi.searchdialog.core.SearchResultListener +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.buyers_fragment.* +import kotlinx.android.synthetic.main.fragment_ajustes.* +import kotlinx.android.synthetic.main.fragment_buscar_item.location_recyclerview +import kotlinx.android.synthetic.main.fragment_buscar_item.splash_progress +import kotlinx.android.synthetic.main.fragment_inventary.* +import kotlinx.android.synthetic.main.fragment_inventary.filter_itemFk +import kotlinx.android.synthetic.main.toolbar.* + +class InventaryFragment : BaseFragment(InventaryViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : InventoryAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private var listInvetory:ArrayList = ArrayList() + private var listInvetoryAux:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + private var reload = false + private var hideLoad = true + private var layoutManager : LinearLayoutManager? = null + private var firstVisiblePosition = 0 + private var secondVisiblePosition = 1 + + + //sergio : cmbios para insertar lista compradores en inventary en el searchable + private val items=ArrayList() + private var prefs: SharedPreferences? = null + private lateinit var buyerId:String + + + companion object { + fun newInstance() = InventaryFragment() + } + + + //override fun getLayoutId(): Int = R.layout.fragment_inventary + override fun getLayoutId(): Int = R.layout.fragment_inventary + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun onCreate(savedInstanceState: Bundle?) { + prefs = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs!!.getString(USER,"").toString() + password = prefs!!.getString(PASSWORD,"").toString() + sectorFk = prefs!!.getInt(SECTORFK,1).toString() + warehouseFk = prefs!!.getInt(WAREHOUSEFK,1).toString() + + //sergio. se quita para subir version.A la espera de como será el inventario + viewModel.itemShelvingBuyerGet(user = user,password = password) + super.onCreate(savedInstanceState) + } + + + override fun init() { + + filter_buyer.setText(prefs!!.getString(BUYER,"")) + splash_progress.visibility = View.VISIBLE + buyerId=prefs!!.getString(BUYERID,"").toString() + //Log.i("VERDNATURA","el sector es $warehouseFk") + //Log.i("VERDNATURA","el sbuyerid es $buyerId") + viewModel.getInventory(user,password,buyerId,warehouseFk) + filter_buyer.setOnClickListener{ + //SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(), + SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,items, + SearchResultListener { baseSearchDialogCompat, nombre, position -> + ////Log.i("VERDNATURA","nombre "+nombre.title) + ////Log.i("VERDNATURA","el id es "+nombre.getBuyerId()) + filter_buyer.setText((nombre.title)) + saveBuyer(nombre.getBuyerNickname()) + saveBuyerId(nombre.getBuyerId()) + buyerId=nombre.getBuyerId() + viewModel.getInventory(user,password,nombre.getBuyerId(),warehouseFk) + splash_progress.visibility = View.VISIBLE + baseSearchDialogCompat.dismiss() + }).show() + } + + + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + splash_progress.visibility = View.VISIBLE + toolbar_title.text = getString(R.string.itemShelvingRadar) + setToolBar() + setEvents() + + if (reload){ + reload = false + splash_progress.visibility = View.VISIBLE + hideLoad = false + viewModel.getInventory(user,password,buyerId,warehouseFk) + } + + + super.init() + } + + + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + + listIcons.add(iconReload) + + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener{ + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0 + // sergio. + viewModel.getInventory(user,password,buyerId,warehouseFk) + //viewModel.getInventory(user,password,prefs!!.getInt(SECTORFK,1).toString()) + } + + } + + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + filter_itemFk.setOnKeyListener { v, keyCode, event -> + if (filter_itemFk.text.toString().isNullOrEmpty()){ + if (listInvetory.size != listInvetoryAux.size){ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + listInvetory.add(it) + } + + } + + }else{ + listInvetory.removeAll(listInvetoryAux) + listInvetoryAux.forEach { + if ((it.itemFk.contains(filter_itemFk.text.toString(),true)) || (it.producer?.contains(filter_itemFk.text.toString(),true))){ + listInvetory.add(it) + } + } + + + } + adapter!!.notifyDataSetChanged() + return@setOnKeyListener false + } + } + + + override fun onPause() { + super.onPause() + firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0 + } + + override fun onResume() { + super.onResume() + if (location_recyclerview.layoutManager != null){ + if (firstVisiblePosition <= listInvetory.size){ + location_recyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition) + } + } + } + + override fun observeViewModel() { + with(viewModel){ + + //sergio: para compradores + buyersList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + createBuyerList(it.list) + }) + + + inventaryList.observe(viewLifecycleOwner, Observer { + if (hideLoad){ + splash_progress.visibility = View.GONE + }else{ + hideLoad = true + } + + listInvetory = ArrayList() + listInvetoryAux = ArrayList() + it.list.forEach { + if (it.nicho != "0"){ + listInvetory.add(it) + listInvetoryAux.add(it) + } + } + + adapter = InventoryAdapter(listInvetory,object: OnInvetoryNichoClickListener{ + override fun onInvetoryNichoClickListener(item: ItemInventaryVO) { + + //sergio: cambiad customdialogInput pòr customdialog 6.1.4 + //Log.i("VERDNATURA","A tirar tanto") + customDialog.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton("Tirar"){ + //customDialogInput.setTitle(item.itemFk+"\n"+item.longName+" "+item.size).setDescription("Cantidad real("+item.nicho+")").setOkButton("Tirar"){ + //Log.i("VERDNATURA","A tirar tanto viewmodel dentro") + viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,"0","0") + // viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0") + changeOfflineValue(item) + // customDialogInput.dismiss() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + // customDialogInput.dismiss() + customDialog.dismiss() + }.show() + // }.setValue("0").show() + //sergio: ya no recoge focus porque no tiene cuadro para insertar número de artículo + /* customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()){ + //Log.i("VERDNATURA","A tirar tanto viewmodel fuera") + viewModel.itemStockUpdate(item.itemFk,warehouseFk,user,password,customDialogInput.getValue(),"0") + changeOfflineValue(item) + } + customDialogInput.setValue("") + customDialogInput.dismiss() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + return@setOnEditorActionListener true + } + false + }*/ + + } + },onPasillerosItemClickListener = pasillerosItemClickListener!!) + location_recyclerview.adapter = adapter + layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + location_recyclerview.layoutManager = layoutManager + + if (firstVisiblePosition <= listInvetory.size){ + location_recyclerview.layoutManager!!.scrollToPosition(firstVisiblePosition) + } + + + }) + + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + }) + } + } + + private fun changeOfflineValue(item:ItemInventaryVO){ + var i = 0 + var position = 0 + listInvetory.forEach { + if (it.itemFk == item.itemFk) { + position = i + } + i = i.plus(1) + } + listInvetory.removeAt(position) + + i = 0 + position = 0 + listInvetoryAux.forEach { + if (it.itemFk == item.itemFk) { + position = i + } + i = i.plus(1) + } + listInvetoryAux.removeAt(position) + adapter?.notifyDataSetChanged() + + reload = true + + } + + + //sergio:añadido para compradores + private fun createBuyerList(list: List){ + items.clear() + list.forEach { buyer -> + if (!buyer.isError){ + try { + items.add(SearchBuyerModel(buyer.nickname,buyer.userFk)); + //Log.i("VERDNATURA","Nombre comprador ${buyer.nickname} : ${buyer.userFk}") + }catch (e:Exception){} + } + }} + + +} + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt new file mode 100644 index 00000000..64bd0c6f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt @@ -0,0 +1,146 @@ +package es.verdnatura.presentation.view.feature.inventario.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetInventaryUserCase +import es.verdnatura.domain.GetItemCardUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO +import es.verdnatura.presentation.view.feature.ajustes.model.SectorListVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO +import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO +import es.verdnatura.presentation.view.feature.inventario.model.InventaryListVO +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class InventaryViewModel(context: Context) : BaseViewModel() { + + + private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context) + private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) + + private val _inventaryList by lazy { MutableLiveData() } + val inventaryList: LiveData + get() = _inventaryList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + + private val _buyersList by lazy { MutableLiveData() } + val buyersList: LiveData + get() = _buyersList + + + //sergio para obtener comprador + fun itemShelvingBuyerGet(user:String,password:String){ + getInventaryUserCase.itemShelvingBuyerGet(user,password).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(BuyerVO(isError = true,errorMessage = t.message!!)) + _buyersList.value = BuyerListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _buyersList.value = response.body()?.let { BuyerListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(BuyerVO(isError = true,errorMessage = "Error en la llamada de itemShelving_buyerGet")) + _buyersList.value = BuyerListVO(listError) + } + } + + }) + } + + + val loadInventaryList = Transformations.map(_inventaryList) { Event(it) } + +//sergio: borrar. En 6.1.3 ya no se utiliza + /*fun getInventory(user:String,password:String,buyerFk:String){ + + getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemInventaryVO(isError = true,errorMessage = t.message!!)) + _inventaryList.value = InventaryListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _inventaryList.value = response.body()?.let { InventaryListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemInventaryVO(isError = true,errorMessage = "Error en la llamada de itemShelvingRadar")) + _inventaryList.value = InventaryListVO(listError) + + } + } + + }) + }*/ + + fun getInventory(user:String,password:String,buyerFk:String,warehouseFk: String){ + // getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : + getInventaryUserCase.itemShelvingRadarFilterBuyer(user,password,buyerFk,warehouseFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemInventaryVO(isError = true,errorMessage = t.message!!)) + _inventaryList.value = InventaryListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _inventaryList.value = response.body()?.let { InventaryListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemInventaryVO(isError = true,errorMessage = "Error en la llamada de itemShelvingRadar")) + _inventaryList.value = InventaryListVO(listError) + + } + } + + }) + } + + fun itemStockUpdate(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ + getItemCardUserCase.itemStockUpdate(user,password,itemFk,warehouseFk,newValue,isTrash).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar STOCK "+itemFk+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemStockUpdate") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt new file mode 100644 index 00000000..de78d184 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt @@ -0,0 +1,22 @@ +package es.verdnatura.presentation.view.feature.inventario.fragment + +import ir.mirrajabi.searchdialog.core.Searchable + +class SearchBuyerModel(private var nickname: String?, private var buyerId: String?) : Searchable { + + + + override fun getTitle(): String { + + return nickname!! + } + + fun getBuyerId(): String { + return buyerId!! + } + + fun getBuyerNickname(): String { + return nickname!! + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/BuyerInventary.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/BuyerInventary.kt new file mode 100644 index 00000000..4b1e56e8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/BuyerInventary.kt @@ -0,0 +1,16 @@ +package es.verdnatura.presentation.view.feature.inventario.model + +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO + +class BuyerInventary ( + var userFk:String = "", + var nickname:String= "", + var isError:Boolean = false, + var errorMessage:String = "" +) + + +class BuyerListInventary ( + var list: List = listOf() +) + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt new file mode 100644 index 00000000..b9cb88d8 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt @@ -0,0 +1,19 @@ +package es.verdnatura.presentation.view.feature.inventario.model + +class ItemInventaryVO ( + var itemFk:String = "", + var longName:String= "", + var size:String= "", + var producer:String= "", + var downstairs:String= "", + var upstairs:String= "", + var nicho:String= "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class InventaryListVO ( + var list: List = listOf() +) + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt new file mode 100644 index 00000000..2429af2b --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt @@ -0,0 +1,35 @@ +package es.verdnatura.presentation.view.feature.login.activity + +import android.content.Intent +import es.verdnatura.R +import es.verdnatura.databinding.ActivityLoginBinding +import es.verdnatura.presentation.base.BaseActivity +import es.verdnatura.presentation.common.TAG +import es.verdnatura.presentation.common.addFragment +import es.verdnatura.presentation.view.feature.login.fragment.LoginFragment +import es.verdnatura.presentation.view.feature.main.activity.MainActivity + +class LoginActivity : BaseActivity() { + + override fun getLayoutId(): Int = R.layout.activity_login + + override fun init() { + /* val crashButton = Button(this) + crashButton.text = "Crash!" + crashButton.setOnClickListener { + throw RuntimeException("Test Crash") // Force a crash + } + + addContentView(crashButton, ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT))*/ + + + addFragment(LoginFragment.newInstance(),R.id.main_frame_layout,LoginFragment.TAG) + //sergio: para no hacer login se inicia MainActivity directamente + /* val intent = Intent(this, MainActivity::class.java) + startActivity(intent)*/ + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt new file mode 100644 index 00000000..5046b8fb --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt @@ -0,0 +1,278 @@ +package es.verdnatura.presentation.view.feature.login.fragment + + +import android.app.AlarmManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences +import android.content.pm.PackageInfo +import android.content.pm.PackageManager +import android.net.Uri +import android.preference.PreferenceManager +import android.view.KeyEvent +import android.view.View +import androidx.lifecycle.Observer +import es.verdnatura.R +import es.verdnatura.databinding.FragmentLoginBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.hideKeyboard +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.login.activity.LoginActivity +import es.verdnatura.presentation.view.feature.login.model.LoginItemVO +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import kotlinx.android.synthetic.main.fragment_ajustes.* +import kotlinx.android.synthetic.main.fragment_login.* +import kotlinx.android.synthetic.main.fragment_login.splash_progress + + +class LoginFragment : BaseFragment(LoginViewModel::class) { + + private lateinit var customDialog: CustomDialog + companion object { + fun newInstance() = LoginFragment() + } + + override fun getLayoutId(): Int = R.layout.fragment_login + + override fun init() { + + + customDialog = CustomDialog(requireContext()) + checkUser() + button_login.setOnClickListener(View.OnClickListener { + splash_progress.visibility = View.VISIBLE + viewModel.login(edittext_username.text.toString(), edittext_password.text.toString()) + }) + + textview_remember_password.setOnClickListener { + edittext_username.setText("") + edittext_password.setText("") + switch_remember.isChecked = false + saveRemember(false) + } + + + + edittext_server.setText(this.getDefaults("base_url", this.requireContext())) + edittext_server.setOnKeyListener(View.OnKeyListener { v, keyCode, event -> + if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) { + this.setDefaults("base_url", edittext_server.text.toString(), this.requireContext()) + this.hideKeyboard() + //sergio: deberia lanzar la funcion nueva creada por mi restartapp de BaseFragment. Pero no vuelve a arrancar + restartapp() + return@OnKeyListener false + + } + false + }) + + + + } + + private fun checkUser(){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + if (prefs.getBoolean(RECORDAR, false)){ + edittext_username.setText(prefs.getString(USER, "")) + edittext_password.setText(prefs.getString(PASSWORD, "")) + if (edittext_password.text.toString().isNotEmpty()){ + switch_remember.isChecked = true + } + } + + } + + override fun observeViewModel() { + with(viewModel){ + + versionappitem.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.INVISIBLE + if (it.isError) { + customDialog.setTitle("Error").setDescription(it.errorMessage) + .setOkButton("Cerrar") { + customDialog.dismiss() + }.show() + } else { + splash_progress.visibility = View.VISIBLE + if (it.version.equals(getInfoVersionNameApp())) { + splash_progress.visibility = View.INVISIBLE + goToMain()} + else { + customDialog.setTitle(getString(R.string.Actualizar)) + .setDescription(getString(R.string.updatemng)).setOkButton( + getString( + R.string.Actualizar + ) + ) { + val openURL = Intent(Intent.ACTION_VIEW) + openURL.data = Uri.parse("https://app.verdnatura.es/bin/vn-picking.apk") + startActivity(openURL) + }.setKoButton("Cancelar") { + customDialog.dismiss() + goToMain() + }.show() + + + } + + } + + }) + + + loginitem.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.INVISIBLE + if (it.isError) { + customDialog.setTitle("Error").setDescription(it.errorMessage) + .setOkButton("Cerrar") { + customDialog.dismiss() + }.show() + } else { + splash_progress.visibility = View.VISIBLE + saveUserFkPref(it) + if (switch_remember.isChecked) { + saveRemember(true) + } else { + saveRemember(false) + } + + saveUserAccesPref( + edittext_username.text.toString(), + edittext_password.text.toString() + ) + loginSalix( + user = edittext_username.text.toString(), + password = edittext_password.text.toString() + ) + } + + }) + loginsalixitem.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.INVISIBLE + if (it.isError) { + saveTokenPref("") + customDialog.setTitle("Error") + .setDescription(it.errorMessage + ". Puedes continuar pero algunas funcionalidades no estarán disponibles.") + .setOkButton( + "Entendido" + ) { + customDialog.dismiss() + getVersion() + }.show() + } else { + saveTokenPref(it.token) + getVersion() + } + }) + + version.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.INVISIBLE + if (it) { + /* customDialog.setTitle("Atención").setDescription("La aplicación se encuentra en fase de desarrollo. Algunas funcionalidades están desactivadas y se van a ir añadiendo de forma progresiva.").setOkButton("Entrar"){ + goToMain() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + customDialog.dismiss() + }.show()*/ + goToMain() + + } else { + customDialog.setTitle(getString(R.string.Actualizar)) + .setDescription(getString(R.string.updatemng)).setOkButton( + getString( + R.string.Actualizar + ) + ) { + val openURL = Intent(Intent.ACTION_VIEW) + openURL.data = Uri.parse("https://app.verdnatura.es/bin/vn-picking.apk") + startActivity(openURL) + }.setKoButton("Cancelar") { + customDialog.dismiss() + goToMain() + }.show() + } + }) + } + super.observeViewModel() + } + + private fun getInfoVersionNameApp(): String { + val manager: PackageManager = context!!.getPackageManager() + val info: PackageInfo = manager.getPackageInfo(context!!.getPackageName(), 0) + return info.versionName + } + + private fun saveTokenPref(token: String){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putString(TOKEN, token) + editor.apply() + } + + private fun saveUserFkPref(loginitem: LoginItemVO){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putString(USERFK, loginitem.id) + editor.apply() + } + + private fun saveUserAccesPref(user: String, password: String){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putString(USER, user) + editor.putString(PASSWORD, password) + editor.apply() + } + + private fun saveRemember(remember: Boolean){ + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER, 0) + val editor = prefs.edit() + editor.putBoolean(RECORDAR, remember) + editor.apply() + } + + private fun goToMain(){ + val intent = Intent(activity, MainActivity::class.java) + startActivity(intent) + } + + private fun getVersion(){ + splash_progress.visibility = View.VISIBLE + viewModel.checkVersion( + user = edittext_username.text.toString(), + password = edittext_password.text.toString(), + nameApp = "warehouse") + // version = versionName) + + } + + + fun setDefaults(key: String?, value: String?, context: Context?) { + val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val editor = preferences.edit() + editor.putString(key, value) + editor.commit() + } + + fun getDefaults(key: String?, context: Context?): String? { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + return preferences.getString(key, null) + } + + // sergio:creada restart en BaseFragment para AjustesFragment... + fun restartapp(){ + val mStartActivity = Intent(context, LoginActivity::class.java) + val mPendingIntentId = 123456 + val mPendingIntent = PendingIntent.getActivity( + context, + mPendingIntentId, + mStartActivity, + PendingIntent.FLAG_CANCEL_CURRENT + ) + val mgr = context!!.getSystemService(Context.ALARM_SERVICE) as AlarmManager + mgr[AlarmManager.RTC, System.currentTimeMillis() + 100] = mPendingIntent + System.exit(0) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt new file mode 100644 index 00000000..fce823b2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt @@ -0,0 +1,119 @@ +package es.verdnatura.presentation.view.feature.login.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetLoginUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.view.feature.login.model.LoginItemVO +import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO +import es.verdnatura.presentation.view.feature.login.model.versionApp +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class LoginViewModel(context: Context) : BaseViewModel() { + + private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) + + + private val _loginitem by lazy { MutableLiveData ()} + val loginitem : LiveData + get() = _loginitem + + private val _loginsalixitem by lazy { MutableLiveData ()} + val loginsalixitem : LiveData + get() = _loginsalixitem + + + private val _version by lazy { MutableLiveData ()} + val version : LiveData + get() = _version + + //sergio: nueva version para actualizar + private val _versionappitem by lazy { MutableLiveData ()} + val versionappitem : LiveData + get() = _versionappitem + + fun login(user:String,password:String){ + getLoginUserCase.login(user,password).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + + var loginItemVO:LoginItemVO? + if (response.raw().code() == 555){ + loginItemVO = LoginItemVO(id = "0",isError = true, errorMessage = "Usuario o contraseña incorrectos") + }else if (!response.body().isNullOrEmpty()){ + loginItemVO = response.body()?.let { LoginItemVO(id = it) } + }else{ + loginItemVO = LoginItemVO(id = "0",isError = true,errorMessage = "Error desconocido") + } + + _loginitem.value = loginItemVO!! + } + + override fun onFailure(call: Call, t: Throwable) { + val loginItemVO : LoginItemVO? = LoginItemVO(id = "0",isError = true, errorMessage = t.message!!) + _loginitem.value = loginItemVO + } + }) + } + + fun loginSalix(user:String,password:String){ + getLoginUserCase.salixLogin(user,password).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + + var loginSalixVO:LoginSalixVO? + if(response.body() != null){ + loginSalixVO = response.body()?.token?.let { LoginSalixVO(user,password, it,isError = false,errorMessage = "") } + }else{ + loginSalixVO = LoginSalixVO(user,password,isError = true,errorMessage = "Error al conectar con salix") + } + + _loginsalixitem.value = loginSalixVO + } + + override fun onFailure(call: Call, t: Throwable) { + val loginSalixVO = LoginSalixVO(user,password, "",isError = true,errorMessage = t.message!!) + _loginsalixitem.value = loginSalixVO + } + }) + } + + /*fun checkVersion_old(user:String,password:String,version:String){ + getLoginUserCase.checkVersion(user,password,version).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + if (response.body() != null){ + _version.value = response.body() + }else{ + _version.value = true + } + } + + override fun onFailure(call: Call, t: Throwable) { + _version.value = true + } + }) + }*/ + //sergio:checkVersion new + fun checkVersion(user:String,password:String,nameApp:String){ + getLoginUserCase.checkVersion(user,password,nameApp).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + + var versionApp:versionApp? + + if (response.body() != null){ + versionApp= response.body()?.version?.let { versionApp(nameApp,it,isError = false,errorMessage = "") } + // Log.i("VERDNATURA","Recogemos ${versionApp?.version}") + }else{ + versionApp = versionApp(user,password,isError = true,errorMessage = "Error al conectar.") + } + _versionappitem.value=versionApp + } + + override fun onFailure(call: Call, t: Throwable) { + val versionApp=versionApp(nameApp,"",isError=true,errorMessage=t.message!!) + _versionappitem.value = versionApp + } + }) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt new file mode 100644 index 00000000..92fcf0d5 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt @@ -0,0 +1,30 @@ +package es.verdnatura.presentation.view.feature.login.model + +class LoginItemVO ( + val id:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class LoginSalixVO ( + val user:String = "", + val password:String = "", + val token:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class SalixMessageVO ( + val workerId:Int = 0, + val message:String = "", + val token:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class versionApp( + val appname:String="", + val version:String="", + var isError:Boolean = false, + val errorMessage:String="" +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt new file mode 100644 index 00000000..2f57d6af --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -0,0 +1,298 @@ +package es.verdnatura.presentation.view.feature.main.activity + +import android.content.SharedPreferences +import android.util.Log +import android.view.Menu +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import es.verdnatura.R +import es.verdnatura.databinding.ActivityMainBinding +import es.verdnatura.presentation.base.BaseActivity +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.ajustes.fragment.AjustesFragment +import es.verdnatura.presentation.view.feature.articulo.fragment.ItemCardFragment +import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemAllFragment +import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragment +import es.verdnatura.presentation.view.feature.calidad.fragment.BuyersFragment +import es.verdnatura.presentation.view.feature.calidad.fragment.QaualityFragment +import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragment +import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment +import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasFragment +import es.verdnatura.presentation.view.feature.historico.fragment.HistoricoFragment +import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryFragment +import es.verdnatura.presentation.view.feature.main.model.ItemMenuVO +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailFragment +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletFragment +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanFragment +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionTruckListFragment +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO +import es.verdnatura.presentation.view.feature.parking.fragment.ParkingFragment +import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroFragment +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.presacador.fragment.PreSacadorFragment +import es.verdnatura.presentation.view.feature.reposicion.fragment.ReposicionFragment +import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import es.verdnatura.presentation.view.feature.shelvingparking.fragment.ShelvingParkingFragment +import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment +import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch + + +class MainActivity : BaseActivity() , OnPasillerosItemClickListener, + OnTruckClickListener, OnPalletClickListener,OnComprobarPalletViewClickListener,OnCollectionSelectedListener,OnBuyerSelectedListener { + + private var lastBottomMenuItemSelected: ItemMenuVO? = null + private lateinit var customDialog: CustomDialog + var firstItem : ItemMenuVO? = null + var fm = supportFragmentManager + + override fun getLayoutId(): Int = R.layout.activity_main + + + override fun init() { + customDialog = CustomDialog(this) + setBottomMenu() + if(haveSector()) addFragment(PasilleroFragment.newInstance(),R.id.main_frame_layout, PasilleroFragment.TAG,false) + else addFragment(AjustesFragment.newInstance(),R.id.main_frame_layout, AjustesFragment.TAG,false) + } + + + private fun haveSector() : Boolean{ + val prefs: SharedPreferences = getSharedPreferences("es.verdnatura.user.prefs",0) + val sectorFk = prefs.getInt("sectorFk",-1) + return sectorFk != -1 + } + + private fun setBottomMenu(){ + val bottomMenu = main_bottom_navigation + bottomMenu.itemIconTintList = null + GlobalScope.launch(Dispatchers.Main){ + val bottomMenuItems : ArrayList = ArrayList() + + bottomMenuItems.add(ItemMenuVO(0,title = getString(R.string.Pasilleros),defaultImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_device_hub_black_24dp),selectedImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_device_hub_black_24dp_selected))) + + bottomMenuItems.add(ItemMenuVO(1,title = getString(R.string.Sacadores),defaultImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_local_florist_black_24dp),selectedImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_local_florist_black_24dp_selected))) + + bottomMenuItems.add(ItemMenuVO(2,title = getString(R.string.Controladores),defaultImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_verified_user_black_24dp),selectedImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_verified_user_black_24dp_selected))) + + bottomMenuItems.add(ItemMenuVO(3,title = getString(R.string.Paletizadores),defaultImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_local_shipping_black_24dp),selectedImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_local_shipping_black_24dp_selected))) + + bottomMenuItems.add(ItemMenuVO(4,title = getString(R.string.Ajustes),defaultImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_build_black_24dp),selectedImage = ContextCompat.getDrawable( + applicationContext,R.drawable.ic_build_black_24dp_selected))) + + + // Add al items to menu view + bottomMenuItems.forEach { + bottomMenu.menu.add(Menu.NONE, it.id, Menu.NONE, it.title).icon = it.defaultImage + } + + + if(haveSector()){ + // Select first item by default + firstItem = bottomMenuItems.first() + bottomMenu.selectedItemId = firstItem!!.id + bottomMenu.menu.findItem(firstItem!!.id).icon = firstItem!!.selectedImage + lastBottomMenuItemSelected = firstItem + }else{ + // Select last item by default + val lastItem = bottomMenuItems.last() + bottomMenu.selectedItemId = lastItem.id + bottomMenu.menu.findItem(lastItem.id).icon = lastItem.selectedImage + lastBottomMenuItemSelected = lastItem + } + + + bottomMenu.setOnNavigationItemSelectedListener { menuItem -> + // Get selected item from itemList and apply ui changes to menu view + val selectedItemMenu = bottomMenuItems.find { menuItem.itemId == it.id } + menuItem.icon = selectedItemMenu?.selectedImage + + // Get last selected item and disable it + bottomMenu.menu.findItem(lastBottomMenuItemSelected?.id!!).icon = + lastBottomMenuItemSelected?.defaultImage + lastBottomMenuItemSelected = selectedItemMenu + + + when (selectedItemMenu?.title) { + getString(R.string.Pasilleros) -> { + fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + delete_Fragments() + addFragment(PasilleroFragment.newInstance(),R.id.main_frame_layout, PasilleroFragment.TAG,false) + true + } + getString(R.string.Sacadores) -> { + fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + addFragment(SacadorFragment.newInstance(),R.id.main_frame_layout, SacadorFragment.TAG,false) + true + } + getString(R.string.Controladores) -> { + fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + addFragment(ControladorFragment.newInstance(),R.id.main_frame_layout, ControladorFragment.TAG,false) + + true + } + getString(R.string.Paletizadores) -> { + fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + addFragment(ExpeditionTruckListFragment.newInstance(),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false) + true + } + getString(R.string.Ajustes) -> { + fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + addFragment(AjustesFragment.newInstance(),R.id.main_frame_layout, AjustesFragment.TAG,false) + } + + + else -> false + } + + true + } + bottomMenu!!.setOnNavigationItemReselectedListener { + + } + } + } + + private fun delete_Fragments() { + fm.getFragments().forEach { + // Log.i("VERDNATURA", "si esta ${it.tag.toString()}") + var fragment:Fragment?=supportFragmentManager.findFragmentByTag(it.tag.toString()) + if (fragment!= null) supportFragmentManager + .beginTransaction().remove(fragment) + .commit() + } + + } + + override fun onPasillerosItemClickListener(item: PasillerosItemVO, entryPoint: String) { + + + when (item.title){ + + "Pre Sacador" -> { + addFragmentOnTop(PreSacadorFragment.newInstance()) + } + "Reposición" -> { + addFragmentOnTop(ReposicionFragment.newInstance()) + } + "Consultar artículo" -> { + addFragmentOnTop(ItemCardFragment.newInstance(entryPoint)) + } + "Parking" -> { + addFragmentOnTop(ParkingFragment.newInstance()) + } + "Buscar item" -> { + addFragmentOnTop(BuscarItemFragment.newInstance(entryPoint)) + } + // "Buscar item full" -> { + // addFragmentOnTop(BuscarItemAllFragment.newInstance(entryPoint)) + // } + "Historico" -> { + //addFragmentOnTop(HistoricoFragment.newInstance(entryPoint)) + } + "Inventario" -> { + addFragmentOnTop(InventaryFragment.newInstance()) + } + "Faltas" -> { + addFragmentOnTop(FaltasFragment.newInstance()) + } + "Shelving Parking" -> { + addFragmentOnTop(ShelvingParkingFragment.newInstance()) + } + "Ubicador" -> { + addFragmentOnTop(UbicadorFragment.newInstance(entryPoint)) + } + "Automatic" -> { + addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint)) + } + "Calidad" -> { + addFragmentOnTop(BuyersFragment.newInstance()) + } + } + Log.i("Item: ",item.title) + } + + + fun addFragmentOnTop(fragment: Fragment?) { + + + supportFragmentManager + .beginTransaction() + .replace(R.id.main_frame_layout, fragment!!) + .addToBackStack(null) + .commitAllowingStateLoss() + } + + + + override fun onBackPressed() { + + try{ + fm.executePendingTransactions() + }catch (e:Exception){} + + if (fm.backStackEntryCount > 0) { + + fm.popBackStackImmediate() + + }else { + customDialog.setTitle("Cerrar sesión").setDescription("¿Estás seguro de cerrar la sesión?").setOkButton("Salir"){ + customDialog.dismiss() + finish() + }.setKoButton("Cancelar") { + customDialog.dismiss() + }.show() + } + + } + + override fun onTruckClickListener(item: ItemExpeditionTruckVO, entryPoint: String) { + addFragmentOnTop(ExpeditionPalletFragment.newInstance(item)) + //Log.i("VERDNATURA","clickamos la expedicion y abrimos ExpeditionPalletFragment") + + } + + override fun onPalletClickListener(itemTruck: ItemExpeditionTruckVO,itemPallet: ItemPalletVO) { + addFragmentOnTop(ExpeditionScanFragment.newInstance(itemTruck,itemPallet)) + + } + + override fun onComprobarPalletViewClickListener( + itemTruck: ItemExpeditionTruckVO, + itemPallet: ItemPalletVO + ) { + + addFragmentOnTop(ExpeditionPalletDetailFragment.newInstance(itemTruck,itemPallet)) + + } + + + + override fun onCollectionSelected(collection: CollectionVO,type:String) { + fm.popBackStack() + // Log.i("VERDNATURA","el type es $type") + addFragmentOnTop(CollectionFragment.newInstance(collection,type)) + + } + + override fun onBuyerSelected(userFk: String) { + addFragmentOnTop(QaualityFragment.newInstance(userFk)) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt new file mode 100644 index 00000000..9de1fb60 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt @@ -0,0 +1,10 @@ +package es.verdnatura.presentation.view.feature.main.model + +import android.graphics.drawable.Drawable + +data class ItemMenuVO( + val id: Int, + val title: String, + val defaultImage: Drawable?, + val selectedImage: Drawable? +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionListAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionListAdapter.kt new file mode 100644 index 00000000..5d139103 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionListAdapter.kt @@ -0,0 +1,43 @@ +package es.verdnatura.presentation.view.feature.paletizador.adapter + +import android.util.Log +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemExpeditiontruckRowBinding +import es.verdnatura.presentation.common.OnTruckClickListener +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO + +class ExpeditionListAdapter ( + private val items: List, + private val onTruckClickListener: OnTruckClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemExpeditiontruckRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onTruckClickListener.onTruckClickListener(items[position],"") + //Log.i("VERDNATURA","3-ontruckClickListener") + } + } + + inner class ItemHolder( + val binding: ItemExpeditiontruckRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemExpeditionTruckVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletAdapter.kt new file mode 100644 index 00000000..36e113d5 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletAdapter.kt @@ -0,0 +1,58 @@ +package es.verdnatura.presentation.view.feature.paletizador.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemExpeditionpalletRowBinding +import es.verdnatura.presentation.common.OnComprobarPalletViewClickListener +import es.verdnatura.presentation.common.OnPalletClickListener +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO + +class ExpeditionPalletAdapter ( + private val items: List, + private val onPalletClickListener: OnPalletClickListener, + private val onComprobarPalletViewClickListener: OnComprobarPalletViewClickListener, + private val itemExpeditionTruckVO: ItemExpeditionTruckVO +): RecyclerView.Adapter () { + + private var context:Context? = null + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + this.context = parent.context + return ItemHolder( + ItemExpeditionpalletRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onPalletClickListener.onPalletClickListener(itemExpeditionTruckVO,items[position]) + } + holder.binding.root.setOnLongClickListener { + onComprobarPalletViewClickListener.onComprobarPalletViewClickListener(itemExpeditionTruckVO,items[position]) + true + } + } + + inner class ItemHolder( + val binding: ItemExpeditionpalletRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemPalletVO) { + binding.apply { + this.item = item + if (item.Rutas != "1"){ + expeditionPalletRutas.setTextColor(ContextCompat.getColor(context!!, R.color.verdnatura_red)) + }else { + expeditionPalletRutas.setTextColor(ContextCompat.getColor(context!!, R.color.verdnatura_white)) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletViewAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletViewAdapter.kt new file mode 100644 index 00000000..59c59ab9 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletViewAdapter.kt @@ -0,0 +1,39 @@ +package es.verdnatura.presentation.view.feature.paletizador.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemExpeditionViewRowBinding +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewVO + +class ExpeditionPalletViewAdapter ( + private val items: List +): RecyclerView.Adapter () { + + private var context: Context? = null + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + this.context = parent.context + return ItemHolder( + ItemExpeditionViewRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + + } + + inner class ItemHolder( + val binding: ItemExpeditionViewRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemPalletViewVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionScanAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionScanAdapter.kt new file mode 100644 index 00000000..15d4466f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionScanAdapter.kt @@ -0,0 +1,43 @@ +package es.verdnatura.presentation.view.feature.paletizador.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemExpeditionscanRowBinding +import es.verdnatura.presentation.common.OnScanLongClickListener +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO + +class ExpeditionScanAdapter ( + private val items: List, + private val onScanLongClickListener: OnScanLongClickListener +): RecyclerView.Adapter () { + + private var context: Context? = null + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + this.context = parent.context + return ItemHolder( + ItemExpeditionscanRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onScanLongClickListener.onScanLongClickListener(items[position]) + } + } + + inner class ItemHolder( + val binding: ItemExpeditionscanRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemExpeditionScanVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt new file mode 100644 index 00000000..11fb4340 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt @@ -0,0 +1,165 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.util.Log +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentExpeditionPalletDetailBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPalletClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.paletizador.adapter.ExpeditionPalletViewAdapter +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewListVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_expedition_pallet_detail.* +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList + +class ExpeditionPalletDetailFragment( + var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null, + var itemPallet: ItemPalletVO? = null +) : BaseFragment( + ExpeditionPalletDetailViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : ExpeditionPalletViewAdapter? = null + private lateinit var customDialogList: CustomDialogList + private var onPalletClickListener:OnPalletClickListener? = null + + private lateinit var customDialog: CustomDialog + + + companion object { + fun newInstance(item: ItemExpeditionTruckVO,itemPallet: ItemPalletVO) = + ExpeditionPalletDetailFragment(item,itemPallet) + } + + override fun onAttach(context: Context) { + if (context is OnPalletClickListener) onPalletClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet_detail + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + + + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + customDialogList = CustomDialogList(requireContext()) + expedition_pallet_detail_pallet.text = "Pallet "+itemPallet!!.Pallet + splash_progress.visibility = View.VISIBLE + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getCURDATE(itemExpeditionTruckVO!!.ETD) + " " + itemExpeditionTruckVO!!.Destino + setToolBar() + setEvents() + viewModel.expeditionPallet_List(user,password,itemPallet!!.Pallet) + super.init() + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + button_ok.setOnClickListener { + activity!!.onBackPressed() + // sergio: en caso de que hay problemas habrá que cambiar aquí la llamada + // MainActivity.addFragmentOnTop(ExpeditionPalletDetailFragment.newInstance(itemTruck,itemPallet)) + // que llame diractamente al fragment para que no se repita la ultima accion + //Log.i("VERDNATURA", "pulsamos boton OK en detail fragment") + + } + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + val iconEditar : Drawable = resources.getDrawable(R.drawable.ic_mode_edit_black_24dp,resources.newTheme()) + val iconBorrar : Drawable = resources.getDrawable(R.drawable.ic_delete_forever_black_24dp,resources.newTheme()) + val iconPrint : Drawable = resources.getDrawable(R.drawable.ic_print_black_24dp,resources.newTheme()) + listIcons.add(iconEditar) + listIcons.add(iconBorrar) + listIcons.add(iconPrint) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionPallet_List(user,password,itemPallet!!.Pallet) + }else if(item == iconEditar){ + onPalletClickListener!!.onPalletClickListener(itemExpeditionTruckVO!!,itemPallet!!) + }else if(item == iconBorrar){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionPalletDel(user,password,itemPallet!!.Pallet) + }else if(item == iconPrint){ + splash_progress.visibility = View.VISIBLE + + viewModel.expeditionPalletPrintSet(user,password,itemPallet!!.Pallet,sectorFk) + + ////Log.i("VERDNATURA","imprimiento etiqueta pallet $itemPallet.Pallet y sector $sectorFk") + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun getCURDATE(date:String):String{ + val c = Calendar.getInstance() + val df = SimpleDateFormat("yyyy-mm-dd HH:mm") + val df2 = SimpleDateFormat("HH:mm") + c.time = df.parse(date) + return df2.format(c.time); + } + + override fun observeViewModel() { + with(viewModel){ + loadExpeditionPalletList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {printExpeditionList(it) } + }) + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + activity!!.onBackPressed() + } + }) + } + } + + private fun printExpeditionList(it: ItemPalletViewListVO){ + splash_progress.visibility = View.GONE + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + adapter = ExpeditionPalletViewAdapter(it.list) + expedition_pallet_recyclerview.adapter = adapter + expedition_pallet_recyclerview.layoutManager = lm + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt new file mode 100644 index 00000000..66be7a83 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt @@ -0,0 +1,89 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetPaletizadoresUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewListVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ExpeditionPalletDetailViewModel(context: Context): BaseViewModel() { + + private val getPaletizadoresUserCase: GetPaletizadoresUserCase = GetPaletizadoresUserCase(context) + + private val _expeditionPalletList by lazy { MutableLiveData() } + val loadExpeditionPalletList = Transformations.map(_expeditionPalletList) { Event(it) } + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + fun expeditionPallet_List(usuario:String,password:String,vPalletFk:String){ + getPaletizadoresUserCase.expeditionPalletView(usuario,password,vPalletFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemPalletViewVO(isError = true,errorMessage = t.message!!)) + _expeditionPalletList.value = ItemPalletViewListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _expeditionPalletList.value = response.body()?.let { ItemPalletViewListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemPalletViewVO(isError = true,errorMessage = "Error en la llamada de expeditionPallet_View")) + _expeditionPalletList.value = ItemPalletViewListVO(listError) + } + } + + }) + } + + fun expeditionPalletDel(usuario:String,password:String,vPalletFk:String){ + getPaletizadoresUserCase.expeditionPalletDel(usuario,password,vPalletFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al borrar pallet "+vPalletFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionPallet_Del") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun expeditionPalletPrintSet( + usuario: String, + password: String, + vPalletFk: String, + vSectorFk: String + ){ + getPaletizadoresUserCase.expeditionPalletPrintSet(usuario,password,vPalletFk,vSectorFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al imprimir pallet "+vPalletFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionPallet_PrintSet") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt new file mode 100644 index 00000000..34d5a49d --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt @@ -0,0 +1,271 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentExpeditionPalletBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.common.OnComprobarPalletViewClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPalletClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.paletizador.adapter.ExpeditionPalletAdapter +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletListVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanList +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_expedition_pallet.* +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList + +class ExpeditionPalletFragment( + var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null +) : BaseFragment( + ExpeditionPalletViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : ExpeditionPalletAdapter? = null + private var onPalletClickListener: OnPalletClickListener? = null + private var onComprobarPalletViewClickListener:OnComprobarPalletViewClickListener? = null + private lateinit var customDialogList: CustomDialogList + private var listExpeditions:ArrayList = ArrayList() + private var expeditionAdapter : BarcodeAdapter? = null + private lateinit var customDialog: CustomDialog + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + + + companion object { + fun newInstance(item: ItemExpeditionTruckVO) = + ExpeditionPalletFragment(item) + } + + override fun onAttach(context: Context) { + if (context is OnPalletClickListener) onPalletClickListener = context + if (context is OnComprobarPalletViewClickListener) onComprobarPalletViewClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + customDialogList = CustomDialogList(requireContext()) + splash_progress.visibility = View.VISIBLE + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getCURDATE(itemExpeditionTruckVO!!.ETD) + " " + itemExpeditionTruckVO!!.Destino + setToolBar() + setEvents() + viewModel.expeditionPallet_List(user,password,itemExpeditionTruckVO!!.truckFk) + //Log.i("VERDNATURA","4-listamos listado de pallets para la expedicion") + super.init() + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + val iconPlus : Drawable = resources.getDrawable(R.drawable.ic_add_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + listIcons.add(iconPlus) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionPallet_List(user,password,itemExpeditionTruckVO!!.truckFk) + }else if(item == iconPlus){ + expeditionScanAdd() + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun getCURDATE(date:String):String{ + val c = Calendar.getInstance() + val df = SimpleDateFormat("yyyy-mm-dd HH:mm") + val df2 = SimpleDateFormat("HH:mm") + c.time = df.parse(date) + return df2.format(c.time); + } + + override fun observeViewModel() { + with(viewModel){ + loadExpeditionPalletList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {printExpeditionList(it) } + }) + + loadScanList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {showScanExpeditions(it) } + }) + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + }) + + + responseCheckexpeditionScanPut.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + //Log.i("VERDNATURA"," Resultado llamada es ${it.response.toString()}") + + + if (it.response=="0") { + + //"Rutas iguales ${it.response}".toast(activity!!) + //Log.i("VERDNATURA","Rutas iguales") + } + if (it.response=="1"){ + mperror?.start() + // "Resultado llamada $it.response".toast(activity!!) + // customDialog.setTitle("Rutas distintas").setDescription(it.response).setOkButton("Cerrar"){ + // customDialog.dismiss() + // }.show() + }} + }) + + } + + + } + + private fun printExpeditionList(it: ItemPalletListVO){ + splash_progress.visibility = View.GONE + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + adapter = ExpeditionPalletAdapter(it.list,onPalletClickListener!!,onComprobarPalletViewClickListener!!,itemExpeditionTruckVO!!) + expedition_pallet_recyclerview.adapter = adapter + expedition_pallet_recyclerview.layoutManager = lm + + } + + private fun expeditionScanAdd(){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionScanAdd(usuario = user,password = password,vPalletFk = "0",vTruckFk = itemExpeditionTruckVO!!.truckFk) + } + + private fun showScanExpeditions(it:ItemScanList){ + + //Log.i("VERDNATURA","VA A ESCANEAR EN PALLETFRAGMENT") + splash_progress.visibility = View.GONE + + listExpeditions = ArrayList() + + it.list.forEach { + if(it.expeditionFk != "0") + listExpeditions.add(BarcodeVO(code = it.expeditionFk)) + } + + customDialogList.setTitle("Expedition ("+toolbar_title.text+")").setOkButton("Comprobar"){ + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + + + if (listExpeditions.size > 0){ + onComprobarPalletViewClickListener!!.onComprobarPalletViewClickListener(itemExpeditionTruckVO!!, + ItemPalletVO(Pallet = it.list.get(0).palletFk)) + }else{ + customDialog.setTitle("Atención").setDescription("No ha escaneado expediciones").setOkButton("Ok"){ + customDialog.dismiss() + }.show() + } + + customDialogList.dismiss() + + + }.setKoButton("Cerrar"){ + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + splash_progress.visibility = View.VISIBLE + viewModel.expeditionPallet_List(user,password,itemExpeditionTruckVO!!.truckFk) + listExpeditions = ArrayList() + customDialogList.dismiss() + }.setValue("").show() + + customDialogList.getEditText().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + + customDialogList.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!customDialogList.getValue().isNullOrEmpty()){ + try{ + val numExpedition = customDialogList.getValue().toDouble() + if(customDialogList.getValue().length >= 7){ + listExpeditions.add(0,BarcodeVO(code = customDialogList.getValue())) + customDialogList.setDescription("Total: "+listExpeditions.size) + viewModel.expeditionScanPut(user,password,it.list.get(0).palletFk,customDialogList.getValue()) + //Log.i("VERDNATURA"," palletizando ${it.list.get(0).palletFk} expedi: ${customDialogList.getValue()}") + viewModel.checkRouteExpeditionScanPut(user,password,it.list.get(0).palletFk,customDialogList.getValue()); + }else{ + if (mperror != null) mperror!!.start() + } + }catch (e:Exception){ + if (mperror != null) mperror!!.start() + } + + + expeditionAdapter!!.notifyDataSetChanged() + } + customDialogList.setValue("") + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + return@setOnEditorActionListener true + } + false + } + + expeditionAdapter = BarcodeAdapter(listExpeditions,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + + } + },showDelete = false) + customDialogList.getRecyclerView().adapter = expeditionAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + + } + + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt new file mode 100644 index 00000000..f1b495c9 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt @@ -0,0 +1,125 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetPaletizadoresUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletListVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanList +import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ExpeditionPalletViewModel (context: Context) : BaseViewModel() { + + private val getPaletizadoresUserCase: GetPaletizadoresUserCase = GetPaletizadoresUserCase(context) + + private val _expeditionPalletList by lazy { MutableLiveData() } + val loadExpeditionPalletList = Transformations.map(_expeditionPalletList) { Event(it) } + + + private val _scanList by lazy { MutableLiveData() } + val loadScanList = Transformations.map(_scanList) { Event(it) } + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + +//sergio: añadido para comprobar rutas escaneado desde PalletFragment + private val _responseCheckexpeditionScanPut by lazy { MutableLiveData() } + val responseCheckexpeditionScanPut: LiveData + get() = _responseCheckexpeditionScanPut + + + + + fun expeditionPallet_List(usuario:String,password:String,vTruckFk:String){ + getPaletizadoresUserCase.expeditionPallet_List(usuario,password,vTruckFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemPalletVO(isError = true,errorMessage = t.message!!)) + _expeditionPalletList.value = ItemPalletListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _expeditionPalletList.value = response.body()?.let { ItemPalletListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemPalletVO(isError = true,errorMessage = "Error en la llamada de expeditionTruck_List")) + _expeditionPalletList.value = ItemPalletListVO(listError) + } + } + + }) + } + + fun expeditionScanAdd(usuario:String,password:String,vPalletFk:String,vTruckFk:String){ + getPaletizadoresUserCase.expeditionScanAdd(usuario,password,vPalletFk,vTruckFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemScanVO(isError = true,errorMessage = t.message!!)) + _scanList.value = ItemScanList(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _scanList.value = response.body()?.let { ItemScanList(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemScanVO(isError = true,errorMessage = "Error en la llamada de expeditionTruck_List")) + _scanList.value = ItemScanList(listError) + } + } + + }) + } + + fun expeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){ + getPaletizadoresUserCase.expeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar expedition "+vExpeditionFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionScan_Put") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun checkRouteExpeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){ + getPaletizadoresUserCase.checkRouteExpeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar expedition "+vExpeditionFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseCheckexpeditionScanPut.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada checkExpeditionScan_Put") + }else{ + _responseCheckexpeditionScanPut.value = ResponseItemVO(isError = false,response = response.body()!!) + //Log.i("VERDNATURA","Resultado checkExpeditionScan ${_responseCheckexpeditionScanPut.value}") + } + } + }) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt new file mode 100644 index 00000000..b9cf3f6f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt @@ -0,0 +1,326 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentExpeditionScanBinding +import es.verdnatura.domain.notNull +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.component.CustomDialogTwoButtons +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.paletizador.adapter.ExpeditionScanAdapter +import es.verdnatura.presentation.view.feature.paletizador.model.* +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_expedition_scan.* +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList + +class ExpeditionScanFragment ( + var itemExpeditionTruckVO: ItemExpeditionTruckVO? = null, + var itemPalletVO: ItemPalletVO? = null +) : BaseFragment( + ExpeditionScanViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : ExpeditionScanAdapter? = null + private var onPalletClickListener: OnPalletClickListener? = null + private var onComprobarPalletViewClickListener: OnComprobarPalletViewClickListener? = null + private lateinit var customDialogList: CustomDialogList + private lateinit var customDialogTwoButtons: CustomDialogTwoButtons + private var listExpeditions:ArrayList = ArrayList() + private var expeditionAdapter : BarcodeAdapter? = null + private lateinit var customDialog: CustomDialog + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + + companion object { + fun newInstance(item: ItemExpeditionTruckVO,itemPalletVO: ItemPalletVO) = + ExpeditionScanFragment(item,itemPalletVO) + } + + override fun onAttach(context: Context) { + if (context is OnPalletClickListener) onPalletClickListener = context + if (context is OnComprobarPalletViewClickListener) onComprobarPalletViewClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_expedition_scan + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + customDialogList = CustomDialogList(requireContext()) + customDialogTwoButtons = CustomDialogTwoButtons(requireContext()) + expedition_scan_detail_pallet.text = "Pallet "+itemPalletVO!!.Pallet + splash_progress.visibility = View.VISIBLE + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getCURDATE(itemExpeditionTruckVO!!.ETD) + " " + itemExpeditionTruckVO!!.Destino + setToolBar() + setEvents() + viewModel.expeditionScanList(user,password,itemPalletVO!!.Pallet) + super.init() + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + val iconPlus : Drawable = resources.getDrawable(R.drawable.ic_add_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + listIcons.add(iconPlus) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionScanList(user,password,itemPalletVO!!.Pallet) + }else if(item == iconPlus){ + expeditionScanAdd() + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun getCURDATE(date:String):String{ + val c = Calendar.getInstance() + val df = SimpleDateFormat("yyyy-mm-dd HH:mm") + val df2 = SimpleDateFormat("HH:mm") + c.time = df.parse(date) + return df2.format(c.time); + } + + override fun observeViewModel() { + with(viewModel){ + loadExpeditionScanList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {printExpeditionList(it) } + }) + + loadScanList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {showScanExpeditions(it) } + }) + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + }) + + responseCheckexpeditionScanPut.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + //Log.i("VERDNATURA"," Resultado llamada es ${it.response.toString()}") + + + if (it.response=="0") { + + //"Rutas iguales ${it.response}".toast(activity!!) + //Log.i("VERDNATURA","Rutas iguales") + } + if (it.response=="1"){ + mperror?.start() + // "Resultado llamada $it.response".toast(activity!!) + // customDialog.setTitle("Rutas distintas").setDescription(it.response).setOkButton("Cerrar"){ + // customDialog.dismiss() + // }.show() + }} + }) + + + responseDeleteScan.observe(viewLifecycleOwner, Observer { + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + viewModel.expeditionScanList(user,password,itemPalletVO!!.Pallet) + } + }) + } + } + + private fun printExpeditionList(it: ItemExpeditionScanList){ + + splash_progress.visibility = View.GONE + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + adapter = ExpeditionScanAdapter(it.list,object: OnScanLongClickListener{ + override fun onScanLongClickListener(itemExpeditionScanVO: ItemExpeditionScanVO) { + customDialogTwoButtons.setTitle("Ticket: "+itemExpeditionScanVO.Ticket+" Pallet: "+itemPalletVO!!.Pallet) + .setDescription("Expedition: "+itemExpeditionScanVO!!.expeditionFk) + .setOkButton("Borrar"){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionScanDel(user,password,itemExpeditionScanVO.id) + customDialogTwoButtons.dismiss() + }.setKoButton("Cancelar"){ + customDialogTwoButtons.dismiss() + }.show() + } + + }) + expedition_pallet_recyclerview.adapter = adapter + expedition_pallet_recyclerview.layoutManager = lm + + + } + + private fun expeditionScanAdd(){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionScanAdd(usuario = user,password = password,vPalletFk = itemPalletVO!!.Pallet,vTruckFk = itemExpeditionTruckVO!!.truckFk) + //Log.i("VERDNATURA","entramos a escanear ticket del pallet") + + } + + private fun showScanExpeditions(it: ItemScanList){ + //Log.i("VERDNATURA","muestra expediciones") + listExpeditions = ArrayList() + splash_progress.visibility = View.GONE + it.list.forEach { + if(it.expeditionFk != "0") + listExpeditions.add(BarcodeVO(code = it.expeditionFk)) + } +//sergio:Comprueba si el numero es mayor>0 + customDialogList.setTitle("Pallet"+itemPalletVO!!.Pallet+" ("+toolbar_title.text+")").setOkButton("Comprobar"){ + //Log.i("VERDNATURA","Añadida etiqueta") + + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + + + if (listExpeditions.size > 0){ + //Log.i("VERDNATURA","boton comprobar . si las expediciones >0 muetra DetailFragment") + onComprobarPalletViewClickListener!!.onComprobarPalletViewClickListener(itemExpeditionTruckVO!!, + ItemPalletVO(Pallet = it.list.get(0).palletFk) + ) + }else{ + customDialog.setTitle("Atención").setDescription("No ha escaneado expediciones").setOkButton("Ok"){ + customDialog.dismiss() + }.show() + } + + customDialogList.dismiss() + + + }.setKoButton("Cerrar"){ + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + listExpeditions = ArrayList() + customDialogList.dismiss() + }.setValue("").show() + + customDialogList.getEditText().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + + + + //sergio: seguimos escaneando id=0 -> sin especificar id=5->next + customDialogList.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!customDialogList.getValue().isNullOrEmpty()) { + + //Log.i("VERDNATURA", "scan put pallet ${it.list.get(0).palletFk}"); + //Log.i("VERDNATURA", "scan put list ${customDialogList.getValue()}"); + + listExpeditions.add(BarcodeVO(code = customDialogList.getValue())) + viewModel.expeditionScanPut( + user, + password, + it.list.get(0).palletFk, + customDialogList.getValue() + ) + //Log.i("VERDNATURA", "scan put pallet ${it.list.get(0).palletFk}"); + //Log.i("VERDNATURA", "scan put list ${customDialogList.getValue()}"); + + // //Log.i("VERDNATURA","misma ruta ?") + //sergio:comprueba si es de la misma ruta. Check_route_expedition. + checkRouteExpeditionScanPut(user, password,it.list.get(0).palletFk,customDialogList.getValue()) + + //Log.i("VERDNATURA", "scan put pallet ${it.list.get(0).palletFk}"); + //Log.i("VERDNATURA", "scan put list ${customDialogList.getValue()}"); + + expeditionAdapter!!.notifyDataSetChanged() + + } + customDialogList.setValue("") + (activity as MainActivity).hideKeyboard(customDialogList.getEditText()) + return@setOnEditorActionListener true + } + false + } + + expeditionAdapter = BarcodeAdapter(listExpeditions,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + + } + },showDelete = false) + customDialogList.getRecyclerView().adapter = expeditionAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + + } + + private fun checkRouteExpeditionScanPut(user: String, password: String, palletFk: String, expedition: String){ + + viewModel.checkRouteExpeditionScanPut(user,password,palletFk,expedition); + // "Pallet $palletFk y expediti $expedition".toast(activity!!) + // //Log.i("VERDNATURA", "ha entrado en checkexpedition"); + + + /* var addScanInput = false; + + customDialogTwoButtons.setTitle("La etiqueta escaneada no pertenece a la misma ruta. \n¿Desea incluirla igualmente?") + .setOkButton("Incluir") { + addScanInput = true + customDialogTwoButtons.dismiss() + return@setOkButton + + } + .setKoButton("Eliminar") { + addScanInput = false + customDialogTwoButtons.dismiss() + return@setKoButton + + }.show() + */ + + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt new file mode 100644 index 00000000..ccfae616 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt @@ -0,0 +1,143 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetPaletizadoresUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanList +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanList +import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ExpeditionScanViewModel(context: Context) : BaseViewModel() { + + private val getPaletizadoresUserCase: GetPaletizadoresUserCase = GetPaletizadoresUserCase(context) + + private val _expeditionScanList by lazy { MutableLiveData() } + val loadExpeditionScanList = Transformations.map(_expeditionScanList) { Event(it) } + + + private val _scanList by lazy { MutableLiveData() } + val loadScanList = Transformations.map(_scanList) { Event(it) } + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _responseDeleteScan by lazy { MutableLiveData() } + val responseDeleteScan: LiveData + get() = _responseDeleteScan + +//sergio:añadido para llamada nueva checkexpeditionScan + private val _responseCheckexpeditionScanPut by lazy { MutableLiveData() } + val responseCheckexpeditionScanPut: LiveData + get() = _responseCheckexpeditionScanPut + + + fun expeditionScanList(usuario:String,password:String,vPalletFk:String){ + getPaletizadoresUserCase.expeditionScanList(usuario,password,vPalletFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemExpeditionScanVO(isError = true,errorMessage = t.message!!)) + _expeditionScanList.value = ItemExpeditionScanList(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _expeditionScanList.value = response.body()?.let { ItemExpeditionScanList(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemExpeditionScanVO(isError = true,errorMessage = "Error en la llamada de expeditionScan_List")) + _expeditionScanList.value = ItemExpeditionScanList(listError) + } + } + + }) + } + fun expeditionScanAdd(usuario:String,password:String,vPalletFk:String,vTruckFk:String){ + getPaletizadoresUserCase.expeditionScanAdd(usuario,password,vPalletFk,vTruckFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemScanVO(isError = true,errorMessage = t.message!!)) + _scanList.value = ItemScanList(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _scanList.value = response.body()?.let { ItemScanList(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemScanVO(isError = true,errorMessage = "Error en la llamada de expeditionTruck_List")) + _scanList.value = ItemScanList(listError) + } + } + + }) + } + + fun expeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){ + getPaletizadoresUserCase.expeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar expedition "+vExpeditionFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionScan_Put") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + + } + } + }) + } + + fun checkRouteExpeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){ + getPaletizadoresUserCase.checkRouteExpeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar expedition "+vExpeditionFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseCheckexpeditionScanPut.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada checkExpeditionScan_Put") + }else{ + _responseCheckexpeditionScanPut.value = ResponseItemVO(isError = false,response = response.body()!!) + // //Log.i("VERDNATURA","Resultado checkExpeditionScan ${_responseCheckexpeditionScanPut.value}") + } + } + }) + } + + + + fun expeditionScanDel(usuario:String,password:String,vScanFk:String){ + getPaletizadoresUserCase.expeditionScanDel(usuario,password,vScanFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseDeleteScan.value = ResponseItemVO(isError = true,errorMessage = "Error al eliminar expedition "+vScanFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseDeleteScan.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionScan_Del") + }else{ + _responseDeleteScan.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt new file mode 100644 index 00000000..748e9b95 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt @@ -0,0 +1,163 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentExpeditionTruckListBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnTruckClickListener +import es.verdnatura.presentation.view.component.CustomDialogHour +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.paletizador.adapter.ExpeditionListAdapter +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckList +import kotlinx.android.synthetic.main.fragment_expedition_truck_list.* +import kotlinx.android.synthetic.main.toolbar.* +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList +import java.util.Calendar.getInstance as getInstance1 + + +class ExpeditionTruckListFragment : BaseFragment( + ExpeditionTruckListViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : ExpeditionListAdapter? = null + private lateinit var customDialogHor: CustomDialogHour + private var onTruckClickListener: OnTruckClickListener? = null + + + companion object {//similar a static en Java + fun newInstance() = ExpeditionTruckListFragment() + } + + override fun onAttach(context: Context) { + if (context is OnTruckClickListener) onTruckClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.fragment_expedition_truck_list + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialogHor = CustomDialogHour(requireContext()) + splash_progress.visibility = View.VISIBLE + toolbar_title.text = "PScan: "+getCURDATE() + backButton.visibility = View.GONE + setToolBar() + //Log.i("VERDNATURA","1-cargamos expediciones") + viewModel.expeditionTruckList(user,password) + super.init() + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + val iconPlus : Drawable = resources.getDrawable(R.drawable.ic_add_black_24dp,resources.newTheme()) + listIcons.add(iconReload) + listIcons.add(iconPlus) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.expeditionTruckList(user,password) + }else if(item == iconPlus){ + addTruck() + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun getCURDATE():String{ + val c: Date = getInstance1().getTime() + val df = SimpleDateFormat("dd/MM/yyyy") + return df.format(c); + } + + override fun observeViewModel() { + with(viewModel){ + loadExpeditionTruckList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull {printExpeditionList(it) } + }) + loadResponseExpeditionAdd.observe(viewLifecycleOwner, Observer { event -> + viewModel.expeditionTruckList(user,password) + }) + } + } + + private fun printExpeditionList(it: ItemExpeditionTruckList){ + splash_progress.visibility = View.GONE + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + adapter = ExpeditionListAdapter(it.list,onTruckClickListener!!) + expedition_truck_recyclerview.adapter = adapter + expedition_truck_recyclerview.layoutManager = lm + //Log.i("VERDNATURA","2-Rellenamos adapter") + } + + private fun addTruck(){ + customDialogHor.setTitle("Nuevo Camión").setOkButton("Guardar"){ + (activity as MainActivity).hideKeyboard(customDialogHor.getDestinoEditText()) + if (!customDialogHor.getDestinoValue().isNullOrEmpty() && !customDialogHor.getHoraValue().isNullOrEmpty()){ + viewModel.expeditionTruckAdd(user,password,customDialogHor.getHoraValue(),customDialogHor.getDestinoValue()) + splash_progress.visibility = View.VISIBLE + customDialogHor.dismiss() + } + (activity as MainActivity).hideKeyboard(customDialogHor.getDestinoEditText()) + customDialogHor.dismiss() + }.setKoButton("Cancelar"){ + customDialogHor.dismiss() + }.setHoraValue("").setDestinoValue("").show() + + customDialogHor.getDestinoEditText().requestFocus() + customDialogHor.getDestinoEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogHor.getDestinoValue().isNullOrEmpty() && !customDialogHor.getHoraValue().isNullOrEmpty()){ + viewModel.expeditionTruckAdd(user,password,customDialogHor.getHoraValue(),customDialogHor.getDestinoValue()) + splash_progress.visibility = View.VISIBLE + customDialogHor.dismiss() + } + + return@setOnEditorActionListener true + } + (activity as MainActivity).hideKeyboard(customDialogHor.getDestinoEditText()) + false + } + } + + + + +} + + + + + + + + + + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt new file mode 100644 index 00000000..3c8955c5 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt @@ -0,0 +1,73 @@ +package es.verdnatura.presentation.view.feature.paletizador.fragment + + +import android.content.Context +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetPaletizadoresUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckList +import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ExpeditionTruckListViewModel(context: Context) : BaseViewModel() { + + private val getPaletizadoresUserCase: GetPaletizadoresUserCase = GetPaletizadoresUserCase(context) + + private val _expeditionTruckList by lazy { MutableLiveData() } + val loadExpeditionTruckList = Transformations.map(_expeditionTruckList) { Event(it) } + + private val _response by lazy { MutableLiveData() } + val loadResponseExpeditionAdd = Transformations.map(_response) { Event(it) } + + + + + fun expeditionTruckList(usuario:String,password:String){ + getPaletizadoresUserCase.expeditionTruckList(usuario,password).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemExpeditionTruckVO(isError = true,errorMessage = t.message!!)) + _expeditionTruckList.value = ItemExpeditionTruckList(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _expeditionTruckList.value = response.body()?.let { ItemExpeditionTruckList(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemExpeditionTruckVO(isError = true,errorMessage = "Error en la llamada de expeditionTruck_List")) + _expeditionTruckList.value = ItemExpeditionTruckList(listError) + } + } + + }) + } + + fun expeditionTruckAdd(usuario:String,password:String,vHour:String,vDescription:String){ + getPaletizadoresUserCase.expeditionTruckAdd(usuario,password,vHour,vDescription).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error al guardar CAMIÓN "+vDescription+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada expeditionTruckAdd") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt new file mode 100644 index 00000000..04d087ee --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt @@ -0,0 +1,15 @@ +package es.verdnatura.presentation.view.feature.paletizador.model + +class ItemExpeditionTruckVO ( + var truckFk:String = "", + var ETD:String = "", + var Destino:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + + +class ItemExpeditionTruckList( + var list: List = listOf() +) + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt new file mode 100644 index 00000000..96d13d6c --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt @@ -0,0 +1,27 @@ +package es.verdnatura.presentation.view.feature.paletizador.model + +class ItemPalletVO( + var Pallet:String = "", + var Rutas:String = "", + var Eti:String = "", + var isError: Boolean = false, + var errorMessage: String = "" + +) + +class ItemPalletListVO( + var list:List = listOf() +) + + +class ItemPalletViewVO( + var Pallet:String = "", + var Rutas:String = "", + var Cajas:String = "", + var isError: Boolean = false, + var errorMessage: String = "" +) + +class ItemPalletViewListVO( + var list:List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt new file mode 100644 index 00000000..a1fbe345 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt @@ -0,0 +1,27 @@ +package es.verdnatura.presentation.view.feature.paletizador.model + +class ItemScanVO ( + var expeditionFk:String = "", + var palletFk:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class ItemScanList( + var list:List = listOf() +) + +class ItemExpeditionScanVO( + var id:String = "", + var expeditionFk:String = "", + var Ruta:String = "", + var Ticket:String = "", + var Caja:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class ItemExpeditionScanList( + var list:List = listOf() +) + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/adapter/ParkingAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/adapter/ParkingAdapter.kt new file mode 100644 index 00000000..9b82cc85 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/adapter/ParkingAdapter.kt @@ -0,0 +1,42 @@ +package es.verdnatura.presentation.view.feature.parking.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemBarcodeRowBinding +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO + + +class ParkingAdapter ( + private val items: List, + private val onBarcodeRowClickListener: OnBarcodeRowClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemBarcodeRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onBarcodeRowClickListener.onBarcodeRowClickListener(items[position]) + } + } + + + inner class ItemHolder( + val binding: ItemBarcodeRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(item: BarcodeVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt new file mode 100644 index 00000000..6b2b058f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt @@ -0,0 +1,146 @@ +package es.verdnatura.presentation.view.feature.parking.fragment + +import android.content.SharedPreferences +import android.media.MediaPlayer +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentParkingBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.common.hideKeyboard +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.parking.adapter.ParkingAdapter +import kotlinx.android.synthetic.main.fragment_parking.* +import kotlinx.android.synthetic.main.toolbar.* + +class ParkingFragment : BaseFragment(ParkingViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private lateinit var customDialog: CustomDialog + private var scanerList:ArrayList = ArrayList() + private var adapter : ParkingAdapter? = null + private var numParking : Int = 0 + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + + + override fun getLayoutId(): Int = R.layout.fragment_parking + companion object { + fun newInstance() = ParkingFragment() + } + + + override fun init() { + setEvents() + toolbar_title.text = "Parking" + viewModel.hideProgressLoading() + setList() + customDialog = CustomDialog(requireContext()) + super.init() + } + + private fun setEvents(){ + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!scan_input.text.isNullOrEmpty()) { + checkScan(scan_input.text.toString()) + } + scan_input.setText("") + requireActivity().hideKeyboard() + return@setOnEditorActionListener true + } + false + } + + backButton.setOnClickListener { + activity!!.onBackPressed() + } + } + + override fun observeViewModel() { + with(viewModel){ + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + mperror?.start() + splash_progress.visibility = View.GONE + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + numParking -= 1 + if (numParking <= 0) { + splash_progress.visibility = View.GONE + viewModel.hideProgressLoading() + mpok?.start() + setList() + } + } + }) + } + } + + private fun setList(){ + scanerList = ArrayList() + adapter = ParkingAdapter(scanerList,object: OnBarcodeRowClickListener{ + override fun onBarcodeRowClickListener(item: BarcodeVO) { + scanerList.removeAt(scanerList.indexOf(item)) + adapter?.notifyDataSetChanged() + } + }) + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + fragment_parking_scan_list.adapter = adapter + fragment_parking_scan_list.layoutManager = lm + } + + private fun checkScan(txtScan:String){ + var isParking:Boolean = false + if (txtScan.trim().length == 4 && isLetter(txtScan.substring(txtScan.length - 1)) || txtScan.contains("-")){ + isParking = true + } + + if (isParking){ + numParking = scanerList.size + scanerList.forEach { + splash_progress.visibility = View.VISIBLE + viewModel.parking( + usuario = user, + password = password, + parking = txtScan, + scanItem = it.code!! + ) + } + }else{ + scanerList.add(BarcodeVO(code = txtScan)) + adapter?.notifyDataSetChanged() + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + super.onCreate(savedInstanceState) + } + + @Throws(NumberFormatException::class) + fun isLetter(text: String): Boolean { + return text.matches("[a-zA-Z ]+".toRegex()) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt new file mode 100644 index 00000000..b6a6bfe2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt @@ -0,0 +1,54 @@ +package es.verdnatura.presentation.view.feature.parking.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ParkingViewModel(context: Context) : BaseViewModel() { + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _isLoading by lazy { MutableLiveData() } + val isLoading: LiveData = _isLoading + + private fun showProgressLoading() { + _isLoading.value = true + } + + fun hideProgressLoading() { + _isLoading.value = false + } + + + fun parking(usuario: String,password: String,scanItem: String,parking:String){ + showProgressLoading() + getUbicadorUserCase.shelvingPark(usuario,password,scanItem,parking).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPark") + }else{ + if (response.body() == "Finish") + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + else + _response.value = ResponseItemVO(isError = true,errorMessage = "No existe el parking en la Base de Datos (shelvingPark)") + } + } + }) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt new file mode 100644 index 00000000..0cc79721 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt @@ -0,0 +1,46 @@ +package es.verdnatura.presentation.view.feature.pasillero.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemPasillerosMainMenuBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class PasillerosAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener +): RecyclerView.Adapter () { + + var context : Context? = null + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PasillerosItemHolder { + this.context = parent.context + return PasillerosItemHolder( + ItemPasillerosMainMenuBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: PasillerosItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(items[position],"") + } + + } + + + inner class PasillerosItemHolder( + val binding: ItemPasillerosMainMenuBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(item: PasillerosItemVO) { + binding.apply { + this.item = item + this.title = context?.getString(item.titleToShow) + itemImage.setImageResource(item.iconResource) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt new file mode 100644 index 00000000..202646be --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt @@ -0,0 +1,54 @@ +package es.verdnatura.presentation.view.feature.pasillero.fragment + +import android.content.Context +import android.os.Bundle +import android.view.View +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentPasilleroBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.view.feature.pasillero.adapter.PasillerosAdapter +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_pasillero.* +import kotlinx.android.synthetic.main.toolbar.* + +class PasilleroFragment : BaseFragment(PasilleroViewModel::class){ + + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + + companion object { + fun newInstance() = PasilleroFragment() + } + + override fun onAttach(context: Context) { + super.onAttach(context) + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + } + + override fun getLayoutId(): Int = R.layout.fragment_pasillero + + override fun init() { + activity!!.main_bottom_navigation.visibility = View.VISIBLE + toolbar_title.text = "Verdnatura" + backButton.visibility = View.GONE + super.init() + } + + override fun onCreate(savedInstanceState: Bundle?) { + viewModel.inititializeDefaultData() + super.onCreate(savedInstanceState) + } + + + + + override fun observeViewModel() { + with(viewModel){ + pasilleros_items.adapter = PasillerosAdapter(pasillerositem,pasillerosItemClickListener!!) + pasilleros_items.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + } + super.observeViewModel() + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt new file mode 100644 index 00000000..8bcebfed --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt @@ -0,0 +1,88 @@ +package es.verdnatura.presentation.view.feature.pasillero.fragment + + +import android.content.Context +import es.verdnatura.R +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO + +class PasilleroViewModel(context: Context) : BaseViewModel() { + private val _pasillerositem by lazy { ArrayList() } + val pasillerositem: List + get() = _pasillerositem + + + fun inititializeDefaultData() { + + _pasillerositem.add( + PasillerosItemVO(7, + R.drawable.ic_streetview_black_24dp, + "Pre Sacador",R.string.PreSacador) + ) + + _pasillerositem.add( + PasillerosItemVO(7, + R.drawable.ic_baseline_all_inbox_24, + "Reposición",R.string.reposicion) + ) + + _pasillerositem.add( + PasillerosItemVO(0, + R.drawable.ic_loyalty_black_24dp, + "Consultar artículo",R.string.ConsultarArticulo) + ) + + _pasillerositem.add( + PasillerosItemVO(6, + R.drawable.ic_local_parking_orange_24dp, + "Parking",R.string.Parking) + ) + + _pasillerositem.add( + PasillerosItemVO(2, + R.drawable.ic_visibility_black_24dp, + "Buscar item",R.string.BuscarItem) + ) + + //sergio: pruebas cau item buscar + /* _pasillerositem.add( + PasillerosItemVO(9, + R.drawable.ic_visibility_black_24dp, + "Buscar item full",R.string.test) + )*/ + + _pasillerositem.add( + PasillerosItemVO(1, + R.drawable.ic_dashboard_black_24dp, + "Ubicador",R.string.Ubicador) + ) + + _pasillerositem.add( + PasillerosItemVO(3, + R.drawable.ic_spa_black_24dp, + "Inventario",R.string.Inventario) + ) + + _pasillerositem.add( + PasillerosItemVO(4, + R.drawable.ic_move_to_inbox_black_24dp, + "Faltas",R.string.Faltas) + ) + + _pasillerositem.add( + PasillerosItemVO(5, + R.drawable.ic_send_black_24dp, + "Shelving Parking",R.string.ShelvingParking) + ) + + _pasillerositem.add( + PasillerosItemVO(8, + R.drawable.ic_baseline_star_24, + "Calidad",R.string.Calidad) + ) + + + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt new file mode 100644 index 00000000..3cd9f0a0 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt @@ -0,0 +1,8 @@ +package es.verdnatura.presentation.view.feature.pasillero.model + +class PasillerosItemVO ( + var id: Int = 0, + var iconResource: Int = 0, + val title: String = "", + val titleToShow:Int = 0 +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt new file mode 100644 index 00000000..10f1f066 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt @@ -0,0 +1,109 @@ +package es.verdnatura.presentation.view.feature.presacador.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemArticleRowBinding +import es.verdnatura.databinding.ItemArticleRowPresacadorBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnQuantityClickListener +import es.verdnatura.presentation.common.OnSaleClickListener +import es.verdnatura.presentation.view.feature.collection.adapter.PlacementAdapter +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.presacador.mapper.toSale +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO + +class PreSacadorAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener, + private val onQuantityClick: OnQuantityClickListener, + private val onSaleClickListener: OnSaleClickListener +): RecyclerView.Adapter () { + var context: Context? = null + var position:Int = 0 + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + this.context = parent.context + + return AjustesItemHolder( + ItemArticleRowPresacadorBinding.inflate(LayoutInflater.from(parent.context),parent,false) + + + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + this.position = position + holder.bind(items[position]) + } + + inner class AjustesItemHolder( + val binding: ItemArticleRowPresacadorBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(preSale: PreSacadorItemVO) { + binding.apply { + + val sale : SaleVO = preSale.toSale() + + if (sale.pickedQuantity.isNullOrEmpty()) + sale.pickedQuantity = "0" + + val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) + + itemArticlePlacements.apply { + layoutManager = childLayoutManager + adapter = PlacementAdapter(sale.placements,onPasillerosItemClickListener) + } + + //CLICK EVENTS + contentLayout.setOnClickListener { + onSaleClickListener.onSaleClick(sale) + } + + itemArticleItemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),sale.itemFk) + } + + itemArticleQuantity.setOnClickListener { + onQuantityClick.onQuantityClick(sale) + } + + itemArticleQuantityPicked.setOnClickListener { + onQuantityClick.onQuantityClick(sale) + } + + if (sale.quantity == sale.pickedQuantity){ + sale.isPreviousPrepared = "1" + }else{ + sale.isPreviousPrepared = "0" + } + + //SEMAFORO + if (sale.isPreviousPrepared == "1"){ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_warm_grey)) + } + + + + if (sale.isPreviousPrepared == "1"){ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_black)) + } + + + //ASIGNAMOS VALOR A LA VSITA + this.sale = sale + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt new file mode 100644 index 00000000..e9d81cd1 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt @@ -0,0 +1,886 @@ +package es.verdnatura.presentation.view.feature.presacador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.FragmentPreSacadorBinding +import es.verdnatura.domain.ConstAndValues.PRESACADOR +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.component.CustomDialogThreeButtons +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.presacador.adapter.PreSacadorAdapter +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_pre_sacador.* +import kotlinx.android.synthetic.main.toolbar.* + +class PreSacadorFragment : BaseFragment(PreSacadorViewModel::class) { + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + private var sales:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + private lateinit var customDialogList: CustomDialogList + private var saleAdapter: PreSacadorAdapter? = null + private var ticket:String = "" + private var lm : LinearLayoutManager? = null + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + private var storedPosition: Int = 0 + private var storedBackPosition : Int = 0 + private var storedShelvingPosition:Int = 0 + private var itemShelvingFkStored : String = "" + private var goBack:Boolean = false + private var goBack2:Boolean = false + private var listPlacementSupply:ArrayList = ArrayList() + private var placementSupplyAdapter : BarcodeAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogThreeButtons: CustomDialogThreeButtons + private var token = "" + private var ticketFk = "" + //sergio: se añada para leer el articulo leido que era el buyFk + private var originalItemScan: String = "" + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + token = prefs.getString(TOKEN,"").toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + customDialogList = CustomDialogList(requireContext()) + customDialogInput = CustomDialogInput(requireContext()) + customDialogThreeButtons = CustomDialogThreeButtons(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + splash_progress.visibility = View.GONE + toolbar_title.text = getString(R.string.getticketpre) + setToolBar() + setEvents() + + + super.init() + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + + } + //ESCANER ========= + hideKeyboards() + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + + if (!scan_input.text.toString().isNullOrEmpty()){ + if (scan_input.text.contains("-")){ + //es parking + parkingTicket(scan_input.text.toString()) + }else{ + if (scan_input.text.length > 6){ + //es ticket + ticketFk = scan_input.text.toString() + searchTicket(scan_input.text.toString()) + }else{ + //es sale + findSale(scan_input.text.toString()) + } + } + + + } + scan_input.setText("") + hideKeyboards() + return@setOnEditorActionListener true + } + true + } + + hideKeyboards() + + //LISTA ========= + collection_swipe.setOnRefreshListener { + splash_progress.visibility = View.VISIBLE + searchTicket(ticket) + collection_swipe.isRefreshing = false + } + } + + override fun observeViewModel() { + with(viewModel){ + salesList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + createSaleList(it) + }) + + placementSuppleyList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (!goBack) printShelvingResult(it) + goBack = false + }) + + responseCode.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (!goBack2){ + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setKoButton("Cerrar"){ + scanRequest() + customDialog.dismiss() + }.show() + }else{ + if (checkItemScan(it.response)){ + scanRequest() + customDialogList.dismiss() + mpok?.start() + onQuantityOfShelvingSelected(itemShelvingFkStored) + }else{ + customDialogList.setValueTwo("") + showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response) + if (mperror != null) { + mperror?.start() + } + } + } + } + + goBack2 = false + + }) + } + } + + //CREATE LIST + private fun searchTicket(ticketFk:String){ + Log.i(TAG,"Escaneamos ticket en previa") + ticket = ticketFk + splash_progress.visibility = View.VISIBLE + viewModel.ticketToPrePrepare( + usuario = user, + password = password, + ticketFk = ticketFk, + sectorFk = sectorFk + ) + } + + private fun createSaleList(salesList : List){ + splash_progress.visibility = View.GONE + if (salesList.isNullOrEmpty()){ + customDialog.setTitle("Pre Sacador").setDescription("No hemos podido obtener movimientos para el ticket escaneado").setKoButton("Cancelar"){ + customDialog.dismiss() + }.show() + }else{ + toolbar_title.text = ticket + sales = ArrayList() + salesList.forEach { + sales.add(it) + } + lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + saleAdapter = PreSacadorAdapter(sales,pasillerosItemClickListener!!,object: OnQuantityClickListener{ + override fun onQuantityClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.idMovimiento == sale.saleFk){ + showQuantityDialog(index) + } + } + } + + },object : + OnSaleClickListener { + override fun onSaleClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.idMovimiento == sale.saleFk) { + if (saleVO.quantity != saleVO.picked) { + showScanner(index, saleVO) + } else { + unMarkLine(index) + } + } + } + } + }) + fragment_sacador_collections.adapter = saleAdapter + fragment_sacador_collections.layoutManager = lm + + setTotalLines() + if (storedPosition != 0) + setListPosition(storedPosition) + else if (storedBackPosition != 0) + setListPosition(storedBackPosition) + + setScrollListener(lm!!) + } + } + + private fun setScrollListener(lm: LinearLayoutManager){ + fragment_sacador_collections.addOnScrollListener(object : RecyclerView.OnScrollListener(){ + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + storedBackPosition = lm.findFirstVisibleItemPosition() + super.onScrolled(recyclerView, dx, dy) + } + }) + } + + private fun setTotalLines(){ + var totalMark = 0 + sales.forEach { + if (it.saldo == it.picked) + totalMark += 1 + } + toolbar_title.text = ticket + toolbar_subtitle.text = "" +totalMark + "/" + sales.size + if (totalMark == sales.size) { + "Ticket completo".toast(this.context, Toast.LENGTH_SHORT) + } + + } + + private fun setListPosition(position:Int){ + storedPosition = position + fragment_sacador_collections.addViewObserver { + lm!!.scrollToPositionWithOffset(position,0) + } + } + + //SEARCH AND MARK + private fun findSale(txtscan:String){ + var index = 0 + var isBreak = false + var isOk = false + + for (saleVO in sales) { + if(saleVO.quantity != saleVO.picked){ + //1- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.carros){ + if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ + if (mpok != null) mpok!!.start() + isOk = true + showShelving(index,shelvingIndex) + isBreak = true + break + } + shelvingIndex+=1 + } + if (isBreak) break + } + index += 1 + } + + if (!isOk) { + if (mperror != null) { + mperror!!.start() + } + ("Elemento escaneado no encontrado: "+txtscan).toast(requireContext()) + } + + } + + private fun findSale(txtscan:String,position: Int){ + var index = 0 + var isBreak = false + var isOk = false + + val saleVO = sales[position] + + if(saleVO.quantity != saleVO.picked){ + //1- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.carros){ + if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ + if (mpok != null) mpok!!.start() + isOk = true + showShelving(position,shelvingIndex) + isBreak = true + break + } + shelvingIndex+=1 + } + } + index += 1 + + + if (!isOk) { + if (mperror != null) { + mperror!!.start() + } + ("Elemento escaneado no encontrado: "+txtscan).toast(requireContext()) + } + + } + + private fun markLine(position:Int){ + + saleAdapter!!.notifyDataSetChanged() + setListPosition(position) + saleTrackingReplace(position) + setTotalLines() + } + + private fun saleTrackingReplace(position: Int){ + viewModel.saleTrackingReplace( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", + vOriginalQuantity = sales[position].picked.toString(), + vStateFk = PRESACADOR, + + //sergio: se añade originalItemScan para + vBuyFk = originalItemScan + + ) + + // //Log.i("VERDNATURA","El id movimiento es ${sales[position].idMovimiento}") + // //Log.i("VERDNATURA","Checked is ${if (sales[position].picked == sales[position].quantity) "1" else "0"}") + // //Log.i("VERDNATURA","Position is ${position}") + + + } + + private fun unMarkLine(position: Int){ + + if (sales[position].quantity == sales[position].picked){ + customDialog.setTitle("Desmarcar linea").setDescription("Vas a desmarcar la linea: "+sales[position].itemFk+ " ¿Estás seguro?").setOkButton("Desmarcar"){ + sales[position].picked = 0 + saleAdapter!!.notifyDataSetChanged() + setListPosition(position) + viewModel.saleTrackingDel( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento + ) + setTotalLines() + scanRequest() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + scanRequest() + customDialog.dismiss() + }.show() + } + + + + } + + //SHELVINGS + private fun showShelving(position:Int,shelvingPosition:Int){ + storedShelvingPosition = shelvingPosition + storedPosition = position + splash_progress.visibility = View.VISIBLE + var quantityGet = "0" + try{ + quantityGet = (sales[position].saldo - sales[position].picked).toString() + }catch (e:Exception){} + viewModel.itemPlacementSupplyAiming( + usuario = user, + password = password, + itemFk = sales[position].itemFk, + quantity = quantityGet, + shelvingFk = sales[position].carros[shelvingPosition].shelving + ) + } + + private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO){ + var shelving = "" + var item = "" + var longName = "" + var total = "0" + var itemShelvingFk = "0" + if (!placementSupplyListVO.list.isEmpty()){ + val placement = placementSupplyListVO.list[0] + shelving = placement.shelving + item = placement.itemFk + longName = placement.longName + total = placement.total + itemShelvingFk = placement.itemShelvingFk + } + listPlacementSupply = ArrayList() + placementSupplyListVO.list.forEach { + listPlacementSupply.add(BarcodeVO(code = it.proposal)) + } + + customDialogList.setTitle("$shelving($item) $total del $longName").setOkButton("Coger"){ + + + + if (customDialogList.getValueTwo().isNotEmpty()){ + + + if (checkItemScan(customDialogList.getValueTwo())){ + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + }else{ + itemShelvingFkStored = itemShelvingFk + splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + scanRequest() + hideKeyboards() + }else{ + "Escanea item para validar".toast(requireContext()) + } + + + }.setKoButton("Cerrar"){ + scanRequest() + hideKeyboards() + customDialogList.dismiss() + }.setHintValue("Cantidad que coges:").setValue(total).setHintValueTwo("Escanea item").setValueTwo("").show() + + + customDialogList.getEditTextTwo().post(Runnable { + customDialogList.getEditTextTwo().requestFocusFromTouch() + val lManager: InputMethodManager = + activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + lManager.hideSoftInputFromWindow(customDialogList.getEditTextTwo().windowToken, InputMethodManager.SHOW_FORCED) + }) + + customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + + + originalItemScan=customDialogList.getValueTwo() + //Log.i("VERDNATURA","el item original es $originalItemScan") + + if (customDialogList.getValueTwo().isNotEmpty()){ + if (checkItemScan(customDialogList.getValueTwo())){ + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + }else{ + itemShelvingFkStored = itemShelvingFk + splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + }else{ + "Escanea item para validar".toast(requireContext()) + } + scanRequest() + hideKeyboards() + return@setOnEditorActionListener true + + } + false + } + + placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + placementSupplyListVO.list.forEach { + if (it.proposal == item.code){ + customDialogList.setValue(it.total) + total = it.total + itemShelvingFk = it.itemShelvingFk + } + } + + } + },showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + } + + private fun onQuantityOfShelvingSelected(itemShelvingFk:String){ + //1 - MODIFICAR CANTIDAD DEL CARRO + try { + val shelvingVisible = sales[storedPosition].carros[storedShelvingPosition].stockTotal + + sales[storedPosition].carros[storedShelvingPosition].stockTotal = (shelvingVisible.toInt() - customDialogList.getValue().toInt()).toString() + + viewModel.itemShelvingSaleSupplyAdd( + usuario = user, + password = password, + itemShelvingFk = itemShelvingFk, + saleFk = sales[storedPosition].idMovimiento, + quantity = customDialogList.getValue() + ) + + }catch (e:Exception){} + + //2- MODIFICAR EL PICKED DEL SALE + try{ + sales[storedPosition].picked = sales[storedPosition].picked + customDialogList.getValue().toInt() + }catch (e:Exception){} + + //3- MARCAR LINEA + markLine(storedPosition) + + + } + + private fun checkItemScan(valueToCheck:String):Boolean{ + val saleToCheck = sales[storedPosition] + return saleToCheck.itemFk == valueToCheck + } + + private fun showScanner(index:Int, sale:PreSacadorItemVO){ + + customDialogInput.setTitle(""+sale.itemFk).setDescription("Escanea el carro para el item seleccionado").setOkButton("Aceptar"){ + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + return@setOnEditorActionListener true + } + false + } + + } + + //OPTIONS + private fun print(){ + viewModel.collectionStickerPrint( + usuario = user, + password = password, + collectionFk = ticket, + sectorFk = sectorFk + ) + //Log.i("VERDNATURA","La collection es $ticket, sectorFk $sectorFk, user $user i pass $password") + "Imprimiendo...".toast(requireContext()) + } + + //OTROS + private fun setToolBar(){ + toolbar_subtitle.visibility = View.VISIBLE + + val listIcons:ArrayList = ArrayList() + val iconPrint : Drawable = resources.getDrawable(R.drawable.ic_print_black_24dp,resources.newTheme()) + val iconParking : Drawable = resources.getDrawable(R.drawable.ic_local_parking_black_24dp,resources.newTheme()) + //val iconTransferir : Drawable = resources.getDrawable(R.drawable.ic_swap_horiz_black_24dp,resources.newTheme()) + + listIcons.add(iconPrint) + listIcons.add(iconParking) + //listIcons.add(iconTransferir) + + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconPrint){ + print() + }else if (item == iconParking){ + pasillerosItemClickListener?.onPasillerosItemClickListener(PasillerosItemVO(title = "Parking"),"") + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun scanRequest(){ + if (scan_input != null) { + scan_input.requestFocus() + } + hideKeyboards() + } + + private fun hideKeyboards(){ + requireActivity().hideKeyboard() + } + + private fun parkingTicket(parking:String){ + viewModel.parking( + usuario = user, + password = password, + ticketFk = ticket, + parking = parking + + ) + //Log.i("VERDNATURA","El usuario $user pass $password ticket $ticketFk y parking $parking") + if (mpok != null) mpok!!.start() + "Ticket aparcado".toast(requireContext()) + } + + companion object { + fun newInstance() = PreSacadorFragment() + } + + override fun getLayoutId(): Int = R.layout.fragment_pre_sacador + + override fun onPause() { + goBack = true + goBack2 = true + super.onPause() + } + + private fun showErrorMessage(text:String){ + customDialog.setTitle("Error al marcar la linea").setDescription(text).setKoButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + + //FALTAS / BASURA / SPLIT + private fun showQuantityDialog(position:Int) { + customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)).setValue("") + .setOkButton(getString(R.string.Faltas)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + trash(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setOkButtonTwo(getString(R.string.BasuraRechazar)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + missing(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setOkButtonThree(getString(R.string.Reject)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + reject(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + + }.setOkButtonFour("Split"){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + split(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + + }.setOkButtonAdd(getString(R.string.Agregar)){ + if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()){ + getString(R.string.Indicanuevacantidad).toast(requireContext()) + }else{ + increaseQuantity(position,customDialogThreeButtons.getValue()) + scanRequest() + customDialogThreeButtons.dismiss() + } + }.setKoButton("Cancelar"){ + scanRequest() + customDialogThreeButtons.dismiss() + }.show() + } + + private fun split(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].saldo.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.saleMove( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + quantity = totalQuantity.toString(), + originalQuantity = sales[position].quantity.toString() + ) + //sales[position].originalQuantity = quantity + try{ + sales[position].saldo = quantity.toInt() + }catch (e:Exception){ + sales[position].saldo = 0 + } + //sales[position].startQuantity = quantity + + if (quantity == "0") + markLine(position) + saleAdapter!!.notifyDataSetChanged() + + + //enviar mensaje a salix + val ticket = "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" + val message = "Se ha enviado a Split el articulo "+sales[position].itemFk+" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].trabajador,message = message) + + + } + + private fun trash(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].saldo.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "FALSE", + originalQuantity = quantity + ) + //sales[position].originalQuantity = quantity + try{ + sales[position].saldo = quantity.toInt() + }catch (e:Exception){ + sales[position].saldo = 0 + } + //sales[position].startQuantity = quantity + saleAdapter!!.notifyDataSetChanged() + if (quantity == "0") + markLine(position) + + + //enviar mensaje a salix + val ticket = "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" + val message = "Se ha enviado a Faltas la cantidad de "+ totalQuantity +" del articulo "+sales[position].itemFk+" ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].trabajador,message = message) + } + + private fun missing(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].saldo.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "TRUE", + originalQuantity = quantity + ) + //sales[position].originalQuantity = quantity + try{ + sales[position].saldo = quantity.toInt() + }catch (e:Exception){ + sales[position].saldo = 0 + } + + //sales[position].startQuantity = quantity + + if (quantity == "0") + markLine(position) + saleAdapter!!.notifyDataSetChanged() + + + //enviar mensaje a salix + val ticket = "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" + val message = "Se ha enviado a Basura "+ totalQuantity +" del articulo "+sales[position].itemFk+" ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].trabajador,message = message) + } + + private fun reject(position: Int,quantity:String){ + var totalQuantity: Int = 0 + try { + totalQuantity = sales[position].saldo.toInt() - quantity.toInt() + }catch (e:Exception){} + viewModel.collectionMissingTrash( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + quantity = totalQuantity.toString(), + warehouseFk = warehouseFk, + type = "reject", + originalQuantity = quantity + ) + + //enviar mensaje a salix + val ticket = "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" + val message = "Se ha modificado la cantidad original "+sales[position].saldo+" del artículo "+sales[position].itemFk+" a nueva cantidad: "+ quantity +" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].trabajador,message = message) + + try{ + sales[position].saldo = quantity.toInt() + }catch (e:Exception){ + sales[position].saldo = 0 + } + //sales[position].startQuantity = quantity + saleAdapter!!.notifyDataSetChanged() + if (quantity == "0") + markLine(position) + + + + } + + private fun increaseQuantity(position:Int,quantity:String){ + viewModel.collectionIncreaseQuantity( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento, + quantity = quantity + ) + try { + + //enviar mensaje a salix + val ticket = "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" + val message = "Se ha modificado la cantidad original "+sales[position].saldo+" del artículo "+sales[position].itemFk+" a nueva cantidad: "+ quantity +" del ticket "+ticket + viewModel.sendChekingPresence(token = token,workerId = sales[position].trabajador,message = message) + + try{ + sales[position].saldo = quantity.toInt() + }catch (e:Exception){ + sales[position].saldo = 0 + } + }catch (e:Exception){} + saleAdapter?.notifyDataSetChanged() + + + + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt new file mode 100644 index 00000000..f88ff970 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt @@ -0,0 +1,250 @@ +package es.verdnatura.presentation.view.feature.presacador.fragment + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetLoginUserCase +import es.verdnatura.domain.GetPreSacadorUseCase +import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class PreSacadorViewModel (context: Context): BaseViewModel() { + private val getPreSacadorUseCase: GetPreSacadorUseCase = GetPreSacadorUseCase(context) + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) + + private val _salesList by lazy { MutableLiveData>() } + val salesList: LiveData> + get() = _salesList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _placementSuppleyList by lazy { MutableLiveData() } + val placementSuppleyList: LiveData + get() = _placementSuppleyList + + private val _responseCode by lazy { MutableLiveData() } + val responseCode: LiveData + get() = _responseCode + + private val _responseIncQuantity by lazy { MutableLiveData() } + val responseIncQuantity: LiveData + get() = _responseIncQuantity + + + fun ticketToPrePrepare(usuario:String,password:String,ticketFk:String,sectorFk:String){ + getPreSacadorUseCase.ticketToPrePrepare(usuario,password,ticketFk,sectorFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + _salesList.value = listOf() + } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _salesList.value = response.body()?.let { it } + }else{ + _salesList.value = listOf() + } + } + }) + } + + fun collectionStickerPrint(usuario:String,password:String,collectionFk: String,sectorFk: String){ + getSacadorControladorUserCase.collectionStickerPrint(usuario,password,collectionFk,sectorFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionStickerPrint") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun parking(usuario: String,password: String,ticketFk: String,parking:String){ + getUbicadorUserCase.shelvingPark(usuario,password,ticketFk,parking).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPark") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemPlacementSupplyAiming(usuario:String,password:String,shelvingFk:String,quantity:String,itemFk:String){ + getSacadorControladorUserCase.itemPlacementSupplyAiming(usuario,password,shelvingFk,quantity,itemFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = t.message!!)) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _placementSuppleyList.value = response.body()?.let { PlacementSupplyListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = "Error en la llamada de itemPlacementSupplyAiming")) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + } + }) + } + + fun itemShelvingSaleSupplyAdd(usuario:String,password:String,itemShelvingFk:String,saleFk:String,quantity:String){ + getSacadorControladorUserCase.itemShelvingSaleSupplyAdd(usuario,password,itemShelvingFk,saleFk,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingSaleSupplyAdd") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun saleTrackingReplace(usuario:String,password:String,saleFk:String,vOriginalQuantity:String,vStateFk:String,vIsChecked:String,vBuyFk:String){ + //Lo ultimo que se envia + //sergio: se quita el 0 que habia por defecto para la previa se añada el buyFk que sera el item escaneado. + //getSacadorControladorUserCase.saleTrackingReplace(usuario,password,saleFk,vOriginalQuantity,vStateFk,vIsChecked,"0").enqueue(object : Callback{ + getSacadorControladorUserCase.saleTrackingReplace(usuario,password,saleFk,vOriginalQuantity,vStateFk,vIsChecked,vBuyFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada saleTracking_Replace") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun getIdFromCode(usuario:String,password:String,code: String){ + getSacadorControladorUserCase.getIdFromCode(usuario,password,code).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseCode.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseCode.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada barcodeToItem") + }else{ + _responseCode.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun saleTrackingDel(usuario:String,password:String,saleFk: String){ + getSacadorControladorUserCase.saleTrackingDel(usuario,password,saleFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionMissingTrash") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun saleMove(usuario:String,password:String,saleFk: String,quantity: String,originalQuantity : String){ + getSacadorControladorUserCase.saleMove(usuario,password,saleFk,quantity,originalQuantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada saleMove") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionMissingTrash(usuario:String,password:String,saleFk: String,quantity: String,type:String,warehouseFk:String,originalQuantity: String){ + getSacadorControladorUserCase.collectionMissingTrash(usuario,password,saleFk,quantity,type,warehouseFk,originalQuantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionMissingTrash") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun collectionIncreaseQuantity(usuario:String,password:String,saleFk: String,quantity: String){ + getSacadorControladorUserCase.collectionIncreaseQuantity(usuario,password,saleFk,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseIncQuantity.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseIncQuantity.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada collectionIncreaseQuantity") + }else{ + _responseIncQuantity.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun sendChekingPresence(token:String,workerId:String,message:String){ + try{ + getLoginUserCase.sendChekingPresence(token,workerId.toInt(),message).enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + Log.i("Salix","Mensaje enviado a salix") + } + + override fun onFailure(call: Call, t: Throwable) { + Log.i("Salix Error",""+t.message) + } + }) + }catch (e:Exception){} + + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt new file mode 100644 index 00000000..bd05402d --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt @@ -0,0 +1,48 @@ +package es.verdnatura.presentation.view.feature.presacador.mapper + +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO + +fun PreSacadorItemVO.toSale() : SaleVO { + return SaleVO( + ticketFk = id, + level = "1", + saleFk = idMovimiento, + itemFk = itemFk, + quantity = saldo.toString(), + longName = if (longName != null) longName else "", + isPreviousPrepared = if (quantity == picked) "1" else "0", + line1 = longName, + line2 = if (subName.isNullOrEmpty()) "" else subName, + pickedQuantity = picked.toString(), + workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, + originalQuantity = quantity.toString(), + placements = carros, + agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, + packingType=packingType + + ) +} + + +fun PreSacadorItemVO.toSaleReposicion() : SaleVO { + return SaleVO( + ticketFk = id, + level = "1", + saleFk = idMovimiento, + itemFk = itemFk, + quantity = quantity.toString(), + longName = if (longName != null) longName else "", + isPreviousPrepared = if ((quantity - saldo) == 0) "1" else "0", + line1 = longName, + line2 = if (subName.isNullOrEmpty()) "" else subName, + pickedQuantity = (quantity - saldo).toString(), + workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, + originalQuantity = quantity.toString(), + placements = carros, + agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador + ) +} + + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt new file mode 100644 index 00000000..bcef48aa --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt @@ -0,0 +1,19 @@ +package es.verdnatura.presentation.view.feature.presacador.model + +import es.verdnatura.presentation.view.feature.sacador.model.PlacementVO + +class PreSacadorItemVO ( + var id : String = "", + var itemFk : String = "", + var packingType: String="", + var longName : String = "", + var subName : String = "", + var quantity : Int = 0, + var saldo : Int = 0, + var picked : Int = 45, + var idMovimiento : String = "", + var trabajador : String = "", + var carros : List = listOf() +) + + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt new file mode 100644 index 00000000..70732b56 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt @@ -0,0 +1,100 @@ +package es.verdnatura.presentation.view.feature.reposicion.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemArticleRowBinding +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnSaleClickListener +import es.verdnatura.presentation.view.feature.collection.adapter.PlacementAdapter +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.presacador.mapper.toSaleReposicion +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO + +class ReposicionAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener, + private val onSaleClickListener: OnSaleClickListener +): RecyclerView.Adapter () { + var context: Context? = null + var position:Int = 0 + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + this.context = parent.context + return AjustesItemHolder( + ItemArticleRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + this.position = position + holder.bind(items[position]) + } + + inner class AjustesItemHolder( + val binding: ItemArticleRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(preSale: PreSacadorItemVO) { + binding.apply { + + val sale : SaleVO = preSale.toSaleReposicion() + + + itemRowLayout.visibility = View.GONE + + if (sale.pickedQuantity.isNullOrEmpty()) + sale.pickedQuantity = "0" + + val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) + + itemArticlePlacements.apply { + layoutManager = childLayoutManager + adapter = PlacementAdapter(sale.placements,onPasillerosItemClickListener) + } + + //CLICK EVENTS + contentLayout.setOnClickListener { + onSaleClickListener.onSaleClick(sale) + } + + itemArticleItemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),sale.itemFk) + } + + + if (sale.quantity == sale.pickedQuantity){ + sale.isPreviousPrepared = "1" + }else{ + sale.isPreviousPrepared = "0" + } + + //SEMAFORO + if (sale.isPreviousPrepared == "1"){ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + itemArticleRowSemaforoPre.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_warm_grey)) + } + + + + if (sale.isPreviousPrepared == "1"){ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_dark_sky_blue)) + }else{ + contentLayout.setBackgroundColor(ContextCompat.getColor(context!!, R.color.verdnatura_black)) + } + + + //ASIGNAMOS VALOR A LA VSITA + this.sale = sale + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt new file mode 100644 index 00000000..0bb2a4f1 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt @@ -0,0 +1,592 @@ +package es.verdnatura.presentation.view.feature.reposicion.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.ReposicionFragmentBinding +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogList +import es.verdnatura.presentation.view.component.CustomDialogThreeButtons +import es.verdnatura.presentation.view.feature.articulo.adapter.BarcodeAdapter +import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.reposicion.adapter.ReposicionAdapter +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.reposicion_fragment.* +import kotlinx.android.synthetic.main.toolbar.* + +class ReposicionFragment : BaseFragment( + ReposicionViewModel::class){ + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + + private lateinit var customDialog: CustomDialog + private lateinit var customDialogList: CustomDialogList + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogThreeButtons: CustomDialogThreeButtons + + private var sales:ArrayList = ArrayList() + + private var lm : LinearLayoutManager? = null + private var saleAdapter: ReposicionAdapter? = null + + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + + private var storedBackPosition : Int = 0 + private var storedShelvingPosition:Int = 0 + private var storedPosition: Int = 0 + private var listPlacementSupply:ArrayList = ArrayList() + private var itemShelvingFkStored : String = "" + private var placementSupplyAdapter : BarcodeAdapter? = null + + private var goBack:Boolean = false + private var goBack2:Boolean = false + + companion object { + fun newInstance() = ReposicionFragment() + } + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun getLayoutId(): Int = R.layout.reposicion_fragment + + override fun init() { + customDialog = CustomDialog(requireContext()) + customDialogList = CustomDialogList(requireContext()) + customDialogInput = CustomDialogInput(requireContext()) + customDialogThreeButtons = CustomDialogThreeButtons(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + splash_progress.visibility = View.GONE + toolbar_title.text = getString(R.string.itemPlacementSupplyGetOrder) + setToolBar() + setEvents() + super.init() + } + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + + super.onCreate(savedInstanceState) + } + + override fun onPause() { + goBack = true + goBack2 = true + super.onPause() + } + + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + btn_obtener.setOnClickListener { + splash_progress.visibility = View.VISIBLE + viewModel.itemPlacementSupplyGetOrder(usuario = user,password = password,sectorFk = sectorFk) + } + + btn_cancelar.setOnClickListener { + + customDialog.setTitle("Confirmar").setDescription("¿Estás seguro de cerrar el pedido?").setKoButton("Cerrar"){ + scanRequest() + customDialog.dismiss() + }.setOkButton("Cerrar"){ + splash_progress.visibility = View.VISIBLE + if (sales.count() > 0){ + viewModel.itemPlacementSupplyCloseOrder(usuario = user,password = password,id = sales[0].id,quantity = sales[0].quantity.toString()) + } + customDialog.dismiss() + + }.show() + + + + } + + //ESCANER ========= + hideKeyboards() + scan_input.requestFocus() + scan_input.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!scan_input.text.toString().isNullOrEmpty()){ + + if (sales.count() > 0 && sales[0].saldo == 0){ + "Pedido completado".toast(requireContext()) + }else{ + findSale(scan_input.text.toString()) + } + + + } + scan_input.setText("") + hideKeyboards() + return@setOnEditorActionListener true + } + true + } + + hideKeyboards() + + + //LISTA ========= + collection_swipe.setOnRefreshListener { + splash_progress.visibility = View.VISIBLE + viewModel.itemPlacementSupplyGetOrder(usuario = user,password = password,sectorFk = sectorFk) + collection_swipe.isRefreshing = false + } + + } + + private fun hideKeyboards(){ + requireActivity().hideKeyboard() + } + + override fun observeViewModel() { + with(viewModel){ + salesList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + createSaleList(it) + }) + + placementSuppleyList.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (!goBack) printShelvingResult(it) + goBack = false + }) + + responseCode.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (!goBack2){ + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setKoButton("Cerrar"){ + scanRequest() + customDialog.dismiss() + }.show() + }else{ + if (checkItemScan(it.response)){ + scanRequest() + customDialogList.dismiss() + mpok?.start() + onQuantityOfShelvingSelected(itemShelvingFkStored) + }else{ + customDialogList.setValueTwo("") + showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response) + mperror?.start() + } + } + } + + goBack2 = false + + }) + + responseClose.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + sales.clear() + saleAdapter!!.notifyDataSetChanged() + btn_cancelar.visibility = View.GONE + }) + } + + + super.observeViewModel() + } + + private fun createSaleList(salesList : List){ + splash_progress.visibility = View.GONE + if (salesList.isNullOrEmpty()){ + customDialog.setTitle("Reposición").setDescription("No existen pedidos para reponer").setKoButton("Cancelar"){ + if (sales.count()>0){ + sales.clear() + saleAdapter!!.notifyDataSetChanged() + } + customDialog.dismiss() + }.show() + scan_input.visibility = View.GONE + btn_cancelar.visibility = View.GONE + }else if(salesList.count() > 0 && salesList[0].saldo == 0){ + "Pedido completado".toast(requireContext()) + scan_input.visibility = View.GONE + btn_cancelar.visibility = View.GONE + }else{ + + scan_input.visibility = View.VISIBLE + btn_cancelar.visibility = View.VISIBLE + + sales = ArrayList() + salesList.forEach { + sales.add(it) + } + lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + saleAdapter = ReposicionAdapter(sales,pasillerosItemClickListener!!,object : + OnSaleClickListener { + override fun onSaleClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.idMovimiento == sale.saleFk) { + if (saleVO.quantity != saleVO.picked) { + showScanner(index, saleVO) + } else { + unMarkLine(index) + } + } + } + } + }) + fragment_sacador_collections.adapter = saleAdapter + fragment_sacador_collections.layoutManager = lm + + } + } + + + //SEARCH AND MARK + private fun findSale(txtscan:String){ + var index = 0 + var isBreak = false + var isOk = false + + for (saleVO in sales) { + if(saleVO.quantity != saleVO.picked){ + //1- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.carros){ + if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ + if (mpok!= null) mpok!!.start() + isOk = true + showShelving(index,shelvingIndex) + isBreak = true + break + } + shelvingIndex+=1 + } + if (isBreak) break + } + index += 1 + } + + if (!isOk) { + mperror!!.start() + ("Elemento escaneado no encontrado: "+txtscan).toast(requireContext()) + } + + } + + private fun findSale(txtscan:String,position: Int){ + var index = 0 + var isBreak = false + var isOk = false + + val saleVO = sales[position] + + if(saleVO.quantity != saleVO.picked){ + //1- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.carros){ + if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ + if(mpok != null) mpok!!.start() + isOk = true + showShelving(position,shelvingIndex) + isBreak = true + break + } + shelvingIndex+=1 + } + } + index += 1 + + + if (!isOk) { + mperror!!.start() + ("Elemento escaneado no encontrado: "+txtscan).toast(requireContext()) + } + + } + + //SHELVINGS + private fun showShelving(position:Int,shelvingPosition:Int){ + storedShelvingPosition = shelvingPosition + storedPosition = position + splash_progress.visibility = View.VISIBLE + var quantityGet = "0" + try{ + quantityGet = (sales[position].saldo - sales[position].picked).toString() + }catch (e:Exception){} + viewModel.itemPlacementSupplyAiming( + usuario = user, + password = password, + itemFk = sales[position].itemFk, + quantity = quantityGet, + shelvingFk = sales[position].carros[shelvingPosition].shelving + ) + } + + private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO){ + var shelving = "" + var item = "" + var longName = "" + var total = "0" + var itemShelvingFk = "0" + if (!placementSupplyListVO.list.isEmpty()){ + val placement = placementSupplyListVO.list[0] + shelving = placement.shelving + item = placement.itemFk + longName = placement.longName + total = placement.total + itemShelvingFk = placement.itemShelvingFk + } + listPlacementSupply = ArrayList() + placementSupplyListVO.list.forEach { + listPlacementSupply.add(BarcodeVO(code = it.proposal)) + } + + customDialogList.setTitle("$shelving($item) $total de $longName").setOkButton("Coger"){ + if (customDialogList.getValueTwo().isNotEmpty()){ + if (checkItemScan(customDialogList.getValueTwo())){ + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + }else{ + itemShelvingFkStored = itemShelvingFk + splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + scanRequest() + hideKeyboards() + }else{ + "Escanea item para validar".toast(requireContext()) + } + + + }.setKoButton("Cerrar"){ + scanRequest() + hideKeyboards() + customDialogList.dismiss() + }.setHintValue("Cantidad que coges:").setValue(total).setHintValueTwo("Escanea item").setValueTwo("").show() + + + customDialogList.getEditTextTwo().post(Runnable { + customDialogList.getEditTextTwo().requestFocusFromTouch() + val lManager: InputMethodManager = + activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + lManager.hideSoftInputFromWindow(customDialogList.getEditTextTwo().windowToken, InputMethodManager.SHOW_FORCED) + }) + + customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (customDialogList.getValueTwo().isNotEmpty()){ + if (checkItemScan(customDialogList.getValueTwo())){ + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + }else{ + itemShelvingFkStored = itemShelvingFk + splash_progress.visibility = View.VISIBLE + viewModel.getIdFromCode( + usuario = user, + password = password, + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + }else{ + "Escanea item para validar".toast(requireContext()) + } + scanRequest() + hideKeyboards() + return@setOnEditorActionListener true + + } + false + } + + placementSupplyAdapter = BarcodeAdapter(listPlacementSupply,object: OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + placementSupplyListVO.list.forEach { + if (it.proposal == item.code){ + customDialogList.setValue(it.total) + total = it.total + itemShelvingFk = it.itemShelvingFk + } + } + + } + },showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + } + + private fun onQuantityOfShelvingSelected(itemShelvingFk:String){ + //1 - MODIFICAR CANTIDAD DEL CARRO + try { + val shelvingVisible = sales[storedPosition].carros[storedShelvingPosition].stockTotal + + sales[storedPosition].carros[storedShelvingPosition].stockTotal = (shelvingVisible.toInt() - customDialogList.getValue().toInt()).toString() + + viewModel.itemShelvingPlacementSupplyAdd( + usuario = user, + password = password, + itemShelvingFk = itemShelvingFk, + itemPlacementSupplyFk = sales[storedPosition].id, + quantity = customDialogList.getValue() + ) + + }catch (e:Exception){} + + //2- MODIFICAR EL PICKED DEL SALE + try{ + sales[storedPosition].saldo = sales[storedPosition].saldo - customDialogList.getValue().toInt() + }catch (e:Exception){} + + //3- MARCAR LINEA + markLine(storedPosition) + + + } + + + //OTROS + private fun setToolBar(){ + toolbar_subtitle.visibility = View.VISIBLE + + val listIcons:ArrayList = ArrayList() + val iconPrint : Drawable = resources.getDrawable(R.drawable.ic_print_black_24dp,resources.newTheme()) + val iconParking : Drawable = resources.getDrawable(R.drawable.ic_local_parking_black_24dp,resources.newTheme()) + //val iconTransferir : Drawable = resources.getDrawable(R.drawable.ic_swap_horiz_black_24dp,resources.newTheme()) + + //listIcons.add(iconPrint) + listIcons.add(iconParking) + //listIcons.add(iconTransferir) + + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconPrint){ + + }else if (item == iconParking){ + pasillerosItemClickListener?.onPasillerosItemClickListener(PasillerosItemVO(title = "Parking"),"") + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + + private fun scanRequest(){ + scan_input.requestFocus() + hideKeyboards() + } + + private fun checkItemScan(valueToCheck:String):Boolean{ + val saleToCheck = sales[storedPosition] + return saleToCheck.itemFk == valueToCheck + } + + private fun showErrorMessage(text:String){ + customDialog.setTitle("Error al marcar la linea").setDescription(text).setKoButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + + private fun showScanner(index:Int, sale:PreSacadorItemVO){ + ////Log.i("VERDNATURA","CUSTOMDIALOG para enviar") + customDialogInput.setTitle(""+sale.itemFk).setDescription("Escanea el carro para el item seleccionado").setOkButton("Aceptar"){ + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(),index) + } + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + return@setOnEditorActionListener true + } + false + } + + } + + + private fun unMarkLine(position: Int){ + + if (sales[position].quantity == sales[position].picked){ + customDialog.setTitle("Desmarcar linea").setDescription("Vas a desmarcar la linea: "+sales[position].itemFk+ " ¿Estás seguro?").setOkButton("Desmarcar"){ + sales[position].picked = 0 + saleAdapter!!.notifyDataSetChanged() + + /*viewModel.saleTrackingDel( + usuario = user, + password = password, + saleFk = sales[position].idMovimiento + )*/ + scanRequest() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + scanRequest() + customDialog.dismiss() + }.show() + } + + + + } + + private fun markLine(position:Int){ + saleAdapter!!.notifyDataSetChanged() + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt new file mode 100644 index 00000000..e1aea6d2 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt @@ -0,0 +1,150 @@ +package es.verdnatura.presentation.view.feature.reposicion.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetPreSacadorUseCase +import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ReposicionViewModel(context: Context) : BaseViewModel() { + private val getPreSacadorUseCase: GetPreSacadorUseCase = GetPreSacadorUseCase(context) + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) + + private val _salesList by lazy { MutableLiveData>() } + val salesList: LiveData> + get() = _salesList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _responseClose by lazy { MutableLiveData() } + val responseClose: LiveData + get() = _responseClose + + private val _placementSuppleyList by lazy { MutableLiveData() } + val placementSuppleyList: LiveData + get() = _placementSuppleyList + + private val _responseCode by lazy { MutableLiveData() } + val responseCode: LiveData + get() = _responseCode + + fun itemPlacementSupplyGetOrder(usuario:String,password:String,sectorFk:String){ + getPreSacadorUseCase.itemPlacementSupplyGetOrder(usuario,password,sectorFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + _salesList.value = listOf() + } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _salesList.value = response.body()?.let { it } + }else{ + _salesList.value = listOf() + } + } + }) + } + + fun parking(usuario: String,password: String,ticketFk: String,parking:String){ + getUbicadorUserCase.shelvingPark(usuario,password,ticketFk,parking).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPark") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemPlacementSupplyAiming(usuario:String,password:String,shelvingFk:String,quantity:String,itemFk:String){ + getSacadorControladorUserCase.itemPlacementSupplyAiming(usuario,password,shelvingFk,quantity,itemFk).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = t.message!!)) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _placementSuppleyList.value = response.body()?.let { PlacementSupplyListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(PlacementSupplyVO(isError = true,errorMessage = "Error en la llamada de itemPlacementSupplyAiming")) + _placementSuppleyList.value = PlacementSupplyListVO(listError) + } + } + }) + } + + fun getIdFromCode(usuario:String,password:String,code: String){ + getSacadorControladorUserCase.getIdFromCode(usuario,password,code).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseCode.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseCode.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada barcodeToItem") + }else{ + _responseCode.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + + fun itemShelvingPlacementSupplyAdd(usuario:String,password:String,itemShelvingFk:String,itemPlacementSupplyFk:String,quantity:String){ + getSacadorControladorUserCase.itemShelvingPlacementSupplyAdd(usuario,password,itemShelvingFk,itemPlacementSupplyFk,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingPlacementSupplyAdd") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemPlacementSupplyCloseOrder(usuario:String,password:String,id:String,quantity:String){ + getPreSacadorUseCase.itemPlacementSupplyCloseOrder(usuario,password,id,quantity).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseClose.value = ResponseItemVO(isError = true,errorMessage = ""+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseClose.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemPlacementSupplyCloseOrder") + }else{ + _responseClose.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/adapter/CollectionAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/adapter/CollectionAdapter.kt new file mode 100644 index 00000000..00789d8f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/adapter/CollectionAdapter.kt @@ -0,0 +1,44 @@ +package es.verdnatura.presentation.view.feature.sacador.adapter + +import android.util.Log +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemCollectionRowBinding +import es.verdnatura.domain.ConstAndValues.SACADOR +import es.verdnatura.presentation.common.OnCollectionSelectedListener +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO + +class CollectionAdapter ( + private val items: List, + private val onCollectionSelected: OnCollectionSelectedListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { + return AjustesItemHolder( + ItemCollectionRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: AjustesItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onCollectionSelected.onCollectionSelected(items[position],SACADOR) + ////Log.i("VERDNATURA","2-Click item ${items[position].collectionFk}") + } + } + + + class AjustesItemHolder( + val binding: ItemCollectionRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + fun bind(item: CollectionVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt new file mode 100644 index 00000000..6497e1a3 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -0,0 +1,182 @@ +package es.verdnatura.presentation.view.feature.sacador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.util.Log +import android.view.View +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentSacadorBinding +import es.verdnatura.domain.ConstAndValues.SACADOR +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnCollectionSelectedListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapter +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import kotlinx.android.synthetic.main.fragment_sacador.* +import kotlinx.android.synthetic.main.toolbar.* + +class SacadorFragment : BaseFragment(SacadorViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var onCollectionSelectedListener : OnCollectionSelectedListener? = null + private var goBack:Boolean = false + private var goBack2:Boolean = false + private lateinit var customDialog: CustomDialog + private var collectionsList:ArrayList = ArrayList() + private var adapter: CollectionAdapter? = null + private var carros="" + + + companion object { + fun newInstance() = SacadorFragment() + } + + override fun onAttach(context: Context) { + super.onAttach(context) + if (context is OnCollectionSelectedListener) onCollectionSelectedListener = context + } + + override fun getLayoutId(): Int = R.layout.fragment_sacador + + override fun onCreate(savedInstanceState: Bundle?) { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + //sergio: asignamos carros por defecto 2 + carros= prefs!!.getString(CARRO,"2").toString() + + super.onCreate(savedInstanceState) + } + + override fun init() { + customDialog = CustomDialog(requireContext()) + splash_progress.visibility = View.VISIBLE + splash_progress_two.visibility = View.GONE + //el texto de la toolbar + toolbar_title.text =getString(R.string.getcollection) + setToolBar() + setEvents() + viewModel.collectionGet(user,password) + + + super.init() + } + + override fun onPause() { + goBack = true + goBack2 = true + super.onPause() + } + + private fun setToolBar(){ + backButton.visibility = View.GONE + val listIcons:ArrayList = ArrayList() + val iconAdd : Drawable = resources.getDrawable(R.drawable.ic_add_black_24dp,resources.newTheme()) + listIcons.add(iconAdd) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if(item == iconAdd){ + ////Log.i("VERDNATURA","pulsando el +") + + splash_progress_two.visibility = View.VISIBLE + viewModel.collectionNew(user,password,sectorFk,carros) + } + } + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + sacador_swipe.setOnRefreshListener { + splash_progress.visibility = View.VISIBLE + + viewModel.collectionGet(user,password) + Log.i("VERDNATURA","CollectionGet desde SacadorFragment SETEVENTS del swipe") + //sergio: para mostrar que si se refresca o no + sacador_swipe.isRefreshing = false + } + } + + override fun observeViewModel() { + with(viewModel){ + collectionList.observe(viewLifecycleOwner, Observer { + if (!goBack2)splash_progress.visibility = View.GONE + createCollectionList(it.list) + goBack2 = false + }) + /* collectionTicketList.observe(viewLifecycleOwner, Observer { + splash_progress_two.visibility = View.GONE + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Aceptar"){ + customDialog.dismiss() + }.show() + }else{ + if (!goBack)navigateToCollectionList(it) + } + goBack = false + })*/ + response.observe(viewLifecycleOwner, Observer { + splash_progress_two.visibility = View.GONE + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Aceptar"){ + customDialog.dismiss() + }.show() + }else{ + if (!goBack)addCollectionToList(it.response) + } + goBack = false + }) + } + } + + private fun createCollectionList(collections:List){ + collectionsList = ArrayList() + collections.forEach { + collectionsList.add(it) + } + val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + adapter = CollectionAdapter(collectionsList,onCollectionSelectedListener!!) + ////Log.i("VERDNATURA","3-New fragment") + fragment_sacador_collections.layoutManager = lm + fragment_sacador_collections.adapter = adapter + + } + + + private fun addCollectionToList(collection:String){ + var isNew = true + collectionsList.forEach { + if (it.collectionFk == collection){ + isNew = false + } + } + if (isNew){ + collectionsList.add(CollectionVO(collectionFk = collection,created = "Nuevo")) + adapter?.notifyDataSetChanged() + }else{ + customDialog.setTitle("Atención").setDescription("La colección "+collection+" sigue pendiente de preparar").setOkButton("Aceptar"){ + customDialog.dismiss() + }.show() + } + } + + private fun navigateToCollectionList(collection:CollectionVO){ + collectionsList.add(collection) + adapter?.notifyDataSetChanged() + + onCollectionSelectedListener?.onCollectionSelected(collection, SACADOR) + } + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt new file mode 100644 index 00000000..bb2ff198 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt @@ -0,0 +1,151 @@ +package es.verdnatura.presentation.view.feature.sacador.fragment + + +import android.content.Context +import android.util.Log +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.collection.mapper.map +import es.verdnatura.presentation.view.feature.sacador.mapper.toDateFormat +import es.verdnatura.presentation.view.feature.sacador.model.CollectionListVO +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import org.json.JSONObject +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class SacadorViewModel(context: Context) : BaseViewModel() { + + val emptyMessage = "No tienes colecciones pendientes. Presiona sobre el + para crear colección"; + + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase( + context + ) + + private val _collectionList by lazy { MutableLiveData() } + val collectionList: LiveData + get() = _collectionList + + private val _collectionTicketList by lazy { MutableLiveData() } + val collectionTicketList: LiveData + get() = _collectionTicketList + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + + fun collectionTicketGet( + usuario: String, + password: String, + collectionFk: String, + sectorFk: String, + print: String + ){ + getSacadorControladorUserCase.collectionTicketGet( + usuario, + password, + collectionFk, + sectorFk, + print + ).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _collectionTicketList.value = CollectionVO( + isError = true, + errorMessage = t.message!! + ) + } + + override fun onResponse( + call: Call, + response: Response + ) { + if (response.body() != null) { + _collectionTicketList.value = response.body()?.let { it.map() } + } else { + _collectionTicketList.value = CollectionVO( + isError = true, + errorMessage = "No hay tickets para sacar" + ) + } + } + }) + } + // fun collectionNew(usuario:String,password:String,sectorFk:String){ + // getSacadorControladorUserCase.collectionNew(usuario,password,sectorFk).enqueue(object : + fun collectionNew(usuario: String, password: String, sectorFk: String, carros: String){ + ////Log.i("VERDNATURA", "El sector para CollectionNew es $sectorFk y los carros son $carros") + + getSacadorControladorUserCase.collectionNew(usuario, password, sectorFk, carros).enqueue( + object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = + ResponseItemVO(isError = true, errorMessage = "" + t.message!!) + ////Log.i("VERDNATURA",t.message.toString()) + + } + + override fun onResponse( + call: Call, + response: Response + ) { + if (response.body() != null) { + _response.value = + ResponseItemVO(isError = false, response = response.body()!!) + } else { + val error=response.message() + ////Log.i("VERDNATURA",""+ error) + _response.value = ResponseItemVO( + isError = true, + // errorMessage = "Error en la llamada collectionNew" + errorMessage = "No hay tickets para sacar" + ) + + } + } + }) + } + + + + + fun collectionGet(usuario: String, password: String){ + ////Log.i("VERDNATURA","collectionGet para coger tickets") + getSacadorControladorUserCase.collectionGet(usuario, password).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add(CollectionVO(isError = true, errorMessage = t.message!!)) + _collectionList.value = CollectionListVO(listError) + } + + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null) { + _collectionList.value = + response.body()?.let { CollectionListVO(it.toDateFormat()) } + } else { + val listError: ArrayList = ArrayList() + listError.add( + CollectionVO( + isError = true, + errorMessage = "Error en la llamada de collection_get" + ) + ) + _collectionList.value = CollectionListVO(listError) + + } + } + + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt new file mode 100644 index 00000000..609a6a64 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt @@ -0,0 +1,27 @@ +package es.verdnatura.presentation.view.feature.sacador.mapper + +import es.verdnatura.presentation.common.convertToDateString +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import java.text.SimpleDateFormat +import java.util.* +import kotlin.collections.ArrayList + +fun List.toDateFormat(): ArrayList { + val collections : ArrayList = ArrayList() + this.forEach { + collections.add(CollectionVO( + collectionFk = it.collectionFk, + created = getCalendarFromDate(it.created).convertToDateString() + )) + + } + return collections +} + + +private fun getCalendarFromDate(date:String): Calendar { + val sdf = SimpleDateFormat("yyyy-MM-dd") + val cal = Calendar.getInstance() + cal.setTime(sdf.parse(date)) + return cal +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt new file mode 100644 index 00000000..64dfd428 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt @@ -0,0 +1,104 @@ +package es.verdnatura.presentation.view.feature.sacador.model + +class CollectionListVO( + var list: List = listOf() +) + +class CollectionVO( + var collectionFk : String = "", + var created : String = "", + var tickets : List = listOf(), + var isError : Boolean = false, + var errorMessage : String = "" +) + +class TicketVO( + var ticketFk : String = "", + var level : String = "", + var agencyName : String = "", + var salesPersonFk : String = "", + var sales : List = listOf(), + var observations: String = "" +) +class SaleVO( + var ticketFk : String = "", + var level : String = "", + var agencyName : String = "", + var saleOrder : Int = 9999, + var saleFk : String = "", + var itemFk : String = "", + var quantity : String = "", + var longName : String = "", + var size : String = "", + var reserved : String = "", + var isPreviousPrepared : String = "", + var isPrepared : String = "", + var isControlled : String = "", + var color : String = "", + var productor : String = "", + var discount : String = "", + var price : String = "", + var stems : String = "", + var category : String = "", + var origin : String = "", + var clientFk : String = "", + var originalQuantity : String = "", + var line1 : String = "", + var line2 : String = "", + var line3 : String = "", + var isAdded : String = "", + var pickedQuantity : String = "", + var workerFk : String = "", + var placements : List = listOf(), + var Barcodes : List = listOf(), + var isNew : Boolean = false, + var salePersonFk : String = "", + var packingType:String ="" +) + +class PlacementVO( + var saleFk : String = "", + var itemFk : String = "", + var placement : String = "", + var parking : String = "", + var stockTotal : String = "", + var shelving : String = "", + var created : String = "", + var visible : String = "", + var order : String = "", + var grouping : String = "", + var priority : String = "", + var saleOrder : String = "", + var isPreviousPrepared : String = "", + var itemShelvingSaleFk : String = "", + var ticketFk : String = "", + var id : String = "" +) + +class PlacementSupplyVO( + var itemFk : String = "", + var longName : String = "", + var size : String = "", + var subName : String = "", + var itemShelvingFk : String = "", + var shelving : String = "", + var stock : String = "", + var total : String = "", + var proposal : String = "", + var isError: Boolean = false, + var errorMessage: String = "" +) + +class PlacementSupplyListVO ( + var list: List = listOf() +) + +class MistakeTypeVO ( + var id : String = "", + var description : String = "" +) + +class MistakeTypeListVO ( + var list: List = listOf() +) + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/adapter/ShelvingParkingAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/adapter/ShelvingParkingAdapter.kt new file mode 100644 index 00000000..f9eee3b9 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/adapter/ShelvingParkingAdapter.kt @@ -0,0 +1,37 @@ +package es.verdnatura.presentation.view.feature.shelvingparking.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemShelvingparkingRowBinding +import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO + +class ShelvingParkingAdapter ( + private val items: List +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemShelvingparkingRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemShelvingparkingRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemShelvingParkingVO) { + binding.apply { + this.item = item + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingFragment.kt new file mode 100644 index 00000000..5e0a2ae3 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingFragment.kt @@ -0,0 +1,113 @@ +package es.verdnatura.presentation.view.feature.shelvingparking.fragment + + +import android.content.SharedPreferences +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentShelvingParkingBinding +import es.verdnatura.domain.notNull +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.shelvingparking.adapter.ShelvingParkingAdapter +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_shelving_parking.* +import kotlinx.android.synthetic.main.toolbar.* + +class ShelvingParkingFragment : BaseFragment( + ShelvingParkingViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : ShelvingParkingAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private var listInvetory:ArrayList = ArrayList() + private var listInvetoryAux:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + + + companion object { + fun newInstance() = ShelvingParkingFragment() + } + + override fun getLayoutId(): Int = R.layout.fragment_shelving_parking + + + override fun init() { + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + + toolbar_title.text = getString(R.string.shelvingParking_get) + setEvents() + super.init() + } + + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + shelvingText.requestFocus() + shelvingText.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!shelvingText.text.toString().isNullOrEmpty()){ + toolbar_title.text = shelvingText.text.toString() + splash_progress.visibility = View.VISIBLE + viewModel.shelvingParking_get(user,password,shelvingText.text.toString(),warehouseFk,dayrange.text.toString()) + } + + shelvingText.setText("") + (activity as MainActivity).hideKeyboard(shelvingText) + return@setOnEditorActionListener true + } + + return@setOnEditorActionListener false + } + + dayrange.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!shelvingText.text.toString().isNullOrEmpty()) + splash_progress.visibility = View.VISIBLE + else + shelvingText.requestFocus() + + toolbar_title.text = shelvingText.text.toString() + viewModel.shelvingParking_get(user,password,shelvingText.text.toString(),warehouseFk,dayrange.text.toString()) + shelvingText.setText("") + (activity as MainActivity).hideKeyboard(dayrange) + return@setOnEditorActionListener true + } + + return@setOnEditorActionListener false + } + } + + override fun observeViewModel() { + with(viewModel){ + loadShelvingList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE + adapter = ShelvingParkingAdapter(it.list) + location_recyclerview.adapter = adapter + location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + + } + }) + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt new file mode 100644 index 00000000..a0275501 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt @@ -0,0 +1,59 @@ +package es.verdnatura.presentation.view.feature.shelvingparking.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetShelvingParkingUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingListVO +import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ShelvingParkingViewModel(context: Context) : BaseViewModel() { + + + private val getShelvingParkingUserCase: GetShelvingParkingUserCase = GetShelvingParkingUserCase(context) + + + + private val _shelvingList by lazy { MutableLiveData() } + val shelvingList: LiveData + get() = _shelvingList + + + val loadShelvingList = Transformations.map(_shelvingList) { Event(it) } + + + fun shelvingParking_get(usuario:String,password:String,vShelvingFk:String,vWarehouseFk:String,vDayRange:String){ + getShelvingParkingUserCase.shelvingParking_get(usuario,password,vShelvingFk.toUpperCase(),vWarehouseFk,vDayRange).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemShelvingParkingVO(isError = true,errorMessage = t.message!!)) + _shelvingList.value = ItemShelvingParkingListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _shelvingList.value = response.body()?.let { ItemShelvingParkingListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemShelvingParkingVO(isError = true,errorMessage = "Error en la llamada de shelvingParking_get")) + _shelvingList.value = ItemShelvingParkingListVO(listError) + } + } + + }) + } + + + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/model/ItemShelvingParkingVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/model/ItemShelvingParkingVO.kt new file mode 100644 index 00000000..d80bdc44 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/model/ItemShelvingParkingVO.kt @@ -0,0 +1,14 @@ +package es.verdnatura.presentation.view.feature.shelvingparking.model + +class ItemShelvingParkingVO ( + var itemFk:String = "0", + var concept:String = "", + var sinServir:String = "0", + var aparcado:String = "0", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class ItemShelvingParkingListVO( + var list:List = listOf() +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaFragment.kt new file mode 100644 index 00000000..96383ab5 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaFragment.kt @@ -0,0 +1,16 @@ +package es.verdnatura.presentation.view.feature.transferencia.fragment + +import es.verdnatura.R +import es.verdnatura.databinding.FragmentTransferenciaBinding +import es.verdnatura.presentation.base.BaseFragment + +class TransferenciaFragment : BaseFragment(TransferenciaViewModel::class) { + + companion object { + fun newInstance() = TransferenciaFragment() + } + + override fun getLayoutId(): Int = R.layout.fragment_transferencia + + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt new file mode 100644 index 00000000..1ffc688a --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt @@ -0,0 +1,36 @@ +package es.verdnatura.presentation.view.feature.transferencia.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class TransferenciaViewModel(context: Context) : BaseViewModel() { + + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + fun itemShelvingTransfer(usuario:String,password:String,itemFk:String,shelvingFk:String){ + getUbicadorUserCase.itemShelvingTransfer(usuario,password,itemFk,shelvingFk).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+itemFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingTransfer") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt new file mode 100644 index 00000000..cd4d63ec --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt @@ -0,0 +1,41 @@ +package es.verdnatura.presentation.view.feature.ubicador.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.databinding.ItemEscanerRowBinding +import es.verdnatura.presentation.common.OnAutomaticItemClickListener +import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO + +class AutomaticAdapter ( + private val items: List, + private val onAutomaticItemClickListener: OnAutomaticItemClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemEscanerRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + holder.binding.root.setOnClickListener { + onAutomaticItemClickListener.onAutomaticItemClickListener(position) + } + } + + inner class ItemHolder( + val binding: ItemEscanerRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemEscanerVO) { + binding.apply { + this.item = item + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt new file mode 100644 index 00000000..1590de0f --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt @@ -0,0 +1,68 @@ +package es.verdnatura.presentation.view.feature.ubicador.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import es.verdnatura.R +import es.verdnatura.databinding.ItemUbicationRowBinding +import es.verdnatura.presentation.common.OnMoreClickListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnVisibleClickListener +import es.verdnatura.presentation.common.loadUrl +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO + +class UbicadorAdapter ( + private val items: List, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener, + private val onVisibleClickListener: OnVisibleClickListener, + private val onMoreClickListener: OnMoreClickListener +): RecyclerView.Adapter () { + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { + return ItemHolder( + ItemUbicationRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ) + } + + override fun getItemCount() =items.size + + override fun onBindViewHolder(holder: ItemHolder, position: Int) { + holder.bind(items[position]) + } + + inner class ItemHolder( + val binding: ItemUbicationRowBinding + ) : RecyclerView.ViewHolder(binding.root){ + private val res = binding.root.context.resources + fun bind(item: ItemUbicadorVO) { + binding.apply { + this.item = item + multiText.text = item.stickers+"x"+item.packing + imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/"+item.item); + imgItem.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.item) + } + + layerVisible.setOnClickListener { + onVisibleClickListener.onVisibleClickListener(item) + } + + if (item.visible == "0"){ + visibleText.setTextColor(res.getColor(R.color.verdnatura_brown_grey)) + }else{ + visibleText.setTextColor(res.getColor(R.color.verdnatura_pumpkin_orange)) + } + + moreImg.setOnClickListener { + onMoreClickListener.onMoreClickListener(item) + } + namelayout.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.item) + } + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt new file mode 100644 index 00000000..3926d8c9 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt @@ -0,0 +1,134 @@ +package es.verdnatura.presentation.view.feature.ubicador.fragment + +import android.content.SharedPreferences +import android.view.View +import android.view.inputmethod.EditorInfo +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentAutomaticAddItemBinding +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnAutomaticItemClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogUbicador +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter +import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_automatic_add_item.* +import kotlinx.android.synthetic.main.toolbar.* + +class AutomaticAddItemFragment( + var shelvingFk : String = "" +) : BaseFragment(AutomaticAddItemViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : AutomaticAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogUbicador : CustomDialogUbicador + private var listItems:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + private var deep:Int = 1 + private var contador = 0 + + companion object { + fun newInstance(entryPoint:String) = AutomaticAddItemFragment(entryPoint) + } + + override fun getLayoutId(): Int = R.layout.fragment_automatic_add_item + + override fun init() { + + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + customDialogUbicador = CustomDialogUbicador(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = "itemShelvingMake" + setEvents() + setViews() + setToolBar() + super.init() + } + + private fun setToolBar(){ + toolbar_subtitle.visibility = View.VISIBLE + } + + private fun setSubtitle(){ + toolbar_subtitle.text = "Etiquetas: "+contador + } + + private fun setViews(){ + adapter = AutomaticAdapter(listItems,object: OnAutomaticItemClickListener{ + override fun onAutomaticItemClickListener(position: Int) { + contador -= 1 + setSubtitle() + if (listItems.size > position){ + listItems.removeAt(position) + } + + adapter!!.notifyDataSetChanged() + } + }) + items_recyclerview.adapter = adapter + items_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + } + + private fun setEvents(){ + edit_matricula.requestFocus() + edit_matricula.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_matricula.text.toString().isNullOrEmpty()){ + contador += 1 + setSubtitle() + listItems.add(0,ItemEscanerVO(edit_matricula.text.toString())) + adapter!!.notifyDataSetChanged() + } + edit_matricula.setText("") + (activity as MainActivity).hideKeyboard(edit_matricula) + return@setOnEditorActionListener true + } + + return@setOnEditorActionListener false + } + + button_finalizar.setOnClickListener { + val listString:ArrayList = ArrayList() + listItems.forEach { + listString.add(it.item) + } + listItems = ArrayList() + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingMake_multi(user,password,shelvingFk,listString,deep.toString(),warehouseFk,"1") + } + + backButton.setOnClickListener { + activity!!.onBackPressed() + } + } + + override fun observeViewModel() { + with(viewModel){ + response.observe(viewLifecycleOwner, Observer { + splash_progress.visibility = View.GONE + if (it.isError){ + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + }else{ + activity!!.onBackPressed() + } + }) + } + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt new file mode 100644 index 00000000..06455888 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt @@ -0,0 +1,40 @@ +package es.verdnatura.presentation.view.feature.ubicador.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.ResponseItemVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class AutomaticAddItemViewModel (context: Context): BaseViewModel() { + + + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + + fun itemShelvingMake_multi(usuario:String,password:String,shelving:String,items:List,deep:String,warehouse:String,level:String){ + getUbicadorUserCase.itemShelvingMake_multi(usuario,password,shelving,items,deep,warehouse,level).enqueue(object : + Callback { + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar items. Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingMake multiple") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt new file mode 100644 index 00000000..9165d379 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt @@ -0,0 +1,474 @@ +package es.verdnatura.presentation.view.feature.ubicador.fragment + +import android.content.Context +import android.content.SharedPreferences +import android.graphics.drawable.Drawable +import android.media.MediaPlayer +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import es.verdnatura.R +import es.verdnatura.databinding.FragmentUbicadorBinding +import es.verdnatura.domain.notNull +import es.verdnatura.domain.toast +import es.verdnatura.presentation.base.BaseFragment +import es.verdnatura.presentation.common.OnMoreClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnVisibleClickListener +import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput +import es.verdnatura.presentation.view.component.CustomDialogTwoButtons +import es.verdnatura.presentation.view.component.CustomDialogUbicador +import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter +import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO +import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapter +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_ubicador.* +import kotlinx.android.synthetic.main.toolbar.* + +class UbicadorFragment( + var shelvingFk:String = "" +) : BaseFragment( + UbicadorViewModel::class) { + + private var user = "" + private var password = "" + private var sectorFk = "" + private var warehouseFk = "" + private var adapter : UbicadorAdapter? = null + private lateinit var customDialogInput: CustomDialogInput + private lateinit var customDialogUbicador : CustomDialogUbicador + private lateinit var customDialogTwoButtons:CustomDialogTwoButtons + private var listItems:ArrayList = ArrayList() + private lateinit var customDialog: CustomDialog + private var deep:Int = 1 + private var parking: String = "" + private var etiquetas:String = "0" + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + + + companion object { + fun newInstance(entryPoint:String) = UbicadorFragment(entryPoint) + } + + override fun getLayoutId(): Int = R.layout.fragment_ubicador + + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + + override fun init() { + + val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) + user = prefs.getString(USER,"").toString() + password = prefs.getString(PASSWORD,"").toString() + sectorFk = prefs.getInt(SECTORFK,1).toString() + warehouseFk = prefs.getInt(WAREHOUSEFK,1).toString() + customDialogInput = CustomDialogInput(requireContext()) + customDialog = CustomDialog(requireContext()) + customDialogUbicador = CustomDialogUbicador(requireContext()) + customDialogTwoButtons = CustomDialogTwoButtons(requireContext()) + activity!!.main_bottom_navigation.visibility = View.GONE + toolbar_title.text = getString(R.string.locator) + setEvents() + setToolBar() + if (!shelvingFk.isNullOrEmpty()){ + splash_progress.visibility = View.VISIBLE + toolbar_title.text = shelvingFk + viewModel.itemShelvingList(user,password,shelvingFk) + } + super.init() + } + + override fun onCreate(savedInstanceState: Bundle?) { + mperror = MediaPlayer.create((activity as MainActivity),R.raw.error) + mpok = MediaPlayer.create((activity as MainActivity),R.raw.ok) + super.onCreate(savedInstanceState) + } + + private fun setToolBar(){ + val listIcons:ArrayList = ArrayList() + val iconAdd : Drawable = resources.getDrawable(R.drawable.ic_add_black_24dp,resources.newTheme()) + val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) + listIcons.add(iconAdd) + listIcons.add(iconReload) + toolbar_icons.adapter = ToolBarAdapter(listIcons,object: OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + if (item == iconAdd){ + showAddItem("","","","",false,ItemUbicadorVO()) + }else if(item == iconReload){ + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingList(user,password,shelvingFk) + } + } + + }) + toolbar_icons.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + } + + private fun setEvents(){ + backButton.setOnClickListener { + activity!!.onBackPressed() + } + + edit_matricula.requestFocus() + edit_matricula.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_matricula.text.toString().isNullOrEmpty()){ + toolbar_title.text = edit_matricula.text.toString() + shelvingFk = edit_matricula.text.toString() + splash_progress.visibility = View.VISIBLE + viewModel.itemShelvingList(user,password,edit_matricula.text.toString()) + } + + edit_matricula.setText("") + (activity as MainActivity).hideKeyboard(edit_matricula) + return@setOnEditorActionListener true + } + + return@setOnEditorActionListener false + } + + edit_prioridad.setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!edit_prioridad.text.toString().isNullOrEmpty()){ + viewModel.shelvingPriorityUpdate(user,password,edit_prioridad.text.toString(),shelvingFk) + } + + (activity as MainActivity).hideKeyboard(edit_prioridad) + return@setOnEditorActionListener true + } + + return@setOnEditorActionListener false + } + + + automatic_img.setOnClickListener { + if (!shelvingFk.isNullOrEmpty()) + (activity as MainActivity).onPasillerosItemClickListener(PasillerosItemVO(title = "Automatic"),entryPoint = shelvingFk) + else + "Escanea una matrícula".toast(activity!!,Toast.LENGTH_SHORT) + } + + parking_img.setOnClickListener { + customDialogInput.setTitle("Aparcar carro").setValue("").setOkButton("Aparcar"){ + viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue()) + parking = customDialogInput.getValue() + toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking + " E: "+etiquetas + if(mpok != null) mpok!!.start() + customDialogInput.dismiss() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.show() + + customDialogInput.getEditText().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + viewModel.shelvingPark(user,password,shelvingFk,customDialogInput.getValue()) + customDialogInput.dismiss() + parking = customDialogInput.getValue() + if (toolbar_title != null && shelvingFk != null && parking != null && etiquetas != null){ + toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas + }else{ + toolbar_title.text = "" + } + if (mpok != null) { + mpok!!.start() + } + + return@setOnEditorActionListener true + } + false + } + + } + + edit_img.setOnClickListener { + customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton("Guardar"){ + viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue()) + shelvingFk = customDialogInput.getValue() + toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas + if(mpok != null) mpok!!.start() + customDialogInput.dismiss() + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.show() + + customDialogInput.getEditText().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + viewModel.shelvingChange(user,password,shelvingFk,customDialogInput.getValue()) + shelvingFk = customDialogInput.getValue() + toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas + if(mpok != null) mpok!!.start() + customDialogInput.dismiss() + return@setOnEditorActionListener true + } + false + } + + } + + delete_img.setOnClickListener { + customDialog.setTitle("Vaciar carro").setDescription("Esta operación no se puede rectificar.").setOkButton("Vaciar"){ + viewModel.clearShelvingList(user,password,shelvingFk) + listItems.forEach { + it.stickers = "0" + it.visible = "0" + } + if (adapter != null){ + adapter!!.notifyDataSetChanged() + } + customDialog.dismiss() + }.setKoButton("Cancelar"){ + customDialog.dismiss() + }.show() + + + } + + } + + override fun observeViewModel() { + with(viewModel){ + loadShelvingList.observe(viewLifecycleOwner, Observer { event -> + event.getContentIfNotHandled().notNull { + deep = it.list.size + listItems = ArrayList() + var contEtiquetas:Int = 0 + it.list.forEach { item -> + try{ + contEtiquetas += item.stickers.toInt() + }catch (e: Exception) {} + + parking = item.code.toUpperCase() + listItems.add(item) + } + etiquetas = contEtiquetas.toString() + toolbar_title.text = shelvingFk.toUpperCase() + " P: "+parking+ " E: "+etiquetas + if(it.list.size > 0) + edit_prioridad.setText(it.list[0].priority) + splash_progress.visibility = View.GONE + adapter = UbicadorAdapter(listItems,onPasillerosItemClickListener = pasillerosItemClickListener!!, + onVisibleClickListener = object: OnVisibleClickListener{ + override fun onVisibleClickListener(item: ItemUbicadorVO) { + showAddItem(item.item,item.packing,item.stickers,item.visible,true,item) + } + + },onMoreClickListener = object: OnMoreClickListener{ + override fun onMoreClickListener(item: ItemUbicadorVO) { + showMoreOptions(item) + } + + }) + + location_recyclerview.adapter = adapter + location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, true) + + } + }) + + response.observe(viewLifecycleOwner, Observer { + if (it.isError){ + mperror!!.start() + customDialog.setTitle("Error").setDescription(it.errorMessage).setOkButton("Cerrar"){ + customDialog.dismiss() + }.show() + } + }) + + responseMake.observe(viewLifecycleOwner, Observer { + if (!shelvingFk.isNullOrEmpty()){ + splash_progress.visibility = View.VISIBLE + toolbar_title.text = shelvingFk + viewModel.itemShelvingList(user,password,shelvingFk) + } + }) + } + } + + private fun showAddItem(itemFk:String,packing: String,etiquetas: String,visible: String, delete:Boolean,itemUbicador:ItemUbicadorVO){ + var title = "Nuevo Item" + if (delete) title = "Editar item "+itemFk + customDialogUbicador.setTitle(title).setItemValue(itemFk).setPackingValue(packing).setEtiquetaValue(etiquetas).setVisibleValue(visible).setOkButton("Guardar"){ + var packingUpdate = false + if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()){ + packingUpdate = true + } + saveNewItem(customDialogUbicador.getItemValue(),customDialogUbicador.getEtiquetaValue(),customDialogUbicador.getPackingValue(),customDialogUbicador.getVisibleValue(),if (delete)packingUpdate else null,itemUbicador.id) + }.setKoButton("Cerrar"){ + customDialogUbicador.dismiss() + }.show() + + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + + customDialogUbicador.getVisibleItem().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + var packingUpdate = false + if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()){ + packingUpdate = true + } + saveNewItem(customDialogUbicador.getItemValue(),customDialogUbicador.getEtiquetaValue(),customDialogUbicador.getPackingValue(),customDialogUbicador.getVisibleValue(),if (delete)packingUpdate else null,itemUbicador.id) + return@setOnEditorActionListener true + } + false + } + + customDialogUbicador.getEtiquetaItem().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + var packingUpdate = false + if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()){ + packingUpdate = true + } + saveNewItem(customDialogUbicador.getItemValue(),customDialogUbicador.getEtiquetaValue(),customDialogUbicador.getPackingValue(),customDialogUbicador.getVisibleValue(),if (delete)packingUpdate else null,itemUbicador.id) + return@setOnEditorActionListener true + } + false + } + + } + + private fun saveNewItem(itemFk:String,etiquetas:String,packing:String,visible:String,updatePacking:Boolean? = null,itemShelvingFk:String){ + if (!packing.isNullOrEmpty()){ + if (updatePacking == null){ + if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty()){ + viewModel.itemShelvingMake(user,password,shelvingFk,itemFk,deep.toString(),visible,packing,warehouseFk,"1") + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible,packing = packing)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + customDialogUbicador.dismiss() + + }else if(!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty()){ + val visible_calc = (etiquetas.toInt() * packing.toInt()).toString() + viewModel.itemShelvingMake(user,password,shelvingFk,itemFk,deep.toString(),visible_calc,packing,warehouseFk,"1") + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible_calc,packing = packing,stickers = etiquetas)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + customDialogUbicador.dismiss() + + }else{ + "Rellena campos obligatorios".toast((activity as MainActivity), Toast.LENGTH_LONG) + } + }else{ + if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty() && !updatePacking){ + viewModel.itemShelvingMakeEdit(user,password,shelvingFk,itemFk,deep.toString(),visible,packing,warehouseFk,"1",itemShelvingFk) + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible,packing = packing)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + customDialogUbicador.dismiss() + + }else if(!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty() && updatePacking){ + var visible_calc = "0" + try{ + visible_calc = (etiquetas.toInt() * packing.toInt()).toString() + }catch (e:Exception){} + viewModel.itemShelvingMakeEdit(user,password,shelvingFk,itemFk,deep.toString(),visible_calc,packing,warehouseFk,"1",itemShelvingFk) + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible_calc,packing = packing,stickers = etiquetas)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + customDialogUbicador.dismiss() + + }else{ + "Rellena campos obligatorios".toast((activity as MainActivity), Toast.LENGTH_LONG) + } + } + + }else{ + "Packing obligatorio".toast((activity as MainActivity), Toast.LENGTH_LONG) + } + } + + private fun editItem(itemFk:String,etiquetas:String,packing:String,visible:String){ + if (!packing.isNullOrEmpty()){ + if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty()){ + viewModel.itemShelvingMake(user,password,shelvingFk,itemFk,deep.toString(),visible,packing,warehouseFk,"1") + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible,packing = packing)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + }else if(!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty()){ + val visible_calc = (etiquetas.toInt() * packing.toInt()).toString() + viewModel.itemShelvingMake(user,password,shelvingFk,itemFk,deep.toString(),visible_calc,packing,warehouseFk,"1") + changeOfflineValue(ItemUbicadorVO(item = itemFk,visible = visible_calc,packing = packing,stickers = etiquetas)) + customDialogUbicador.setItemValue("").setPackingValue("").setEtiquetaValue("").setVisibleValue("") + customDialogUbicador.getEditItem().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogUbicador.getEditItem()) + }else{ + "Rellena campos obligatorios".toast((activity as MainActivity), Toast.LENGTH_LONG) + } + }else{ + "Packing obligatorio".toast((activity as MainActivity), Toast.LENGTH_LONG) + } + } + + private fun changeOfflineValue(item:ItemUbicadorVO){ + if (splash_progress != null) splash_progress.visibility = View.VISIBLE + /*listItems.add(item) + adapter?.notifyDataSetChanged()*/ + } + + private fun showMoreOptions(item:ItemUbicadorVO){ + customDialogTwoButtons.setTitle(item.item).setDescription("Selecciona una acción").setOkButton("Transferir"){ + customDialogInput.setTitle("Nueva matrícula").setDescription("Introduce el destino para item: "+item.item).setValue("").setOkButton("Transferir"){ + if (customDialogInput.getValue().isNotEmpty()){ + viewModel.itemShelvingTransfer(user,password,item.id,customDialogInput.getValue()) + listItems.remove(item) + adapter!!.notifyDataSetChanged() + customDialogInput.dismiss() + }else{ + "Carro incorrecto".toast(requireContext()) + } + + + + }.setKoButton("Cancelar"){ + customDialogInput.dismiss() + }.show() + customDialogInput.getEditText().requestFocus() + (activity as MainActivity).hideKeyboard(customDialogInput.getEditText()) + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + viewModel.itemShelvingTransfer(user,password,item.id,customDialogInput.getValue()) + listItems.remove(item) + adapter!!.notifyDataSetChanged() + customDialogInput.dismiss() + return@setOnEditorActionListener true + } + false + } + customDialogTwoButtons.dismiss() + }.setOkButtonTwo("Eliminar"){ + customDialog.setTitle("Confirmar").setDescription("Confirmas eliminar el artículo: "+item.item+"?").setOkButton("Eliminar"){ + listItems.remove(item) + adapter!!.notifyDataSetChanged() + viewModel.itemShelvingDelete(user,password,item.id) + customDialogTwoButtons.dismiss() + customDialog.dismiss() + }.setKoButton("Cancelar"){ + customDialog.dismiss() + customDialogTwoButtons.dismiss() + }.show() + + }.setKoButton("Cancelar"){ + customDialogTwoButtons.dismiss() + }.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt new file mode 100644 index 00000000..32e8f039 --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -0,0 +1,191 @@ +package es.verdnatura.presentation.view.feature.ubicador.fragment + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.presentation.base.BaseViewModel +import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemVO +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorListVO +import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class UbicadorViewModel(context: Context) : BaseViewModel() { + + + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + + private val _shelvingList by lazy { MutableLiveData() } + + private val _response by lazy { MutableLiveData() } + val response: LiveData + get() = _response + + private val _responseMake by lazy { MutableLiveData() } + val responseMake: LiveData + get() = _responseMake + + + val loadShelvingList = Transformations.map(_shelvingList) { Event(it) } + + + fun itemShelvingList(usuario:String,password:String,vShelvingFk:String){ + getUbicadorUserCase.itemShelvingList(usuario,password,vShelvingFk.toUpperCase()).enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError:ArrayList = ArrayList() + listError.add(ItemUbicadorVO(isError = true,errorMessage = t.message!!)) + _shelvingList.value = ItemUbicadorListVO(listError) + } + + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null){ + _shelvingList.value = response.body()?.let { ItemUbicadorListVO(it) } + }else{ + val listError:ArrayList = ArrayList() + listError.add(ItemUbicadorVO(isError = true,errorMessage = "Error en la llamada de itemShelvingList")) + _shelvingList.value = ItemUbicadorListVO(listError) + } + } + + }) + } + + fun shelvingPriorityUpdate(usuario:String,password:String,priority:String,shelving:String){ + getUbicadorUserCase.shelvingPriorityUpdate(usuario,password,priority,shelving).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPriorityUpdate") + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPriorityUpdate") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + + fun itemShelvingMake(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String){ + getUbicadorUserCase.itemShelvingMake(usuario,password,shelving,item,deep,quantity,packing,warehouse,level).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseMake.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+item+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseMake.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingMake") + }else{ + _responseMake.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun itemShelvingMakeEdit(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String,itemShelvingFk:String){ + getUbicadorUserCase.itemShelvingMakeEdit(usuario,password,shelving,item,deep,quantity,packing,warehouse,level,itemShelvingFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _responseMake.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+item+ " Respuesta:"+t.message!!) + } + + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _responseMake.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingMakeEdit") + }else{ + _responseMake.value = ResponseItemVO(isError = false,response = response.body()!!) + } + + } + + }) + } + + fun shelvingPark(usuario:String,password:String,shelving:String,parking:String){ + getUbicadorUserCase.shelvingPark(usuario,password,shelving,parking).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+shelving+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingPark") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun shelvingChange(usuario:String,password:String,origen:String,destino:String){ + getUbicadorUserCase.shelvingChange(usuario,password,origen,destino).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+origen+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada shelvingChange") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun clearShelvingList(usuario:String,password:String,shelvingFk:String){ + getUbicadorUserCase.clearShelvingList(usuario,password,shelvingFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+shelvingFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada clearShelvingList") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemShelvingTransfer(usuario:String,password:String,itemFk:String,shelvingFk:String){ + getUbicadorUserCase.itemShelvingTransfer(usuario,password,itemFk,shelvingFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+itemFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingTransfer") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + + fun itemShelvingDelete(usuario:String,password:String,itemFk:String){ + getUbicadorUserCase.itemShelvingDelete(usuario,password,itemFk).enqueue(object : Callback{ + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO(isError = true,errorMessage ="Error al guardar item: "+itemFk+ " Respuesta:"+t.message!!) + } + override fun onResponse(call: Call, response: Response) { + if (response.body() == null){ + _response.value = ResponseItemVO(isError = true,errorMessage = "Error en la llamada itemShelvingDelete") + }else{ + _response.value = ResponseItemVO(isError = false,response = response.body()!!) + } + } + }) + } + +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt new file mode 100644 index 00000000..9ee2978e --- /dev/null +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt @@ -0,0 +1,24 @@ +package es.verdnatura.presentation.view.feature.ubicador.model + +class ItemUbicadorVO ( + var item:String = "", + var description:String = "", + var visible:String = "", + var stickers:String = "", + var packing:String = "", + var col:String = "", + var row:String = "", + var code:String = "", + var id:String = "", + var priority:String = "", + var isError:Boolean = false, + var errorMessage:String = "" +) + +class ItemEscanerVO( + var item:String = "" +) + +class ItemUbicadorListVO( + var list:List = listOf() +) diff --git a/app/src/main/res/drawable-v24/background_gradient.xml b/app/src/main/res/drawable-v24/background_gradient.xml new file mode 100644 index 00000000..bc7484fb --- /dev/null +++ b/app/src/main/res/drawable-v24/background_gradient.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..b49b3b0f --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_logo_large.png b/app/src/main/res/drawable-v24/ic_logo_large.png new file mode 100644 index 00000000..96c7947b Binary files /dev/null and b/app/src/main/res/drawable-v24/ic_logo_large.png differ diff --git a/app/src/main/res/drawable-v24/selector_bottombar_text.xml b/app/src/main/res/drawable-v24/selector_bottombar_text.xml new file mode 100644 index 00000000..b6b2e8a2 --- /dev/null +++ b/app/src/main/res/drawable-v24/selector_bottombar_text.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/background_login.jpg b/app/src/main/res/drawable/background_login.jpg new file mode 100644 index 00000000..1222ac69 Binary files /dev/null and b/app/src/main/res/drawable/background_login.jpg differ diff --git a/app/src/main/res/drawable/background_oval_checked.xml b/app/src/main/res/drawable/background_oval_checked.xml new file mode 100644 index 00000000..de8667d9 --- /dev/null +++ b/app/src/main/res/drawable/background_oval_checked.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_oval_unchecked.xml b/app/src/main/res/drawable/background_oval_unchecked.xml new file mode 100644 index 00000000..6bc2ac95 --- /dev/null +++ b/app/src/main/res/drawable/background_oval_unchecked.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/border_parental.xml b/app/src/main/res/drawable/border_parental.xml new file mode 100644 index 00000000..055fb3d9 --- /dev/null +++ b/app/src/main/res/drawable/border_parental.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_blue.xml b/app/src/main/res/drawable/btn_blue.xml new file mode 100644 index 00000000..a4a5886b --- /dev/null +++ b/app/src/main/res/drawable/btn_blue.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_green.xml b/app/src/main/res/drawable/btn_green.xml new file mode 100644 index 00000000..a2def816 --- /dev/null +++ b/app/src/main/res/drawable/btn_green.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_ios_like.xml b/app/src/main/res/drawable/btn_ios_like.xml new file mode 100644 index 00000000..82e322aa --- /dev/null +++ b/app/src/main/res/drawable/btn_ios_like.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_orange.xml b/app/src/main/res/drawable/btn_orange.xml new file mode 100644 index 00000000..015136be --- /dev/null +++ b/app/src/main/res/drawable/btn_orange.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_white_transparent.xml b/app/src/main/res/drawable/btn_white_transparent.xml new file mode 100644 index 00000000..04580960 --- /dev/null +++ b/app/src/main/res/drawable/btn_white_transparent.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/component_progress.xml b/app/src/main/res/drawable/component_progress.xml new file mode 100644 index 00000000..4323faee --- /dev/null +++ b/app/src/main/res/drawable/component_progress.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/drawable_white_circle.xml b/app/src/main/res/drawable/drawable_white_circle.xml new file mode 100644 index 00000000..65768015 --- /dev/null +++ b/app/src/main/res/drawable/drawable_white_circle.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add_black_24dp.xml new file mode 100644 index 00000000..3c997374 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml new file mode 100644 index 00000000..0adc924c --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml new file mode 100644 index 00000000..1d53945f --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_autorenew_black_24dp.xml b/app/src/main/res/drawable/ic_autorenew_black_24dp.xml new file mode 100644 index 00000000..8198d51d --- /dev/null +++ b/app/src/main/res/drawable/ic_autorenew_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_all_inbox_24.xml b/app/src/main/res/drawable/ic_baseline_all_inbox_24.xml new file mode 100644 index 00000000..9d07048c --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_all_inbox_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_star_24.xml b/app/src/main/res/drawable/ic_baseline_star_24.xml new file mode 100644 index 00000000..2cca397f --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_star_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_build_black_24dp.xml b/app/src/main/res/drawable/ic_build_black_24dp.xml new file mode 100644 index 00000000..1962aea6 --- /dev/null +++ b/app/src/main/res/drawable/ic_build_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_build_black_24dp_selected.xml b/app/src/main/res/drawable/ic_build_black_24dp_selected.xml new file mode 100644 index 00000000..a634102d --- /dev/null +++ b/app/src/main/res/drawable/ic_build_black_24dp_selected.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml new file mode 100644 index 00000000..6c1fb088 --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml new file mode 100644 index 00000000..4e11f689 --- /dev/null +++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml new file mode 100644 index 00000000..389a6a12 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_forever_black_24dp.xml b/app/src/main/res/drawable/ic_delete_forever_black_24dp.xml new file mode 100644 index 00000000..e16ada2c --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_forever_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_device_hub_black_24dp.xml b/app/src/main/res/drawable/ic_device_hub_black_24dp.xml new file mode 100644 index 00000000..0123debb --- /dev/null +++ b/app/src/main/res/drawable/ic_device_hub_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml b/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml new file mode 100644 index 00000000..10d6fe4b --- /dev/null +++ b/app/src/main/res/drawable/ic_device_hub_black_24dp_selected.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_flash_auto_black_24dp.xml b/app/src/main/res/drawable/ic_flash_auto_black_24dp.xml new file mode 100644 index 00000000..b645efae --- /dev/null +++ b/app/src/main/res/drawable/ic_flash_auto_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_history_black_24dp.xml b/app/src/main/res/drawable/ic_history_black_24dp.xml new file mode 100644 index 00000000..009248ba --- /dev/null +++ b/app/src/main/res/drawable/ic_history_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..369dd5c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_local_florist_black_24dp.xml b/app/src/main/res/drawable/ic_local_florist_black_24dp.xml new file mode 100644 index 00000000..c2854d8d --- /dev/null +++ b/app/src/main/res/drawable/ic_local_florist_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_florist_black_24dp_selected.xml b/app/src/main/res/drawable/ic_local_florist_black_24dp_selected.xml new file mode 100644 index 00000000..635695a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_local_florist_black_24dp_selected.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_parking_black_24dp.xml b/app/src/main/res/drawable/ic_local_parking_black_24dp.xml new file mode 100644 index 00000000..1592149d --- /dev/null +++ b/app/src/main/res/drawable/ic_local_parking_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_parking_orange_24dp.xml b/app/src/main/res/drawable/ic_local_parking_orange_24dp.xml new file mode 100644 index 00000000..393893fb --- /dev/null +++ b/app/src/main/res/drawable/ic_local_parking_orange_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_shipping_black_24dp.xml b/app/src/main/res/drawable/ic_local_shipping_black_24dp.xml new file mode 100644 index 00000000..0020ffde --- /dev/null +++ b/app/src/main/res/drawable/ic_local_shipping_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_shipping_black_24dp_selected.xml b/app/src/main/res/drawable/ic_local_shipping_black_24dp_selected.xml new file mode 100644 index 00000000..3d8c2da0 --- /dev/null +++ b/app/src/main/res/drawable/ic_local_shipping_black_24dp_selected.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_loyalty_black_24dp.xml b/app/src/main/res/drawable/ic_loyalty_black_24dp.xml new file mode 100644 index 00000000..6e54d2d5 --- /dev/null +++ b/app/src/main/res/drawable/ic_loyalty_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml b/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml new file mode 100644 index 00000000..cbefb2fb --- /dev/null +++ b/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml new file mode 100644 index 00000000..11a3457c --- /dev/null +++ b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_move_to_inbox_black_24dp.xml b/app/src/main/res/drawable/ic_move_to_inbox_black_24dp.xml new file mode 100644 index 00000000..84240c0f --- /dev/null +++ b/app/src/main/res/drawable/ic_move_to_inbox_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml new file mode 100644 index 00000000..87a821f0 --- /dev/null +++ b/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_print_black_24dp.xml b/app/src/main/res/drawable/ic_print_black_24dp.xml new file mode 100644 index 00000000..0d14f178 --- /dev/null +++ b/app/src/main/res/drawable/ic_print_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_black_24dp.xml b/app/src/main/res/drawable/ic_send_black_24dp.xml new file mode 100644 index 00000000..63b175c1 --- /dev/null +++ b/app/src/main/res/drawable/ic_send_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_spa_black_24dp.xml b/app/src/main/res/drawable/ic_spa_black_24dp.xml new file mode 100644 index 00000000..f1dcc9bf --- /dev/null +++ b/app/src/main/res/drawable/ic_spa_black_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_spa_black_launcher.xml b/app/src/main/res/drawable/ic_spa_black_launcher.xml new file mode 100644 index 00000000..25f34b08 --- /dev/null +++ b/app/src/main/res/drawable/ic_spa_black_launcher.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_star_ko.xml b/app/src/main/res/drawable/ic_star_ko.xml new file mode 100644 index 00000000..445f93e8 --- /dev/null +++ b/app/src/main/res/drawable/ic_star_ko.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_start_ok.xml b/app/src/main/res/drawable/ic_start_ok.xml new file mode 100644 index 00000000..92fccae1 --- /dev/null +++ b/app/src/main/res/drawable/ic_start_ok.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_streetview_black_24dp.xml b/app/src/main/res/drawable/ic_streetview_black_24dp.xml new file mode 100644 index 00000000..775a9039 --- /dev/null +++ b/app/src/main/res/drawable/ic_streetview_black_24dp.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_swap_horiz_black_24dp.xml b/app/src/main/res/drawable/ic_swap_horiz_black_24dp.xml new file mode 100644 index 00000000..e357d4a9 --- /dev/null +++ b/app/src/main/res/drawable/ic_swap_horiz_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_verified_user_black_24dp.xml b/app/src/main/res/drawable/ic_verified_user_black_24dp.xml new file mode 100644 index 00000000..36793b4e --- /dev/null +++ b/app/src/main/res/drawable/ic_verified_user_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml b/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml new file mode 100644 index 00000000..ef5e9321 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_visibility.xml b/app/src/main/res/drawable/ic_visibility.xml new file mode 100644 index 00000000..1e902323 --- /dev/null +++ b/app/src/main/res/drawable/ic_visibility.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_visibility_black_24dp.xml b/app/src/main/res/drawable/ic_visibility_black_24dp.xml new file mode 100644 index 00000000..518f0381 --- /dev/null +++ b/app/src/main/res/drawable/ic_visibility_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/loadphoto.png b/app/src/main/res/drawable/loadphoto.png new file mode 100644 index 00000000..607d930a Binary files /dev/null and b/app/src/main/res/drawable/loadphoto.png differ diff --git a/app/src/main/res/drawable/round_av_timer_24.xml b/app/src/main/res/drawable/round_av_timer_24.xml new file mode 100644 index 00000000..6214334f --- /dev/null +++ b/app/src/main/res/drawable/round_av_timer_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/round_outline.xml b/app/src/main/res/drawable/round_outline.xml new file mode 100644 index 00000000..8c4ed16e --- /dev/null +++ b/app/src/main/res/drawable/round_outline.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_imageview.xml b/app/src/main/res/layout/activity_imageview.xml new file mode 100644 index 00000000..fb4d68fa --- /dev/null +++ b/app/src/main/res/layout/activity_imageview.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml new file mode 100644 index 00000000..7264870f --- /dev/null +++ b/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..f2e186f3 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/buyers_fragment.xml b/app/src/main/res/layout/buyers_fragment.xml new file mode 100644 index 00000000..c509f8f9 --- /dev/null +++ b/app/src/main/res/layout/buyers_fragment.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/component_custom_dialog.xml b/app/src/main/res/layout/component_custom_dialog.xml new file mode 100644 index 00000000..3a9b6196 --- /dev/null +++ b/app/src/main/res/layout/component_custom_dialog.xml @@ -0,0 +1,63 @@ + + + + + + + + + +