From bac4c6abf03de2a84650404e27d82c00a18512b8 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Sun, 27 Mar 2022 15:43:09 +0200
Subject: [PATCH] Arreglos ventana marchando una de

---
 Helper/HelperGlobal.cs                     |  1 +
 Model/contract/IprocessManager.cs          |  1 +
 Services/FinProcServ.cs                    |  7 ++++---
 Services/ProcesoEjecServ.cs                |  2 +-
 View/Comun/MarchandoUnaDe.xaml             | 12 ++++++-----
 View/Comun/MarchandoUnaDe.xaml.cs          | 14 +++++++++++++
 ViewModel/Comun/MarchandoUnaDeViewModel.cs | 23 ++++++++++++++++++----
 7 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/Helper/HelperGlobal.cs b/Helper/HelperGlobal.cs
index b27f0d0..465adcc 100644
--- a/Helper/HelperGlobal.cs
+++ b/Helper/HelperGlobal.cs
@@ -90,6 +90,7 @@ namespace OliviaAddInPro.Helper
         public MyCancelableProgressorSource(IprocessManager prodlg)
         {
             _ProgrSrc = prodlg;
+            _ProgrSrc.Inicia();
         }
         public void Init(string stat)
         {
diff --git a/Model/contract/IprocessManager.cs b/Model/contract/IprocessManager.cs
index 6d7b9f9..10df6b3 100644
--- a/Model/contract/IprocessManager.cs
+++ b/Model/contract/IprocessManager.cs
@@ -14,5 +14,6 @@ namespace OliviaAddInPro.Model.contract
         double GetProgress();
         bool Getcancelled();
         void Setcancelled();
+        void Inicia();
     }
 }
