From 59b06bea019d19d825bbba2862ac721f83bd0008 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 30 Mar 2023 07:24:16 +0200
Subject: [PATCH] Pantalla embalajes

---
 .idea/workspace.xml                                 |  7 ++++---
 .../main/java/es/verdnatura/domain/SalixService.kt  |  6 ++++++
 .../es/verdnatura/presentation/base/BaseFragment.kt |  1 +
 .../PackagingViewModel/SupplierViewModel.kt         |  4 ++--
 .../feature/packaging/fragment/SupplierFragment.kt  | 13 ++++++++++---
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9f3badc..7eb1b9ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,11 +83,12 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.10Beta">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.10.1 Modificar controlador orden">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,7 +99,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 8896f1e7..f2392923 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -147,6 +147,12 @@ interface SalixService {
     ):
             Call<List<EntrySalix>>
 
+    @GET("Entries")//REVISADA
+    fun add_entry(
+        @Query("filter") filter:String
+    ):
+            Call<List<EntrySalix>>
+
     @GET("Shelvings")
     fun Shelvings(
         @Query("filter") filter: String
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
index 6c91190f..65cbbc0b 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -541,6 +541,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
             "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString()
 
 
+
             "base_url" -> {
                 val preferences = PreferenceManager.getDefaultSharedPreferences(context)
                 preferences.getString(getString(R.string.baseurl), "").toString()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 54189db4..9464ea37 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -146,7 +146,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-   /* fun entry_addSalix(entry: EntrySalix) {
+   fun entry_addSalix(entry: EntrySalix) {
         salix.getEntries(entry)
             .enqueue(object :
                 SilexCallback<EntrySalix>(context) {
@@ -175,5 +175,5 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
 
                 }
             })
-    }*/
+    }
 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
index 2814f4b7..a2472ea0 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
@@ -84,9 +84,6 @@ class SupplierFragment(
         setToolBar()
         setEvents()
 
-        val entry = EntrySalix(supplierFk = 591, travelFk = 186025, companyFk = 442)
-        // viewModel.entry_addSalix(entry)
-
         super.init()
     }
 
@@ -236,5 +233,15 @@ class SupplierFragment(
         setEntryDialog()
     }
 
+    private fun addEntry(){
+
+
+        if   (getData("ENTRYTYPE" )=="Rec"){
+            viewModel.entry_addSalix(EntrySalix(supplierFk = getData("SUPPLIERID").toInt(), travelFk = 186025, companyFk = 442))
+        }else{
+            viewModel.entry_addSalix(EntrySalix(supplierFk = getData("SUPPLIERID").toInt(), travelFk = 186025, companyFk = 442))
+        }
+
+    }
 }