From e82c5a70b892322f7b591536ec94986ecb1919ee Mon Sep 17 00:00:00 2001 From: fede Date: Sun, 11 Aug 2024 18:20:24 -0300 Subject: [PATCH] no pude usar controladoras, no carga los datos ,interface de cliente y provedor --- .vs/Final_OOP/v17/.wsuo | Bin 36352 -> 36352 bytes .../bin/Debug/net6.0/Controladora.deps.json | 5647 +++++++++++++++++ .../bin/Debug/net6.0/Controladora.dll | Bin 4096 -> 14336 bytes .../bin/Debug/net6.0/Controladora.pdb | Bin 10096 -> 25316 bytes .../obj/Controladora.csproj.nuget.dgspec.json | 42 +- .../Debug/net6.0/Controladora.AssemblyInfo.cs | 4 + .../Controladora.AssemblyInfoInputs.cache | 4 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + ...ontroladora.csproj.CoreCompileInputs.cache | 2 +- .../Controladora.csproj.FileListAbsolute.txt | 17 + .../obj/Debug/net6.0/Controladora.dll | Bin 4096 -> 14336 bytes .../obj/Debug/net6.0/Controladora.pdb | Bin 10096 -> 25316 bytes .../obj/Debug/net6.0/ref/Controladora.dll | Bin 4608 -> 7168 bytes .../obj/Debug/net6.0/refint/Controladora.dll | Bin 4608 -> 7168 bytes Controladora/obj/project.assets.json | 18 +- Controladora/obj/project.nuget.cache | 6 + Entidades/Proveedor.cs | 3 +- .../Debug/net6.0/Entidades.AssemblyInfo.cs | 4 + .../net6.0/Entidades.AssemblyInfoInputs.cache | 4 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + .../obj/Entidades.csproj.nuget.dgspec.json | 14 +- Entidades/obj/project.assets.json | 10 +- Entidades/obj/project.nuget.cache | 6 +- .../obj/Debug/net6.0/Modelo.AssemblyInfo.cs | 4 + .../net6.0/Modelo.AssemblyInfoInputs.cache | 4 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Modelo/obj/Modelo.csproj.nuget.dgspec.json | 31 +- Modelo/obj/project.assets.json | 15 +- Modelo/obj/project.nuget.cache | 6 +- Vista/FrmCliente.Designer.cs | 187 + Vista/FrmCliente.cs | 93 + Vista/FrmCliente.resx | 120 + Vista/FrmClientes.Designer.cs | 15 + Vista/FrmClientes.cs | 56 +- Vista/FrmProveedor.Designer.cs | 14 +- Vista/FrmProveedor.cs | 38 +- Vista/FrmProveedores.Designer.cs | 8 + Vista/FrmProveedores.cs | 44 +- Vista/FrmRemitos.Designer.cs | 24 - Vista/Vista.csproj.user | 5 +- .../net6.0-windows/Vista.AssemblyInfo.cs | 4 + .../Vista.AssemblyInfoInputs.cache | 4 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Vista/obj/Vista.csproj.nuget.dgspec.json | 27 +- Vista/obj/project.assets.json | 15 +- Vista/obj/project.nuget.cache | 6 +- 46 files changed, 6435 insertions(+), 82 deletions(-) create mode 100644 Vista/FrmCliente.Designer.cs create mode 100644 Vista/FrmCliente.cs create mode 100644 Vista/FrmCliente.resx diff --git a/.vs/Final_OOP/v17/.wsuo b/.vs/Final_OOP/v17/.wsuo index 269473160211156981b75bc79daf53b8cb754b4f..4b3b08c92cd25f7ccaa9ca2aaf120dcfbebdd5e6 100644 GIT binary patch literal 36352 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 delta 3867 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 OP2eNW&&&V62>cKDgzEeN delta 1074 zcmYk5e@IhN6vw}J(>bTCJu=fweNLB_HlNcPWt3~9-_~jxDNCL1W!BtV+YE|y_D2~( z(YXCl{ZT?i5&lsa74%O;5J3qzfq!LC{}cqB`!=idIG_7H=iPhGeec~j9vhc0 zoY{8rOZ#VJ?IY}R0aE}oB}|#5bs3E^c^f%k)3pJ}(Zhcu#?!Bz*2fNDm$=gg_>A16 z6cqr46u+$jI(U_#fp@W5OOYrplbiWjR$=uSNw$%Tq89#uRp$4RqAsxV56oUVM`eX= zAvYiwK^ZtflNnDd?gG1^j=ET|0^s$MBh|-%>M`IYjc7=N{|%KB=#pXHK*v6kekN{+ zm-q&g%mfD$T#0jR0iMt;6ZXMNnL;)~ybr-6I?wC;uG6FQ6^rV{#77ZL#APFw(4=d> zEb^yICa4CZjix53xdaiG5-nIxw9#b2H99>yx9Z%jvrA`)Xo8cTsDiiYu-pGk!ZrYb}c*-QP;z( zMU!zY5(;ba5CX>%Np;w{XC#^&8dl*``$q-``RLMjTq}3;yX8x`p`v8*{4DiAL>)*D zX;C-_l3JV(SGH`+ETNB2_0sVoE`d%$V6IgXNNt zBoSK8cQ^E=q#4UvZgO6(wJ_v1ITa`UA{o2quX_sC?iWYlAbA5F)P_9X(^zb}Nb+JH zKi+6>x$>h*d6&B6xfy%0>6@+9E#8lJZLl+;#uLGvp@D;1(5EI2C$(7cs2UH4!fIUO zGmUOncH!>%h1722spI|`d-{58U8MEQr|f?rHuGC(IbBt3m~-&GO5OCRl4g8TiE*o| zRcZrf#U`^hYvA3kt85GZ>8fTm)8);NnNfj>zi+AM-K%cVvW|Q?bINV2r=`_%EUo1I E0oF>%MF0Q* diff --git a/Controladora/bin/Debug/net6.0/Controladora.pdb b/Controladora/bin/Debug/net6.0/Controladora.pdb index 28e31357ebd623e89d8a47a1505e731b0aff8af7..fc4fe310381e94f9261f54f197f24ec26d5870f7 100644 GIT binary patch literal 25316 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 f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) }, "projects": { - "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -41,6 +49,7 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -54,6 +63,13 @@ "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj" >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } @@ -239,14 +255,14 @@ } } }, - "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -299,14 +315,14 @@ } } }, - "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -323,8 +339,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" } } } diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs index d1f8ae6..1f372c8 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs +++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs @@ -19,6 +19,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] @@ -26,6 +27,9 @@ using System.Reflection; ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] >>>>>>> 8ad9dc6 (faltan controladoras) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")] +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) [assembly: System.Reflection.AssemblyProductAttribute("Controladora")] [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache index 8d3f8b0..c0e6900 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7 ======= f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0 @@ -7,3 +8,6 @@ f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0 ======= bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537 >>>>>>> 8ad9dc6 (faltan controladoras) +======= +41b9ae2cc417f11ef0d05afd64f424d30011ec3381b04e193604d3f4663cdb67 +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig index 6dc1d01..dcd6cfe 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Controladora <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ >>>>>>> 8ad9dc6 (faltan controladoras) +======= +build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\ +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = ======= diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 0810fcd..7195f05 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a8e0260e0db6be55f0b0f28b550784baab05fd07 +19830861cd564e51db0c3967ce8e2d2c457eecffb478d0402938a76286038bed diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 94665ac..d971078 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -16,3 +16,20 @@ C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date +C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 95b3e46d21a58b038329027227860ee3af40014e..f1d51a9ebb97a8c9a7cbb12b3a0018532407ef7a 100644 GIT binary patch literal 14336 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 OP2eNW&&&V62>cKDgzEeN delta 1074 zcmYk5e@IhN6vw}J(>bTCJu=fweNLB_HlNcPWt3~9-_~jxDNCL1W!BtV+YE|y_D2~( z(YXCl{ZT?i5&lsa74%O;5J3qzfq!LC{}cqB`!=idIG_7H=iPhGeec~j9vhc0 zoY{8rOZ#VJ?IY}R0aE}oB}|#5bs3E^c^f%k)3pJ}(Zhcu#?!Bz*2fNDm$=gg_>A16 z6cqr46u+$jI(U_#fp@W5OOYrplbiWjR$=uSNw$%Tq89#uRp$4RqAsxV56oUVM`eX= zAvYiwK^ZtflNnDd?gG1^j=ET|0^s$MBh|-%>M`IYjc7=N{|%KB=#pXHK*v6kekN{+ zm-q&g%mfD$T#0jR0iMt;6ZXMNnL;)~ybr-6I?wC;uG6FQ6^rV{#77ZL#APFw(4=d> zEb^yICa4CZjix53xdaiG5-nIxw9#b2H99>yx9Z%jvrA`)Xo8cTsDiiYu-pGk!ZrYb}c*-QP;z( zMU!zY5(;ba5CX>%Np;w{XC#^&8dl*``$q-``RLMjTq}3;yX8x`p`v8*{4DiAL>)*D zX;C-_l3JV(SGH`+ETNB2_0sVoE`d%$V6IgXNNt zBoSK8cQ^E=q#4UvZgO6(wJ_v1ITa`UA{o2quX_sC?iWYlAbA5F)P_9X(^zb}Nb+JH zKi+6>x$>h*d6&B6xfy%0>6@+9E#8lJZLl+;#uLGvp@D;1(5EI2C$(7cs2UH4!fIUO zGmUOncH!>%h1722spI|`d-{58U8MEQr|f?rHuGC(IbBt3m~-&GO5OCRl4g8TiE*o| zRcZrf#U`^hYvA3kt85GZ>8fTm)8);NnNfj>zi+AM-K%cVvW|Q?bINV2r=`_%EUo1I E0oF>%MF0Q* diff --git a/Controladora/obj/Debug/net6.0/Controladora.pdb b/Controladora/obj/Debug/net6.0/Controladora.pdb index 28e31357ebd623e89d8a47a1505e731b0aff8af7..fc4fe310381e94f9261f54f197f24ec26d5870f7 100644 GIT binary patch literal 25316 zcmb7N2|QHa+rM_=7g|(GXXkm<@2{U76tZhPtvP70dq(rh65lY%r zDixI$Nu@<8rKG+0oI7*582x*FKKIU?x##;l&w0){&w0*s&bf%TW<)VW41s?N;IcL% zs{79)Xrn(M(#R(8#T{Hzt=-+=Z>`{ZEeX=_#MGXWX`2cd7~ejI0`+B_{`j zfl|!^*Klx2fNL?hCW6ZrT<~`&FU*5oBZc2#UUA_CKHzsj0g)V-1b^Ykf8Y-3%>Wk= z6PW`pQ;^LD8%A_XeEtESOT@(xBXMyg z1bprSpXb5n4e&WpLJXNJA&z_mpW>3@h=P;ET)>|53U7ePu4NpuuP(!li- zT$7x{k>yVCi3DQhB!PH?D+*k>=x>rpg_9)m7+hk`lE@@ym`@7Pc9ue{z~v3DDD*dJ zWWTdCQUR_eaCM`<$sp3JWsqs$B7)0xHN?syzN=-CSa219>l*r-9MZg64*3qQv1{az zg`g%8WEf(yW*FiKE`M8ZFh#81biA%4by^vnV2S-3RB&%ve5Kw4u!T5~{J3zvrYxwtgMYY#}z8<5t)r6FE- zKzac#4a>7|Kzh-DG{^$lj|=D%@bjW0v_Uh0CAupOOMXu_6WFbIM}IL1#9AUmOd9EN zOakAhN@jxZs!nC#`wFQV^!HY9k9SlThj|RZUDe4I{T>4D@s2g%-sIE@?mwIm3HV(d z+~XZx(eEMP{=+E~{a%Cqj!2?;!2O4l0s7q)+~XZH(eE|r@2%)}L<;_H0Pa1GuHdff z6oP)wM1OBZza!G{cXe8ls%8Z8FEzN{IP;p9zp3uQS#wjloa%9SIElt*c(S=n8V^r|r#}5@>f1#> zwisR=abhiL{JrAf-8&{rOo(sia7$F`sf2H1`VsMFGFW^DBryz=Bjl9&nI+Ey&y~?F zuRn;b9clM%(dhRFvPX9MoIW`^*uU=H(#QR17}Mx{KQ1apAB~^tCq9lUZ);t(niR0j z&n1DAc}XVmRI=pR7@M*B?evqX*CyiSpmNkYsQTMd;=89PcIH{k zlyy?)t(9QAZICizxcPZXvl#q^1nqv+M=$|?49(k~2b~{+C(yVO)|x`!hjxX24gI73 z>7#D@>*>#5%?OF>-lf`gCaYzoJ}ooN;q$Kj(XzBTr+sGv*QBv&RWU_V>uQrF^@h2Y znI^^ZcKP!cW;d@=&91MUrB#33d{qc1KR;Asm$?nE;A7pJC9ht!9iEZw{_@r6w-sT# zuUpK>ywI2tBA#*mG*R5_r;YjNWoBl>WM|1=on>ZeA!ep@%xdnmBArhMF;cOdV+X0QEk*aUnN>QxYhbpDp*~#-)i3uJzl7l*=wcEEPnu5Wq!1j@u#5|?V zV}9;DHoJcArPr;*+D;Ys_tb;GRosY)Mued59XCo`Jt+Fu(vl{67MZ!g(kw*29*VWz{M{OP9a z-P%3;jHkUc^_a$HuVt&%o<#aG-qC0iZI9|1y`A?x@?A=u^;|1np04FE*OkUKi2EAu+ooL0zJBczqv(E}`p=An zphKsR=$HIFaG7%Zz~=X+(dxRj&S&W_j)f;SPAD5aSH{GUxvzBQ6J*;Te?dP$ zbPzf)#Y}GoR}1?|m#~DOtu>#ZqdQM$9$}saZOLN#5^eVd3w0MPn7?Sr;`s~R-51ao z>n?DczrcgGWWJ7@wl>{^HXre(u{`}~o(zOE72%W=784D45q<;fw)6cq{Z>};~}8Q@;%sG zAHjD>T7pjem3HZT|Y$MDw;1^-`d4sa{KA0yO zp)(Xh$7M)_j%ZTzhaxqRxjd4*(&$iJ zQzW7ALNXZ`A9tEN7>fk?>^|leT$ zj-#K{Wb*#`E;h3Wb7OJXK6Zwn_@LE!GPprP)+yq32M~2J#B0Z$Y>Uzia&%mZ^0^Op zoJ7M#6vmXz;{zjZ%cpVqejFjy&Nt^9kPrm9L8lzvDa|ECEAth1PB$wMP1TRT9{6)Y zEfEaecziDK&Va_ST5_E&6$2_6i7C_OMcdvqkMx{qUuxv^?O(`|*laImZ+*Y#e7FK< z9X=X=K{ue@K0em8Z#_jEZzt0oC z!DtgX*52@$nx#SbQQu@Fc+@|&fL?xvbkx`i%UQx9RzUHdM3?9DOLvi?manv(YhQ=- zX2*9d!~Ttm3e!S5b6AWIP&Bm=Y0Vj@&r?IH0{xA1k(2*K2Ur4%JMb!4zzhiK*}OA5 zhh&0SQrA1_@%Ijy9-dK`aQoZ1_J5&g7r^B6dzE%m)8iMEtmDk`?4Yy0o+ofaflUyWG~~)U)2&=d%t5XB6iBZ$jpbAR`8s>5o@OCvVt! zSYd0`FRpGUby1^-oByiZ^gUf9H6t3IX3b^u1>U+SgFENrhbl;J%B&^wA)bolc(IE` zQYpK~{u4Ra9BjcD34AAESxaua-h<>?w_354{!1pOY`1>wZ|Ai7U&sl}W#zF=A3=Z? znOL+)bJFfIV#vn4X-6)kJp305Kqh#<#mqwaKSuTjJdjDneS`S z#F#Ws798W~VBj7+G(B~kvJbW+UQnxto>c-dD=_imcV6q>|4B8 zw(9o_q@+2+%w{K9r~FSibY%EJy^|oEGr_+a90{F?xS7}Gb<)R?%5DV|sK|14M3NLp z!7Tsu6c%Ft=BUfhJvaub@$1~vgBuh?LWI3rlrp}wTzCuXS$tLfqzx}(%?_7eH!sj_ z6aOn6fe0$?4XKE_IC67=&uxtl4OWrM?ZsM+<`n%E3M~#Wo+7H{nSRnQSR$?JG2bq& zq?%T53Dn;<@+Da`Ilhm#C?X#NKE8oOCMu-wbUpFbBt6Q-fF)5+a7={J3~n-eZ^H@$_B|;Np8xir)_V)?XsBtvycX}C)Lz6IO&_GnI*IUwbTVDr_-O&>HPqsHEQ;saH zzp8d7L$q&c%I9;apgOqBKKHuw!H;%Gz{Dnd$7aQ6M*CNBCasfI(h?~F1-RI-Q45WR zwfxvhsJMeFwDl3spO91AD#vl$6@UL7J9NKjcwQcl)QBNf)r>5|r2WK@U#X8dUzu(q z>6!7^ENdE{j`<8r$v(%S-U;4sO79B(k|!DdhQrpzjY?ejv?*x0zRkESuV-{kJ2 zhYV2|Kmupw^6ExiMnYte+~?0MI-Z@S?x?o-P+2i-){sR2SgiQ>L(V6`;+L#CEly^H zQwnC?iL&mFzda-t4w!~47MqU_xfq#hHPx%IO^Cb694Q&`#r$ZfxVepqmhO;b1XUQ~ zoAv-!A-(&!dR(zHwM2PxRgdQEwjp80AWT4mULubGo29TN?9;oq7j`X`ubWJbJbX>g zs021!Rt@3BLjB{&I0Abo5JuAU%6C`=J6>LE(V&d8ia6$f;noX7=8(dOXxpTH8xo-; zug2EBzG8jRsEqV5e*5E(tRZRG(1Lqs(5v6h{(%^XBd7BlJ|EZ`K`M`&7BJVpCEK$(~7!>ZtN^(M3XbIrHEB8J|ckurmqcWOuq4opVC0F&F? zUb6!Ukwo%JyJwD&nq+did$-g1j_tuBX;`t{8NFV&K!!hWjT_*+@=?NtCu626n;kD$ zNFat+h#tzR0Zgnp?W|!PfWysLiPM%}yVZuU#&4oBwu_5s=Dn!n=`YOgV;^e zA)V&e2OcXhRr?FjLKs;Ss%_gFmoCIr8mWrgn5!^8!7}`#;TPLm@>Bmp0Sh7v%B*LG zJcf;U|Hgt}77A3u1I=G1#QSa)J#DgK@HoH~WRSq}7qqJ)oQI{_#%Ignknti=$;j~ful&-J9^3vZUL?{cm9I|;aq#Na_!Rj8UV zW~08quH|XMwEw;7velV|J$|vB+M)+w8%6+^$;W(dN$$qSutKwf=}m!)Cz%`?Zn-(1 z`%+G{1j0c^gfb3tR=$GDRqdATSsoQa-Mg~Iwd>sIi+`mfP{LxJ$#;=fG33c%$@#KP zM6+X>xfK`9Q$@Eap)Uu$2(VHhEdOz{Yv&Pl3FP~mmbQW@S%bos&^z!6Kvj|89#OzlDU%!8#n5;f)`4o-C?KguSyt;q1&x zt|KYu&}8vx1+1#S$%By*=)~Q9(`VSWB$wWmkE8MPImABeL1%#*v> zQ+n3E{(lk%;cq{GVI^)l;c^JJ#3eo}bE@S}njI^@5>kEss?rdm;@f}trl=Cw_{N-$ zPuxR2X;CSMSl)QwSSA|Ep+SYAAqau8H!0|qz!BQ=WPnE`kY2hOw! zAROR8^Yg}{QGR;PKad(}#Gs_nBKzbuv&!OIUX%8G{e@%O9|i;mB!oh5FI;~f8l311 zr=FOGL&m2~=1O{H)lTd~lfanM>rRqv*VDLI(D(2nl|M)(5xII}f1>fzo0jq4R#=Yt z{3&?|tUyc2HnG+Eg&Wj187ZK!$?+nA&)z-B`fbb(vfC*?@Y3)2-%AO5HDM9@0>}f78O?@i@8Ie6U_Xuof;EiRiQ!WSgEqYjBA> zx0-T9f|#;iU8gj&_EjGZQS%}r23U~5h8pshcRyexLUYoyEe)41nxB-E)17YNX8d;& zf?^Y+oPZCYjKmGMDQy&QBqb_Fd9t0AaSpX8_7s*S!-w6w5^=|FaW~XMi&>6W-mwkT zl!n>iO{bJ_1C1ymHVmK@Fktq^)x6torXe+Q$cBmUr>zUtH8@t?EHQ6IG_KQ%BGa!% zc&jdg=sxg;BD&IkJ=$V;SiQ@6|*FA`H}r z=VuV%0o`@WjnUedUgnVxK2+&kDQSia;o+rVvpkrdV1o`C@)gnIr}oSVgS~mSe|Ea} zh*XP1C0C}r(3SjvZ1hp4xHWfU|)>gg;r?y6c?)^MR(&EWL=#qB-099#fsNNLC{eF_t>OLIUm;NSyBF)GaILj0%k83KkZ2Q}FEu1pIJ)8<3Z#tnp86XW^TDLo zTkN%Tso~~6-d09maBd%yZ&l-v_<^|PZ7ZTW`^ z#7(NVyvjNTMLGJBh1|_DCLahNH}3fT|Fr*s3fxp@%b;`n8~~oFE%3k*Brp9m;XWzM zAU#}8JfYly{SUxPZDIC6JifN=HJ zCz>U2Ah7U5K=9^VX!BdetFrekM5xsXosn}X_cg zOp@rPS&!sRrH;wRizEVDAXxkG2SG|OZx>-$&P_Y=1lC%5`^uRWT6M(e_6oH_>vC~k z1+G;6sljc4Y+m2U?(ojiN9UXi zkdiDd$oX0Q3#*E{vP`Q)4$iL_QYh>7An*s`kwQu@y>8xsbzeH^(@f?EIdZ1Bu0lf5 zD6t`B5^URoTjkvP!jM{5wx5A2mv7jgx+WuoywfDz=|ic>SCLfyvS9G(-LqS;T(7<~ z$r^aWL4%oUlEI z9Jx;1b~epKCt{iC;n9LEqyq;=u&r>wENbM@Kk-mOonykoX!R|W*bC=fH)|N@ZR`Q(>c+u3|1I{_^H&waL9X$ z-VMF3m6wh8`btk;FnQeHbxQUJBdB1LwNL^DvERVaMv$+Ezpj6HMb310P2@gO0)m_I zh|mI^($}B!8I(Z48(LW^7=&>A3#V{p-w)53kzh z@Ghxvok$U^xlFL7nCahZ2%H$qa#+8C^3L`nEJj#Hq^X82VEngABpS?`$t*e;%6g-} zqZOB<6|$qwl=yndaPom$reO;rr#$V0WA;Zd0+P^O>|hK6Tb=wFMoccKp}yJB!}AA^ z!r4RHCXMW0?2(3{t-t52IwFA!s{b1`Ok2Xnx8gwf4X9~)(TnbEk4#F!nN(F9WX7nW zgzVn~a)z&Pg6JEP7GfHqM~wF!%1cfx%*3r?^%n|mGGNo$-k9fj3*v!>bE0Q>etVE& zS@n9{^vermdWPcOho_3zck>jbCWh>Be`tohnoJ5S_&#re2CZW#YIbZdun$0}h!YSD zV)gt@ag>m*vu1nTbn`cMIN*kPIOT>BH-aexY#8jV<||{~ynqW0){f7MUYu_vl|&Y& zZ^&!m^l=3dW++V7id#?kB1l)UrrO(4(q~_DX5YD z+f*8~7J=rifE*NSRU}=UM=cNOF4>bj`4ZY+*}@VnR;)*R(8;>o&qiwMq)L}8ZaU9& zpAV1D=6W;TgxU19MkYdyuS^xUa9?=DY`ofiOb$%wkufzA zlN<;UROHmD%vXr|Fr@S9yW0$nv*i5jQOob>Eo=ctD%j}s8q}AsQ0xahS8$e50;#&H zR_L>_#vsPO&354{@dVqI7QnByCRy0f0tjyCY9xqMx_ELK3@m^&Mb6F%)>ys7tddw~ zb8=Y0l{GWJWfTno_16)yBnWX?684`T9``jadT+Iy8@Xd10&IEdPrJId)4|SBn4jq9;n8PU3fm-6U)WuSv`=-| zQ%dqxZs)s*<3+;E!mY>HKuq`Ja)D>JqZ#nxrt<$U%x2^(=Fyk^Gs9U`!T zHu1guQYln}=i8S$r(!cL%4MEzUG_Nfl?VXE$H$Kk=l?=pEQ@t7VO+YTmT0iLsg88E zmS&p};yOwM)QZhAf#*knF%qz)F)Qkzoa3kH6y88~SX4<`oes`)3KD^}xQ(KB z5;QkMvIK&uqmI!twfg(RdiB9ZX|e!I=tJqxQDhcBh*i4EGNASX#}xw@EY&L7{zuD90hD^=w*A zzRX0Ugl%cTgl4hpqA{q$2v6C$8}fo!nBwvd{P-*7a`bZ!VIyz5VGLvf7H$2f;b^#?L7~Vdci$ zmosWPW^QyS#OdQyNtS7E=HC8q_Tcg*nA1l8+M-K#YQ`CtyTW9~MvN2YL<8(Fme#w7 znnD`09WLzWu;n!t?L2CF&~)Ss<(R}&JOH9>8T>&`twLqjcUXoP1=r1gj(;|eYY2CC zl38{r*ljHF@K}b~K7YMt9e&;r4IJ0W_=%(O( ztC>=8z((u5&4ext(;M(WeQ$JEJm$Y#luJ7S1$#Hba+>d9TjS~_3WhQrPg_Mm@zWo< zLKeETt+%#A+Ku?iEUDN}tLpc?v7%tT-22TtoGdqPhrMXBLcy;eZwaK>D-kx|7OUM7 zK>f6Jteg{ZINN z#P#Scr(g z+5!8$3NEB`Q34jgy?{1MNQmGdgKm{{&s6-XIVP79R{tr==lu>NQG~#B3zOaO`c*VM zxmYTmx@lDqkw$#a!Lb@I;-@(5Yp$LZF~Nq}`pK!lB@*RQ#*GjS|M$BbI6$P^RT$)VVaU zO9b10c43P}4Xixf7h}Knd^9$Wt4aF|&SQTbka>^+viP+bI5{9jH$!5Qd2NA7rLU3G zhSi+S7*23}s`qf9K(fZA4?jR=m+W*mxe%_Kol2h;z5Fs^rw}CA&;*auu;vMCXW6Zo zPFP@%YgI1i^^HxEj?gbIGk=F^N^sy4+nGnAd4pp;v|i8Nb)>@?$nNQj5@a3U->5>x zQ{tdu40dp_KUg4Pi;ZM7gmk&)B+Z(^vC1ymU2>f!RUwqHKV*<`$#pU9f#`#p68X;* zLX5(*m}bwkujvTU{pV7`*$X&lAuMY(IvEo~^mW%w?ulm_9G}kCDSxGp84q;3IXp(= z&j1?g8%d`8(E&@863ESCZ*ME}rkNi(`YQIU6Z06xlnSQ#ecMogN6+`hV(fojjl2)# zJxeId?TE6cChak08rTQNiG~U^Fy zt?I)Hc)VY~0tlo?AmDk5R-6UPHL-fdF_N*VVVptz`Dv^>0U{wrV6#61 zXF;7CY+pj~ezgVj9wtp7#uTf>=!(r-ED}7ZE9M<}5(Civ%Y zxNMiQ-!LxtMCoYhOQC%%1?!cTG!BR14wZ%3&E|$1*PyVcIyg-MTYpiqw6%8}U2_}r z*#JjtCI{peRV`PtkAN+0;JnbSyflXe4@o7zJYAn=^*j|By50dXdUXP@5A5TngpccBcS8aXO zfDLN68CF%2C+daPbtaCy_cVZVaPn;TZI@3C6Y@cGf_<_eK8-)Ju$^!db-KOIy^$#j zjjO4p^1$=@Pe)r9M zAA^~}R%a4kFQrIpV3Rq>$PyeW6&9k)*CqmLX1JVmaZXS!<@m}4A3sFh#k@|K8%`8K z?1$|QHf;AgpX!mdXdHv#9j@i{$HO$mHjr&Q-gqibHh_i4-eCua8-4q*4{u%piyH_s zy7E{?q1Oj$^xeX;`wtyiIIMNw(7eDZ5uHDNDER%*Nt11maY0}0nRZJSKKHOz}S!iJ?KP)E&FB zaR{&q>IeKMEF|+$EB7JvFG^(;Nrk_k5|7HteST-J#P5edw{2OonY}aGearV|!#ZsW zembN5ShH!=q5UfkZ|&;Dqxx;P;$5?N0oiPr-|p}}rpIu9L!yD}^ItD<01%?;=YHp{ z9o`LF0J%YCiaI2!he0!Z()OQlwXcoCYMPC~c(8$(B8o>o=!8X@8W!*FNzJuNC1o${2(FvbAAxNm>nG{QXonOCRbyT|`pm?~ zYUk@ya(53Lm?j!3=tvD_EoWir-dQsqW?H{84O7Z#ou>G{6vO!Wz==6lul_p%UqcQF zvzE=h9U)_uJ?dhqJGGVRI(INypn~r7#c?qIdc&>1MnpfgD$Y?Zt#1iy9-N;HmI8zoOA7mt09!cg zELUQGau9WoUE=AN)W?|Ka3Z20iUk_t!1vn-_le)3=54Ejv-U@Su*{-dz9*Ko6mzi# zQm}xh!UGuaE)?N)+>vxBw}JtoxbC-^RRP13zN~OPQH0!mTZjZjuGJZduCbL}J>o@N zu*xuTU#(GDrox)RP)i1%<_>qf34p%Y#>e0Rtn{^`c1$Z}864JgSFbw08k^VQgdXHk zd@NV|0?T{fC_?5%PKI%2+OJK&ynGr4^MsLwL2mGB=ijKCZ@>4kZ`6DV^Ek6qZ||j3 zu(=sDsqh^|JP?(Gfq0?3g^pq9a?APgZO#5=;>JgZsi$m~eTqdF@F)S^5*@rT`1->u zz@}6L(QA`;e|NKo9Nyj)|FQe?%wCx>rh=)Ukm)O@1ax_qr10|Ao@+17t9*_guD$kO z2Zj>9+XQ;hz=;9-L4?~;?O8mU2j-VvG&qj>rJthHlG7Q_h`A|NVw1Bsp8Q`#1R;8o zP!wakjis;vw)6b6+9cA5)kLLFqi2mM96&`-xt8irPQlYM`NU#saL0GEV_}*-lus2{ z_y}937*sV%d!|%ECc8aGntvMBV-z~&?Tw!lNok5yU%B3tTMz%k zW6Yw>*LX4A7V8d>44t5`2QD_-J6D(~85S{7GgjG5V43`t3eNrVu{^&M7W?MSt(JTKgjr-OwK&Y!n(^YV z_(4YGx14Dqq>`{@S#a&m4&&2O8}e?SsM_;aDt-H;9_egAyKUbnun%FSJ;@XG6)*FY@Eo5u9P8pt#1t138>`Mka0 z{^aagYKrW>-nj`y_O&R1C9lr*UXDlbv@Uv-GX(n zUa?7dDx}_U%$(9w6;O!4Tv}OfM6B7Fu}?4P-8xbJS0P9|Y{&M-9$$*!<=P4hz$S=Otp-yQfX4Y-_Z%fo!@ zoUL@!lsm8B4iBII+dPAE|6-Zf^CN#HF{lAa9-o7rS%0=SVcsN7Z{x`9qrdVFNB>=w zjtjJxkU*T9=>cCq(mU<+|KWh1C~B)5lfUkOh57L+J!Kx_0~VVQT`hf$u_%g-u5+ue zethz-z8@)v>uW60ql87fdf|fpCpMx59aKKBxCN9Cbj!R~=CtQ~--Hb;J}5DZ&gArN z<u(lP}L*s;NpTZHuNBu(@thtkwpPFhetvA}EVE2vA ze|c{p9u*gy=m+evFksfIN$7Mp=EU-PT}rb-wf!tj_86Bjy-;-A6F7cwVOUVmBcn#6 zws=g(k};=MPExAwIQHgcFhJ|GMg9QcJK*=kEkQXu1S;m*nQRCl@;}U-{F~iXxGH7t+hqoSr`oCI0 z(5`GUCdV#Y)0L*hP!lCB4_#jua9upCF$3b3ivOmhPZ>vw`zg~iSD!EfkHeYg`=7mE z!U^>Qlj;!@&djC8E-Y2Jy>$;ZJ4S^BtLT2-H16QI!`tV3UO)r0&V0rB(H3QfyA37( zxW6X1V7%6Y7>GM;7bLK7%3}1!yIleU(CM4J2B+I5yUVb`@^DSKI6;xt?tX_( z3s{txc#hc@Vv&cfU-x zIju%Xi+HW?%-+Kt0yL=JU7M}ZHKj)k2mO-&DoCeW^0vo(j~zP%en42~DK{t{a@V}R zakD}Geo{d&M?vkoThL%MS~tRil82kO!Zx#Ar}6OX+$qMp^XJL$(p3CD1PZrPZ20i7 zvydMxsDkDE?2buJRL3<{<*D?+Nbpua%)2htc%J}4+d9vEJN@{jLGGH#DT_vBX<;CE z0ImNko({a2_6H*N_%l{ix_%~RcYNncFHP)iXm|v=2~$|G(ESZ)XQ)g#HvC{)7&*R} zxa5#~2T#b!f#&VUu=C^e28ECNk3`Q6{Nx|gis8wbNBlMlBql9-Ak5!qtPbuzmkR~@ zv3h(}&9GE*CH0CSLvPhjTt*mF5}ew?rub63o6$(rMuX*YF{~WRgx$BlJzp7$g_8T* z-y2#E`H;i+#vIFH#}`KXQ|kyCZ+pYWeZxt|hVkg3f;qaKX9JkcCZ}T)I*P?NW7Ale z5f@;LnB}tvlCAkFz25KRJ3+72i`l{G9X695|G3j<#tOzRKAB@5!um&>7Ty?Lg6^5Pi|29?Xx%0f;R zW5GJKG-&pLWt#Ng8r0my8~ME1#tRQ{lKnfVTGeF%@r7r<9ucdEXdwDf8M$r z9ZNiA6zgBU*f3oQyhl`Q#D8LllDMoaA|@UrEs#-FC~9B)iANCbsgM&sqEO|9-(V|H z6n@77rAorI9cHRk2L1rvzX?nu7WKk2!o_c}$Jiuh!0b(0ut!QqtOi+?2XDvW?K-^O zgSTh!)&*{k67Z%9Z%g3KQCvk#8bOe0!{yZAi{6LHi6O(qWu@RIBrRm3toV9K`XWS3 zI!KNTUJio3y6^wRq!MK!DXydGE;@vP9NSZS3cg{-tNRzTu@%0aW+NYVqKa-?AS zz{}}D9()1OJnJMG!aSgWf;@xRx(ewifvP}Ds5undd9Z}*gxLo%M4xUDGDM%^S)ot8 zF;+4{RysqmS_D~b7>X78)PE>e=+i)qm8_7};-Og071kT7s6nMdpMrYpdx|d=`V`a~ z`cz3y$VwYyHLy`@LRM>rY9i><^+Pog^eNEDB3S22!-TAcY>jCD0d<9DAJiJrr=YI- zp5jY|J_U6pU8u_1h=A3D&x%c1aGo90!=lg8$`#kUSJSU19lcE7>K;UNx_TkVd z1|jAoGx-B(0JI*vvBN%w9Ih{TR*8MM;O__sGQeQ{!M&SQ%o7Gkuv=&<@yx>wGRE#X z;CqILBMrNTVSj&{hW$<9qk!4&j>%?!Zp92ijm88 z>WAMC#;$|#d+;6j!M?+9^Ar!DNV!hnA^2!wpLy6F1*1&IuKTfTJ9hnvUFU0PKnxAQ zUGZatA%irGAT20JlZqh&2_e|m!y9MBpB)h(UR?lTjZCYx}){BtF$pGin*iN-Z#3!>47$b9U;_N!8+D_Rku7yIuzVvywz|rn^&7F+vuJOgu3&c&Knu2quI?mPinRFF%|t#dd|SOo~V_-b1>1 zN7fj8ULL36w&M1Z)Oq_~pBVpe_1pWgZ(EZbM@Q7Bb=Kz8giYw7D8bNC=#TbfwP~Wk zrRf8&n12mD@zU4AqcZw?eMA&5(*O3%rp4!$eDd~eTcM$`sS9%{P!FE0Wo48G(vU~8_wwGHg+5Br)SbIdKw zEV*+nVTcb417vUj0#OYi2`Ur&A+!B4&a?ecnNSK@L8weBl1XO=^MqW87A}MZJU^Jv z4`=a&!3dYd^A*G5a0nGic>>;ASPHb`f|Z&r;>#qEh!0EsQLz9b3&W`*86?Jd@&t&A z)^kbo%;$nICG=2!XKsc)70UR0*q4t$bfNshMf`a}1afyJQ|Tr&I>m!wf-N8T*!Y-% z3)RJyPUdjHt+kJtkBh4h1AE|3cg1OXJ;BM%`;aQXFjtST_&0=w&%Yup)U&euH&&KC zSV6goY@VMOm7xAo64fmb7K=z+J|D{td!Jo6hh+<>)juy5lH@PQI zB7^x9SiuR_ED`kd^iZ zx*`EQiBuep!y==iwnEtuv@+4+F2$3{N^Kc$)La&xBarx^Vm{9oCmXzZSS~Q-&(k$t zNBd1nOx(>+HS&^ek@doP3_^LpxJ=zg_=;AW#j~ zO@#RIU_NgxqV)c%7xw|!SZ95cR@_IYjE!(*gm&^OC0HOrg_uv+C>PwPJ4Fm3}xmaPtiFFDCazH z9_)YqEMsqUK!LCO6DH0UtQ!^}0s$(-^|+Y!C=!b72c0{=C~~s#b6WNa*C@-Mzm}>3 z0Ll%K(!->P5S)|5p1Cr}3d2GW_3mxEl(^BOoLOs=t6dSm1c-)|$8Ll2#?F zfyzr6+^+iKi@yPEdwd6!^6{75J}YYbQ=PLP)WMX}-Q?#q&OtJJ{XGy7ODjtGffIsR zF`h~AAhf(x4F`MdV8=@wc@3g4`a?@%3s52ZpN$PEZ)4a;bicj#n7MO`8U`FO>W4@O zljns6Q~=2aIjLmJPBts!llO*pd##shfNoOQFW4RP7m*7r6zkspA6j%1arTHZQxGvJ^$z8@cyTTWZ^@guH*Wp0LdbFSq?|`&ku49%~ zKJ+%_%;c%Rw{EFvB)E&=&~A>j!Bs`Tj=wb*wA*T5aZFhkKZ~)t9_mHhCz-U)pWg!3 z?!(4uUiKqCQwuI_Wv*)$MiMwhrAKmA6l}Qqv78in0{ieo(+M>Vq{K9(7VP(qO2I+) zSfvMJ0YR1s&2dCgiO=^c9a9Ext7+sLNmH{l3H>5dnUBr42Dz)4N4QHp6w z60oiPx&`{vWSi4rX6tdiNyDb91uJ})uy(>*0IBxQ8Eg6dCbP(c@;0C0WU3a@Cs7z_ zv|j}1UlCn80}_SosIx<77k-`2!_kf|ASa2$SOj3%g+vjfQa%qilzFl&4?rdJqo-`X zTT4CB5G4Ei(Dmu+p$cVBJ=~NEoU^g5&N@`q#I6|hMz-quf-dzK5WM&|3V2ayP8|@b zO}=V;eamTwWIhYgIU#CM4`0p`0S>sjha1e~Rot9a7E#~|=j_s`$LK9;prb;q%p5)O1z^vG~3FP0y zDccG<-JUT1SE&}k+*sy?*JX|{QP6*UYDEBM{jA;Hh(yP%fM8?yUp$BZP_cIbYT!{deps{A>y z80%WGiW1+}UD0QOphat%xre{z)3?N&DfJcCo>zq|ks;!6m6CbjV#*$XsegUbc?zr0 zF>36iD9`HaUvZ4WaGZZm)3sQr1%i%B(eFs%dR88F`Ri7O=5CzU86j%^sdiW7aj5z5 zgw9xsCS~U$`-`L>H}g~o9i&pC(PNLyx(b>cn?vi?JL`tfHhsT%IcAFHU~BY);c(Q_4QXIOx^B3J;(K=Xrp$+z?H3!qzx zwdR*{Ej`w$tJ6mgy=p&76^BSeQE@N`aB#MCW3~Fvx&>q|ojcb(@1Q5S;QNTeBc`K| zs9-tWr)0qY4kZ9dUDl1{6^GW?SNfhdHgPXCP^IqOuP(dbk^m&!SsrNi!K^#xVB+!9K?UK4U_BpCN;J1gK5kpV zQNK~>3QdV)lMBQD(yDFL`O*U+4&nJB9F(VQ6b(mS+Y78InBeLa=HJgTX8S9~!ipV* zswmVi80&m-N0T*Hl>#v|K>%~P|8MqwLBBl5`aR=S0A7eMmCx&LMzwb?D+M7xyy2il8k$sGs%<~-5^J1Y z=Ai$Ip&qJ;{|BSbR|D%#ea;_iyJxO*TErh`CR>{jiN;wb0R1lEzC7{u0w5uF?K{_B z5)mV%>Vf;`E!k%Y2?Vt#*4m@W>V-VyeJ$8OH)j-gM0+PVq)+XLZ+$S(6GyrD24Uoi zHdmoka$3-50I+zlagFD5eR6Du-dM?u$waH=iumKR0}_oV5rM-;)q@R3_k9LRE(>ps z{BYfced^2cm7MSF`?xq2v_cx~lgnv9Pr35ICVIS-x#zmgRxi&z#fAW#~LfZw-O_2^jLY%-p6pJ zO1f87F|w7AT;-97>st`{ybYj&O}|`S`<&!_cr6m%;MI6cDYP4P};T}KT--3#`6qs6p#&fMHSf8EfQ zc0wrLNq`C(D`LcMh&-=JNFG87>`zofTko*D0263oPWs2S?UdMo3nN;eO>6uAm?#FE zR9uzP7w3}!m&dC_<9%({v7$M4*UW8dh+#p`rlusV3G1K+LK6dLmXC4sVw@a2@40Ec zbWSgkeU^rvRGSWjhz-_Ksh6|q1zD5sKWh5f*$d}@4IjH}wt|P9^#HV~Oy}9`%QfV^ z$6h`==k9U27swGCK#Eb3(npGIxV|i_5EME;G7LhdFh^5Q=iC1=>$5A7#tE}}gYoBm z&rtm(#q!>Bg*uBZzX#| z6&)<*d&1PzS(ULs0ljVWgr&jllmuaAwBLabM0KuS0hRJ=Z1t7>K#SlC?YW~apClKy zujZ~{<*w~zc26z(B#~>pt*L-ZTAlu__eWPdB=$=imBXOl{!cDT1w?%|rN&)8Gj&Rd zyRmAUvBR0zvhtJ08Dt!;tVz^03Uhw8MS+Yz-e%l`{bO=minCtjf12Fzwl@}gt;Z7( zUb8Z5c?V9iEcVA+Ke=U2hgzB@Ub+7&pbtnKE|Q`FVptRyP9pOIP^>fxRB|!Q*NX>L zOJ!35e}#S~C0}g3-|c%Eaeyk-rmAwGDrYU%L!-|CC7zz*xK@xxIb^^3W5qhR@6-NM z395vswWSgMO|il7 zIdnamm9a~^w?+!;5YDPvpg-s7vont}ifFkrHCTV%w+QJ?jj1g3d}HMG54sTBoXYzr(g=elgF1}Uolo41mTKm*7 zV!Y84(&xZSNjUHbxb$cK1j=xmQH(7?aWlT=wk%PnEmj*SJyZOPS`2U_2kaQM>y6lD z(+k@3yXTWLRdFgQGsyJG1JLB!P8(J7&pq#d1rg$tA}zeZ;t6?_c=x$ql|uTr>ZO2ZC;2 zs90DnKH-vI>pNyFchi$TNOxEgEFpnc8vcAV6h{wu=t+S7+WD;Q@O>#QvvR1bdEI%UkyJs;^}r3iGLLl|>>1X! ziDz=_BUwAwi61_R-%B)gy-^%&vX3J#|GjJzkmpkWl3uaE)n&7=e(9I%4~eo&1&RG5 z0#TiGEfVGckTH^U3mV);-!=M7`sojR;*`VQJ77gB{@zyM)Vf@KdF_bokPqKaUl*uPBR>P^U~YX*j$%J7cgCE971=kVh6W6Sr%(dY^DWr({>q#V== zU)t=HyH9Us6^+4U$B#MN6}AU;#rI2hl%=+9mrrW@3m2^ASuA8_-Q31+YO~5wAq0aS z4=In|J%7j;?=62PZ?H0W$PL)nrSwpSFl=#*kO1{asYmDRz6DfikL&Ouw>mlOvRf&6 zzxWri>AUL>@TCAXFLpF{5Yx0Bl#g=+YdECX!=~ z+V=iaa`q0c1E5wkH$A$Imb4o!;Gd?nSNmw)SU-l6<8$@suB08rG6Pi4qDrxBB`Y^) z17R2Jv?>_f6Xf#pKr}w1VWf(%r8LwJ>*$r!mK1ZXOb~PF6O3-u*uAHnwzIHlOJ1-_ z6(ZpG0_9IxUJT?Ett}Od56QJponTTIaC-lio*+U)Gt14|JTJZptqFSQ;d48{`14NjIE zQD4>vp8=Wubq8*s%+ z4*ka9efA#Cz-Vsc(%CmZdh**p`pL8Y&whCD9vXtI_9m55G?^nZnuwI! z*nSpKBq{sq&Vg*s#b3{Kyox@($HsQObUGUiA zuPcM?t8Hq6mca8K*>-ShXaM!6z^AZhwe?v}o{doem8V)?Z)o5>@1II1?|U5oMqC(* z+~T@XZ^5++*CV)CA6^X=9)6@P(Tp05zm6^_hZA+ws51Q>?M6!hA(?10t z&GfOF!?+TJ1Oxpbk)uW+&V4g&18M?lm8bzI4aAR)W~xi(;3+{5O7szQ8-TV+bOUG$ z5NEuZUIN+*l$GdJHAmZlIzfMxD1+`$=V&YkCB3|U3As^X=o>ZYg&I`VeYal6_!V}6 zaxJx}ek+FFQ@;~K^FTb~T&|_A10^c`U68#eE9e@%r@n@a1(98&>p-ap%>&g%XiIf~WzsJnQy@ZIp+=z7S~k&eB5LSKm5%>%8E(4zV;`eKcj5V4n}QbpH+ zHbm{_fi^~HQEgN<)p!ZfHCj~HL^}4lDTd~OHb-8r18u4C!grBE`>>P!KhXwS!j9Pj zT8G>&VJ~|`@*SYfv{%wzNrxmoBI$8SHAzj-I_yeIYAg1KmGrQZ#j0or-AJRLZFCHD zC!GN8q}M>dLcaj*rz@aequ+u~Ncl6MomhJ()qc{^svq~uF=awZbScrLM5ojA59Pd+ zoR^aGkYv=0*rN`DrfFDRko*F6vj$*KA$T#GL1gVs^Z2`({y4 zzhw&B7c^MR3&Rjbua6@@z6=RFF)iU96t-~DT}%}jO?g^DM2H4NzFa71c`GIxDO*;p zq}TIAF>lRHntt4HQgadL0lc(|Gmd+@>NT`KfM|{i*F%PGRSwxRj$70?eVTPgE2MSC zEFdRrS9KB$RSL(2rJa?WSJj6RjJcQs-LERb!SQtA6|t%q7c;^Y$amPZstP6Csb|apK4pYO0IK%Z}#1j`f69BdnTLk~J)=Vjng`xRtd> zl`%RsO~ysh^c@-#hG{qhV$2m@xl|S&Wbkj!n7ZcDpk)?K8_Z!7Yt5zJg9WUJ zA+VAutNWnwwH>WvuSQ(6j%!twMeT*5513lPc0AwIBT*%h*>D9<2zS=hg-3%}^M+=C z3sx!;$LXoDQ?ZO zN6|6~ZWE7!+2suc-%gglKPEGZQlH3>k^&@C*!Xy&ZgWblOL1Q*?rU=j&(AeV zeTG`oL&_S0tSO-B;fgRl%)<1M5FU|mDuh!K9uMJh2~ULZgoIiMH3>xsg@k4ZBc>?j z#biB)rc^#`ZQ*14q`K}YS1XM;_TX7vlz4}jJmorPJhodQH}fRZeG0A5jtoxrJFe(0 zm3CEb!hN%QvhDEFv^Ltp228JHX>%jk(dxNH1{N&}JrKVE@HkK?C6^<<2ce@5yr$tt z)TvNbf}OgUG4^ylwzs>hyQfFr-C^X79--$udo)e!?lF2ay}ipYy7ENZ6}oVm-=8Mc zRlSzwoEa`#zFD#a1Pw#>DdC#f$l2`h+W&5rl5aDhC@U2_4N(*zNWwEai-N-MDDm+A;3n*F|~G0X>d)Cj}=@hl)6FaUXLSkp?8Bd)C;}vm^U9fH@W} zeX?yB^#EFUIN5OwrJ5M;=A#{ZhZ4nm6h2&dsgAD$C+PO*;yzno&l&Qit&Lc$Sj2bg zD@z9K_-hT(4$J~>U9>OA*4(CqadYGaIt9-}8C-{CU!xT{XO{a4$IB?l(r4*2$nzL{ zIf$f;Jo&MxNzTBX^86xw8S&P(U7o3Go_4~w!1^(8-tMBu@W#@Ox|@3N({WbrfF_Tt z2Ua?`PH>w1u?@>L$lKAzz>n7nmmWD!y_g#h?TV0E$XEs|w|2&=aqzr-&LtQ87qBC| P;Xdc??|1jV&A@*El$zd& delta 922 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 P;Xdc??|1jV&A@*El$zd& delta 922 zcmZ9L&r4KM6vw~!>AW1B#uD<+HdTsV=5U=&M0Y7j`|Q~oLBFSRGVhn zL~X+9LW>qIBuLs6SRmLR(85LZJB*N4;wGXNB@vx_N5eXBKKGpO<=%7N+%xGz>8h!l zm3QC0p2xZ^qq3ra1p$?WysS9hmU-CcE^7n2g)j(&ax(s6R~m3p{woCRlk$;Ac2H(3Q8)-2l^CM}dh7$nanckxfGntA3_WsP}$d_A`s{oK-iy=VU3$F~jP zIdAS4wjEtmUswmZ0tccxFiVFSl|IPB>fThG0fB44ds@GXIFhu+5~H>_wMgYer9f{4 zFDUkixV^WNddD*5&qdx6H-~5yrqIRhC4f^TYpfnV5-8l7-IH+v#lnS7o}%Rn6N&in zS6E;wbS7AfSyqT8+EU??${Cy|y_!uCpFr@E0Q{i$)oT zby4p|*$hjmBseicEqIA4%8B{dC*wMz2Ztq_B|9ZgOZH2~BsKb`-Ox~sYT^!@AO`5= zHPj$Vtj8VVQQRlC;t}yAo)IJCa^oy9H=X@asIhhP(zk6jR~!1GLamcFc30^CPzp4vik#nS=dwl@2=KoSoWBiphxF1 zPmMzxPMQ{P@HW(DkC9F_3>)1;ICW430W2 zs0I1cl08NG`Y4JE21Kl9{63|tjsGrL>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectName": "Controladora", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -13503,6 +13511,7 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -13516,6 +13525,13 @@ "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj" >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index ac25056..0edad58 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==", "success": true, @@ -9,6 +10,11 @@ "success": false, "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "dgSpecHash": "MYQDimuvgTLgdr4nkAgRSaHTw8GikSKj95s3ws08wKEVVrpNozmS3GJxrppl/rSuADCp+u9k9/QhTzUwq8ILpw==", + "success": false, + "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "expectedPackageFiles": [ "/home/fede/.nuget/packages/emailer/1.0.0/emailer.1.0.0.nupkg.sha512", "/home/fede/.nuget/packages/libuv/1.10.0/libuv.1.10.0.nupkg.sha512", diff --git a/Entidades/Proveedor.cs b/Entidades/Proveedor.cs index 06d7741..72a40ef 100644 --- a/Entidades/Proveedor.cs +++ b/Entidades/Proveedor.cs @@ -12,6 +12,7 @@ namespace Entidades public string Nombre { get; set; } public string RazonSocial { get; set; } public string Direccion { get; set; } - public bool Habilitado { get; set; } + public bool Habilitado { get; set; } + } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs index c7148eb..822a927 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs +++ b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs @@ -14,10 +14,14 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] >>>>>>> 8ad9dc6 (faltan controladoras) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")] +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) [assembly: System.Reflection.AssemblyProductAttribute("Entidades")] [assembly: System.Reflection.AssemblyTitleAttribute("Entidades")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache index 884293c..290f16e 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache +++ b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973 ======= 390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af >>>>>>> 8ad9dc6 (faltan controladoras) +======= +a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index e1b0ed5..bb6c360 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,13 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entidades <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\ >>>>>>> 8ad9dc6 (faltan controladoras) +======= +build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\ +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index ccbc2ec..216ef13 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, @@ -15,17 +16,24 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {} +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {} +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) }, "projects": { - "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index 5988670..18bf0a9 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -13,6 +13,7 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", @@ -21,11 +22,18 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", ======= "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", +======= + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index ed94780..a120038 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==", "success": true, @@ -10,8 +11,11 @@ ], ======= "dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==", +======= + "dgSpecHash": "+9QsqENGYd4qIIPCnRA0BRL7UiFYXaYZJR2jVoACt5fTCzrycu1oHCxViXeMxzr+idMIyJGQ/11fIYTFVqnyPA==", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "success": true, - "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs index 724aa57..b93c893 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs +++ b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs @@ -14,10 +14,14 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] >>>>>>> 8ad9dc6 (faltan controladoras) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")] +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) [assembly: System.Reflection.AssemblyProductAttribute("Modelo")] [assembly: System.Reflection.AssemblyTitleAttribute("Modelo")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache index a1de216..b2f069a 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache +++ b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD 19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587 ======= 6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b >>>>>>> 8ad9dc6 (faltan controladoras) +======= +099b8681c0fe3ea241c3236b037e92bb2b80c449b64984e5089c2c47a48ee0b9 +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index 6d9970d..7e36b48 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,13 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Modelo <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\ >>>>>>> 8ad9dc6 (faltan controladoras) +======= +build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Modelo\ +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 3fc54fd..e825ae2 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, @@ -15,17 +16,24 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {} +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {} +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) }, "projects": { - "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -82,6 +90,7 @@ } } }, +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "version": "1.0.0", @@ -93,14 +102,21 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -116,6 +132,7 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -123,6 +140,10 @@ "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index ac8867f..d57f078 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -32,6 +32,7 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", @@ -40,11 +41,18 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/", ======= "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", +======= + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectName": "Modelo", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -60,6 +68,7 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -67,6 +76,10 @@ "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index e855cb2..496ac29 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==", "success": true, @@ -10,8 +11,11 @@ ], ======= "dgSpecHash": "xK3JnXpdCUpoZcekhyP91lNk41C1CsX+md42EcLnzhmp4nv0wa9QUPqxaUDvd+ItjZUDnL5nqMnWsYofgtcCWA==", +======= + "dgSpecHash": "GHvzI31gpq3LC5PsFVAyJd0HJLioNTu1zueIve1esILQ9QlNaZAenRITvunQ0HsZ06NONsSYihAL5kiY+8UONw==", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "success": true, - "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Vista/FrmCliente.Designer.cs b/Vista/FrmCliente.Designer.cs new file mode 100644 index 0000000..e13da86 --- /dev/null +++ b/Vista/FrmCliente.Designer.cs @@ -0,0 +1,187 @@ + +namespace Vista +{ + partial class FrmCliente + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + label5 = new Label(); + txtCuit = new TextBox(); + txtNombre = new TextBox(); + txtApellido = new TextBox(); + txtDireccion = new TextBox(); + txtCorreo = new TextBox(); + button1 = new Button(); + button2 = new Button(); + SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(29, 29); + label1.Name = "label1"; + label1.Size = new Size(29, 15); + label1.TabIndex = 0; + label1.Text = "Cuit"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(29, 59); + label2.Name = "label2"; + label2.Size = new Size(51, 15); + label2.TabIndex = 1; + label2.Text = "Nombre"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(29, 88); + label3.Name = "label3"; + label3.Size = new Size(51, 15); + label3.TabIndex = 2; + label3.Text = "Apellido"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(29, 117); + label4.Name = "label4"; + label4.Size = new Size(57, 15); + label4.TabIndex = 3; + label4.Text = "Direccion"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new Point(29, 146); + label5.Name = "label5"; + label5.Size = new Size(43, 15); + label5.TabIndex = 4; + label5.Text = "Correo"; + // + // txtCuit + // + txtCuit.Location = new Point(92, 21); + txtCuit.Name = "txtCuit"; + txtCuit.Size = new Size(173, 23); + txtCuit.TabIndex = 5; + // + // txtNombre + // + txtNombre.Location = new Point(92, 51); + txtNombre.Name = "txtNombre"; + txtNombre.Size = new Size(173, 23); + txtNombre.TabIndex = 6; + // + // txtApellido + // + txtApellido.Location = new Point(91, 80); + txtApellido.Name = "txtApellido"; + txtApellido.Size = new Size(174, 23); + txtApellido.TabIndex = 7; + // + // txtDireccion + // + txtDireccion.Location = new Point(92, 109); + txtDireccion.Name = "txtDireccion"; + txtDireccion.Size = new Size(173, 23); + txtDireccion.TabIndex = 8; + // + // txtCorreo + // + txtCorreo.Location = new Point(91, 138); + txtCorreo.Name = "txtCorreo"; + txtCorreo.Size = new Size(174, 23); + txtCorreo.TabIndex = 9; + // + // button1 + // + button1.Location = new Point(29, 190); + button1.Name = "button1"; + button1.Size = new Size(75, 23); + button1.TabIndex = 10; + button1.Text = "Aceptar"; + button1.UseVisualStyleBackColor = true; + button1.Click += button1_Click; + // + // button2 + // + button2.Location = new Point(158, 190); + button2.Name = "button2"; + button2.Size = new Size(75, 23); + button2.TabIndex = 11; + button2.Text = "Cancelar"; + button2.UseVisualStyleBackColor = true; + button2.Click += button2_Click; + // + // FrmCliente + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(420, 245); + Controls.Add(button2); + Controls.Add(button1); + Controls.Add(txtCorreo); + Controls.Add(txtDireccion); + Controls.Add(txtApellido); + Controls.Add(txtNombre); + Controls.Add(txtCuit); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Name = "FrmCliente"; + Text = "Form1"; + ResumeLayout(false); + PerformLayout(); + } + + + #endregion + + private Label label1; + private Label label2; + private Label label3; + private Label label4; + private Label label5; + private TextBox txtCuit; + private TextBox txtNombre; + private TextBox txtApellido; + private TextBox txtDireccion; + private TextBox txtCorreo; + private Button button1; + private Button button2; + + public EventHandler button1_Click_1 { get; private set; } + } +} \ No newline at end of file diff --git a/Vista/FrmCliente.cs b/Vista/FrmCliente.cs new file mode 100644 index 0000000..4472952 --- /dev/null +++ b/Vista/FrmCliente.cs @@ -0,0 +1,93 @@ +using Entidades; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Vista +{ + public partial class FrmCliente : Form + { + Cliente cliente; + public FrmCliente(Cliente? cliente = null) + { + InitializeComponent(); + this.cliente = cliente; + + this.Text = (cliente == null) ? + "Agregar Cliente" : + "Modificar Cliente"; + } + private bool ValidarDatos() + { + string devolucion = ""; + + /* + * complicado de leer pero en estas lineas estan todas las comprobaciones + * que pude pensar en el momento. + */ + + if (string.IsNullOrEmpty(txtDireccion.Text)) devolucion += "La direccion no deberia ser nulo o vacio\n"; + if (txtDireccion.Text.Length > 200) devolucion += "La direccion no puede superar los 200 chars\n"; + if (string.IsNullOrEmpty(txtNombre.Text)) devolucion += "el nombre no puede ser nulo o vacio\n"; + if (txtNombre.Text.Length > 50) devolucion += "El nombre no puede superar los 50 chars\n"; + if (string.IsNullOrEmpty(txtApellido.Text)) devolucion += "El Apellido no puede ser nulo o vacio\n"; + if (string.IsNullOrEmpty(txtCorreo.Text)) devolucion += "El Correo no puede ser nulo o vacio\n"; + + if (devolucion == "") + { + return true; + } + else + { + MessageBox.Show(devolucion); + return false; + } + + } + private void button2_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void button1_Click(object sender, EventArgs e) + { + string msg; + if (ValidarDatos()) + { + if (cliente == null) + { + cliente = new Cliente + { + Nombre = txtNombre.Text, + Cuit = txtCuit.Text, + Direccion = txtDireccion.Text, + Apellido = txtApellido.Text, + Correo = txtCorreo.Text, + + }; + + // msg = ControladoraCliente.Instance.AgregarCliente(Cliente); + } + else + { + //Cliente.Apellido = txtApellido.Text; + // Cliente.Nombre = txtNombre.Text; + // Cliente.Direccion = txtDireccion.Text; + // Cliente.Correo = txtCorreo.Text; + // Cliente.Cuit = txtCuit.Text; + // msg = ControladoraCliente.Instance.ModificarCliente(Cliente); + } + // MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); + Close(); + } + + + } + } +} diff --git a/Vista/FrmCliente.resx b/Vista/FrmCliente.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmCliente.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Vista/FrmClientes.Designer.cs b/Vista/FrmClientes.Designer.cs index 8a5e0bf..09b5921 100644 --- a/Vista/FrmClientes.Designer.cs +++ b/Vista/FrmClientes.Designer.cs @@ -31,6 +31,7 @@ BtnModificar = new Button(); BtnEliminar = new Button(); groupBox1 = new GroupBox(); + button1 = new Button(); dataGridView1 = new DataGridView(); groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); @@ -44,6 +45,7 @@ BtnModificar.TabIndex = 1; BtnModificar.Text = "Modificar"; BtnModificar.UseVisualStyleBackColor = true; + BtnModificar.Click += BtnModificar_Click; // // BtnEliminar // @@ -53,9 +55,11 @@ BtnEliminar.TabIndex = 2; BtnEliminar.Text = "Eliminar"; BtnEliminar.UseVisualStyleBackColor = true; + BtnEliminar.Click += BtnEliminar_Click; // // groupBox1 // + groupBox1.Controls.Add(button1); groupBox1.Controls.Add(dataGridView1); groupBox1.Controls.Add(BtnEliminar); groupBox1.Controls.Add(BtnModificar); @@ -65,6 +69,16 @@ groupBox1.TabIndex = 3; groupBox1.TabStop = false; // + // button1 + // + button1.Location = new Point(6, 302); + button1.Name = "button1"; + button1.Size = new Size(75, 23); + button1.TabIndex = 4; + button1.Text = "Añadir"; + button1.UseVisualStyleBackColor = true; + button1.Click += button1_Click; + // // dataGridView1 // dataGridView1.AllowUserToAddRows = false; @@ -98,5 +112,6 @@ private Button BtnEliminar; private GroupBox groupBox1; private DataGridView dataGridView1; + private Button button1; } } \ No newline at end of file diff --git a/Vista/FrmClientes.cs b/Vista/FrmClientes.cs index f22b333..636b34f 100644 --- a/Vista/FrmClientes.cs +++ b/Vista/FrmClientes.cs @@ -1,4 +1,5 @@ -using System; +using Entidades; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,62 @@ namespace Vista { public partial class FrmClientes : Form { + Cliente cliente; public FrmClientes() { InitializeComponent(); } + private void ActualizarGrilla() + { + + dataGridView1.DataSource = null; + // dataGridView1.DataSource = listaProveedores; + //revisar dataGridView1.DataSource = ControladoraClientes.Instance.RecuperarProveedores(); + } + + private void button1_Click(object sender, EventArgs e) + { + var form = new FrmCliente(); + form.ShowDialog(); + ActualizarGrilla(); + } + + private void BtnModificar_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count < 1) + { + MessageBox.Show("Seleccione una linea para modificar"); + return; + } + + Cliente cliente = new Cliente() + { + Nombre = dataGridView1.SelectedRows[0].Cells["Nombre"].Value.ToString(), + Cuit = dataGridView1.SelectedRows[0].Cells["Cuit"].Value.ToString(), + Apellido = dataGridView1.SelectedRows[0].Cells["RazonSocial"].Value.ToString(), + Direccion = dataGridView1.SelectedRows[0].Cells["Direccion"].Value.ToString(), + Correo = dataGridView1.SelectedRows[0].Cells["Correo"].Value.ToString(), + }; + + var formModificar = new FrmCliente(cliente); + formModificar.ShowDialog(); + ActualizarGrilla(); + } + + private void BtnEliminar_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count < 0) + { + MessageBox.Show("Seleccione una linea para eliminar"); + return; + } + + foreach (DataGridViewRow Fila in dataGridView1.SelectedRows) + { // itera por un loop y elimina las lineas seleccionadas 1 a la vez. + //string devolucion = ControladoraClientes.Instance.EliminarCliente(Fila.Cells["Codigo"].Value.ToString()); + // MessageBox.Show(devolucion); + ActualizarGrilla(); + } + } } } diff --git a/Vista/FrmProveedor.Designer.cs b/Vista/FrmProveedor.Designer.cs index 5de29ce..71b3153 100644 --- a/Vista/FrmProveedor.Designer.cs +++ b/Vista/FrmProveedor.Designer.cs @@ -39,6 +39,7 @@ label3 = new Label(); checkBoxHabilitado = new CheckBox(); label4 = new Label(); + button1 = new Button(); ((System.ComponentModel.ISupportInitialize)numCuit).BeginInit(); SuspendLayout(); // @@ -79,7 +80,6 @@ numCuit.Name = "numCuit"; numCuit.Size = new Size(100, 23); numCuit.TabIndex = 4; - numCuit.ValueChanged += numCuit_ValueChanged; // // Nombre // @@ -135,11 +135,22 @@ label4.TabIndex = 10; label4.Text = "Habilitado"; // + // button1 + // + button1.Location = new Point(174, 195); + button1.Name = "button1"; + button1.Size = new Size(75, 23); + button1.TabIndex = 11; + button1.Text = "Cancelar"; + button1.UseVisualStyleBackColor = true; + button1.Click += button1_Click; + // // FrmProveedor // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(409, 230); + Controls.Add(button1); Controls.Add(label4); Controls.Add(checkBoxHabilitado); Controls.Add(label3); @@ -172,5 +183,6 @@ private Label label3; private CheckBox checkBoxHabilitado; private Label label4; + private Button button1; } } \ No newline at end of file diff --git a/Vista/FrmProveedor.cs b/Vista/FrmProveedor.cs index 3528c4c..2961f25 100644 --- a/Vista/FrmProveedor.cs +++ b/Vista/FrmProveedor.cs @@ -15,9 +15,10 @@ namespace Vista { Proveedor proveedor; + List listaProveedores = new List(); public FrmProveedor(Proveedor? proveedor = null) { - InitializeComponent(); + InitializeComponent(); this.proveedor = proveedor; @@ -65,27 +66,30 @@ namespace Vista Cuit = (Int64)numCuit.Value, Direccion = txtDireccion.Text, RazonSocial = txtSocial.Text, - Habilitado = checkBoxHabilitado.Checked; - }; + Habilitado = checkBoxHabilitado.Checked, + }; + listaProveedores.Add(proveedor); + // msg = ControladoraProveedores.Instance.AgregarProveedor(proveedor); + } + else + { - msg = ControladoraProveedores.Instance.AgregarProveedor(proveedor); + proveedor.Nombre = txtNombre.Text; + proveedor.Direccion = txtDireccion.Text; + proveedor.RazonSocial = txtSocial.Text; + proveedor.Cuit = (Int64)numCuit.Value; + // msg = ControladoraProveedores.Instance.ModificarProveedor(proveedor); + } + // MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); + Close(); } - else - { - proveedor.Nombre = txtNombre.Text; - proveedor.Direccion = txtDireccion.Text; - proveedor.RazonSocial = txtSocial.Text; - proveedor.Cuit = (Int64)numCuit.Value; - msg = ControladoraProveedores.Instance.ModificarProveedor(proveedor); - } - MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); - Close(); + + } - private void numCuit_ValueChanged(object sender, EventArgs e) + private void button1_Click(object sender, EventArgs e) { - + this.Close(); } } } - } diff --git a/Vista/FrmProveedores.Designer.cs b/Vista/FrmProveedores.Designer.cs index 9ae6879..5b5b775 100644 --- a/Vista/FrmProveedores.Designer.cs +++ b/Vista/FrmProveedores.Designer.cs @@ -51,9 +51,15 @@ // // dataGridView1 // + dataGridView1.AllowUserToAddRows = false; + dataGridView1.AllowUserToDeleteRows = false; + dataGridView1.AllowUserToResizeColumns = false; + dataGridView1.AllowUserToResizeRows = false; + dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView1.Location = new Point(6, 22); dataGridView1.Name = "dataGridView1"; + dataGridView1.ReadOnly = true; dataGridView1.RowTemplate.Height = 25; dataGridView1.Size = new Size(550, 235); dataGridView1.TabIndex = 3; @@ -76,6 +82,7 @@ BtnEliminar.TabIndex = 2; BtnEliminar.Text = "Eliminar"; BtnEliminar.UseVisualStyleBackColor = true; + BtnEliminar.Click += BtnEliminar_Click; // // BtnModificar // @@ -85,6 +92,7 @@ BtnModificar.TabIndex = 1; BtnModificar.Text = "Modificar"; BtnModificar.UseVisualStyleBackColor = true; + BtnModificar.Click += BtnModificar_Click; // // FrmProveedores // diff --git a/Vista/FrmProveedores.cs b/Vista/FrmProveedores.cs index 793db37..8ae8345 100644 --- a/Vista/FrmProveedores.cs +++ b/Vista/FrmProveedores.cs @@ -1,4 +1,5 @@ -using System; +using Entidades; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,16 +11,20 @@ using System.Windows.Forms; namespace Vista { + public partial class FrmProveedores : Form { + public FrmProveedores() { + InitializeComponent(); } private void ActualizarGrilla() { dataGridView1.DataSource = null; + // dataGridView1.DataSource = listaProveedores; //revisar dataGridView1.DataSource = ControladoraProveedor.Instance.RecuperarProveedores(); } private void BtnAdd_Click(object sender, EventArgs e) @@ -28,5 +33,42 @@ namespace Vista form.ShowDialog(); ActualizarGrilla(); } + + private void BtnModificar_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count < 1) + { + MessageBox.Show("Seleccione una linea para modificar"); + return; + } + + Proveedor proveedor = new Proveedor() + { + Nombre = dataGridView1.SelectedRows[0].Cells["Nombre"].Value.ToString(), + Cuit = (Int64)dataGridView1.SelectedRows[0].Cells["Cuit"].Value, + RazonSocial = dataGridView1.SelectedRows[0].Cells["RazonSocial"].Value.ToString(), + Direccion = dataGridView1.SelectedRows[0].Cells["Direccion"].Value.ToString() + }; + + var formModificar = new FrmProveedor(proveedor); + formModificar.ShowDialog(); + ActualizarGrilla(); + } + + private void BtnEliminar_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count < 0) + { + MessageBox.Show("Seleccione una linea para eliminar"); + return; + } + + foreach (DataGridViewRow Fila in dataGridView1.SelectedRows) + { // itera por un loop y elimina las lineas seleccionadas 1 a la vez. + // string devolucion = ControladoraProveedores.Instance.EliminarProveedor(Fila.Cells["Codigo"].Value.ToString()); + // MessageBox.Show(devolucion); + ActualizarGrilla(); + } + } } } diff --git a/Vista/FrmRemitos.Designer.cs b/Vista/FrmRemitos.Designer.cs index 2c2ec34..3128121 100644 --- a/Vista/FrmRemitos.Designer.cs +++ b/Vista/FrmRemitos.Designer.cs @@ -31,8 +31,6 @@ groupBox1 = new GroupBox(); dataGridView1 = new DataGridView(); BtnAdd = new Button(); - BtnEliminar = new Button(); - BtnModificar = new Button(); groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); SuspendLayout(); @@ -41,8 +39,6 @@ // groupBox1.Controls.Add(dataGridView1); groupBox1.Controls.Add(BtnAdd); - groupBox1.Controls.Add(BtnEliminar); - groupBox1.Controls.Add(BtnModificar); groupBox1.Location = new Point(12, 12); groupBox1.Name = "groupBox1"; groupBox1.Size = new Size(776, 351); @@ -67,24 +63,6 @@ BtnAdd.Text = "Añadir"; BtnAdd.UseVisualStyleBackColor = true; // - // BtnEliminar - // - BtnEliminar.Location = new Point(215, 302); - BtnEliminar.Name = "BtnEliminar"; - BtnEliminar.Size = new Size(75, 23); - BtnEliminar.TabIndex = 2; - BtnEliminar.Text = "Eliminar"; - BtnEliminar.UseVisualStyleBackColor = true; - // - // BtnModificar - // - BtnModificar.Location = new Point(108, 302); - BtnModificar.Name = "BtnModificar"; - BtnModificar.Size = new Size(75, 23); - BtnModificar.TabIndex = 1; - BtnModificar.Text = "Modificar"; - BtnModificar.UseVisualStyleBackColor = true; - // // FrmRemitos // AutoScaleDimensions = new SizeF(7F, 15F); @@ -104,7 +82,5 @@ private GroupBox groupBox1; private DataGridView dataGridView1; private Button BtnAdd; - private Button BtnEliminar; - private Button BtnModificar; } } \ No newline at end of file diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index 188a96d..87b34a1 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -1,7 +1,7 @@  - + Form @@ -13,6 +13,9 @@ Form + + Form + Form diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs index 5877391..d19e9ee 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs +++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs @@ -19,6 +19,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] @@ -26,6 +27,9 @@ using System.Reflection; ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] >>>>>>> 8ad9dc6 (faltan controladoras) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")] +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) [assembly: System.Reflection.AssemblyProductAttribute("Vista")] [assembly: System.Reflection.AssemblyTitleAttribute("Vista")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache index 217b422..82f5f4b 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache +++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305 ======= a90b7be7f25b3be585c8c3eda0cd50696de263dc @@ -7,3 +8,6 @@ a90b7be7f25b3be585c8c3eda0cd50696de263dc ======= 244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6 >>>>>>> 8ad9dc6 (faltan controladoras) +======= +14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig index 3515758..e97d32e 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Vista <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\ >>>>>>> 8ad9dc6 (faltan controladoras) +======= +build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Vista\ +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = ======= diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 894ec08..1e07b73 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, @@ -15,16 +16,19 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {} +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {} +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) }, "projects": { - "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -77,15 +81,19 @@ } } }, - "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": { + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -102,11 +110,16 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" }, "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj" +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index 0460a5c..0443579 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -13509,6 +13509,7 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", @@ -13517,11 +13518,18 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/", ======= "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", +======= + "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectName": "Vista", - "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -13537,6 +13545,7 @@ "net6.0-windows7.0": { "targetAlias": "net6.0-windows", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -13547,6 +13556,10 @@ "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" >>>>>>> 8ad9dc6 (faltan controladoras) +======= + "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj" +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index 7a5ff53..f8b813f 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==", "success": true, @@ -303,8 +304,11 @@ ], ======= "dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==", +======= + "dgSpecHash": "hleejJDgsDTscOjcjAaqsz7O8bRKdelLTFiNGc0rJ/YKvc+AuQ7Vc0530fJwdTW+IjGZB03MheqWXYO7aqD5eA==", +>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "success": true, - "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": []