From 04cc22e6f472f1274f72ce8d63a9cd6e72ef418d Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Thu, 17 Feb 2022 00:14:36 +0100
Subject: [PATCH] =?UTF-8?q?Arreglos=20comenzar=20ejecuci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/OliviaGlob.cs                         | 40 ++++++++++++++++++---
 ViewModel/Limpieza/PaneLimpiezaViewModel.cs |  6 ++--
 ViewModel/PanelViewModelBase.cs             | 13 -------
 ViewModel/Recogida/PaneRecogidaViewModel.cs |  7 ++--
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/Model/OliviaGlob.cs b/Model/OliviaGlob.cs
index 3b6c24f..8eaf6d6 100644
--- a/Model/OliviaGlob.cs
+++ b/Model/OliviaGlob.cs
@@ -120,11 +120,11 @@ namespace OliviaAddInPro.Model
             {
                 HelperGlobal.ponMsg(resp.Error.First());
             }
-            /*resp = comprueba_dlls();
+            resp = comprueba_dlls();
             if (!resp.Value && resp.HasError)
             {
                 HelperGlobal.ponMsg(resp.Error.First());
-            }*/            
+            }           
         }
 
         public static bool IsLimp()
@@ -282,8 +282,13 @@ namespace OliviaAddInPro.Model
                 //comprueba utiles.dll
                 dll = "utiles.dll";
 
-                //path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), dll);
-                path_dll_dest = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dll);
+                //path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), dll);
+                //path_dll_dest = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dll);
+                //path_dll_dest = Path.Combine(System.Reflection.Assembly.GetExecutingAssembly().Location, dll);
+                //path_dll_dest = Path.Combine(System.Windows.Application.Current.StartupUri.AbsoluteUri, dll);
+                //path_dll_dest=System.Reflection.Assembly.GetEntryAssembly().CodeBase;
+                //path_dll_dest = System.Reflection.AssemblyName.GetAssemblyName();
+                path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), dll);
                 if (!File.Exists(path_dll_dest))
                 {
                     resp.Error.Add("No se encuentran las librerías necesarias, compruebe la instalación");
@@ -301,6 +306,33 @@ namespace OliviaAddInPro.Model
             }
         }
 
+
+        public static void finEjecuta(OliviaAddInPro.Model.ComunDef.TareaRes res)
+        {
+            progrDialog.Hide();
+
+            if (res.Errores)
+            {
+                HelperGlobal.ponMsg(res.msg);
+            }
+            else
+            {
+                HelperGlobal.ponMsg(Resource1.String_exito);
+            }
+            //tiene que hacer delegate finEjecuta2()
+        }
+        public static void finEjecuta2()
+        {           
+            //muestra la ventana
+            ShowHidePane(true);
+
+            //importa resultados
+
+            //borra los archivos que le toca borrar
+
+            //pone modo config2
+        }
+
         /**
          * Inicializa los nombres por defecto de las variables, para debug por si no hay instalador
          */
diff --git a/ViewModel/Limpieza/PaneLimpiezaViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
index 24df67f..0bdb8ea 100644
--- a/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
+++ b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
@@ -178,7 +178,9 @@ namespace OliviaAddInPro
             string err = "";
             
 
-            OliviaGlob.progrDialog.Show();            
+            OliviaGlob.progrDialog.Show();
+            //oculta la ventana
+            OliviaGlob.ShowHidePane(false);
 
             if (!Lee(out err))
             {
@@ -186,7 +188,7 @@ namespace OliviaAddInPro
                 return;
             }
 
-            Action<TareaRes> ac = finEjecuta;
+            Action<TareaRes> ac = OliviaGlob.finEjecuta;
             OliviaGlob.Limp.EjecutaAsync(modo, ac);
         }
     }
diff --git a/ViewModel/PanelViewModelBase.cs b/ViewModel/PanelViewModelBase.cs
index 901addb..7f3d1e0 100644
--- a/ViewModel/PanelViewModelBase.cs
+++ b/ViewModel/PanelViewModelBase.cs
@@ -125,19 +125,6 @@ namespace OliviaAddInPro
             return true;
 
         }
-
-        public void finEjecuta(OliviaAddInPro.Model.ComunDef.TareaRes res)
-        {
-            OliviaGlob.progrDialog.Hide();
-            if (res.Errores)
-            {
-                HelperGlobal.ponMsg(res.msg);
-            }
-            else
-            {
-                HelperGlobal.ponMsg(Resource1.String_exito);
-            }
-        }
     }
 
     //******************************************************
diff --git a/ViewModel/Recogida/PaneRecogidaViewModel.cs b/ViewModel/Recogida/PaneRecogidaViewModel.cs
index 70671d9..522290d 100644
--- a/ViewModel/Recogida/PaneRecogidaViewModel.cs
+++ b/ViewModel/Recogida/PaneRecogidaViewModel.cs
@@ -224,14 +224,17 @@ namespace OliviaAddInPro
         public void Ejecuta(OliviaAddInPro.Services.ModosEjec modo)
         {
             string err = "";
-            OliviaGlob.progrDialog.Show();            
+            OliviaGlob.progrDialog.Show();
+            //oculta la ventana
+            OliviaGlob.ShowHidePane(false);
+
             if (!Lee(out err))
             {
                 HelperGlobal.ponMsg(err);
                 return;
             }
 
-            Action<TareaRes> ac = finEjecuta;
+            Action<TareaRes> ac = OliviaGlob.finEjecuta;
             OliviaGlob.Reco.EjecutaAsync(modo, ac);
         }
     }