From 22dcc95342b55f9f353d57940484036f6e49eefb Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Sat, 25 Sep 2021 22:08:32 +0200
Subject: [PATCH] Arreglos compilacion y ordenacion views

---
 Model/Limpieza.cs                             |  2 +-
 OliviaAddInPro.csproj                         | 40 +++++++++----------
 View/{ => Limpieza}/DockpaneLimpieza.xaml     |  0
 View/{ => Limpieza}/DockpaneLimpieza.xaml.cs  |  0
 View/{ => Limpieza}/PaneLimpieza.xaml         |  0
 View/{ => Limpieza}/PaneLimpieza.xaml.cs      |  0
 View/{ => Limpieza}/PaneLimpiezaSub1.xaml     |  0
 View/{ => Limpieza}/PaneLimpiezaSub1.xaml.cs  |  0
 View/{ => Limpieza}/PaneLimpiezaSub2.xaml     |  0
 View/{ => Limpieza}/PaneLimpiezaSub2.xaml.cs  |  0
 View/{ => Limpieza}/PaneLimpiezaSub3.xaml     |  0
 View/{ => Limpieza}/PaneLimpiezaSub3.xaml.cs  |  0
 View/{ => Limpieza}/PaneLimpiezaSub4.xaml     |  0
 View/{ => Limpieza}/PaneLimpiezaSub4.xaml.cs  |  0
 .../Configuracion/PaneConfigViewModel.cs      |  2 +-
 .../DockpaneLimpiezaViewModel.cs              |  0
 .../PaneLimpiezaSub1ViewModel.cs              |  0
 .../PaneLimpiezaSub2ViewModel.cs              |  0
 .../PaneLimpiezaSub3ViewModel.cs              |  0
 .../PaneLimpiezaSub4ViewModel.cs              |  0
 .../{ => Limpieza}/PaneLimpiezaViewModel.cs   |  0
 21 files changed, 22 insertions(+), 22 deletions(-)
 rename View/{ => Limpieza}/DockpaneLimpieza.xaml (100%)
 rename View/{ => Limpieza}/DockpaneLimpieza.xaml.cs (100%)
 rename View/{ => Limpieza}/PaneLimpieza.xaml (100%)
 rename View/{ => Limpieza}/PaneLimpieza.xaml.cs (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub1.xaml (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub1.xaml.cs (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub2.xaml (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub2.xaml.cs (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub3.xaml (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub3.xaml.cs (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub4.xaml (100%)
 rename View/{ => Limpieza}/PaneLimpiezaSub4.xaml.cs (100%)
 rename ViewModel/{ => Limpieza}/DockpaneLimpiezaViewModel.cs (100%)
 rename ViewModel/{ => Limpieza}/PaneLimpiezaSub1ViewModel.cs (100%)
 rename ViewModel/{ => Limpieza}/PaneLimpiezaSub2ViewModel.cs (100%)
 rename ViewModel/{ => Limpieza}/PaneLimpiezaSub3ViewModel.cs (100%)
 rename ViewModel/{ => Limpieza}/PaneLimpiezaSub4ViewModel.cs (100%)
 rename ViewModel/{ => Limpieza}/PaneLimpiezaViewModel.cs (100%)

diff --git a/Model/Limpieza.cs b/Model/Limpieza.cs
index e41f10f..77157ff 100644
--- a/Model/Limpieza.cs
+++ b/Model/Limpieza.cs
@@ -57,7 +57,7 @@ namespace OliviaAddInPro.Model
                 if (Serv.ErrStr.Length > 0)
                     msg = Serv.ErrStr;
                 else
-                    msg="Han ocurrido errores al comenzar la ejeción."
+                    msg = "Han ocurrido errores al comenzar la ejeción.";
                 HelperGlobal.ponMsg(msg);
             }
         }
diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index 68331e0..356689b 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -137,8 +137,8 @@
     <Compile Include="Model\TratamientoComun.cs" />
     <Compile Include="Model\Limpieza.cs" />
     <Compile Include="Model\LimpiezaDef.cs" />
-	<Compile Include="Services\EjecServ.cs" />
-	<Compile Include="Model\OliviaConf.cs" />
+    <Compile Include="Services\EjecServ.cs" />
+    <Compile Include="Model\OliviaConf.cs" />
     <Compile Include="Model\OliviaDef.cs" />
     <Compile Include="Services\ConfigServ.cs" />
     <Compile Include="Services\LimpiezaServ.cs" />
@@ -146,10 +146,10 @@
     <Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
     <Compile Include="ViewModel\OptionsMenuItem.cs" />
     <Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
-    <Compile Include="ViewModel\PaneLimpiezaSub4ViewModel.cs" />
-    <Compile Include="ViewModel\PaneLimpiezaSub3ViewModel.cs" />
-    <Compile Include="ViewModel\PaneLimpiezaSub2ViewModel.cs" />
-    <Compile Include="ViewModel\PaneLimpiezaViewModel.cs" />
+    <Compile Include="ViewModel\Limpieza\PaneLimpiezaSub4ViewModel.cs" />
+    <Compile Include="ViewModel\Limpieza\PaneLimpiezaSub3ViewModel.cs" />
+    <Compile Include="ViewModel\Limpieza\PaneLimpiezaSub2ViewModel.cs" />
+    <Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
     <Compile Include="ViewModel\PanelViewModelBase.cs" />
     <Compile Include="View\Configuracion\DockPaneConfig.xaml.cs">
       <DependentUpon>DockPaneConfig.xaml</DependentUpon>
@@ -160,26 +160,26 @@
     <Compile Include="View\PaneEjecutar.xaml.cs">
       <DependentUpon>PaneEjecutar.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PaneLimpiezaSub4.xaml.cs">
+    <Compile Include="View\Limpieza\PaneLimpiezaSub4.xaml.cs">
       <DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PaneLimpiezaSub3.xaml.cs">
+    <Compile Include="View\Limpieza\PaneLimpiezaSub3.xaml.cs">
       <DependentUpon>PaneLimpiezaSub3.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PaneLimpiezaSub2.xaml.cs">
+    <Compile Include="View\Limpieza\PaneLimpiezaSub2.xaml.cs">
       <DependentUpon>PaneLimpiezaSub2.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PaneLimpiezaSub1.xaml.cs">
+    <Compile Include="View\Limpieza\PaneLimpiezaSub1.xaml.cs">
       <DependentUpon>PaneLimpiezaSub1.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\PaneLimpiezaSub1ViewModel.cs" />
-    <Compile Include="View\PaneLimpieza.xaml.cs">
+    <Compile Include="ViewModel\Limpieza\PaneLimpiezaSub1ViewModel.cs" />
+    <Compile Include="View\Limpieza\PaneLimpieza.xaml.cs">
       <DependentUpon>PaneLimpieza.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\DockpaneLimpieza.xaml.cs">
+    <Compile Include="View\Limpieza\DockpaneLimpieza.xaml.cs">
       <DependentUpon>DockpaneLimpieza.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\DockpaneLimpiezaViewModel.cs" />
+    <Compile Include="ViewModel\Limpieza\DockpaneLimpiezaViewModel.cs" />
     <Compile Include="View\DockpaneRecogida.xaml.cs">
       <DependentUpon>DockpaneRecogida.xaml</DependentUpon>
     </Compile>
@@ -229,27 +229,27 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\PaneLimpiezaSub4.xaml">
+    <Page Include="View\Limpieza\PaneLimpiezaSub4.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\PaneLimpiezaSub3.xaml">
+    <Page Include="View\Limpieza\PaneLimpiezaSub3.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\PaneLimpiezaSub2.xaml">
+    <Page Include="View\Limpieza\PaneLimpiezaSub2.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\PaneLimpiezaSub1.xaml">
+    <Page Include="View\Limpieza\PaneLimpiezaSub1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\PaneLimpieza.xaml">
+    <Page Include="View\Limpieza\PaneLimpieza.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\DockpaneLimpieza.xaml">
+    <Page Include="View\Limpieza\DockpaneLimpieza.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/View/DockpaneLimpieza.xaml b/View/Limpieza/DockpaneLimpieza.xaml
similarity index 100%
rename from View/DockpaneLimpieza.xaml
rename to View/Limpieza/DockpaneLimpieza.xaml
diff --git a/View/DockpaneLimpieza.xaml.cs b/View/Limpieza/DockpaneLimpieza.xaml.cs
similarity index 100%
rename from View/DockpaneLimpieza.xaml.cs
rename to View/Limpieza/DockpaneLimpieza.xaml.cs
diff --git a/View/PaneLimpieza.xaml b/View/Limpieza/PaneLimpieza.xaml
similarity index 100%
rename from View/PaneLimpieza.xaml
rename to View/Limpieza/PaneLimpieza.xaml
diff --git a/View/PaneLimpieza.xaml.cs b/View/Limpieza/PaneLimpieza.xaml.cs
similarity index 100%
rename from View/PaneLimpieza.xaml.cs
rename to View/Limpieza/PaneLimpieza.xaml.cs
diff --git a/View/PaneLimpiezaSub1.xaml b/View/Limpieza/PaneLimpiezaSub1.xaml
similarity index 100%
rename from View/PaneLimpiezaSub1.xaml
rename to View/Limpieza/PaneLimpiezaSub1.xaml
diff --git a/View/PaneLimpiezaSub1.xaml.cs b/View/Limpieza/PaneLimpiezaSub1.xaml.cs
similarity index 100%
rename from View/PaneLimpiezaSub1.xaml.cs
rename to View/Limpieza/PaneLimpiezaSub1.xaml.cs
diff --git a/View/PaneLimpiezaSub2.xaml b/View/Limpieza/PaneLimpiezaSub2.xaml
similarity index 100%
rename from View/PaneLimpiezaSub2.xaml
rename to View/Limpieza/PaneLimpiezaSub2.xaml
diff --git a/View/PaneLimpiezaSub2.xaml.cs b/View/Limpieza/PaneLimpiezaSub2.xaml.cs
similarity index 100%
rename from View/PaneLimpiezaSub2.xaml.cs
rename to View/Limpieza/PaneLimpiezaSub2.xaml.cs
diff --git a/View/PaneLimpiezaSub3.xaml b/View/Limpieza/PaneLimpiezaSub3.xaml
similarity index 100%
rename from View/PaneLimpiezaSub3.xaml
rename to View/Limpieza/PaneLimpiezaSub3.xaml
diff --git a/View/PaneLimpiezaSub3.xaml.cs b/View/Limpieza/PaneLimpiezaSub3.xaml.cs
similarity index 100%
rename from View/PaneLimpiezaSub3.xaml.cs
rename to View/Limpieza/PaneLimpiezaSub3.xaml.cs
diff --git a/View/PaneLimpiezaSub4.xaml b/View/Limpieza/PaneLimpiezaSub4.xaml
similarity index 100%
rename from View/PaneLimpiezaSub4.xaml
rename to View/Limpieza/PaneLimpiezaSub4.xaml
diff --git a/View/PaneLimpiezaSub4.xaml.cs b/View/Limpieza/PaneLimpiezaSub4.xaml.cs
similarity index 100%
rename from View/PaneLimpiezaSub4.xaml.cs
rename to View/Limpieza/PaneLimpiezaSub4.xaml.cs
diff --git a/ViewModel/Configuracion/PaneConfigViewModel.cs b/ViewModel/Configuracion/PaneConfigViewModel.cs
index 225beea..0e18d9e 100644
--- a/ViewModel/Configuracion/PaneConfigViewModel.cs
+++ b/ViewModel/Configuracion/PaneConfigViewModel.cs
@@ -28,7 +28,7 @@ namespace OliviaAddInPro
             set 
             { 
                 base.SetProperty(ref conf, value, () => conf);
-                ConfiguracioProperty.Update();
+                //ConfiguracioProperty.Update();
              }
             
     }
diff --git a/ViewModel/DockpaneLimpiezaViewModel.cs b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs
similarity index 100%
rename from ViewModel/DockpaneLimpiezaViewModel.cs
rename to ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs
diff --git a/ViewModel/PaneLimpiezaSub1ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
similarity index 100%
rename from ViewModel/PaneLimpiezaSub1ViewModel.cs
rename to ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
diff --git a/ViewModel/PaneLimpiezaSub2ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub2ViewModel.cs
similarity index 100%
rename from ViewModel/PaneLimpiezaSub2ViewModel.cs
rename to ViewModel/Limpieza/PaneLimpiezaSub2ViewModel.cs
diff --git a/ViewModel/PaneLimpiezaSub3ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs
similarity index 100%
rename from ViewModel/PaneLimpiezaSub3ViewModel.cs
rename to ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs
diff --git a/ViewModel/PaneLimpiezaSub4ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub4ViewModel.cs
similarity index 100%
rename from ViewModel/PaneLimpiezaSub4ViewModel.cs
rename to ViewModel/Limpieza/PaneLimpiezaSub4ViewModel.cs
diff --git a/ViewModel/PaneLimpiezaViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
similarity index 100%
rename from ViewModel/PaneLimpiezaViewModel.cs
rename to ViewModel/Limpieza/PaneLimpiezaViewModel.cs