diff --git a/Button/ButtonLimp.cs b/Button/ButtonLimp.cs index 8810a7a..f5c073b 100644 --- a/Button/ButtonLimp.cs +++ b/Button/ButtonLimp.cs @@ -30,13 +30,13 @@ namespace OliviaAddInPro if (OliviaGlob.TipoView == TiposEjecucion.Ninguno) { ///Comprueba que existe la red navegable configurada - if (!OliviaGlob.CompruebaNwYCampos()) + /*if (!OliviaGlob.CompruebaNwYCampos()) { HelperGlobal.ponMsg("No se encuentra red navegable, cambie Configuración: " + HelperGdb.OutStr, System.Windows.MessageBoxImage.Warning); } else - { + {*/ OliviaGlob.SetFlagTipEjec(TiposEjecucion.Limp); OliviaGlob.ViewSetFlagTipEjec(TiposEjecucion.Limp); @@ -44,7 +44,7 @@ namespace OliviaAddInPro OliviaGlob.Limp = new Limpieza(); DockpaneLimpiezaViewModel.Reset(); DockpaneLimpiezaViewModel.Show(); - } + //} } else if(OliviaGlob.ViewIsProps()) { diff --git a/Button/ButtonRec.cs b/Button/ButtonRec.cs index df82527..bc10465 100644 --- a/Button/ButtonRec.cs +++ b/Button/ButtonRec.cs @@ -28,13 +28,13 @@ namespace OliviaAddInPro if (OliviaGlob.TipoView == TiposEjecucion.Ninguno) { ///Comprueba que existe la red navegable configurada - if (!OliviaGlob.CompruebaNwYCampos()) + /*if (!OliviaGlob.CompruebaNwYCampos()) { HelperGlobal.ponMsg("No se encuentra red navegable, cambie Configuración: " + HelperGdb.OutStr, System.Windows.MessageBoxImage.Warning); } else - { + {*/ OliviaGlob.SetFlagTipEjec(TiposEjecucion.Reco); OliviaGlob.ViewSetFlagTipEjec(TiposEjecucion.Reco); @@ -42,7 +42,7 @@ namespace OliviaAddInPro OliviaGlob.Reco = new Recogida(); DockpaneRecogidaViewModel.Reset(); DockpaneRecogidaViewModel.Show(); - } + //} } else if (OliviaGlob.ViewIsProps()) { diff --git a/Model/OliviaGlob.cs b/Model/OliviaGlob.cs index 36e7c17..1851cc8 100644 --- a/Model/OliviaGlob.cs +++ b/Model/OliviaGlob.cs @@ -281,7 +281,7 @@ namespace OliviaAddInPro.Model camps[2] = ComunDef.CamposNW.cons_kph; camps[3] = ComunDef.CamposNW.cons_name; camps[4] = ComunDef.CamposNW.cons_fow; - return true;// HelperGdb.CheckFileds(OliviaGlob.Paths.PathGdbNw, camps) == 0; + return HelperGdb.CheckFileds(OliviaGlob.Paths.PathGdbNw, camps) == 0; } /** diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs index 1ce43e4..152a352 100644 --- a/Services/EjecServ.cs +++ b/Services/EjecServ.cs @@ -436,7 +436,8 @@ namespace OliviaAddInPro.Services return false; if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_onewFT, ComunDef.CamposNW.config.campo_sentidoFT)) return false; - + if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_evit, "0")) + return false; return true; } /**