From 31ded359f6464329798f81385a7ac3a6089e7b60 Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Wed, 21 Dec 2022 15:31:15 +0100
Subject: [PATCH] Probado ventana guardar nombre ftclass

---
 Images/GenericButtonPurple16.png       | Bin 1055 -> 0 bytes
 Images/GenericButtonPurple32.png       | Bin 1255 -> 0 bytes
 OliviaAddInPro.csproj                  |  14 ------
 Services/EjecServ.cs                   |  26 ++++++-----
 Services/FinProcServ.cs                |  16 +++++--
 View/ProWindowSaveFileName.xaml        |  24 -----------
 View/ProWindowSaveFileName.xaml.cs     |  57 -------------------------
 ViewModel/ShowProWindowSaveFileName.cs |  47 --------------------
 8 files changed, 27 insertions(+), 157 deletions(-)
 delete mode 100644 Images/GenericButtonPurple16.png
 delete mode 100644 Images/GenericButtonPurple32.png
 delete mode 100644 View/ProWindowSaveFileName.xaml
 delete mode 100644 View/ProWindowSaveFileName.xaml.cs
 delete mode 100644 ViewModel/ShowProWindowSaveFileName.cs

diff --git a/Images/GenericButtonPurple16.png b/Images/GenericButtonPurple16.png
deleted file mode 100644
index 01b089507f9a610698e9beef0932c761c4b14e3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1055
zcmaJ=OK8(z98cK;*#kT%xG5M?Hx$>T=_6Z1<JLCaR$0bqyIC)?H2J#5Ef14#Hk$}j
zPaYIx9&`wL@Ug)dQxriDDxMUST?Ds_h=Lvz56Vyw>X)wFJXn)_`5yd#zyIs^ogW(P
zYi?+5z%Z;i(a$H*yxkew>d}Ai_o9fV78uXKl%9hH(F9mT*0TUlsNxt%0#Tki@dAV~
ztY)8*&cKW?z)HGGijECws|G@2Sh(9ZL}?sAJPXDYjU&E2enQ}i%n?U|f>$tNAg}aK
zn;<nkn3kr;rI1W?AHu^niwINzMch^=G>f%4qQuLhwR21nc*z8gbHqka8DR*I=_bH~
zq~9ZXX&Pr3k`4qJhVH<9UfM@_(Z_h`02^djUngFE2;|L_b8M3DE&D<{j>to3uoP7&
z6v%>~)Xg!94uwJvhtKCh79ML#gQD%xEO&*02bN?i22^wncNoR2J_$JjMY@rKYHZSK
zR=G^5V3aKy6is@alq!aT@PAWP-L$q~5^Tl$Phu-QWdJG(EPc|HP~&oL$CbgxOdvwt
zOzZkYrHVs&9qLwIH}F`B!S@TIq-f5;ff7Ox*o0<5QIkM|=Lp0>DvHcTgMqFtKNDkU
zzLTco{z&Piz1~1?EEeZO6)dkylPb_)1uJi1`Knk)461=V^T1S20=d`JRlJlmt5lCA
zQkAcam8-`Rt%{{kFqG5Uzgk^6Li%x*o5Dq#P3Z#->D@%aKK9_^9J&;j5_}|WuVsH1
zi`_MCGj;spwNtlU{cmRHAJXB~n`i1?E)>>Nxls`ihd*6^SKPI(J!-tS>{>dPdG-1D
z(UrD4_rHRlzdm%1T==qQu_-kC`ieNy)HBD`4BTy9KK)#2qTA~mp3S>5S=Wx?x6$40
zeJj`xyM3+k#>YfQ&q$*caR=1d%U649-M3a-@Tb^L>)`v^h2^YsWfSp1eknS7_7BY~
BR#yN3

