From b62fa7b021e2e6c25f2dc189f36cf051fffbfcc0 Mon Sep 17 00:00:00 2001 From: fede Date: Sun, 11 Aug 2024 18:24:34 -0300 Subject: [PATCH] cambios nacho --- .../bin/Debug/net6.0/Controladora.dll | Bin 19968 -> 19968 bytes .../bin/Debug/net6.0/Controladora.pdb | Bin 15168 -> 15912 bytes .../obj/Controladora.csproj.nuget.dgspec.json | 42 ++++-- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + ...ontroladora.csproj.CoreCompileInputs.cache | 2 +- .../Controladora.csproj.FileListAbsolute.txt | 17 +++ .../obj/Debug/net6.0/Controladora.dll | Bin 19968 -> 19968 bytes .../obj/Debug/net6.0/Controladora.pdb | Bin 15168 -> 15912 bytes .../obj/Debug/net6.0/ref/Controladora.dll | Bin 7680 -> 7680 bytes .../obj/Debug/net6.0/refint/Controladora.dll | Bin 7680 -> 7680 bytes Controladora/obj/project.assets.json | 16 ++- Controladora/obj/project.nuget.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + .../obj/Entidades.csproj.nuget.dgspec.json | 14 +- Entidades/obj/project.assets.json | 8 +- Entidades/obj/project.nuget.cache | 6 +- Informes/bin/Debug/net6.0/Entidades.dll | Bin 16384 -> 16384 bytes Informes/bin/Debug/net6.0/Entidades.pdb | Bin 15832 -> 16568 bytes Informes/bin/Debug/net6.0/Informes.dll | Bin 9216 -> 9216 bytes Informes/bin/Debug/net6.0/Informes.pdb | Bin 11408 -> 11400 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net6.0/Informes.assets.cache | Bin 152 -> 152 bytes .../Informes.csproj.AssemblyReference.cache | Bin 91986 -> 92311 bytes .../Informes.csproj.CoreCompileInputs.cache | 2 +- .../Informes.csproj.FileListAbsolute.txt | 15 +++ .../obj/Debug/net6.0/Informes.csproj.Up2Date | 0 Informes/obj/Debug/net6.0/Informes.dll | Bin 9216 -> 9216 bytes Informes/obj/Debug/net6.0/Informes.pdb | Bin 11408 -> 11400 bytes Informes/obj/Debug/net6.0/ref/Informes.dll | Bin 5632 -> 5632 bytes Informes/obj/Debug/net6.0/refint/Informes.dll | Bin 5632 -> 5632 bytes .../obj/Informes.csproj.nuget.dgspec.json | 22 ++-- Informes/obj/project.assets.json | 10 +- Informes/obj/project.nuget.cache | 4 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Modelo/obj/Modelo.csproj.nuget.dgspec.json | 31 ++++- Modelo/obj/project.assets.json | 13 +- Modelo/obj/project.nuget.cache | 6 +- Vista/FrmModProducto.Designer.cs | 45 +++++++ Vista/FrmModProducto.cs | 20 +++ Vista/FrmModProducto.resx | 120 ++++++++++++++++++ Vista/FrmProducto.cs | 93 +++++++++++--- Vista/FrmProductoMod.Designer.cs | 45 +++++++ Vista/FrmProductoMod.cs | 20 +++ Vista/FrmProductoMod.resx | 120 ++++++++++++++++++ Vista/FrmProductos.Designer.cs | 16 ++- Vista/FrmProductos.cs | 24 +++- Vista/FrmProductos.resx | 2 +- Vista/Vista.csproj.user | 6 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Vista/obj/Vista.csproj.nuget.dgspec.json | 78 ++++++++---- Vista/obj/project.assets.json | 19 ++- Vista/obj/project.nuget.cache | 6 +- 52 files changed, 745 insertions(+), 101 deletions(-) create mode 100644 Informes/obj/Debug/net6.0/Informes.csproj.Up2Date create mode 100644 Vista/FrmModProducto.Designer.cs create mode 100644 Vista/FrmModProducto.cs create mode 100644 Vista/FrmModProducto.resx create mode 100644 Vista/FrmProductoMod.Designer.cs create mode 100644 Vista/FrmProductoMod.cs create mode 100644 Vista/FrmProductoMod.resx diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index c7bcb7e5c4eab0edd9228ecc17e927fbfadb92ab..4f73da0d73b47bafad90b03575e6ec14002c0937 100644 GIT binary patch delta 746 zcmXw%O=uHA6vy9Wv;Cq3wPLkc$p_*gG0i8NNHA(@5?fmXR!cR9?rt^>^w44?q=+QC zmm)$915zZEmUyu0E#5@1M8SZ!T#6zTQoKm<uYHPW4KJ08W_W9TgDI_VCnXzfL#zID1abZDt7`uWpJA@)j-?k~@M*{eUl z&@}t}4BTF~$L(>-enry4N>&ZX8Gpd%^{SGhDOxC;m1Vyi#3_Xo*^}Xg%Z1~3A>YPV zz5|;`nULo(a(F>G&f>B=|Ga?3CE4E|!0=g1T z?n}JqmgIR$MEG9;5E1yTe*+ zWiT56A9!)9=ql(N5yGl0`bL)w!A?k+SCBo}2V5L~(K~zaU{k^R;j2Gc#nb%{y@9u2 delta 641 zcmXYvL1+^}6hQyq?4(Ty!CJH!Dkfb;p=sGxrA1@3ZklYh#TKik@beW5XqJ=0@uM4?&DmnGyrCw|i3yY9TDHJM54|Vo8ANKM7%%7dl%v4sfvWhEJ zd1v(TvHh+a2krH2_*Wj_0f?voq*uhci zWR*Aoaw9Y3OiHi2Fy(BXI}DbSOoOMeEo%@IG|A1DoA6t4RV*#?tY$5$eG=SXK$&Zj$@av+Gn z2Kv>0m46&vKC>KuSOuJzl*EC*5nn>wMuPXHyI5UVosXrJn_I`BD+kG?krp$V>-jPu|hB>rTh`KH6&Ae;2o?u>b%7 diff --git a/Controladora/bin/Debug/net6.0/Controladora.pdb b/Controladora/bin/Debug/net6.0/Controladora.pdb index 0ca1666c3f2bfcde35fbb36c0e59a65f673c378f..3f9a0d6e48368348ddf38349c8031ecfa09ed0f4 100644 GIT binary patch delta 7904 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 iWViMkvAD4RKLp4D@U%v2v}q2H)c=PD;61W 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 IzS^1nAN=nhHUIzs diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 9144141..73e01d9 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {} }, @@ -31,15 +32,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {} >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {} +>>>>>>> 3925b59 (cambios nacho) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -60,8 +65,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", +>>>>>>> 3925b59 (cambios nacho) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -87,6 +95,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -128,6 +137,13 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } @@ -307,14 +323,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -363,14 +379,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -388,8 +404,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig index 5a1b2b3..0622c7b 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -14,6 +14,7 @@ build_property.RootNamespace = Controladora <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ @@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Controladora\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Controladora\ >>>>>>> 6092f6f (cambios nachito a form factura) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Controladora\ +>>>>>>> 3925b59 (cambios nacho) diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 7658e09..1732e83 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba +07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 451af54..239e0ea 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -15,3 +15,20 @@ C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0 C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.pdb +C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.pdb +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll +C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\Desktop\Final actual\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 c7bcb7e5c4eab0edd9228ecc17e927fbfadb92ab..4f73da0d73b47bafad90b03575e6ec14002c0937 100644 GIT binary patch delta 746 zcmXw%O=uHA6vy9Wv;Cq3wPLkc$p_*gG0i8NNHA(@5?fmXR!cR9?rt^>^w44?q=+QC zmm)$915zZEmUyu0E#5@1M8SZ!T#6zTQoKm<uYHPW4KJ08W_W9TgDI_VCnXzfL#zID1abZDt7`uWpJA@)j-?k~@M*{eUl z&@}t}4BTF~$L(>-enry4N>&ZX8Gpd%^{SGhDOxC;m1Vyi#3_Xo*^}Xg%Z1~3A>YPV zz5|;`nULo(a(F>G&f>B=|Ga?3CE4E|!0=g1T z?n}JqmgIR$MEG9;5E1yTe*+ zWiT56A9!)9=ql(N5yGl0`bL)w!A?k+SCBo}2V5L~(K~zaU{k^R;j2Gc#nb%{y@9u2 delta 641 zcmXYvL1+^}6hQyq?4(Ty!CJH!Dkfb;p=sGxrA1@3ZklYh#TKik@beW5XqJ=0@uM4?&DmnGyrCw|i3yY9TDHJM54|Vo8ANKM7%%7dl%v4sfvWhEJ zd1v(TvHh+a2krH2_*Wj_0f?voq*uhci zWR*Aoaw9Y3OiHi2Fy(BXI}DbSOoOMeEo%@IG|A1DoA6t4RV*#?tY$5$eG=SXK$&Zj$@av+Gn z2Kv>0m46&vKC>KuSOuJzl*EC*5nn>wMuPXHyI5UVosXrJn_I`BD+kG?krp$V>-jPu|hB>rTh`KH6&Ae;2o?u>b%7 diff --git a/Controladora/obj/Debug/net6.0/Controladora.pdb b/Controladora/obj/Debug/net6.0/Controladora.pdb index 0ca1666c3f2bfcde35fbb36c0e59a65f673c378f..3f9a0d6e48368348ddf38349c8031ecfa09ed0f4 100644 GIT binary patch delta 7904 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 iWViMkvAD4RKLp4D@U%v2v}q2H)c=PD;61W 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 IzS^1nAN=nhHUIzs diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 05d77fd4e1c8deac27054578ce1a9b1924bb9725..3bfc6be0258cfad377c809de3361e53c8bdde5fd 100644 GIT binary patch delta 547 zcmZXRJxClu6vzK>*E=zo<^140KaRv)VR3Tq-k$6o93nAxf(DDARrc!&wMbF~F%b_> z&>}^SX)HnroQ0Zllgjea29hd8nuP6>E)Y=g?ITv1Vcz`a|9_8R<~8fh`sf{*9a!YzrL zc%XG~51Smv@KoyxcZGjq5F=VFN-T;_Nv2LoWv97MN#?7#DrYs=PpVwZ{#y>~9<#}HP^t0L QKJIbS>n%%K*fx8w0ki*pH~;_u delta 434 zcmZp$X|S2l!E$VI*yV{mGK@|WSBCR_2w-6FX8?i(1_l@AiHgEJ4GauCK>ih=gv?|` zCY{NVjQ)%slUFjTGrDZP$f(aG@af#k_LL|u|4F-UH}hw$cit?>@}7~2L1i){n=osG z00RRfP@nna0Japyn9W<+g4r2^Cv)=2)_-AaW=Liz1Cm@|GMhn~X)%KmgAJ9|7GY)tsbppZsZ<8DmBDOhFxwf-P6o4+!R%%*yBW-03}VYO zEe3NAgC!1w*^j~O$BZD$HXq?z!iwp+3X#W*oLr0ytcH39dIpnw#i}Q>iwg=#1OfvI z3XDK(hlz?}j4G2I#m`PQVA7b(Ct=6;f(fRAf#C(y*E=zo<^140KaRv)VR3Tq-k$6o93nAxf(DDARrc!&wMbF~F%b_> z&>}^SX)HnroQ0Zllgjea29hd8nuP6>E)Y=g?ITv1Vcz`a|9_8R<~8fh`sf{*9a!YzrL zc%XG~51Smv@KoyxcZGjq5F=VFN-T;_Nv2LoWv97MN#?7#DrYs=PpVwZ{#y>~9<#}HP^t0L QKJIbS>n%%K*fx8w0ki*pH~;_u delta 434 zcmZp$X|S2l!E$VI*yV{mGK@|WSBCR_2w-6FX8?i(1_l@AiHgEJ4GauCK>ih=gv?|` zCY{NVjQ)%slUFjTGrDZP$f(aG@af#k_LL|u|4F-UH}hw$cit?>@}7~2L1i){n=osG z00RRfP@nna0Japyn9W<+g4r2^Cv)=2)_-AaW=Liz1Cm@|GMhn~X)%KmgAJ9|7GY)tsbppZsZ<8DmBDOhFxwf-P6o4+!R%%*yBW-03}VYO zEe3NAgC!1w*^j~O$BZD$HXq?z!iwp+3X#W*oLr0ytcH39dIpnw#i}Q>iwg=#1OfvI z3XDK(hlz?}j4G2I#m`PQVA7b(Ct=6;f(fRAf#C(y>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", +>>>>>>> 3925b59 (cambios nacho) "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -119,6 +123,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -160,6 +165,13 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index a7a0c1a..61f2591 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==", "success": true, @@ -615,8 +616,11 @@ ======= "dgSpecHash": "AVYTA+Cdyhg6wCEQPUiY9Zgnvl4qcFZo9nD09bdg1F+72oerfmmuZj274FC2KL/pXGSF1iqxwV37ZtH0RMkuXw==", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "dgSpecHash": "r6yZkn7vz8/vk90IKpsbux5MO0+aB5kxgPItYHl5ZJHIUAUs/bsNzJEgYyHcVZOte6JF54JInW9sHlpZnQcQMQ==", +>>>>>>> 3925b59 (cambios nacho) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": [] diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index 17d88fe..b28f406 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -13,6 +13,7 @@ build_property.RootNamespace = Entidades <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\ @@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Entidades\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Entidades\ >>>>>>> 6092f6f (cambios nachito a form factura) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Entidades\ +>>>>>>> 3925b59 (cambios nacho) diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index e079b22..e2c43a0 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, @@ -31,15 +32,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {} >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {} +>>>>>>> 3925b59 (cambios nacho) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -60,8 +65,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", +>>>>>>> 3925b59 (cambios nacho) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index 8cbb83c..b8bb4a1 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -21,6 +21,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", @@ -52,10 +53,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", +>>>>>>> 3925b59 (cambios nacho) "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index 7180e60..071cc5f 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==", "success": true, @@ -26,8 +27,11 @@ ======= "dgSpecHash": "xYCKCMKm+oXscuoQamJhNB9nRxekBQBuz6IDgUB/8WpDnH3Ts7NVTClR8NJpQF10id2fDRpsOygcKaFzlcHs+w==", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "dgSpecHash": "vCw9TkU23iJeVGdgwKLwcggjjvRCnx4IVmqtdUC1cx6S4CwC+/lso1ry576JGcrpGs6Tvfs4jnEYWVDgrNS9aA==", +>>>>>>> 3925b59 (cambios nacho) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Informes/bin/Debug/net6.0/Entidades.dll b/Informes/bin/Debug/net6.0/Entidades.dll index 3263dee447d43e709e4181882c2b11f397c54dab..30c6233e860e10f258fce8abfa21de527d5801b4 100644 GIT binary patch delta 1631 zcmXw)L1-LR7{|XiGuurhhP0_E)L1fEq}9Z@$!?h4HH6)633xD#wKX)xI&Wt;2t9O3 zDjs*nMJeLJWT2ju9dZgN6!#<)*&#;}J@qCeghEgCpisQ|zJI^&GQauH??3O&8#cUz zp$bFw?L8;F+I+hE&7``ud$2w_vQBiB%*Q8c+q>@gNJundu4g|ax*ogMYx!3BN9)6Du%j_7KoLSkLLSybPK0dsG10!lJHe+y zZV%BOqCJ8?7IJ%n_5>|ic%{zslf|`d@fvN5r=Eg$h1}-Q=FnE*YeH`8XzOTwcrD~M zKpUV9;Ui&@>n`dp>K=+j$n8FIDr6IXb)nM9I-$+45DB^HAtypM1LRc5h8(=Okj)gb zD`Znet_j)r$XaMj#|d!}3HhcTaw24NgnTSyLm50?$i_u>Gn}i)KB$H4L*z)v=5h}g ziICL*ITf-wLOvFq#8kbPv$`E@76MTDYFOf>-e*QPg4kNLlB|8eH#{gq#rZ?qp(zCY+cEc|XS6co+P&*kUxGrG|5 zTII%8P}I#rabbQw@EWZ~t5n|7x}X=$*DE!2z8UX%pS|+Q_R2F-@2y#8S8SOhG&^G$ zzg9Yzd2G_-xLnH3-uw4i=E2uLU%vn7r%Myti$5xJU%j$TT-j4fAGat;5rUEs{GfOX<^Oo6Mi^esL zEz$zbo3Gh!P1C|rGIwp6o=0g~l*6NvX*K1|IEw#T`g3^g`F{!D>z`i!TkYnv{{!H( BT9yC+ delta 1553 zcmXYxPe>F|9LL|AS^s8>B}mvNJ1!xah*_epX1i^qQIdqEnZXXDLL^$LR1ob9+rNW{ zws-3gJ8T^U56K?uu+!45=xUcxggQob5C|S8SU!2Y?YUkrx{VJa$L45X*5(! zv=U8v7&m??2XJe4U?t7#+K;-*ZBOLL|^k6)+S>!C* ztZu`hJdDqz6$+w7bcYJ!px7`=@Bx$BGPRjd8TBTLEhg35n7oZvNZO)gQfta4(I2Xj zi+X7b-jd{F@CleClYC0jR#Irw@HUvSG0j2YLU~M@mPhuPWC~cQAaN%6fJto`Z5iz* z{1%hiZM55Hg@Gew_C5@%O@sDm8nkp2-eOW4LmNYzfKM{1O`%PpO~czvY8|u=S{L49 zo}xO7I*U4w!e>%jKn|E>)U)Pz=7;H;bOet{MIPB_k|`kvOfn*bgEPrQku4^f1agu| zCXH+}waJ(+1|E~Xlt=cNWHynvm}Eo+ex6CjLbfU>Cy>*i%_Q$4drUHC^BDL{QYGYo zNoEsyi%CXS;^!+Vzlt`V(lhKI&b0n&0=_HeiG_uXa z(#Rf@Odi>1k_nK5D$24N+pVT-RntFa0w#%^Mz$#*HC+rm6nSJHxr7`b7n`g$8Qw76 zh8DUKz~Ysb$piKMKRarT-F+9=9(-RPYK;vRKc4(**3?Q-aiXKMqf>q8S?&@8H@>|U za%9xdx80I{C-jXs(W?VLQhzq+w^hGiboWKsy|MnC-F?pAcPqndBd?D%23=3+TdDZe z)y0{6i&L{R({~o8&Mn-ZpIfk}_4wAjJr}i|rDc0=YF54P9q8iu)$Kf=cJX;A^6ALK z&yW9fTs(7lTrbE^H|1!~YSedbci%B}vu|A`}$Ma8T&qVAz22)j5S+S(qJ%Qh(YNVki}|ZfR2? z?P-x4O5M`F-IV&DGmUhA&wrlh^M22Hzn|}N&Uw%BzH@g&*JeV2#Y&PGhG}fVFi~*~ zv%_H7pOeI5M<>G~<__-(pnHM-m?tb}qOw~c%>~LqSf4V5bxK@9IIQP>_&l#|$1zID zofciWB+KToB=>z3vD0f164$3P~&Ok}z=ff=c379>UaZsj0S;J4rzz)O0 z7kEQRfDaoGAYc!m9G^$P-p%8Ksr~myz-$Z&m?MN6gtsBm@?n97eAr5e2#7ThYa!M_ zWI$|%$b;AeQ4UcHaR_3i5whjSGUAQ+F%HBAh%AUeLw@KCDFv|YMgmv?L@C66heLH3ViVj#)vtnMz>(5X&JL5N?JN(2)cd1Iq~zsSs0S z3Fr*9SP}-5gaIXCizQ);C9#dBl2|@O7n}+hCWM{lN)fD&D@8HIE8Kz@c8e>;u?IXk zZrW}rATE^QXoMa^0(J+EJ(4TPf>7#U^RUB29ZV2w7Rn|FV26lSeEgWcKoGos6G(+u z8NpsYA{Juw=;xJ4#P*RN5$9tE$k=>zKT`-@tGU2nTG9PwIk3BomfHjC$c!+q4(n zF*bd~y@N@k`(RouTyo*E9pc(7HnpQ=M;le@<9D!9e1(KJBO)e&=)z2nAEQo$v0 zb)oqy2?D~BxRx>aAa3}p76tSr426Ywy3BIGkT9RCUI$eYHovNy#leJx*<5ugAW1Ho ztLA}lN#nWd5U7xx^PEKlHzoCcX|t99qSTzLtVG}VFgSl!cU`cyRO7L2gJ(zth`%d;la7kJ%W33JW!)^{QYoi$&T^{!Gx#D3& zH>7!8KR)qF+(a@mBvdqNh<}8Dq9)8I!Z~LFyJbn7OPP;U6^67#X-PyYa zJ+-UP-K@&ws~S8>;iG@^^Y~y#rwh;56}hZS_wpprB@cTWYaX@k!5bAZGTGZTz&Rm_ z>6Dmg2tG-x|4(9DDuAAhT1I9+d=fEZW0D;sg_97?WHXZ(9A+fR*j`LHB^hoKB>(lv z9A^CD|5nL<%&0hK1c#NthME2NBbLxS4fjnpi1cn8n_l{b zVCB=fd5;5}mM#7d=$fXI8|A-kJF8QA;g!mUlC=Q>M+VN4bNi=B_5nrDtqQ#BibMyW zP7$X-m5D>=ZF5`Q!)Dc&ozs?8Re&xjlEADq@l+0@N49=(7Ll4&8fxQRkKM6-`$gz1^Rr zrtC9+5wmI9*j+H`li9L{FJtAs5C1TJHu~u6jz1Nz2V17oa}TPpB?Qy!+^-LHIW@m6 zAH1G_w!fLYVdzX`rG3fcVy}FA>f23O?|Y_a)@#@by!37T*YbhO#WU9wA|BAvJ}CeD z;+^h_=pCD$IDirvH7gskiIF+k%)->nlx%9iu(6J?F^ROavaqx?Uu0u#ZWS468DVW< z8E$SF#jr6q3pX)|h+>$7mohngmR9W?S$hKRB3Uzp&NV)zHa&*2H)(BoYd1f*Ejt1F z7pQsK-@BWIkqB7X8|UC-GwJl6p_Iil&%eL+Vnrk+Bqv01$U&^+6h<6{k<5x9N5;j$ z1)MHHnm`W8f<0`FzyMmM-eB)Yh|FcMNKOqmF0QzblxOtv@?;|nJgPHQb4^z&J}ur)q8A|WY`70wIbU?fwFl3Kct&ok2MAiX?g zAIUBBlO&tTN#-!vk&L8B9&=m6`%$cyfZ475rusR3oqLOo_0~%t8O6N$2PeOC0-M8J z$KmqbFv4TTw_=pu@RhE)!?FLRF`0fq81AVyva4>ZD`qxKM1)!$D1km{B#eQ-;!cFtBvP{5~;U+6&FUG$4d zv##CMp2vw}8FmkgpK`5l%S+;H&sCF{BLQpgqd2Y@?sq=j$M6T4t7W+aNn8qNu)6z^ z`-SRetyi$Eo;?EIC)2A#)^iD-xHN8DCD4utKC)6T^pyO z36ctec>H?WQABujx}vw4sNw=PSEQ3i2!mXLi-H{9R3o+%5qd(>E4!YiITwrHEaK;H zFXs|+6{K+Yo8iSM$pP$kPLNWS%l1T_E4Qtsav(uJ}WMX{n&;GztdPu{4M)Q#>z0q|ylHbL$q8{x9+^5p z`-Xz&-xYEhJ?!CfAT#8xh5*~0N7g`F1dmF;cku$E`Z)|Nx)7jDt-AOwn~3KsfQ^a@ zc$u?&4wlJ>H6(}_EZTO+y~bTeTPnYJA81w7q==q)H;ppN7hS#a$I%bef*V_whww8! zctKnk90o5&))xKSC`K#c)eblI8kZwBi+4VgQ!4_p3pMcbLKVl5o0rmFnrrL)si$m2 zorqIokATlYRa~f*y#*<4L#G78DNpGoZ7D`Q-|ygH>q31z#A`zi8fG=omYJ_F$j-Yj z<@$ZGR=x%if3?=$xg{^Q(i;tuI0Z*4T&1)2|MdRbt^d-ao*136VM;uW`zsJwUi|&l9Zl-=F_cKY=`C@@{oQiLQ2{cm0uF?SqVY-Qc#0Hr^QK z{uwE24EdYKMKfKt)UxQ~CIe>RjH(>aQx(I1Je9eN2&c)NjZ-@UeM$=5S&o6}1&E;X zvr~h8qVrI~14|qf6Ac!4o_b}qN%3hggX^PARSMTJ+5ZUnSYI((U;NF1QvUFh(jMPs zVvwNe__=8R3{p0C*^!NIP$|X3w-!jYbS>j`5Y30zEw5tixtV_Kxp7zP!WQSs#O=We zvG+rP7D>;;>%r%9CeEnYJpy#T1p^;75*En7b zC@Xg=NI%xGK=48q*rukAkKDL2fZTRXB@U-$%+P90Otv0cd3^|+QPZSesz10NDgVCK zR1su(-?{yJ^jYv)A#bjMzN|#%>_&8}MmZP7xi?ZOXzI1yt@(|S+@|WZ<-kB)JEP`a z=`G~y!Mw(YDwQ{UTEqV7$#{B0g6GPU#a_$n@}81t?rzZkx>)AUSQ@QHO)qlu#V+CB znXc;+lbFfqv^pC+hkTX0O~syhPCSy8?A0V_QPZ?Ir6deD{2|wbw=` zKj>@#lNu`2ojcRsqanEc+&tby;k_8FI9~X7YyEOjlf{Ju+Zxt4 z(vB{*eEVj{Z3RHrB;lm(ecU4wGj5Af$d4%ZGXHf6{tKxZAWKsdzkl^o4YFKt;&4@K z>>HoF+pV2@AbHdB{eFmHf@9S=2jy{-(ONL2se}usylg|38_u>p z&yjgat(Itu6X|=t2avQBGn|7SXQFQQZl?F^@cr;C&RWmjw{>UzZ|VCpBT|xBob|jW zyftdPkCxUBqJ(qn_c6+$`9dFF21;`NW091~ieUOCu-LPsw0Fs#den!*>0{de93FAs zaiHA3F5{iq>)*{1B4Xi5ju$6+!1D=;v&Q_NpjY{yoyu<%JFcFXnFKGi7UE5z;vZ43 zyWTMPXe8|J)GTcqDwVFQ0#vlM@L-W8+zA$@+M+Nt>g$nr)MmWo%V;N9p{J9qn zX%zFNFY|u2?^E||$%aRo60bUDTaXgZOkzdMrk}cX-81A0=-L@y&n439WzTmA)GS;I z^mSBl!ry#FXh?MIGGgOgM%*hM@}#O?ICO*6ItsXs*V@}i8L~<;xN6S==PfHN7*Sx4 z6)4ov#zo~heTAc-7J_ z-XYX3KFlTL=}P0z3Jz8x_o9yEw*K#Q?-pisgk5V41svDaSlVYMa|tOsFCUDhST1ua z-rMKWSuMJf*E@4B#$+!hhY>k<^jTX^J&cj~u*y)`t(qNd$2!|cQqR#9*MNZ@9FXG@ zpHNPBU2=&}8mg$(6*GU##KzwMQF=OFE0%xfZn=Sb9laG2xm{hiL{usEgr;Eqb*&jeU+s7i2FRy-f z-SW@7qPHJE=m15175r%k;Jz<8i%woE9GLXzi9b}=Hy}0zeD#g+^NvTkyW9J`iqcBv zIHj@7o1j*|;ZLX}`Tu-Xa^@vK4cO3ug7}-J);{L1pq!#ezF(j#-8!2#@7uu7-OG#g zcNdmP#F{B>KIv1_^uyVPpK0&A%fWmD5-wS&egb*g6(!^GUih<1mimh;-)I76z|lY% zKc!y@EivqUpnp_qojg6yV`VHW+}Z-97--=E;|(9sE5@4YoWP^=hT+z6M&=bqWi?c) zg6jqfzHhG!Z$;LW?b5O~K?yFohmAYw(OT{QlO&CeKAFQ;z}d(CW1;*s*2{-|EwgI6 zAVhTCyZoO<#ru-uz}8R+fAdlO0dgu1>i+r6tat5}ZL2)D-rfVS4OQ?d!bBw+>LKGv z(K_}L??dv>BYbynsR4f*D)SB?SvZUPj9rR4_~fiqrq7Xgf}G}+$z_m2#y5KCK0)@L zU$tnT#j8B?cW5v3Q)0Uz``=gdc(1eDP!d%F67>d*kF@gdf(M4>dAR)nyw$~DMW1b;P}~f{ejsU?mm|i*1c|D2+e()RPQF& zFw@=Oxsj&V&i>_Z(adw3C^dNY=(%@e<0{dov1ej=efevBb&g}O;%7T@+~;WzS_R@? zoQwSX^l6{6`Fp?r@hL0{)R2|II|#4zAzP z)s3vzH8MIIb9dAK!pF|pUORRiDpkODvJk$Z)chstt$!@$g*N@6=Uinka=5NWq>Jm` z&R7EX%)FO{2+0~YJG1{W^f-`P>$}YN<$f+9(^wpD$cW(1qviHV;#X)B0fgnA~oqliFNiDQD5nfGCJs1;vo@ayoCW;`_L=d;wQv4hZ)eXHa zx&5j%&(gn2jI$rx`$B>)9#48xfs*<2#QWji3o$N*q5)qbIFon4sEGz%yG)gPQp!KJ zWXOUx;&>`h*DygoOdcqhs^AA@7jS2S{FIISNx461J-36|l-9m6;A5(U4|T7tLos)y z>X_@8Z}7=kCFmVQVx0u0X0o8vR0_8(E3QC1z`=X zsS|OY~j=p)B(hnc${;wI4n=$_jtX{Eo6eRf-Qh+fYq zYyf3uTKJ2J!YAmlS><7Wc7bQ7(=I20ACb>oN5O3~5+1fLjk|@57$ko5tAFRz?N!&? z_ojOt5Hpv@LwCL8ZdztuK+kU_da%dOpc0M`Ul#@Tb8|M-nEF|%p`W3JlJGG#9hTb9-*$xF}qp!tWll1tJzd!r=i3&B&g%!;@PK> zHDi4@d-?b+w}u^41By}_5n$Lt8SgN71(0&{>oZ?YKAd!HT&Y&JNVe7ph*~P*`=4n3 zK+3{Yru~W4A1L)x(@BDhi${UIB`G7T{04XUPJqMWHIK7hi`pnQ2O_7EdBYdPh)ZDx zq$K|OaB(zMCL1~X#yM=1pDg5&``u+7rDV}P9)B5g_G4Mit}~5@_;tm?o?hX7t|xph zIWcXQefy0FPrBftr9{TOT_fBB?gqytLiy|lFR<(Smx-lWp|eyLJ2D|{c44|=6x59T zPTy?sY72hiQogUBZ1CdOE7;tcIJIWscGR2t7OzjIu}0iZ?gmqBd>co2UJ>!tU{Ld?E7N`>$Y3%G*0$$8m#G@9!Ns0&=ZX@aDlQ+tB}!pDR;XS4*s2xBduv9r~`c z5uCD8^^jAH<<6gVeF|iC(@*r8ysdt!55G427AV*yAp)MyejP_wuIu1FaP_q4MKb>P zTsP}lw8+IcDFEF?%6QqSCwoyQ5j{$8e(Y89%Csr9TKBA`0)#G7b-N%w^cXF>VIxIH zUa!%kcje|TpH6Mg`aPI0gA>D>+xM3Uai5wIoxoCS?I6b!ODZ}uyV^9sxkYLeRk4-a z8CB#G|9mr(k8)73|JLCCog>SBb~yaDI{OXkD2FwQQre^c<3-pZoYLj8JN3A=Q)Roh zwGctR`2?Z)454|1&^$?Ken)8GBecj6TJ!QP^qkA9TZxr2BTyd&5TeqN|ur=$5J9osn8;8vPO$m zY3~(j(~jzG#oPa!Y5ekke?Onkcb`{oO7RhW}MwYc(^UwGJqtBVVc`9Y!XUa z3|{+kSYc5c*zgjwk-{(`bkE-xvxV2u=-S2K%?ZjAaBO4(#|{z9AUOUpDIWZ(al+{o+LirlX&rli>2$(fN01JbX17!`A zO;EmsavVw}0RpBgAb|NmxdzHiDEC8o3(5f~#RUl%Sx^9TgwhMj1Sr#>tP><~v37VN zE=0hTgaoh%C=;PP3*{9k|NTe6w(1kG9T4ddS^7vXfEDNqU?mVoAZj4$AX*^0ATC4P zgt!Os7~(m^TZj?^WGjeqPZ-CPjov5itQnA|?t!G8BRLMKEJ1Eg=>fBEOYcV)$F-*`%3=@NpfxsbDA#@;&AuJ&lLU=+18lgbq zSd@`C76Xw0p$d@bVk-Ab~xDcmuK4Py!|(fsMm!g0Tc<4dH4m35k-B zCkc6ykS7UCED1|2iFrfaa)>~P5QuPy1c)k#bH-B8P72yd!KIOcOCyDyhxdF8rC`ER zFkvYykPB~wK=eYqfl#GLVWtrF5U~*H6lp9E;vhr?M7q8-bR>;c!RuOxW(Z>=Y3K~i zm;?ioU_cU_F$vC?gmq9zSRcd>3et;W7!n37oRS2uiwwHp=LSj_yc10s=H0<$(R~a9Vp2gML28Xm zC?h1ADeAL)a3bU_?qoOf-NXBt}wD&@}@x(nf!VVSp-aBrZ0sO)3Qm(iStu z_d$#F{6FIzbHJpu`Hb;OU_-K=G0q3^B$FBA2cV8L!~aeh@S3FmN59h*D9X(6w=)5( zkg=JeZvh8nOlOQI!5tanKjUO;ASO$hF=he>S;HCQ;~-YnONKN(zvQ9hXUVUV$G|;V zb+B=^$-gzb7J*~4)jj2%qc~w9^biJ{V$WtXB7-90-J(L7lwkJ1JncH9R@k>EyL&9z z{~wVnZJ4*qm>rq0kTMo7B`%`YT6z6J5r`qHTUk*|jV&nV7UuKjQ)~=_ErNs1LQI1h z40@0m-D+M4-PGL7nqg^bVKdK+ZpN^oTbP>KSkb|Ca*BYZS-r2^Vgl}RY3w1Egkg_1 zEq5FAlW@yF&wAD|dbZr(bESSY)GebF) ztVbUpBvSLGT-x{qUJ81{MTmXYvT3%vpDRegxh_{B(eFq0J#7Q_!A zvag~aB}F~)GSl>chgZou<6OIz<*88&4x2-d3Zb(?_)NW`{5Mz^0dsiaslT0?Pc2qA zXTKFETKmScIgCh(eRQ-VGm68ABAX6eO#LZ)-Sxm+XMM}ZY%fr*FdMii$l#{czGY}WLAkq1cRsr2R?_%&eZw>PB|JinA{ifB z8r6y>`HA@WPR0dWTHTM9r4!DZuJQ{pK^;?A8LF z^--lc+_bx~m(UWLf1UsHMKRqyZX=^*FIQ|R_R6dKqqMVkvLAHW8?=G|WqDlJCb<$z62R6UV((n%?eBcxo+=1XWWNWQ z%32Ox&5Qd{Mz1Gn`LDO1b1e()FK^0ZSn-26(K&Q}I=LEaYf(CkoP-u{BGchG<>MN) zjoDT}U3E4fs*rHj&|}`@*0x`op!D^)WNbOK?(5QECq&S4Vg$u(;Cs>ruRBmo`eMm@ zi}LP!7PT+PFHqTcpXVt~MGk-KHKztG{XWydxB~4omn8jp<$g!&JR=7}3YpKird6h+{j2wu)7sMm9s7l~( zj${rX!VAlhr*aHm6ix@<@M1QHxi*TF55| zap6gqUyaL3f9*un)%wrzNomPyA z`$@r26u+X(KmX&+5(~gIcw@c=-p)8C0aPs`k9v zdVLy-x-6DpGxN#~%KMU)wT zB65pNE})5ozR8!_p`>MBSiiL;HZ?LI>`7Ow?>nrLq_-m{7QA7xAn02~qnT&VZ&ehv) zwV!ncbPY0?r6Gyij|J{U1aC7N?V5;A*E)Bx5^d7RD@5S;v?O`?uPDW)!Ou@0Ei1C$ zLriU)XC*|06kYt}LT6snlqgdCbx8QE!=4HJ^Wi;4J9z<`G^FhQvWl2O0pyi-cbpy* zuxnkCI=f0quAW~KH*bC+{B;gLMZD{as&08yj5;@Qi)i<*^_v1AO?{6NQci9#Flm(lajCr*8}Q)k{y_wq>gFA%4xjbAI? z$qQ!YcCu;Y#RF>c$66k3j<OT|o z35$lujNfy+9JrNN4)GKRwW@(}?=qsTtilTB5+J6n!)?|*-iuttecG&LGB?vPOR;os zV!PXCzAMkLsLgyg@6YYNi?*`Q?ORUYUii`WzALqm8OfinBai7E7tLa@*{~Z=2R~I~ z*^l00azzgmKDrutX5}=+xsJCv^Zgs~%zWr9dPD>xf*)z~5928mY0cIQ?W3~??V58| z6uEv@W`F^0C2nVkZv#@23k<|Ry~=W_Zr3q?aD_zYJESopnXGueBjb$JYuGSsaxbvG zVFznGj#-u6`}z_H^0{7&->-g*Aet0ahN@7Z-Q(_mt-}4}`Ne6O&ib7*h^`z?G<3^F zhn(B$&0o+NWFm3l-GX*w~ z6nKB|rS6w(@8Ysuxvj;wh%@5&{ONu^Rb!`+s|o2tCAkS7+&efM&zzBNWr1tDO1Q?l zMa9Tf{b$(#n=eP5Dnc9w>snT%fnT}`_?eOW&(Mm<8YKRGJv7y^etYpEchNN)ftj8H zSNED_IqJZ|^Q=vli}cu6U0bXW-q(M4MiRaZ)|Rkfh7U6=YI^MkwT}#;WInJ0+0`X$ z9nZP``o~H3^wXJE%;0c%JmeSE<4$=i3S;=uW~aqOh*v4|+oQNjZ4+=+PZ4jLk~oAa zPJMFV%GDL3PN#KCLcbqeBn+nXwDC;}PkG&`V%t~uNv##MvsDF)oXMPFus~k{FZ!Za zfbx*m%Br=xf7h-m`N~@Tw>SR*5&D{3QcckqQbrxU9clJv)Tws!kr#$fb}yKbj_0CHmxq)F+k0v zaCRBS>j?AMK*~TKzZlOQMhoMrzDhYllx~+59e}&_>Xd>dQ2DcZel}8yNo&0l8fJPm zxJ7;Mh`m+-q78I#U6#>%ls$QW4?Chz%`?AX!NeA?^U~my0gks@>h>X}uy;}RI|-^& z{fI%X)Awj;Fl3;NA3X9c2d(#Axi6j{1uwX#NnX9EvBmQ>RLTJZ!`ZmjH@6Wq$$}-{ zwh?7aymoc_f2?t?v*HmV3}x}mz4&?LerxAqw*YFm{XP}hw9$M6YfxaQiEpFErz2(U z!H)9G-CEQ#EM85l;2s0?8>-_uDPJCAY64h(!Ylicph2%woAq>uILs$N%t#aOug5wb_^wwda8Fn=2w0hgUyU# z1;Ylri~+ySO+T!Rsac0mGEbS96KiO|r9`tssPd>1Xfe{m?Yig(kWOb?_524nCGG2W zy9Pu=FNg&{j8yQtzhlynvgvuvhm*G6PKBCYbK=xYl!1w{G5-2Sa2HZ`h2*UxCuKVp zCjaV-SDt$qD%E^{fB$miZ)`0$N8V#ux|qQXrJV9;yesBMjkDC4PCEvE|BReI&vx$i zYr>L5uvdF6>P$8w5`&YIv@&;B%}?0Gl|yOVKl?-lO?`r|p3r z+hQPZqJ*!}NaYB8&h<4JPPml0!qOWJNW&Wn% z%qpEsBLiF@vKJ7ddLm~dZa0|^w|`QXWFWZmqSj!%aEZI>dw zjL@Ajm4>V}XY}z96U!>(M10=cVVrZ0 zir-1}2t_`6F&4@AKs%m)lJRgkHjBTizKq})Rv0Iq;ut{>i=6HT_Y@ZwB99|7SMMco z54+bAA}GqOK?IOwrVLh?$>6psho(>y?1}p9yIx)0K9||u|K$A*S4hyshsy&hk@e$6 z6{?JsNe{5R=*-h4gbb)u0fT0uxNnkeE2`Fg|2Vx#(tPK(NzsdgJ&9>N_loAy_}y>W zeTYCGQ?gK&Y4CUe+MOf7j6^ zsEfBcFE56dKR?sV@3;!c>VjAytlR9xbB9VWMAq5k3g2g zygLbypobe674S~Dm-^C1pOu_<=^WaZK4tuOC1|(M#3Q5M@xIrzga%SKZMf*L=VZzA zSEIE6e78`+Nx6G+(4bH9hL$=U+L@mMZ}iOC`K)yDM*drkwJ$Gs)z5?>Xx! z44Ub?0BPPFu*FgaXW9t$AnVf?G}Dd~V%_(Xy|!Mj3_OGgs{9t<_F zgIAhL|M0|`waa-8ElgZSbrkEbdOINQAUvDp8V?C-E)RQ#8jw=m@m5t{ z#|Smm$u()b$=Z)!ML+ag$&6>ATXM7)9fNvvtx~SnUh-&DeM9W~X8{Go&eO(cYc`xm zdq}ZNe|>)VF~<|Tq)G1re%=HPFi`lj+$=N|N8xhM6EZbkrvk202X(4OrUPwc!N&UM zyixd&u@m{4Czl_@UNb>GUEE_-=5gZ)P_)v(Z71&WeqlI_>D-Mo^;edp{ef*S>DkH&PZ43dZqJXH52J+SO5!}G#%a{F$As3N zV6!QnlOZcve00?<-nwp^y^z}ayx0}Ya=Z~LH}aiFP_ZWAZ}vYaL>_{pO#;F*gzfX< z=MXl{YFh-T)++d$h=n<*um=8h0r85zXr;`=t1%mt+ChS~22JNJsTx`Ky;U|B-FU;T z?P=)UwLP-w|5Xe>*uAG;Hlc9?lgP-op6j}C=&RjXE8J^IQn>(lXRUyT7Bw2lT{zYUaa)VOEuy+=_lQB^lHFUvdG*DI%)ZJIjD3DESpZZBo-3;RI?=#B0pDL|u zhIS*rAM3_LG=dDMC*u$4CGGCc1{>z9;HA}bTG0Q8#Lt|PNNg;3%;46xaLc~Sf|B{F z9(A4o3M&J&v?;+AkWHr zBcJ*=8TLSAfij+%mr{c=N%O00x(K}O)2be}U(mUs3v3sta_P-C>rtoPal1QU&19AL zv5`>GS1I=LGlTiiIUD(_aQTk+bL7ituz%q5b{)@*Lhfk>T97 z!G^6S-@NlJ?^=c4*=Bfk#qZUCzw%C>9mJG6QxVnjRF#{R(Q4X`?S_PucFxs$;f10E xxvB|5wE&@7nNY1usJ0+fI})n>2-V?0+m<`$f9b$k+s*&ms3x)AZc(h@{{f@;Q;`4w diff --git a/Informes/bin/Debug/net6.0/Informes.dll b/Informes/bin/Debug/net6.0/Informes.dll index ff1279d98a5387ccf25b996c15f2af241df2976c..8e706b3d2a635a9478ad871a40e6d33f121987d0 100644 GIT binary patch delta 646 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 delta 6211 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 Nl#wwbkw6HMR75b&6;l8J diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache b/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache index fb1d6252e42e084dff1fb9006ddbd218e3f267d6..1e9a4f7d705e666845383b0035a3fcd3f4575008 100644 GIT binary patch delta 188 zcmca~j&=G)Rs}Z3g$xV~j6Tj*F`>n&Ma40GiOCuHF)pda*(Lb}F>Vv}Em_;HO%1v~ zG1pu%BrP*1)kkM+O`aaD#>g{qgP0(iDt)(!R~jaZ$_Y&8j$rg|)?(hS#muOY0sy2B BL3#iH delta 124 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 delta 6211 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 Gz554sxonI8 delta 326 zcmZqBY0#O_!Lm?~`R~LY8OBQ!SBCR7crq~fGXOyX1A`3nL`7kq1_lNmAU_2tAv0N# zNoR5-qd(IP&dIA7)figS^vb<+xV%Rd7kxiIY zfRllN5vb98asXQjW6tKSYzLXl1sR(ek{RYQG&694$!rD-#sy%J#SBUe@r;WZgcwp8 z4}e7ugGCO5L^iMGv}VDy?guX$BPSOl1FNB)fu6x+1OAN3)A`@&Et; diff --git a/Informes/obj/Debug/net6.0/refint/Informes.dll b/Informes/obj/Debug/net6.0/refint/Informes.dll index c627a331df4bbfde98f2c5113f7c05f8abda23ca..3cd584e27489c65724e8faa34bd7a60e79b8f55f 100644 GIT binary patch delta 439 zcmZXQyGsK>5XQf`#K?(B&S<9y8nH=8?sAb!6ve{E#spG`R_^72V3R_ugEkhv;)-D5 z11vOx)nO?pX)Uy{i~oR4urp%epN( zWWcckls(mv{@x1E%ljP`hUAD6l}nUS&?9eXoXXA%#T700`f;*vs0-(F8)IShxastH zo1~y2$=BbNQUPM4C9}Q)9XWTtN5z_?E#z^EE%dnK8U$Uq&-}MeyvyC-AT?wyI4uL(Oklv%QGfxDT-MHLUADBal2x4HzC-eCA}*a!Bo~2z z2^$uQNb_9c$0wN;m?n{c!I@{(X1!f0K2>79?Gl*yD~q|!Yn^?NZ=q*(_P77vX}7CY Gz554sxonI8 delta 326 zcmZqBY0#O_!Lm?~`R~LY8OBQ!SBCR7crq~fGXOyX1A`3nL`7kq1_lNmAU_2tAv0N# zNoR5-qd(IP&dIA7)figS^vb<+xV%Rd7kxiIY zfRllN5vb98asXQjW6tKSYzLXl1sR(ek{RYQG&694$!rD-#sy%J#SBUe@r;WZgcwp8 z4}e7ugGCO5L^iMGv}VDy?guX$BPSOl1FNB)fu6x+1OAN3)A`@&Et; diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json index 1389a7a..9d73e69 100644 --- a/Informes/obj/Informes.csproj.nuget.dgspec.json +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {} + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -60,14 +60,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -85,8 +85,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json index 98d292c..6045869 100644 --- a/Informes/obj/project.assets.json +++ b/Informes/obj/project.assets.json @@ -32,11 +32,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,8 +54,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache index 5ddc6e9..376e547 100644 --- a/Informes/obj/project.nuget.cache +++ b/Informes/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "INVcMeeXX3RoJw93Ye8x1Z2zKXKisJfXRKwLszX9TOBmcSCPTpBbhbgBcrnpGdxF2t/KPFVRZ2CzsnGvpyudOQ==", + "dgSpecHash": "wSRUDPAOADbuzfBaccmKkWkxTPKcGjNIB8Bpaz2yc1b+hR10rBbeJ6qupMQnFD6UaiKUQHlyxseEoFUSlbM17A==", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index f576e36..6170f0c 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -13,6 +13,7 @@ build_property.RootNamespace = Modelo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\ @@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Modelo\ >>>>>>> 6092f6f (cambios nachito a form factura) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Modelo\ +>>>>>>> 3925b59 (cambios nacho) diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index d8a3ee2..12b3c4e 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, @@ -31,15 +32,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {} >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {} +>>>>>>> 3925b59 (cambios nacho) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -60,8 +65,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", +>>>>>>> 3925b59 (cambios nacho) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -146,6 +154,7 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) @@ -155,12 +164,16 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { +>>>>>>> 3925b59 (cambios nacho) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -181,8 +194,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", +>>>>>>> 3925b59 (cambios nacho) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -208,6 +224,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -231,6 +248,10 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index b209fe0..ed84c96 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -40,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", @@ -71,10 +72,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", +>>>>>>> 3925b59 (cambios nacho) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -100,6 +104,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -123,6 +128,10 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index 2fe6b30..1d9b6bf 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==", "success": true, @@ -26,8 +27,11 @@ ======= "dgSpecHash": "fmo2HUMoIdls9H8hGKaMGhIa7cJfQvw6whWqbWRluFrLP21caNqa5sNL0+c6k3hgxAvgJ8kJuQlkGFoq8UfLog==", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "dgSpecHash": "gEY07P7prGCYVR0m9ujCWDU4VIm7roMDseNKc2YK6GTpNG+hy+RKyuu6ewyYVPxE4rRuW4p/7q2JBw4Oa4TZHw==", +>>>>>>> 3925b59 (cambios nacho) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Vista/FrmModProducto.Designer.cs b/Vista/FrmModProducto.Designer.cs new file mode 100644 index 0000000..6fbf9ed --- /dev/null +++ b/Vista/FrmModProducto.Designer.cs @@ -0,0 +1,45 @@ +namespace Vista +{ + partial class FrmModProducto + { + /// + /// 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() + { + SuspendLayout(); + // + // FrmModProducto + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(527, 271); + Name = "FrmModProducto"; + Text = "Form1"; + ResumeLayout(false); + } + + #endregion + } +} \ No newline at end of file diff --git a/Vista/FrmModProducto.cs b/Vista/FrmModProducto.cs new file mode 100644 index 0000000..1750218 --- /dev/null +++ b/Vista/FrmModProducto.cs @@ -0,0 +1,20 @@ +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 FrmModProducto : Form + { + public FrmModProducto() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmModProducto.resx b/Vista/FrmModProducto.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmModProducto.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/FrmProducto.cs b/Vista/FrmProducto.cs index a99e9e0..4565a97 100644 --- a/Vista/FrmProducto.cs +++ b/Vista/FrmProducto.cs @@ -16,6 +16,8 @@ namespace Vista public partial class FrmProducto : Form { private Producto nuevoproducto = new Producto(); + private Producto _producto; + private bool _esModificacion; public FrmProducto() { @@ -24,11 +26,35 @@ namespace Vista CargarTabla(); } + public FrmProducto(Producto producto = null, bool esModificacion = false) + { + InitializeComponent(); + _producto = producto ?? new Producto(); + _esModificacion = esModificacion; + CargarCategorias(); + CargarTabla(); + InicializarFormulario(); + } + private void InicializarFormulario() + { + if (_esModificacion && _producto != null) + { + numericUpDown1.Value = _producto.Id; + numericUpDown1.Enabled = false; + textBox1.Text = _producto.Nombre; + numericUpDown2.Value = (decimal)_producto.Precio; + checkBox1.Checked = _producto.Habilitado; + comboBox1.SelectedValue = _producto.Categoria.Id; + dgvProveedorAñadido.DataSource = _producto.ListarProveedores(); + } + } + private void CargarTabla() { dgvProveedor.DataSource = null; dgvProveedor.DataSource = ControladoraProveedores.Instance.Listar(); } + private void CargarCategorias() { // Obtener la lista de categorías desde la controladora @@ -42,6 +68,23 @@ namespace Vista comboBox1.DataSource = categorias; } + private void CargarDatosProducto() + { + if (_producto != null) + { + numericUpDown1.Value = _producto.Id; + textBox1.Text = _producto.Nombre; + numericUpDown2.Value = Convert.ToDecimal(_producto.Precio); + checkBox1.Checked = _producto.Habilitado; + comboBox1.SelectedItem = _producto.Categoria; + + if (_esModificacion) + { + numericUpDown1.Enabled = false; // Bloquear el ID + } + } + } + private bool ValidarDatos() { string devolucion = ""; @@ -63,7 +106,7 @@ namespace Vista } // Validar ID (Si es necesario) - if (ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numericUpDown1.Value)) + if (!_esModificacion && ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numericUpDown1.Value)) { devolucion += "Ya existe un producto con el mismo ID.\n"; } @@ -89,16 +132,21 @@ namespace Vista { if (ValidarDatos()) { + _producto.Nombre = textBox1.Text; + _producto.Precio = (double)numericUpDown2.Value; + _producto.Habilitado = checkBox1.Checked; + _producto.Categoria = (Categoria)comboBox1.SelectedItem; - nuevoproducto.Id = (int)numericUpDown1.Value; - nuevoproducto.Nombre = textBox1.Text; - nuevoproducto.Precio = (double)numericUpDown2.Value; - nuevoproducto.Habilitado = checkBox1.Checked; - nuevoproducto.Categoria = (Categoria)comboBox1.SelectedItem; - - - // Agregar el producto usando la controladora - string mensaje = ControladoraProductos.Instance.Añadir(nuevoproducto); + string mensaje; + if (_esModificacion) + { + mensaje = ControladoraProductos.Instance.Modificar(_producto); + } + else + { + _producto.Id = (int)numericUpDown1.Value; + mensaje = ControladoraProductos.Instance.Añadir(_producto); + } MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); Close(); @@ -113,7 +161,6 @@ namespace Vista private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) { // Puedes usar este método para manejar cambios en el ComboBox si es necesario - // No es necesario mantener una variable separada para la categoría seleccionada } private void btnaddProveedor_Click(object sender, EventArgs e) @@ -125,19 +172,20 @@ namespace Vista foreach (DataGridViewRow selectedRow in dgvProveedor.SelectedRows) { Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem; - nuevoproducto.AñadirProveedor(proveedor); + _producto.AñadirProveedor(proveedor); dgvProveedorAñadido.DataSource = null; - dgvProveedorAñadido.DataSource = nuevoproducto.ListarProveedores(); - + dgvProveedorAñadido.DataSource = _producto.ListarProveedores(); } - } else { - MessageBox.Show("Por favor, selecciona una fila para eliminar Proveedor del producto."); + MessageBox.Show("Por favor, selecciona una fila para añadir Proveedor al producto."); } } - catch (Exception) { throw; } + catch (Exception ex) + { + MessageBox.Show($"Error al añadir proveedor: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } private void btnrmProveedor_Click(object sender, EventArgs e) @@ -146,12 +194,12 @@ namespace Vista { if (dgvProveedorAñadido.SelectedRows.Count > 0) { - foreach (DataGridViewRow selectedRow in dgvProveedor.SelectedRows) + foreach (DataGridViewRow selectedRow in dgvProveedorAñadido.SelectedRows) { Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem; dgvProveedorAñadido.Rows.Remove(selectedRow); - Proveedor proveedoreliminar = nuevoproducto.ListarProveedores().First(x => x.Cuit == proveedor.Cuit); - nuevoproducto.EliminarProveedor(proveedoreliminar); + Proveedor proveedoreliminar = _producto.ListarProveedores().FirstOrDefault(x => x.Cuit == proveedor.Cuit); + _producto.EliminarProveedor(proveedoreliminar); } } else @@ -159,7 +207,10 @@ namespace Vista MessageBox.Show("Por favor, selecciona una fila para eliminar Proveedor del producto."); } } - catch (Exception) { throw; } + catch (Exception ex) + { + MessageBox.Show($"Error al eliminar proveedor: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } } diff --git a/Vista/FrmProductoMod.Designer.cs b/Vista/FrmProductoMod.Designer.cs new file mode 100644 index 0000000..43b7527 --- /dev/null +++ b/Vista/FrmProductoMod.Designer.cs @@ -0,0 +1,45 @@ +namespace Vista +{ + partial class FrmProductoMod + { + /// + /// 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() + { + SuspendLayout(); + // + // FrmProductoMod + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(654, 299); + Name = "FrmProductoMod"; + Text = "Form1"; + ResumeLayout(false); + } + + #endregion + } +} \ No newline at end of file diff --git a/Vista/FrmProductoMod.cs b/Vista/FrmProductoMod.cs new file mode 100644 index 0000000..2a1aebb --- /dev/null +++ b/Vista/FrmProductoMod.cs @@ -0,0 +1,20 @@ +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 FrmProductoMod : Form + { + public FrmProductoMod() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmProductoMod.resx b/Vista/FrmProductoMod.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmProductoMod.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/FrmProductos.Designer.cs b/Vista/FrmProductos.Designer.cs index 8dbc618..af2f4f9 100644 --- a/Vista/FrmProductos.Designer.cs +++ b/Vista/FrmProductos.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); + button2 = new Button(); label3 = new Label(); dgvProveedores = new DataGridView(); label2 = new Label(); @@ -46,6 +47,7 @@ // // groupBox1 // + groupBox1.Controls.Add(button2); groupBox1.Controls.Add(label3); groupBox1.Controls.Add(dgvProveedores); groupBox1.Controls.Add(label2); @@ -58,6 +60,16 @@ groupBox1.TabIndex = 5; groupBox1.TabStop = false; // + // button2 + // + button2.Location = new Point(87, 263); + button2.Name = "button2"; + button2.Size = new Size(75, 23); + button2.TabIndex = 11; + button2.Text = "Modificar"; + button2.UseVisualStyleBackColor = true; + button2.Click += button2_Click; + // // label3 // label3.AutoSize = true; @@ -73,6 +85,7 @@ dgvProveedores.Location = new Point(473, 22); dgvProveedores.Name = "dgvProveedores"; dgvProveedores.RowTemplate.Height = 25; + dgvProveedores.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dgvProveedores.Size = new Size(240, 235); dgvProveedores.TabIndex = 9; // @@ -110,7 +123,7 @@ // // BtnEliminar // - BtnEliminar.Location = new Point(87, 263); + BtnEliminar.Location = new Point(168, 263); BtnEliminar.Name = "BtnEliminar"; BtnEliminar.Size = new Size(75, 23); BtnEliminar.TabIndex = 2; @@ -182,5 +195,6 @@ private Label label1; private DataGridView dgvProveedores; private Label label3; + private Button button2; } } \ No newline at end of file diff --git a/Vista/FrmProductos.cs b/Vista/FrmProductos.cs index d1b9ec2..88f8891 100644 --- a/Vista/FrmProductos.cs +++ b/Vista/FrmProductos.cs @@ -136,7 +136,7 @@ namespace Vista try { // Obtén el ID del producto desde la columna "colId" - int id = Convert.ToInt32(fila.Cells["colId"].Value); + int id = Convert.ToInt32(fila.Cells["Id"].Value); // Busca el producto con el ID correspondiente var producto = ControladoraProductos.Instance.Listar().FirstOrDefault(p => p.Id == id); @@ -176,6 +176,28 @@ namespace Vista dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto); } } + + private void button2_Click(object sender, EventArgs e) + { + if (dgvProductos.SelectedRows.Count < 1) + { + MessageBox.Show("Seleccione una línea para modificar"); + return; + } + + Producto producto = new Producto() + { + Id = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Id"].Value), + Nombre = dgvProductos.SelectedRows[0].Cells["Nombre"].Value.ToString(), + Precio = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Precio"].Value), + Habilitado = Convert.ToBoolean(dgvProductos.SelectedRows[0].Cells["Habilitado"].Value), + Categoria = ControladoraCategorias.Instance.Listar().FirstOrDefault(c => c.Descripcion == dgvProductos.SelectedRows[0].Cells["Categoria"].Value.ToString()) + }; + + var formModificar = new FrmProducto(producto, true); + formModificar.ShowDialog(); + ActualizarGrilla(); + } } } diff --git a/Vista/FrmProductos.resx b/Vista/FrmProductos.resx index a395bff..af32865 100644 --- a/Vista/FrmProductos.resx +++ b/Vista/FrmProductos.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index 1ac9e07..3260701 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -8,6 +8,12 @@ Form + + Form + + + Form + Form diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig index b4a95b6..49b6fcb 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -14,6 +14,7 @@ build_property.RootNamespace = Vista <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\ @@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Vista\ >>>>>>> 6092f6f (cambios nachito a form factura) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Vista\ +>>>>>>> 3925b59 (cambios nacho) diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 4841f36..e5b46ee 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, @@ -31,16 +32,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {} >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {} +>>>>>>> 3925b59 (cambios nacho) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -58,11 +62,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" } } } @@ -96,14 +100,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -152,14 +156,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -177,8 +181,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" } } } @@ -212,11 +216,12 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", @@ -239,10 +244,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", +>>>>>>> 3925b59 (cambios nacho) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -465,6 +473,7 @@ "targetAlias": "net6.0", "projectReferences": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -476,6 +485,10 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } @@ -520,6 +533,7 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": { "version": "1.0.0", @@ -534,18 +548,25 @@ ======= "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": { >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": { +>>>>>>> 3925b59 (cambios nacho) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD <<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\", >>>>>>> c493033 (cosas que faltaban) ======= "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\", +>>>>>>> 3925b59 (cambios nacho) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -562,6 +583,7 @@ "targetAlias": "net6.0-windows", "projectReferences": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -598,6 +620,16 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj" >>>>>>> 5479db7 (terminado form de config) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index 7ec987c..afe58b9 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -13572,6 +13572,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", @@ -13603,10 +13604,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", >>>>>>> 6092f6f (cambios nachito a form factura) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", +>>>>>>> 3925b59 (cambios nacho) "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -13632,6 +13636,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -13673,6 +13678,16 @@ "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj" >>>>>>> 5479db7 (terminado form de config) +======= + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" +>>>>>>> 3925b59 (cambios nacho) } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index 74bc5ff..b9c2f81 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==", "success": true, @@ -621,8 +622,11 @@ ======= "dgSpecHash": "HaKkXKrDu+gimYBODDKQ5E1ZL1m4YoG9CrkcmpZyBjOtEmifQPEVkmmKOyOtFgPNaLHFACDybW6TDfmls/Ua8g==", >>>>>>> 5479db7 (terminado form de config) +======= + "dgSpecHash": "9xoX6uTcIEHTfvrkxbiNwJryG4RwhPq70t4kNMVhRSGHltn2QOmFl8cQl5qjiBimTD2Zuo2MWeKOifxctKIbdg==", +>>>>>>> 3925b59 (cambios nacho) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": []