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 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() { 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"> -