diff --git a/Images/GenericButtonPurple32.png b/Images/GenericButtonPurple32.png
deleted file mode 100644
index 39f62dbd909f6ea3aea92e464cdec4ad25671294..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c
zI(&VtJoAc667!N%JzZ>-fM)1rW~NxVnYp<c8M&F58M-(c8oC-gf}x>-fr*>5v#X0G
zOs`9Ra%paAUI|QZ3PP_bPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$iU!f75<ZwhX=
z7~|Bd4|I$^C~A?S8YToxKOiPN;Q~4Eq@S7xOz%a&gk2(L^p=5vG1Ak;F{I*F(x3nT
z?GHOJ9dmrh;O6FLkbZQ|Wk!cp@*ScXDfgKb^m;rD?=pP0xWlM$Ix=GBHR&iXLypd(
zOGmzyuitMx$Npc>!}IU!8y}ujlXgh*@%Z$2%N7|HhqUH54Q)oucNiV+H$QS{oHk9_
zx@mHEDC1GaFKqYs|83hG>A+$T_=mlXDeUO;KKm4lZU6ZWpO@e7xv6Dt^VEYkg618(
z6v(>XN~~tm@kX(D%kMo0FZl^e<h)V&^-2Bk&dKEma%%bxNVBFl?lU(ESG-vy!0^&=
z^F@Z)jr<Qv88mL3+$h5q5jj(`?*A|6eatHu|NZ@KzkyGI#ZA`WRYM?qk5$44>j&T8
z?@y8T>xtXLXRs+G!J_mD+m0;Ny%#?UuMtmSyZM&U-Jh3@k58=aar-)cpJtY8GZa!z
zZ18O1cX(SC#k@k6e}m-$fh(B{mMSO63Qve_UY%{WsQNeqBO62Q=SfzdOx|07iXKl_
KKbLh*2~7YH@3UP1

diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index 95771c3..e583315 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -148,9 +148,6 @@
     <Compile Include="Model\TratamientoComun.cs" />
     <Compile Include="Model\Limpieza.cs" />
     <Compile Include="Model\LimpiezaDef.cs" />
-    <Compile Include="View\ProWindowSaveFileName.xaml.cs">
-      <DependentUpon>ProWindowSaveFileName.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Services\EjecServ.cs" />
     <Compile Include="Model\OliviaConf.cs" />
     <Compile Include="Model\OliviaDef.cs" />
@@ -162,7 +159,6 @@
     <Compile Include="Services\LimpiezaServ.cs" />
     <Compile Include="Services\ProcesoEjecServ.cs" />
     <Compile Include="Services\RecogidaServ.cs" />
-    <Compile Include="ViewModel\ShowProWindowSaveFileName.cs" />
     <Compile Include="ViewModel\Comun\MarchandoUnaDeViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
@@ -256,10 +252,6 @@
     <Resource Include="OliviaIconPro.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="View\ProWindowSaveFileName.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="View\Comun\MarchandoUnaDe.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -381,12 +373,6 @@
   <ItemGroup>
     <Resource Include="Images\help16Pro.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\GenericButtonPurple16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\GenericButtonPurple32.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--
   PackageAction can be:
diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs
index 7e31822..18a5d73 100644
--- a/Services/EjecServ.cs
+++ b/Services/EjecServ.cs
@@ -10,6 +10,7 @@ using OliviaAddInPro.Helper;
 using ArcGIS.Core.Internal.Data;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using System.Windows;
+using System.IO;
 
 namespace OliviaAddInPro.Services
 {
@@ -615,10 +616,10 @@ namespace OliviaAddInPro.Services
         /**
          * Realiza las funciones de importación de la sectorización
          */
-        public Respuesta<string> ImportSecto(string GdbFileName)
+        public Respuesta<string> ImportSecto(string GdbFileName, string FtClssName)
         {
             com.ProgrSrc.IncMessage(10,"Importando capas");
-            var res = Import(GdbFileName, 0);
+            var res = Import(GdbFileName, 0, FtClssName);
             if (res.HasError || string.IsNullOrEmpty(res.Value))
             {
                 return res;
@@ -644,10 +645,10 @@ namespace OliviaAddInPro.Services
         /**
          * Realiza las funciones de importación de la planificación
          */
-        public Respuesta<string> ImportPlanif(string GdbFileName)
+        public Respuesta<string> ImportPlanif(string GdbFileName, string FtClssName)
         {
             com.ProgrSrc.IncMessage(10, "Importando capas");
-            var res = Import(GdbFileName, 1);
+            var res = Import(GdbFileName, 1, FtClssName);
             if (res.HasError || string.IsNullOrEmpty(res.Value))
             {
                 res.Value = string.Empty;
@@ -703,7 +704,7 @@ namespace OliviaAddInPro.Services
         /**
          * Realiza las funciones de importación, modo 0 secto, modo 1 planif
          */
-        public Respuesta<string> Import(string GdbFileName, int modo)
+        public Respuesta<string> Import(string GdbFileName, int modo, string FtClssName="")
         {
             var res = new Respuesta<string> { Value = string.Empty };
 
@@ -755,11 +756,13 @@ namespace OliviaAddInPro.Services
                 /////////////////////////////////////////
                 //no tiene un dataset configurado, saca ventana para elegir uno
                 //saca ventana para elegir Dataset, si se cancela, se guarda en el nombre por defecto en función del tratamiento y los ámbitos
-                HelperGlobal.ponMsg("A continuación, introduzca nombre de Feature Class y ubicación (Dataset) para importación. Si cancela el proceso, se establecerán el nombre y Dataset por defecto en función de los ámbitos y el tratamiento");
-                string path_aux = HelperGdb.SaveFileDlg("Introduzca nombre de Feature Class a importar", GdbFileName, null, ArcGIS.Desktop.Catalog.ItemFilters.featureClasses_all);
+                //HelperGlobal.ponMsg("A continuación, introduzca nombre de Feature Class y ubicación (Dataset) para importación. Si cancela el proceso, se establecerán el nombre y Dataset por defecto en función de los ámbitos y el tratamiento");
+                string path_aux = FtClssName;
+                    //HelperGdb.SaveFileDlg("Introduzca nombre de Feature Class a importar", GdbFileName, null, ArcGIS.Desktop.Catalog.ItemFilters.featureClasses_all);
                 if (!string.IsNullOrEmpty(path_aux))
                 {
-                    tratamiento = System.IO.Path.GetDirectoryName(path_aux);
+                    tratamiento = new DirectoryInfo(System.IO.Path.GetDirectoryName(path_aux)).Name;
+                    //tratamiento = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(path_aux));
                     amb_aux = System.IO.Path.GetFileNameWithoutExtension(path_aux);
                     //comprueba si ya existe ese ft class
                     FeatureClass ft = HelperGdb.GetFtClass(path_aux);
@@ -790,6 +793,10 @@ namespace OliviaAddInPro.Services
                 //HelperGlobal.ponMsg(err_spatref +", se ha creado un nuevo dataset "+ datasetNameOut );
                 tratamiento = datasetNameOut;
             }
+            //avisa ahora para dar tiempo?
+            if (!string.IsNullOrEmpty(msg_avisa))
+                HelperGlobal.ponMsg(msg_avisa);
+
             string dataset = tratamiento;
             /////////////////////////////////////////
             if (!string.IsNullOrEmpty(amb_aux))
@@ -884,9 +891,6 @@ namespace OliviaAddInPro.Services
                     res.Error.Add("Errores en la importación: "+err_st);
                     return res;
                 }
-                //avisa ahora para dar tiempo?
-                if(!string.IsNullOrEmpty(msg_avisa))
-                    HelperGlobal.ponMsg(msg_avisa);
 
                 //cambia el nombre de los campos que había truncado a 10 caracteres al exportar a shp
                 //solo para la capa original
diff --git a/Services/FinProcServ.cs b/Services/FinProcServ.cs
index 462453a..01b5223 100644
--- a/Services/FinProcServ.cs
+++ b/Services/FinProcServ.cs
@@ -42,7 +42,8 @@ namespace OliviaAddInPro.Services
                     //actualiza los flags
                     OliviaGlob.RemoveFlagTipEjec(TiposEjecucion.FinEjecOk);
                     //importa resultados
-                    resp = IniImport();
+                    string FtClssName = "";
+                    resp = IniImport(out FtClssName);
                     if (resp.HasError)
                     {
                         msg = resp.Error.First();
@@ -59,7 +60,7 @@ namespace OliviaAddInPro.Services
                                 //actualiza los flags
                                 //OliviaGlob.RemoveFlagTipEjec(TiposEjecucion.EjecSecto);
                                 //acciones de importación
-                                resp2 = inst.ServCom.ImportSecto(GdbFileName);
+                                resp2 = inst.ServCom.ImportSecto(GdbFileName, FtClssName);
                             }
                             else if (OliviaGlob.HasFlagTipEjec(TiposEjecucion.EjecPlanif)) //Ha terminado bien la planificación
                             {
@@ -68,7 +69,7 @@ namespace OliviaAddInPro.Services
                                 //guarda csv
                                 //GuardaCsv(inst); en finEjecuta3
                                 //acciones de importación
-                                resp2 = inst.ServCom.ImportPlanif(GdbFileName);
+                                resp2 = inst.ServCom.ImportPlanif(GdbFileName, FtClssName);
 
                             }
                             Application.Current.Dispatcher.BeginInvoke(new Action<Respuesta<string>, Respuesta<string>, bool, string, TratamientoComun>((p, v, x, u, w) => finEjecuta3(p, v, x, u, w)), resp, resp2, mal, msg, inst);
@@ -246,9 +247,10 @@ namespace OliviaAddInPro.Services
         /*
         * Inicializa la importación
         */
-        public Respuesta<string> IniImport()
+        public Respuesta<string> IniImport(out string FtClssName)
         {
             var res = new Respuesta<string>() { Value = string.Empty };
+            FtClssName = string.Empty;
             //Lanza ventana para elegir gdb a la que importar resultados            
             string GdbFileName="";
             if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGdbImport))
@@ -273,6 +275,12 @@ namespace OliviaAddInPro.Services
                 return res;
             }
             res.Value = GdbFileName;
+            
+            if (string.IsNullOrEmpty(OliviaGlob.Paths.PathDatasetImport))
+            { //ahora pide elegir nombre de ftclass
+                FtClssName = HelperGdb.SaveFileDlg("Seleccione ubicación e introduzca nombre de Feature Class a importar", GdbFileName, null, ArcGIS.Desktop.Catalog.ItemFilters.featureClasses_all);
+            }
+
             return res;
         }
     }
diff --git a/View/ProWindowSaveFileName.xaml b/View/ProWindowSaveFileName.xaml
deleted file mode 100644
index 8106762..0000000
--- a/View/ProWindowSaveFileName.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<controls:ProWindow x:Class="OliviaAddInPro.ProWindowSaveFileName"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:controls="clr-namespace:ArcGIS.Desktop.Framework.Controls;assembly=ArcGIS.Desktop.Framework"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions"
-        mc:Ignorable="d"
-        Title="Guardar elemento como..." Height="145.946" Width="544.144"
-        WindowStartupLocation="CenterOwner" Closed="ProWindow_Closed" Closing="ProWindow_Closing"
-    >
-    <controls:ProWindow.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <extensions:DesignOnlyResourceDictionary Source="pack://application:,,,/ArcGIS.Desktop.Framework;component\Themes\Default.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </controls:ProWindow.Resources>
-    <StackPanel Height="108" VerticalAlignment="Top" Margin="0,0,2,0">
-        <TextBox HorizontalAlignment="Left" Height="35" Margin="20,8,0,0" TextWrapping="Wrap" Text="{Binding Path=Texto, Mode = TwoWay}" VerticalAlignment="Top" Width="491" KeyUp="TextBox_KeyUp"/>
-        <Button Content="Guardar" HorizontalAlignment="Left" Height="35" Margin="387,20,0,0" Width="124" Click="Button_Click"/>
-    </StackPanel>
-
-</controls:ProWindow>
diff --git a/View/ProWindowSaveFileName.xaml.cs b/View/ProWindowSaveFileName.xaml.cs
deleted file mode 100644
index 831528d..0000000
--- a/View/ProWindowSaveFileName.xaml.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace OliviaAddInPro
-{
-    /// <summary>
-    /// Interaction logic for ProWindowSaveFileName.xaml
-    /// </summary>
-    public partial class ProWindowSaveFileName : ArcGIS.Desktop.Framework.Controls.ProWindow
-    {
-        private bool ok = false;
-        public ProWindowSaveFileName()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            ok = true;
-            Close();
-        }
-
-        private void ProWindow_Closed(object sender, EventArgs e)
-        {
-
-        }
-
-        private void ProWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            if (ok)
-                DialogResult = true;
-            else
-                DialogResult = false;
-        }
-
-        private void TextBox_KeyUp(object sender, KeyEventArgs e)
-        {
-            if(e.Key==Key.Enter)
-            {
-                ok = true;
-                Close();
-            }
-        }
-    }
-}
diff --git a/ViewModel/ShowProWindowSaveFileName.cs b/ViewModel/ShowProWindowSaveFileName.cs
deleted file mode 100644
index fb09a17..0000000
--- a/ViewModel/ShowProWindowSaveFileName.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ArcGIS.Desktop.Framework;
-using ArcGIS.Desktop.Framework.Contracts;
-
-namespace OliviaAddInPro
-{
-    internal class ShowProWindowSaveFileName : Button
-    {
-
-        private ProWindowSaveFileName _prowindowsavefilename = null;
-
-        private string texto;
-        public string Texto
-        {
-            get { return texto; }
-            set { base.SetProperty(ref texto, value, () => Texto); }
-
-        }
-
-        public ShowProWindowSaveFileName(string text_in)
-        {
-            Texto = text_in;
-            crea();            
-        }
-        public string GetName()
-        {
-            bool? res = _prowindowsavefilename.ShowDialog();
-            if (res ?? true)
-            {
-                return Texto;
-            }
-            return string.Empty;
-        }
-        private void crea()
-        {
-            //already open?
-            if (_prowindowsavefilename != null)
-                return;
-            _prowindowsavefilename = new ProWindowSaveFileName();
-            _prowindowsavefilename.Owner = FrameworkApplication.Current.MainWindow;
-        }
-    }
-}