diff --git a/Services/FinProcServ.cs b/Services/FinProcServ.cs
index f98f9a1..573b27f 100644
--- a/Services/FinProcServ.cs
+++ b/Services/FinProcServ.cs
@@ -14,7 +14,7 @@ namespace OliviaAddInPro.Services
     {
         public void finEjecuta(Respuesta<TiposEjecucion> res)
         {
-            OliviaGlob.progrDialog.Hide();
+           
             String msg=string.Empty;
             //gestiona los flags, el estado de finok o finnok va en res.Vale
             if (res.HasError)
@@ -41,8 +41,9 @@ namespace OliviaAddInPro.Services
 
         public void finEjecuta2()
         {
-            //muestra la ventana
-            OliviaGlob.ShowHidePane(true);
+            OliviaGlob.progrDialog.Hide();
+           //muestra la ventana
+           OliviaGlob.ShowHidePane(true);
         }
 
         //se le llama cuando ha terminado el proceso de ejecución en Olivia Tasks
diff --git a/Services/ProcesoEjecServ.cs b/Services/ProcesoEjecServ.cs
index fc05fb0..40edf22 100644
--- a/Services/ProcesoEjecServ.cs
+++ b/Services/ProcesoEjecServ.cs
@@ -73,7 +73,7 @@ namespace OliviaAddInPro.Services
             bool fin = false;
             int lastprog = 0;
             var res = new Respuesta<TiposEjecucion>() { Value = TiposEjecucion.FinEjecNOk };
-            
+            cps.SetProceso("Procesando Datos");
             try
             {
                 do
diff --git a/View/Comun/MarchandoUnaDe.xaml b/View/Comun/MarchandoUnaDe.xaml
index c84525b..2c181a9 100644
--- a/View/Comun/MarchandoUnaDe.xaml
+++ b/View/Comun/MarchandoUnaDe.xaml
@@ -6,12 +6,14 @@
         xmlns:ui="clr-namespace:OliviaAddInPro"
         xmlns:local="clr-namespace:OliviaAddInPro"
         mc:Ignorable="d"
-        Title="MarchandoUnaDe" Height="165" Width="462"
-        d:DataContext="{Binding Path=ui.MarchandoUnaDeViewModel}">
+        Title="MarchandoUnaDe" Height="168" Width="481"
+        d:DataContext="{Binding Path=ui.MarchandoUnaDeViewModel}"
+        ResizeMode="NoResize">
 
     <Grid>
-        <Label Content="{Binding TextProceso}" HorizontalAlignment="Left" Margin="76,24,0,0" VerticalAlignment="Top" Width="303" Height="26"/>
-        <ProgressBar Minimum="0" Maximum="100" HorizontalAlignment="Left" Value="{Binding Progreso, UpdateSourceTrigger=PropertyChanged}" Height="20" Margin="76,66,0,0" VerticalAlignment="Top" Width="303"/>
-        <Label  Content="{Binding TextEstado}" HorizontalAlignment="Left" Margin="95,91,0,0" VerticalAlignment="Top" Width="265" Height="28"/>
+        <Label Content="{Binding TextProceso}" HorizontalAlignment="Left" Margin="76,10,0,0" VerticalAlignment="Top" Width="303" Height="26"/>
+        <ProgressBar Minimum="0" Maximum="100" HorizontalAlignment="Left" Value="{Binding Progreso, UpdateSourceTrigger=PropertyChanged}" Height="20" Margin="76,40,0,0" VerticalAlignment="Top" Width="303"/>
+        <Label  Content="{Binding TextEstado}" HorizontalAlignment="Left" Margin="76,70,0,0" VerticalAlignment="Top" Width="303" Height="28"/>
+        <Button Content="Cancelar" HorizontalAlignment="Left" Margin="304,103,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/View/Comun/MarchandoUnaDe.xaml.cs b/View/Comun/MarchandoUnaDe.xaml.cs
index 3734e07..93f792e 100644
--- a/View/Comun/MarchandoUnaDe.xaml.cs
+++ b/View/Comun/MarchandoUnaDe.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -23,6 +24,7 @@ namespace OliviaAddInPro
         {
             InitializeComponent();
             DataContext = new MarchandoUnaDeViewModel();
+            //WindowStyle = WindowStyle.None;
         }
 
         public MarchandoUnaDeViewModel  GetViewModel()
@@ -31,5 +33,17 @@ namespace OliviaAddInPro
                 return m;
             return null;
         }
+
+        protected override void OnClosing(CancelEventArgs e) 
+        {
+            GetViewModel().Cancelado = true;
+            base.OnClosing(e); 
+            e.Cancel = true;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            GetViewModel().CancelaOperacion();
+        }
     }
 }
diff --git a/ViewModel/Comun/MarchandoUnaDeViewModel.cs b/ViewModel/Comun/MarchandoUnaDeViewModel.cs
index 088624c..e13f9cc 100644
--- a/ViewModel/Comun/MarchandoUnaDeViewModel.cs
+++ b/ViewModel/Comun/MarchandoUnaDeViewModel.cs
@@ -2,6 +2,7 @@
 using OliviaAddInPro.Model.contract;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,7 +11,12 @@ namespace OliviaAddInPro
 {
     public class MarchandoUnaDeViewModel : PropertyChangedBase, IprocessManager
     {
-        
+        public MarchandoUnaDeViewModel()
+        {
+            Cancelado = false;
+        }
+        public bool Cancelado { get; set; }
+
         private string textProceso;
         public string TextProceso
         {
@@ -36,7 +42,10 @@ namespace OliviaAddInPro
         {
             TextProceso = proceso;
         }
-
+        void IprocessManager.Inicia()
+        {
+            Cancelado = false;
+        }
         void IprocessManager.SetEstado(string estado)
         {
             TextEstado = estado;
@@ -54,12 +63,18 @@ namespace OliviaAddInPro
 
         bool IprocessManager.Getcancelled()
         {
-            return false;
+            return Cancelado;
         }
 
         void IprocessManager.Setcancelled()
         {
-
+            CancelaOperacion();
         }
+        public void CancelaOperacion()
+        {
+            TextProceso = "Cancelando proceso";
+            Cancelado = true;
+        }
+
     }
 }