From e3aec2879e65775f9b6daacf875bca7c83614c7c Mon Sep 17 00:00:00 2001 From: fede Date: Sun, 11 Aug 2024 18:24:04 -0300 Subject: [PATCH] cambios nachito a form factura --- .vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 | Bin 0 -> 183924 bytes .vs/Final_OOP/v17/.futdcache.v2 | Bin 0 -> 3440 bytes Controladora/ControladoraLotes.cs | 119 +++++++++++ .../bin/Debug/net6.0/Controladora.dll | Bin 16896 -> 19456 bytes .../bin/Debug/net6.0/Controladora.pdb | Bin 13880 -> 15024 bytes .../obj/Controladora.csproj.nuget.dgspec.json | 42 ++-- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + ...ontroladora.csproj.CoreCompileInputs.cache | 2 +- .../Controladora.csproj.FileListAbsolute.txt | 34 +++ .../obj/Debug/net6.0/Controladora.dll | Bin 16896 -> 19456 bytes .../obj/Debug/net6.0/Controladora.pdb | Bin 13880 -> 15024 bytes .../obj/Debug/net6.0/ref/Controladora.dll | Bin 7168 -> 7680 bytes .../obj/Debug/net6.0/refint/Controladora.dll | Bin 7168 -> 7680 bytes Controladora/obj/project.assets.json | 16 +- Controladora/obj/project.nuget.cache | 6 +- Entidades/Lote.cs | 4 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + .../obj/Entidades.csproj.nuget.dgspec.json | 14 +- Entidades/obj/project.assets.json | 8 +- Entidades/obj/project.nuget.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Modelo/obj/Modelo.csproj.nuget.dgspec.json | 31 ++- Modelo/obj/project.assets.json | 13 +- Modelo/obj/project.nuget.cache | 6 +- Vista/FrmFactura.Designer.cs | 82 +++++++- Vista/FrmFactura.cs | 195 +++++++++++++++++- Vista/FrmFactura.resx | 2 +- Vista/FrmFacturas.Designer.cs | 1 + Vista/FrmInforme.Designer.cs | 46 +++++ Vista/FrmInforme.cs | 20 ++ Vista/FrmInforme.resx | 120 +++++++++++ Vista/PantallaPrincipal.Designer.cs | 21 +- Vista/PantallaPrincipal.cs | 16 ++ Vista/Program.cs | 9 +- Vista/Vista.csproj.user | 3 + ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Vista/obj/Vista.csproj.nuget.dgspec.json | 63 ++++-- Vista/obj/project.assets.json | 16 +- Vista/obj/project.nuget.cache | 6 +- 39 files changed, 847 insertions(+), 70 deletions(-) create mode 100644 .vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 create mode 100644 .vs/Final_OOP/v17/.futdcache.v2 create mode 100644 Controladora/ControladoraLotes.cs create mode 100644 Vista/FrmInforme.Designer.cs create mode 100644 Vista/FrmInforme.cs create mode 100644 Vista/FrmInforme.resx diff --git a/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 b/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 0000000000000000000000000000000000000000..f285289eb7b91e66db52189c2af876a9174f8b92 GIT binary patch literal 183924 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 z℞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 literal 0 HcmV?d00001 diff --git a/.vs/Final_OOP/v17/.futdcache.v2 b/.vs/Final_OOP/v17/.futdcache.v2 new file mode 100644 index 0000000000000000000000000000000000000000..9cb059013a33ab9526a14273d0e233b3151f85c2 GIT binary patch literal 3440 zcmb1PU|_Itwu%WYPAw{qNlQ&B$d3umFD*(=jR{IE$S;m@%gjs6iTC#phzZLqE=h!t zddbBFMfq7wK+U|)`FUxX>7_-9C7JnotS+fZrRf|2If*4{`9-;Gj(L^N0imgj8J?fn zRk(M*$sG=$7BFxi&QjOBlFXFEl+@xFIEzHfRXO)JK<$K6R>WEEo1c=JlOF@2s9>!d zan=Guw4^9MCov_zC@}_^Lj@Gb)*iU}^8nS!tT2=c=^A9j|i+1tnfI`_GZX=}rb;&Q!%gIknfmXg$jbT{Y za^u(c__6s8hb2*VQ!9=SpE?S*)s-k)sTs?Rk8djf0{VAy|5LCF5Gfm9m{S(dpCWdF z?Obq#!4nkLc5q*#md9zJCYC~Ca!F}o4x%tdut+SHK^Ykq%|VmC9GBg4hXYaVuzHQk04eS6jVjMtz93T1-^nYuj-ZW4Ex5{&! z0MWj1E78*xN-U#rC~tHiN4aNp**9gNOWetD3AIu{yLdU+4Z&o%ftm>dmJN>eK-`17 V+(C&D6b@zS1LlG#i<#gM0RU4w(ft4b literal 0 HcmV?d00001 diff --git a/Controladora/ControladoraLotes.cs b/Controladora/ControladoraLotes.cs new file mode 100644 index 0000000..54a1021 --- /dev/null +++ b/Controladora/ControladoraLotes.cs @@ -0,0 +1,119 @@ +using Entidades; +using Modelo; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Controladora +{ + public class ControladoraLotes : Singleton + { + public string Añadir(Lote t) + { + if (t == null) return "El Lote es nulo, falló la carga"; + + try + { + bool resultado = RepositorioLote.Instance.Add(t); + return resultado ? + $"El Lote con el ID {t.Id} se cargó correctamente" : + $"Falló la carga del Lote con el ID {t.Id}"; + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + return $"Ocurrió un error inesperado: {ex.Message}"; + } + } + + public string Modificar(Lote t) + { + if (t == null) return "El Lote es nulo, falló la modificación"; + + try + { + bool resultado = RepositorioLote.Instance.Mod(t); + return resultado ? + $"El Lote con el ID {t.Id} se modificó correctamente" : + $"Falló la modificación del Lote con el ID {t.Id}"; + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + return $"Ocurrió un error inesperado: {ex.Message}"; + } + } + + public string Eliminar(Lote t) + { + if (t == null) return "El Lote es nulo, falló la eliminación"; + + try + { + bool resultado = RepositorioLote.Instance.Del(t); + return resultado ? + $"El Lote con el ID {t.Id} se eliminó correctamente" : + $"Falló la eliminación del Lote con el ID {t.Id}"; + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + return $"Ocurrió un error inesperado: {ex.Message}"; + } + } + + public string EliminarPorFacturaId(int facturaId) + { + try + { + var lotes = RepositorioLote.Instance.Listar(); + var lotesAEliminar = lotes.Where(lote => lote.Id == facturaId).ToList(); + + foreach (var lote in lotesAEliminar) + { + RepositorioLote.Instance.Del(lote); + } + + return lotesAEliminar.Any() ? + $"Los Lotes asociados a la Factura con el ID {facturaId} se eliminaron correctamente" : + $"No se encontraron Lotes asociados a la Factura con el ID {facturaId}"; + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + return $"Ocurrió un error inesperado: {ex.Message}"; + } + } + + public ReadOnlyCollection ListarPorFacturaId(int facturaId) + { + try + { + var lotes = RepositorioLote.Instance.Listar(); + var lotesPorFactura = lotes.Where(lote => lote.Id == facturaId).ToList(); + return new ReadOnlyCollection(lotesPorFactura); + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + throw new InvalidOperationException($"Ocurrió un error inesperado: {ex.Message}"); + } + } + + public ReadOnlyCollection Listar() + { + try + { + return RepositorioLote.Instance.Listar(); + } + catch (Exception ex) + { + // Captura cualquier excepción no prevista + throw new InvalidOperationException($"Ocurrió un error inesperado: {ex.Message}"); + } + } + } +} diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index 82fb0198cc11bcc5086f2e03dc56030ee0947e47..13030f54091d098873258562c922496e06f8ebc0 100644 GIT binary patch literal 19456 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 azn;Ijc=^Io&!%>MA$q!3F}N3PC;AJCw~Yn> delta 1802 zcmZuyZ%i9y9R9s`z0&I+3QT4dVTZt2ukDS6IUpk&FdT8o#K~aj7m9FMfQHTjMy6S@ zm?bX8ZFwhtGO5mGtC2*M6HCnXEHG|esTgO-ACpSS#J+*ppJ^VtM{2s=&0kk7o&wBqkBNH z&gg(HdPwxVF41-19^e;i#GPm%na%_Az}HshpzlKtdI(g79n=~Y{S-PHR%i@(3%F`! zPFf5*DY*jL0LsKuqavz_6j3`c45X~gMLgo7WuVA#Q5}9IB9-Y^VE1xsf5h^ql`F3d}eC1p(bZ+H&jc674)M+G* z1-{be#rPdbTOcOT3Vd~ef70f~1hqDQ1ir4o?=0~3HZR5}gSOxVf=w?b6Pr>;yF34c z&clb`y?HPCgl%3-XcYL}HZN|lVXN<>JzE26#Fp9o0iSjks=zgDalfx?GR>epAvIeI=O2>Hj2{ zMSVAz1FJeQQET9CJ<60MUDjt{?tqLs_etB!$j|G_V?Kvp5Rw*3(v<1qZ@8 zt0r0GZD2JN1qZ@2R-Lx;oK=%UWfxGn?a8lLNkby{6H0U|2K~ogE6=?(i0mlEA z5k;-)GvIDLYjI8_A#w`VERKS^b?d<#>Zxr#&^#~@iw_OPCK_lcHe!xXnv^gnrec$W z!*M#5h`(Z*!*PFth6X3ilkvpJ-~^ek@|`M{b$Dc)f2Qt{v)q|LHuE_j zb64{vcRlLA_@C}0vi3$N@ANzky~yA8bU;`6ZBM7HrK)(qdk|{!7rpzSS2_2-plYdH zYAy9k>H+`V+rQ~%J9wY(@PFC@3X*#^~x2>;t-$iG5YVHKJ@15yII$DIbMeS#|&FzNg3a08STJ(gSmZ- gN+g#{j45aTw*>LZsdcJC+`e5xitBrYcq;n;0goXHa{vGU diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 0468b66..9144141 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {} }, @@ -27,14 +28,18 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj": {} >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {} +>>>>>>> 6092f6f (cambios nachito a form factura) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -52,8 +57,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -78,6 +86,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -112,6 +121,13 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "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\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" +>>>>>>> 6092f6f (cambios nachito a form factura) } } } @@ -291,14 +307,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -347,14 +363,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -372,8 +388,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\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 121b667..5a1b2b3 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -13,6 +13,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\ @@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Controladora\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Controladora\ >>>>>>> c493033 (cosas que faltaban) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Controladora\ +>>>>>>> 6092f6f (cambios nachito a form factura) diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 0bec786..7658e09 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -57f080c451434127a4f00cc492b37e2bfd251cea +a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 84ff6d1..98c01d0 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -98,3 +98,37 @@ C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora. C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\Final\Final\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 +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.dll +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Entidades.dll +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Modelo.dll +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete +C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.dll +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 diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 82fb0198cc11bcc5086f2e03dc56030ee0947e47..13030f54091d098873258562c922496e06f8ebc0 100644 GIT binary patch literal 19456 zcmeHPeRNdinSbuR^Th;0GT|E`0|5*KA_yvoA|VM9`3wXp6$+EdO&Fcb4ROFNQ&`uK!#$Ju%^h zc~5CuUYOT)D3ebP*jAsN>QAOqxtvuz{UedzI!VtF+}rZNNkn_6up;llTqeM^qzqUFppT)?cn?Q3B7GK?m<(R{rbX z9gtDDGLXBSE5qoH9Z`CnB$^0Zp_{0ylr|ciB#H&-F~FMwaC5;tS^#{e6$NNwtD`p{ zxspT&o9(>Kri*UFsIZ|M@e5q*5w2$2%vxY%UFjr#EbBV_0@r$?4FOQ9pJ3s*ST~)* z^oz@hjx`Z!f*pS`UvHd56sINKPDP)7*F1<@IL-L@Z4eq-vd$$KBVgzpT0&H}+#p1s zb*Rl>jTDGSjN4#$h#IRQ+nS7`DjGQ-SqEAk!HqY9wP|7##g=f}4~i{ROU9J*T0F8e zW`jIX)pWCNSPAA1qus>V(&dye>gP{ytOG7#*qg!BI0bc}9Y!eB1gLQuuvJZ0NcV;{ z9ni9beJ}V8YX*SEnJAj3+Anz+`%M-$OPW#Cv5CWBz@}2YT)DHA+&S7Pax);7%DtWQ|=}Daj=DJXAXxXy*i>K!~7bc2+bU zw;D818@A@Nrkp)h=Oj%?ley|fy5+kxeJX|k=kwiA7SmvD{u*a2z)=_r>=dg31xCVp z9tjIr7@XZy6-DC1Niq9QbTg@Gm+(fdMPOLgoCwt~a~v149|wcuxKQL)7VOv=Qg%+Y zCx>VtYF&(`wwHX9nrOlj8K*qfqJg-@RM?tsc4F43y42w=HO_SVVhD7)M1lrlrK>L2 zB=q_f9(TaECET_oobs(|TGix?HI;Xmf01{do7}ux43)gRsTH4yaePIstqm zk`rl%*)VP`Md7Ahy_a^+`=(&ZV8%vg$|#q1Ux2R+YZevZrm z@gZ_RsecL7N80IL+UfR_zV3)>z;S^b@G~Z$dSC%FVdsCi}-)fx^wrOHp@nQ>VX1zEl>kC2Kp>oT924;GYQq;t+Hi$yL!VF{gWVX2DK%dtj`zouo)^=p)!b>T$V z-tT)Q9J!VCaI!P(jIsJ_1KclFA)}0cH~WsMYZilppD%wlY47v0LMl&dn;9S$TLhehb!1H9o3o z*;<;V`qT-F5wyTM6$nNA+>9z^M8F0mC4w2lk)u)dWTiXyQqWk<8}9zMc-~9HQ`rAD zLU&9V?I>kFcK1)Z{kZQ+%zGQb;KU>_A2)jQ-rE(q?b&fJCM9cfx%s$QuWMbs+zqO3 zZw`p7q}P%Q(d%OYL6Tb218>4Azp`SJEg z-6(pEFW$v^UGM7Ud*Jm8&}*@0#VC4>6>m)Zh&RX0!t&$A`(3De@y1{;IX75Y&GEjX zaWB{m>)j}E9x()@Vch`0J&$G88c^*+Lcb}5`f+wYnT=Dxjn4w)ulTJ< zu9^=M;xD$_dJhVBd>laC**B|o9GejDEFos!fUc^VFpD-G1fyZ4P{LymiU!>PT+3eZ zFo6@Cb5*iXR-4D-D(6*r_{2VmyW?Xyen!Wt8p-!? zXP^b1(f=2H@-sT~MlBO125+do!AY->-BRNXUOc0-;L>MwRy%63A?2RYN9NC+kjVL? zywS^DChS*$G(<=lZ^`%I0iw-0QAI@4 zIo9v(2hvT4oG>&u;-sZ%mQ(C4|d_z>f}P3A}GF zAq+?h9y=gF#|^u#+n_n8+;}dcBdeO1H?Lg2as{4#_#_f0(Mb>*-izlZJQSRS%!XYB zJCp0nGskHR_NOp;H|*X;J&V*kg@$W)cVLd80^k@Ppc*!0c{s_XW1iSE^-~ijV6#uZ z(pC}%1dfRoO8+FEfGQ{=mpvGx0Fx7O9_GoGP5EPBm<%0h~h^etKmyb&QeW*w1 zZfW}sU?TKO^qZg`(nBaGXb+*^*Qqx&jSPKCI6{v=W`yQ|KS8+&^R$5{LECiZtQI~0 z8$1bW68yOkQ-34ncZ9zXX3SY&BJ`1PFOrVvJQwgLe2A$%uYW3XnFpPPHyGmh)zCxm z>t(2ifT^KJ!gHaGfmkrKH!@d?1F90}RnV#d)d=){&=P>A3iKt=U=iZU?P{WPwON4X z3G_BN=K@+J&{;t90W}HK0%#GSu+VG|GnS4V@0nBU~S#wSWwI z)`60MLbPwbqP2w=8euxBAn83!CmdQf+zi^u23N`|=zY}!1tmd?($^fQExg8v(T^1* zQeyOLhn5X*0Bt=FOwnb7F@e76KuORrDPF8-ZQ)Hu6@5rSBBhEx>d>;`PSEx>y1jSe z86mmYmDy=bqVGD;khaIDrWl6_{e4*5XH1qiatyVFdyN`8qiE7Y4ZY}aX2TX}hnBiB zEyRtMDJThAf`HmBF@=8YKuOT1(x2iuSLt%X zm`0ygkVu(Ek2bZFV|$3gpr z1FZ!#i+13IlzUGCnoXZ^ptkU*jEm@uf<($i^rAz{h93s4jVD@(-zsAcz3M zUNsiba{<~yI_uB|KwC&J2WX4vb%*vz`X0tU&xz0Tq)7K;^($BQRlrx`KPA#sS&8TW z13w`Benhl=kIuHJ@*~j+bSkW2yTbFisb2ly49*EwL_}SWL>0V$yhjKxv2IW6!&!SusejfZ!YF`0Q zf9QEyqiu+OUCM6(e`)9|DE|%Ai6TEM@=wu@Xhdt#_D17cR@y#9Z)?wE&%*r{oPM*> zi$P@xr)aUxRF*SE`TB(x228Ykv~`5A8m>GyInJak@2n9_5FlhQ3$35~~S&CaQlL{44ce zqO73>(#vV-<+SwjlJs&~OYYvH)B8X6Qh~x=vOFb)67saHPC#N zO>_|DO0rR|rQ1-p(g#s)7W^)hD=9(mgj(qa`WVVM%CywePCZR0L&pVkTrkHeOHSU^;W5;rJk1haj74d`h!w` zQ0mV~{W+<>CiT~_Pr5&3=&W;tl&w;xr93X>v(fqBp%|Czr5u*>St(QW2z`gXPd}zQ zjFC-RC%k;Cc8^x4uhYBqL;5lO9{mCRVf~E$g8rI58FK;A>)H>o-@x99X2Z(G*kN5k z>#z&jLc8eQ)Q@%Jf3d&Xuic?NqJ3X`TU)Ak===4<`W^a7{j>Tv^f&a-FwZK%Yc4=+ zy}j$aJ_|EXDHp$EDdl@waK+Ld3XSBO!Vdx1`-L%oMG)&4vLuEPK1r~1DXKNlL&%da z<2PB`Ojl`x^pbWnez)VdnZBsMLce64u3DEqaG))dAIPSLTC=Hqe))mrBati0Ay<|| zu3}_+Hq)QUrR*J+y)l(84BDxVo^{;^n6xF6FO(&;rV3`CWoJ_DN5Nt`?5-pQcC_aP z`%OF5oiz`xpq*x_XL~L?)M{n3X1b8EazO6FQ(D$6NWFtQ18(DBE`9J)@DEt|OaXmZ z8&Y`_n5(v0J%d?u9R^~6=xIW&R<2-M*;J2Zr-B^Y?H)7NX0}@W1H}Z#TG}-P6Z)Hd z&GOCHnmN2%Cmo66Lt>f3YmUW#BQ_tyKR&9 z95PWVRz+ydX3Si{47zBG1vtxv=T2n+wfA?MJw0YmO97A6-Gj^lKW4I~EiQt-0g}hG zn|1XdYBReB`}$Z>AGd8Vn=Qt)4HyijpLNW z=Yu}MZNZXLxgnq6L{9L9Om`-mDFmn+hT!;(*;HRipqm|wFpNl@c{qu-B~!r2!#=~z zx=n)Vy}kQJj6ozI$iZRL+>>?rC5PI~eA>c<+;aFJsCTw zC(JownwVbbTC?B`L`+cBg6Zr?ifhejRmv^sSZ`S6i+oWuH5HRKs;MOJ`n@fa>dRUA zLMH8@oSebLrAFi~(>{_(n|VwUg-lPX2Q@YFkRBY7;to7(O7PC~kPlk!;es~tq>(2# z)j2!!v^A5qt-RG+fKokX3&z|~KI17INWmgExOr04r;iMF8VG%fIU`dhPu}=alZdoP zrwXLX zw9R>ZrSj8|lLHUtag-hSOgTx~H5}t9cfQLdce|-$Y#VVz>W7yQ*4i6^rJi&f+Ji7()xyxTC<*&vT|G&OfRnm?H}1^anw_=JUAA{ z)oZ&Nv)l)dLH3}Em7f!1&p*^uUP^Ja)GR|*8~opmpUUAZYH6{6XC$5*+}Nc{@-ziH z&pE7_8uKa4BRqTX9LVj|+|*lS%Y|f`+p^RP<@DFanFHgJJ?>bKOZqh`!?qx=)e2F0 zypxBETIUE{8H#XfPZ z;QT4Si=gc)M%zK>86$^%4jxIt-;cMkBWF6^TlK;dmG)WG>c*+uF3gY3X#G*c*gDaO z-4gdVnw=x{;$Di^B^7h_1FsOH>ges5f>OrN!OLOaH(TN9(jCq?wD5L0#d5~b;|As5 z9k7%8=2f1fz60^*Ib;x#ACy`Fl+xYL81eUZExwKAX21*W+uciDFu%9<`27bXq;>+u z9=>4N-rD2KF82HHB;A=Ue=kw+o>P2H%SWMn#HrrRkP39~*~6DVwwEi&^7j3{tPAmK z1!>L>p1sH;YY=n7Z;{1oM$Q(M{8!uy&GbE2Lh<$nzMU81vl1!Sj@0bJyj3bEsOJ%k zcAg7(l^ExEU+d~qZa?JD_bML6{b;i*>p(?uEN)l4&nY(_bz_CP5kK<0AOn2V|cPf>9-S6`0Pk1b4d@yAt4$K>D78|2lS0GYb+L7u4(*nQe2E+&GkCG zeA26{tMM5W%IZ*5*Q;YuP3aJiMnr<1*zIW3nHW9=d2v{-#~~*kkA@R%iB7$`w!_h@ zQ=bBjM3+*PI`Ku4a5^1yR^bIQtEl@u>`e^+6-$qWl9cFlRoOcs8Wv7Zll_U|hvr0M ziA|#F{;7$Sme@bF)UMV|s)$K@0O3n8Rgt zqTR{UM7w~UpjXFTT&Ljny5L>`_cKduLQ*B&{+LVMFVu_+W(4ea!F~Y`yWn8~2VHPb zz#$hLnxF;`Y>cpy!?*L0!rNjQ$rwvu*AuLrp5Siv#860H#%j+00fBeH8g=Q@_SmU` zZGkr$U59Mz=DZfu@UE5*dau@KM)S7zu2#!7@oI0W^B(5vBbPVh+uE+`Dc<`k=WXpa zyuONYizGN|HJTVa)W(;W8inPo9v`uyj}`dF6@L_70DMR)9n1Hli!?fM6aN#rE`3r< zHf!Cy6|XWf19%VErBCR{;f)_&|MU>pwoDnD4T2#W8t7~psz6AUK{|e@>S5Bh?qJL< z`2BM?er-%q7i(3A-^KWCzz6gj+7;d{Yut)+-?^)8S7Go-dde!JsUE<1H=RxL+mKYY7zny>pVfWiKJnnboLPX6_XVlV z13lfeYg5ammt9Uy=bdjjox{MUzUx!RzgczWI}({rNP~!jzY3PMdcYLQJVEisg+9;x9>wW)KY*H`7K9^e|)Js{{5(27-)g4Q8-Q$ z4O01hVk6dhJ{j!5GkY&~75~WqxkY;Yp6qrwZWX=N)xD8rlS1HR#0W^nBji zS4PqT;aLv5)t^;3jf4+y7CZ@U-O~Z?V+akmB37f|{YH`{V!gr560`AwJEsap#i@U*k%BHA8bg z;oz$gQNXxIdp<+O>s{D30J~Z9J~{-+L`nRvlfL-Ofbr~E=63C6h~M2*_EE4;<>%sO z7+>qkG9VuI^LNO_ZA(4n`-y0^__PIn6$eln$EH(7DRsmtI%w&P_*DmITBu{y+G)qJGX352_AP9NGX1wZ z^UgcJbAIP{?>q0l`(6?~D5Bls(cN=*zy8-K#eSbrfj?Q45lunBu!9Sh;Oxh-5(iNl z`;tg!c>PSz?t8x^_4~Vs7OKojq8e@A@br`@Q3`Md5>3`{S!{*GC~wnbg#0+BSPzTB zq?PcLUZwSl$WMyG!vIueeJTouma6gbn~g(~i+aWr?H)lStoLfmt$LXu@~mcAIcySU z>@~FQ(9tQ7O5_a>hDmlC*NpPM)AB1RCR-<6Lq$d3IoAcvs`6x&Z8T^@a`1t`1Q50G zMA)$&!0@>BW^($cg5=sk};-01}fmw z7&M(b)$Fl5g@u7mO?Ae;eo1FQxZbHsYo{lFm@g?IhN6L;N|e3BksTYqr0PTo>*=&x z%EmgCC_BxOEs4uMH9&Tf@0PN$PGKFRQ>q2w=`c>Gs^DMm)c259YpNPiEqo^|uc`d_ z*t5Jhc4db3PmH}QF@~anol2Cgab!ovWq*+v3-dRScaDV{A3~ z3N|v=9c}^vi&4)njNM+neIW?3$5uDCDdB*|o0%R+%>o_wK~2dWZm{0T96k97(ABN8 zuVRtXGuyvJPz&GWDv)lUDpez`_37D@;uChdwipENn$umAyNmvL!`Suh?(+6io@zf- zDy4-(u>4Tv#Fyz-5Uy`OORc3t@`t^c7(>y(hwA@Fwj_H<`Q5kzv`aM$dp6+}<)a6e zA?WmTITK0(xQ)T6N~nE&xz(ASU23PMY2kc?Dx&0@6ONE9}9w70CkZxhC*mwZI$@GulEYNRcGUY}GrYtbAmaoP<`y0vs@QDiJU zF!@^oYm_iLVIWd*%%8*!2bLRSyub--kbR7b-yTizl*%zV!DUc}rtCMu?;1?YaVZ9s z$V$zi@8v7753`-6Y=qV_c$@7Iwx@+E4rtGST5c$NNho^{g*7joq()@Bb;VhTte5r+ z75M;sFI`2}OBdJ{=*q8VdsS0@KYWAEF*A+*$asKM+DVsTkH8ufp=UIc?iY2sLG|=N@Mgjm?lsrqb#GJvVd|J{QzbT zP(Gvgf%1SxFlu#0`l$eLG{e7Z{Zs^0!e|rqQytI*(l9l3f9o)@NsQD=sKdl2-+&B! zlNQkl*C<&;*vkaN?;7}~Cfq=&w?5zBb!-?3b;z8blzB1dJlOrj5BD1;nd)uWur ztdq&q6R{!7B-6oIvRB`TWLdzG*(g)!TnvSf8$>HdJ2DT*RO+-5tEAHISgu!(BIj3M zh}@Z|98CQ&6hbbI>VpwSW+(1fYmgDk_-Kob(BQqur4>6ed!(6^k*fj1_&afhZvuWCONM}MqmFUT z5O2y{^5Rb#Fj;08WiWc&Ge!Jf4x?Z~ZX%<7+3)KYkgH0_&0*AqzeFw~7g8t^6V0R5 zv1B!UDD$ZOhQfT>7SDYq^HC-6P$?V1?t3%a_Fv*R;ol_mzZd@xOfOG#2QzmVNpxNp zc;BdJe<-Xsg01Jgo<`%?RCgn`nyIKuuV9n`s#$yT~WH zj7R9Flp;>jK16;AyIf0yEfoE*YxJ|==Zm+%c}_b^k>O&t@eV2b2PE#--h!QkbP5l! zmIpXYi;W*>v{+#Xv6hRE(F$>v*7Cruv4Pu-JYj$mdtGrO62hMC>W>}F;+GmDwo z!^|FLzD*I;s2-;FFtvxN6Pdc7sr#Aw9$(XbX6|R^er8rO^AIx+G4m2L4{`P=vb*RI zR~_Q28s;Bo{&CtK!JRwKWmkFD^Ev%8zdD{|zeUUv>GBfaf)c#_zK|vOF!=}UZIrH+ zP$A{Q25Bkm1ZstyN)N!!pl;ZC9B+i3fH&lK+6=mz4#0Y0*T9dclMU9;&$KR1cX6bP z*3cR42;PrZU~}kiST4#x%l_x=f6l%pR9q8^Q^|!TuWd*RbEkewXqi+7Sjv zIB}N!v%;jk+UG*eRFldUvi-~`K-}+Eb|u@T^c;Oif1)eo6_dquFB}4n(7`w<23#~)t1$|@6$9qho=U$p~$6aj` zYL3o4|L9|FXOgVe>3NaK!ptx-O`NjrQ?7mT+ouusDPW(9?Ngb3nwad?%*sr&T9~ym zDbw68%~~_M1J{`@JbqG%bn;}H(T9+bF25AH+39IQN`xK}c_2g|vV2vGEA83_GkQSt zlUMf(>D9c#>vg-#DzibR`sTz`8e|6QxiT(rv}$C;76_TqCsnaW_mkP+aSNVW$WAUd zqfa@Z<#uS589nTTR@tFuGurEfn(a`F89nBNS`0UqnYq!MqnrJP#^Zrq>UYW~XevxXfa^Nb4%?@m~KDsk+jDt3Fa0|QV{+eLtC;GjG z_%qr0-JyK{zTsK2bctovjs)+uYP?KlD69f^#hLp-?qsl8JeJlnnc_AKS5;;f_{gz z`UPDHx!unZk{qMGkQbECNv}5J z2t!U<0ofYjI2Y{O7Nm= z!f7;QUJTC9)B9Oo0=`<=bK|Apr?Pw@;yu~?ZSXNK%jWYLF|Pn$1-lB8tb(I5o6w+~ zbG!(4C1f$4f`!@fyTH%R9#0ZA&2#X-{qGfXfslpsmgYDYb3=fG4mzkDqUe=VR>1<7;r_x%?ytthG3pug^<>ORYyx7c31s z#Q$}Eq2~P6%ENwL`K5}{{?}HyNfh3JG)XI=HR4CmF|YL8=viu%TZ(K^Yx@oG^T_cA zsc-bH;AfrY}+UfOx7rHCZp>#L&lz$p}vM~ewUgIouB_1q0rJ!{(o4l~!f!66{ zQwMB4n1b#~2BrZUgBd1)S?DRhS5u{-HwL?vor0e7XOumw{AA}CFEpmhwm$`ZZ}YUW zGs;i8oqlQdLf3`7x=x``2kb6?H#DZJbVY_;fmx-=!FC7ql=+-qzBL+4M20Vq#n<=r zCPv~t)En)O3?(AOeu_tiN1}C=EAll=u`mG^}?4`EiqyxGePJGc99+YNUa9IVMQnT#L;rlBol( zYlr9W5x#)ho{}X(tQ4bq>V!z0AZ);Gafc?b50A>0LT)=qV#mC`o49YA#ErnC<#zlE z&A|5)J3dzpWyXCDJC`{mYw?v9gSiq7JToL>C45v!EayZ!Z+*%Pwf2Z2^ZwQWQEdJJ zeU{l5j+K<4z%mrTvel}>rRF!`)xu-ewQVWEr9lKOgT>|MWZOU;?j^!iD5zK(2Jb}K azn;Ijc=^Io&!%>MA$q!3F}N3PC;AJCw~Yn> delta 1802 zcmZuyZ%i9y9R9s`z0&I+3QT4dVTZt2ukDS6IUpk&FdT8o#K~aj7m9FMfQHTjMy6S@ zm?bX8ZFwhtGO5mGtC2*M6HCnXEHG|esTgO-ACpSS#J+*ppJ^VtM{2s=&0kk7o&wBqkBNH z&gg(HdPwxVF41-19^e;i#GPm%na%_Az}HshpzlKtdI(g79n=~Y{S-PHR%i@(3%F`! zPFf5*DY*jL0LsKuqavz_6j3`c45X~gMLgo7WuVA#Q5}9IB9-Y^VE1xsf5h^ql`F3d}eC1p(bZ+H&jc674)M+G* z1-{be#rPdbTOcOT3Vd~ef70f~1hqDQ1ir4o?=0~3HZR5}gSOxVf=w?b6Pr>;yF34c z&clb`y?HPCgl%3-XcYL}HZN|lVXN<>JzE26#Fp9o0iSjks=zgDalfx?GR>epAvIeI=O2>Hj2{ zMSVAz1FJeQQET9CJ<60MUDjt{?tqLs_etB!$j|G_V?Kvp5Rw*3(v<1qZ@8 zt0r0GZD2JN1qZ@2R-Lx;oK=%UWfxGn?a8lLNkby{6H0U|2K~ogE6=?(i0mlEA z5k;-)GvIDLYjI8_A#w`VERKS^b?d<#>Zxr#&^#~@iw_OPCK_lcHe!xXnv^gnrec$W z!*M#5h`(Z*!*PFth6X3ilkvpJ-~^ek@|`M{b$Dc)f2Qt{v)q|LHuE_j zb64{vcRlLA_@C}0vi3$N@ANzky~yA8bU;`6ZBM7HrK)(qdk|{!7rpzSS2_2-plYdH zYAy9k>H+`V+rQ~%J9wY(@PFC@3X*#^~x2>;t-$iG5YVHKJ@15yII$DIbMeS#|&FzNg3a08STJ(gSmZ- gN+g#{j45aTw*>LZsdcJC+`e5xitBrYcq;n;0goXHa{vGU diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 71624c9ca170c310a31bd4e4aa48a77433982b08..344a73d01e2eebede495aeb2284662d38336deb6 100644 GIT binary patch literal 7680 zcmeHMU2GiH6+W}G-q=fGY{yOmA;~5V5rlME%N7vGkL}$JnA)-9pTq%CXS{p8nPhfm zJu_>^6)G-0sP1>q z?99&Eaay%iA42YW&OP5b=bn4+xj*ycfhWE~DiK9-EiV(jhFX?xrZ*<@P&aOWy^$6h z-rn(=(*O33(NnsUDA`uQ){2RoW}23pm=p=SY$kLwkr^CG6s^2SZrBjtRdGF(CF)nA z^tD&dU-oP@=htPAv>G=zY25`Zlb?2``b$N)WsbG`lZM3+(j4rf*Sh->R+!I2gh zH+aWa``8FAf|o~M`=euh8Psn9_v6fJ?=`GRX^aA>9B+HMp+TODe^WYXlNY}{)>?6` z!*vK(0vDRo{kY`#{3~AJ;Rn%qa-u&*yd1=+A@YtIqc1Z(s=T4zPJhRpB1TWLTHRM`AMk@P!E-(q?%%V(M2rbs^*A|J#4ji{vil#e5E`U3qK@-g}qB)^6{PRo$Q z>Dx@#DU$yt^Bt<>_c3i_T41^d6oJ!>Bp4SWSDI+Oay+^(Ktg#(l}Ki*iFzXvMR1!? zkl$JL9LA$!^b+lio})NWoYD87YXrKT(Sy*n0JSoD0lG~WRd+D9tllye}_BaASyKvCMy=sreubbwJeqZl0w zS+2vp@20-!Y0w`=OpNgZng)G0>PqVIOy7rONV=deZl1<$C?PakgPyKIAstPq&sKFb z2o&+XP!>oH(75^~j3V4$fZ*kPRR=FGVpb}a@Nyn;`)FMK7S?vyOMu|zm8uS2UcrNu z-!2Q(5TJ4O2bk%wmjJ=bVpWIU7wIfrMd)}P-l3)CE-arHf{ys(!5!ONAZ4qmR%M&A-qU%_hieU7UiQk#!>rUL{o z*Qz>rxrVjvx61;3DnR4vU-57ijwL|wvRu`{%QD^JTOyWa>=57QxLT)d@e#)oAb4r4 z>fq%?Jf!*Uve0b}(74*FZ1WL&2@s8|TdO+w+#Nz$pzVG;^srk=_=vsisGx7uU!}c@ zkG$RSze4h?dLO6%_2|26$k(*T-c_)tukUTGR{x#6fu>ajYgC>XcYwy}UgkSMn{a|j z+QYPu=~1R9m}*RQ&=~Fj(`p+fvAZ5nl32TkK)29mLEEVSdLJ2}o%DUsN9d=ZY5E1| zXXrBM2+N-Y?Zhs~MADQ)t2B0QLCGHmV|R+L>=>KFxfZ`5f~(<`VEzL07nomSeu??3%wJVn=wL*R$e7!i zrkUoLE-;n%9-j}Fc92Q!B z&@|@KmSKpTt6S#D4jRE@kRe>=_YYY4vLO!AD5W)56f9fUC~cXpZ5dkLvNamC^TN!C zv{ftt9oBMg8Fkjsi@K@VLzZ0;_2sEwcia`CDbF5Cyo?rvJJDyt#>@#CnR8rGOb(Y# zS1$@m8@e!ELH!m;wm2#Bd6DmN@ys?^hD3I+8^V56n8HS&Ayr^B=4b^GAj*iza-pD2 z8X?({vSHLpdK^a-CylvL-3=R#YBr)hjIRu0*0Rr3z54ct5zR4SJ4oqjWuG}^*+os} zTQk5!RI}cme+0R zaYhKNY)a-_(C}Ihc7RhOuGs;#s><4T{LnMHRxmBc)pLQUlE|dLf=7fsqvwP}SuFg# zmIvppR3uKOr?!J2+!gZ5cBwU%d&ePv8OS+uXh6@|mSau12p}(dupZ|ey|$U36yE9>&(63VLY0MUe^)T;?n>cBKNOW4TlfmmD1ex;?=t2TSp zU0#*&s$E`nk5}#Ws+3oCdDTPp7Y|K5)BKzG!)k16T_lFT`baD;yQ!1iY?ZXJC0n1M zww6AnCCl(A^o?;}c9dmfJ{)6sLYmY!BouCTqTbh@VC_>re2SswLye*EpRib8!5{74W;tEa+`by8;xu_Zfm6@mYF@96D4_$jGnTsSx2c?XdT~$qLLm^ zXmj#Nb~J6-qNh~aTiL1yW*$hU;H9xOIOr<(pCdT;>Sc=rESeQsAKoTJafRx5(c&{7 zI_kjNH-4U+0nu)So;xGooJS)YdJMyw9Vi>FUNQs(4SnV*Ve2@>rCC4Tp#POw9lvp+ zTloepZ^96ufU-dHev$9;;qu*~Dtc4$-Blds{O=T=Yyzpu7{-96n^bgi$eZAkN@|zy zhL4rqgk9a@*UW%?`{&Qb^R*`4*PIm5D!H_i-;Tyl5`7e!?T;c|kRHR6*#u~ohQamW zOZySvKG4J7S9khZ^iTirp4)iIpp93{?=`YuZ>?HH8ORiP)yRe)9p94#e3~>xmTW@1 zxYa1M8l(>N8o98ufV^@s`WRwW5R(fl9rD6;Jndqe6rMA^Ul&b+BYGImh67WbV8ma)jv%WeIrGic%9d0fU&s)_MNK2kVjlpx+?@L|JCb$lIo zlSl=Z?6Vp6GD9xgnux^+MZ8vDNy@`ceytEG$o%kvO?S%{>JJh`E$iDzJ~Jg4w1k8e0NZC7ThnkS-%IHx_x oqk}OPG1CS{m%u8k&2F`g%<)Z7hP?j;UA`#>a}&(R|9J@i1lyz?@&Et; delta 2303 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 delta 2303 zcmb`JU2GIp6vxlKvz>02x;wkwUAG^pOIK;NAE{D=M#OEmg*Kptlxk`=bjG#{uI%O3cNrx zpv`ZrtDPpQ1z$r)leJNHSmRQ zzcTU57k$NO;Ff5hG^ZsR!YoNuv>(%tg^2``ZngI6ZI8cPO_X_uXbJYk0Q}L{Up;jA z;A@ybS=4|KWyVHn0KO_bvukX40CqpP&H7GnH5)-uv?{bm(G=f<){Z88t)}8jSgqm{ z%}OP+;YfS{~P;VU-kJ0fj&zrXf%m6k+NF#XxbUhXQ#@g6f%~ zpaxJg)881`YyvZkUjth}ZA_PCo;HCxnX;6pCqa*phSJoME9zlNG6iUhkE(DhH_^{p z0lG&XMCtF+OVC1K3VHy#H;ZX>B4rv_RN=U#nBm9_M`maeC+GqWw4hwTnHQFe>@Tvv!v2c#O{obr zNW;Ak%MAM&_H*p#*e|eOV1I`F8TJ?0UtoWc{Y4R@dbxt~`h_NyW>~|x-$Wl#t&r*z z#VWL5O}lAgEA5~`yck9)Fs<&r|Ca~ozQD8e3Df#f_Nyg=gUi6^D8Kp*YN9dgfk>D2 zc4XWN8m+}1qg}I()}8#szrYR8{7O|>>>>>> c493033 (cosas que faltaban) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -114,6 +118,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -148,6 +153,13 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "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\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" +>>>>>>> 6092f6f (cambios nachito a form factura) } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index 2c9fe97..a7a0c1a 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==", "success": true, @@ -611,8 +612,11 @@ ], ======= "dgSpecHash": "7p6sil6BdpeseYcwxc5SCaMq8T52JX3Gb+/veDRUiSWMCYx7lYCBfkail6lsPgISGkw+p3jfoipb6TSmLcP1ZA==", +======= + "dgSpecHash": "AVYTA+Cdyhg6wCEQPUiY9Zgnvl4qcFZo9nD09bdg1F+72oerfmmuZj274FC2KL/pXGSF1iqxwV37ZtH0RMkuXw==", +>>>>>>> 6092f6f (cambios nachito a form factura) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": [] diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index 171df17..e6781ec 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -8,5 +8,9 @@ namespace Entidades public Producto Producto { get; set; } public long CantidadDeProductos { get; set; } public bool Habilitado { get; set; } + public string NombreProducto + { + get { return Producto?.Nombre ?? string.Empty; } + } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index 5afacc0..17d88fe 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -12,6 +12,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\ @@ -27,3 +28,6 @@ build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Entidades\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Entidades\ >>>>>>> c493033 (cosas que faltaban) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Entidades\ +>>>>>>> 6092f6f (cambios nachito a form factura) diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index f4512a9..e079b22 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, @@ -27,14 +28,18 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {} >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {} +>>>>>>> 6092f6f (cambios nachito a form factura) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -52,8 +57,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\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 42228d8..8cbb83c 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", @@ -48,10 +49,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\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 ad81583..7180e60 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==", "success": true, @@ -22,8 +23,11 @@ ======= "dgSpecHash": "iQ0EifyjZh9oi0Mdt+E3sLhf14CzOUsLKHxZb9iRQ9RyPF+gexIoaaQb71/6xZGzSye9KUJ3V77rlL+eNkHOdw==", >>>>>>> c493033 (cosas que faltaban) +======= + "dgSpecHash": "xYCKCMKm+oXscuoQamJhNB9nRxekBQBuz6IDgUB/8WpDnH3Ts7NVTClR8NJpQF10id2fDRpsOygcKaFzlcHs+w==", +>>>>>>> 6092f6f (cambios nachito a form factura) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index cd7e6bc..f576e36 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -12,6 +12,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\ @@ -27,3 +28,6 @@ build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Modelo\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\ >>>>>>> c493033 (cosas que faltaban) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Modelo\ +>>>>>>> 6092f6f (cambios nachito a form factura) diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 88f0320..d8a3ee2 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, @@ -27,14 +28,18 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {} >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {} +>>>>>>> 6092f6f (cambios nachito a form factura) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -52,8 +57,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -137,17 +145,22 @@ } } }, +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { +>>>>>>> 6092f6f (cambios nachito a form factura) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -165,8 +178,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -191,6 +207,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -210,6 +227,10 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "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) } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index 75aa2f4..b209fe0 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -39,6 +39,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", @@ -67,10 +68,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -95,6 +99,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -114,6 +119,10 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "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) } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index 9fe0225..2fe6b30 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==", "success": true, @@ -22,8 +23,11 @@ ======= "dgSpecHash": "pw7jedCv+5Z7cgVNhso+oycHNF67O1XyYT4HUnm6ukG4VUtgCv2G8NovbqYT02ZK0eONOKuhRbtsHdtFWeVAnw==", >>>>>>> c493033 (cosas que faltaban) +======= + "dgSpecHash": "fmo2HUMoIdls9H8hGKaMGhIa7cJfQvw6whWqbWRluFrLP21caNqa5sNL0+c6k3hgxAvgJ8kJuQlkGFoq8UfLog==", +>>>>>>> 6092f6f (cambios nachito a form factura) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Vista/FrmFactura.Designer.cs b/Vista/FrmFactura.Designer.cs index 9d11ecb..539d852 100644 --- a/Vista/FrmFactura.Designer.cs +++ b/Vista/FrmFactura.Designer.cs @@ -38,15 +38,23 @@ label3 = new Label(); label4 = new Label(); cmbCliente = new ComboBox(); + dataGridView1 = new DataGridView(); + dataGridView2 = new DataGridView(); + numericUpDown1 = new NumericUpDown(); + Unidades = new Label(); + button3 = new Button(); ((System.ComponentModel.ISupportInitialize)numid).BeginInit(); ((System.ComponentModel.ISupportInitialize)numtotal).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); SuspendLayout(); // // button1 // - button1.Location = new Point(12, 172); + button1.Location = new Point(12, 367); button1.Name = "button1"; - button1.Size = new Size(75, 23); + button1.Size = new Size(113, 46); button1.TabIndex = 0; button1.Text = "Aceptar"; button1.UseVisualStyleBackColor = true; @@ -54,9 +62,9 @@ // // button2 // - button2.Location = new Point(142, 172); + button2.Location = new Point(172, 367); button2.Name = "button2"; - button2.Size = new Size(75, 23); + button2.Size = new Size(115, 46); button2.TabIndex = 1; button2.Text = "Cancelar"; button2.UseVisualStyleBackColor = true; @@ -81,9 +89,11 @@ // // numtotal // + numtotal.Enabled = false; numtotal.Location = new Point(97, 57); numtotal.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numtotal.Name = "numtotal"; + numtotal.ReadOnly = true; numtotal.Size = new Size(120, 23); numtotal.TabIndex = 4; // @@ -102,6 +112,7 @@ datepick.Name = "datepick"; datepick.Size = new Size(120, 23); datepick.TabIndex = 6; + datepick.ValueChanged += datepick_ValueChanged; // // label3 // @@ -130,11 +141,64 @@ cmbCliente.Size = new Size(121, 23); cmbCliente.TabIndex = 10; // + // dataGridView1 + // + dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(290, 12); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView1.Size = new Size(324, 318); + dataGridView1.TabIndex = 11; + // + // dataGridView2 + // + dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView2.Location = new Point(674, 12); + dataGridView2.Name = "dataGridView2"; + dataGridView2.RowTemplate.Height = 25; + dataGridView2.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView2.Size = new Size(290, 336); + dataGridView2.TabIndex = 12; + // + // numericUpDown1 + // + numericUpDown1.Location = new Point(494, 359); + numericUpDown1.Name = "numericUpDown1"; + numericUpDown1.Size = new Size(120, 23); + numericUpDown1.TabIndex = 13; + // + // Unidades + // + Unidades.AutoSize = true; + Unidades.Location = new Point(420, 367); + Unidades.Name = "Unidades"; + Unidades.Size = new Size(56, 15); + Unidades.TabIndex = 14; + Unidades.Text = "Unidades"; + // + // button3 + // + button3.Location = new Point(420, 390); + button3.Name = "button3"; + button3.Size = new Size(194, 36); + button3.TabIndex = 15; + button3.Text = "Añadir"; + button3.UseVisualStyleBackColor = true; + button3.Click += button3_Click; + // // FrmFactura // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(652, 205); + ClientSize = new Size(976, 450); + Controls.Add(button3); + Controls.Add(Unidades); + Controls.Add(numericUpDown1); + Controls.Add(dataGridView2); + Controls.Add(dataGridView1); Controls.Add(cmbCliente); Controls.Add(label4); Controls.Add(label3); @@ -149,6 +213,9 @@ Text = "Form1"; ((System.ComponentModel.ISupportInitialize)numid).EndInit(); ((System.ComponentModel.ISupportInitialize)numtotal).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -165,5 +232,10 @@ private Label label3; private Label label4; private ComboBox cmbCliente; + private DataGridView dataGridView1; + private DataGridView dataGridView2; + private NumericUpDown numericUpDown1; + private Label Unidades; + private Button button3; } } \ No newline at end of file diff --git a/Vista/FrmFactura.cs b/Vista/FrmFactura.cs index 5a27869..a7e74ce 100644 --- a/Vista/FrmFactura.cs +++ b/Vista/FrmFactura.cs @@ -18,16 +18,28 @@ namespace Vista { private Factura factura; private Cliente clienteSeleccionado; + private List carrito; // Lista para almacenar los lotes en el carrito + public FrmFactura(Factura? factura = null) { InitializeComponent(); + ConfigurarDataGridView(); + ConfigurarDataGridViewCarrito(); // Nueva configuración del DataGridView para el carrito + ActualizarGrilla(); CargarClientes(); + carrito = new List(); // Inicializar la lista del carrito + cmbCliente.SelectedIndexChanged += comboBox1_SelectedIndexChanged; + // Para el primer control NumericUpDown numid.Maximum = int.MaxValue; // Esto permitirá IDs muy grandes // Para el segundo control NumericUpDown numtotal.Maximum = decimal.MaxValue; // Esto permitirá totales muy grandes + numtotal.Enabled = false; // Deshabilitar el control para que no se pueda modificar + + // Configurar NumericUpDown para unidades + numericUpDown1.Maximum = int.MaxValue; // Configurar el máximo valor permitido cmbCliente.DisplayMember = "Cliente"; cmbCliente.SelectedIndex = -1; @@ -44,17 +56,68 @@ namespace Vista } } + private void ConfigurarDataGridView() + { + dataGridView1.AutoGenerateColumns = false; + + // Definir las columnas manualmente + dataGridView1.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Id", + HeaderText = "ID", + Name = "Id" + }); + dataGridView1.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Nombre", + HeaderText = "Nombre", + Name = "Nombre" + }); + dataGridView1.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Precio", + HeaderText = "Precio", + Name = "Precio" + }); + } + + private void ConfigurarDataGridViewCarrito() + { + dataGridView2.AutoGenerateColumns = false; + + // Definir las columnas manualmente + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "NombreProducto", // Usa la propiedad NombreProducto + HeaderText = "Producto", + Name = "Producto" + }); + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "CantidadDeProductos", + HeaderText = "Cantidad", + Name = "CantidadDeProductos" + }); + + // Asignar la lista de lotes al DataGridView + dataGridView2.DataSource = carrito; + } + + + private void ActualizarGrilla() + { + dataGridView1.DataSource = null; + dataGridView1.DataSource = ControladoraProductos.Instance.Listar(); + } + private void CargarClientes() { // Obtener la lista de clientes desde el repositorio ReadOnlyCollection clientes = RepositorioClientes.Instance.Listar(); - // Asignar la lista de clientes como origen de datos para el ComboBox cmbCliente.DataSource = clientes; - - // Establecer la propiedad para mostrar el nombre del cliente en el ComboBox cmbCliente.DisplayMember = "NombreCompleto"; } @@ -64,8 +127,6 @@ namespace Vista clienteSeleccionado = (Cliente)cmbCliente.SelectedItem; } - - private void CargarDatos() { numid.Value = factura.Id; @@ -77,16 +138,33 @@ namespace Vista { cmbCliente.SelectedItem = factura.Cliente; } + + // Recuperar los lotes asociados a la factura y actualizar el DataGridView + carrito = ControladoraLotes.Instance.ListarPorFacturaId(factura.Id).ToList() ?? new List(); + + dataGridView2.DataSource = null; + dataGridView2.DataSource = carrito; + + // Actualizar el total + ActualizarTotal(); } + private void ActualizarTotal() + { + // Recalcular el total de la factura + decimal total = 0; + foreach (var lote in carrito) + { + total += (decimal)(lote.Producto.Precio * lote.CantidadDeProductos); + } + numtotal.Value = total; + } private bool ValidarDatos() { string devolucion = ""; if (string.IsNullOrEmpty(numid.Text)) devolucion += "El ID no puede ser nulo o vacío\n"; - if (numtotal.Value <= 0) devolucion += "El total debe ser mayor que cero\n"; - if (clienteSeleccionado == null) devolucion += "Debe seleccionar un cliente\n"; if (devolucion == "") @@ -100,14 +178,20 @@ namespace Vista } } - - private void button1_Click(object sender, EventArgs e) { + // Validar los datos antes de continuar if (ValidarDatos()) { try { + // Verificar si la ID de la factura ya está en uso + if (RepositorioFactura.Instance.ExistePorId((int)numid.Value) && factura == null) + { + MessageBox.Show("La ID de la factura ya está en uso. Por favor, elija una ID diferente.", "ID en Uso", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + if (factura == null) { // Crear una nueva factura con los datos proporcionados @@ -116,10 +200,18 @@ namespace Vista Id = (int)numid.Value, Total = (double)numtotal.Value, Fecha = datepick.Value, - Cliente = (Cliente)cmbCliente.SelectedItem, + Cliente = (Cliente)cmbCliente.SelectedItem }; // Agregar la factura a la colección ControladoraFacturas.Instance.Añadir(factura); + + // Guardar los lotes asociados a la factura + foreach (var lote in carrito) + { + lote.Id = factura.Id; // Usar la ID de la factura + lote.Fecha = factura.Fecha; // Usar la fecha de la factura + ControladoraLotes.Instance.Añadir(lote); + } } else { @@ -130,6 +222,15 @@ namespace Vista factura.Cliente = (Cliente)cmbCliente.SelectedItem; // Modificar la factura en la colección ControladoraFacturas.Instance.Modificar(factura); + + // Actualizar los lotes asociados a la factura + ControladoraLotes.Instance.EliminarPorFacturaId(factura.Id); // Eliminar lotes antiguos + foreach (var lote in carrito) + { + lote.Id = factura.Id; // Usar la ID de la factura + lote.Fecha = factura.Fecha; // Usar la fecha de la factura + ControladoraLotes.Instance.Añadir(lote); + } } MessageBox.Show("Operación realizada con éxito", "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); Close(); @@ -153,5 +254,77 @@ namespace Vista } + + private void button3_Click(object sender, EventArgs e) + { + // Validar los datos antes de crear el lote + if (ValidarDatos() && ValidarDatosLote()) + { + // Verifica si hay una fila seleccionada en el DataGridView + if (dataGridView1.CurrentRow != null) + { + // Deshabilitar los controles para ID, fecha, y cliente + numid.Enabled = false; + datepick.Enabled = false; + cmbCliente.Enabled = false; + + // Crear un nuevo lote con los datos proporcionados + var lote = new Lote + { + Id = (int)numid.Value, // Usar la misma ID que la de la factura + Fecha = datepick.Value, // Usar la misma fecha que la de la factura + Producto = (Producto)dataGridView1.CurrentRow.DataBoundItem, + CantidadDeProductos = (long)numericUpDown1.Value, // Usar el valor de unidades del NumericUpDown + Habilitado = true // Asignar un valor por defecto o según tus necesidades + }; + + // Añadir el lote al carrito + carrito.Add(lote); + + // Actualizar el total de la factura + ActualizarTotal(); + + // Actualizar el DataGridView para reflejar los cambios + dataGridView2.DataSource = null; + dataGridView2.DataSource = carrito; + } + else + { + // Mostrar un mensaje si no se ha seleccionado ninguna fila + MessageBox.Show("Por favor, seleccione un producto en el carrito antes de añadir.", "Selección Requerida", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } + } + + + + // Función actualizada para validar los datos del lote + private bool ValidarDatosLote() + { + string devolucion = ""; + + // Validar la selección del producto + if (dataGridView1.CurrentRow == null) + devolucion += "Debe seleccionar un producto para añadir al lote\n"; + + // Validar la cantidad de productos + if (numericUpDown1.Value <= 0) + devolucion += "La cantidad de productos debe ser mayor que cero\n"; + + if (devolucion == "") + { + return true; + } + else + { + MessageBox.Show(devolucion, "Errores de Validación", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return false; + } + } + + private void datepick_ValueChanged(object sender, EventArgs e) + { + + } } -} +} \ No newline at end of file diff --git a/Vista/FrmFactura.resx b/Vista/FrmFactura.resx index a395bff..af32865 100644 --- a/Vista/FrmFactura.resx +++ b/Vista/FrmFactura.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/FrmFacturas.Designer.cs b/Vista/FrmFacturas.Designer.cs index 3d38a23..030b4c1 100644 --- a/Vista/FrmFacturas.Designer.cs +++ b/Vista/FrmFacturas.Designer.cs @@ -52,6 +52,7 @@ dataGridView1.Location = new Point(6, 22); dataGridView1.Name = "dataGridView1"; dataGridView1.RowTemplate.Height = 25; + dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView1.Size = new Size(594, 235); dataGridView1.TabIndex = 3; dataGridView1.CellBorderStyleChanged += dataGridView1_CellBorderStyleChanged; diff --git a/Vista/FrmInforme.Designer.cs b/Vista/FrmInforme.Designer.cs new file mode 100644 index 0000000..4fb8912 --- /dev/null +++ b/Vista/FrmInforme.Designer.cs @@ -0,0 +1,46 @@ +namespace Vista +{ + partial class FrmInforme + { + /// + /// 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(); + // + // FrmInforme + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Name = "FrmInforme"; + Text = "Informes"; + WindowState = FormWindowState.Maximized; + ResumeLayout(false); + } + + #endregion + } +} \ No newline at end of file diff --git a/Vista/FrmInforme.cs b/Vista/FrmInforme.cs new file mode 100644 index 0000000..073954c --- /dev/null +++ b/Vista/FrmInforme.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 FrmInforme : Form + { + public FrmInforme() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmInforme.resx b/Vista/FrmInforme.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmInforme.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/PantallaPrincipal.Designer.cs b/Vista/PantallaPrincipal.Designer.cs index 5dc70f8..608c3d6 100644 --- a/Vista/PantallaPrincipal.Designer.cs +++ b/Vista/PantallaPrincipal.Designer.cs @@ -37,12 +37,14 @@ remitosToolStripMenuItem = new ToolStripMenuItem(); ordenDeCompraToolStripMenuItem = new ToolStripMenuItem(); pedidosPresupuestoToolStripMenuItem = new ToolStripMenuItem(); + configToolStripMenuItem = new ToolStripMenuItem(); + informesToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // // menuStrip1 // - menuStrip1.Items.AddRange(new ToolStripItem[] { gestionarToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { gestionarToolStripMenuItem, configToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(800, 24); @@ -55,6 +57,7 @@ gestionarToolStripMenuItem.Name = "gestionarToolStripMenuItem"; gestionarToolStripMenuItem.Size = new Size(69, 20); gestionarToolStripMenuItem.Text = "Gestionar"; + gestionarToolStripMenuItem.Click += gestionarToolStripMenuItem_Click; // // clientesToolStripMenuItem // @@ -105,6 +108,20 @@ pedidosPresupuestoToolStripMenuItem.Text = "PedidosPresupuesto"; pedidosPresupuestoToolStripMenuItem.Click += pedidosPresupuestoToolStripMenuItem_Click; // + // configToolStripMenuItem + // + configToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { informesToolStripMenuItem }); + configToolStripMenuItem.Name = "configToolStripMenuItem"; + configToolStripMenuItem.Size = new Size(55, 20); + configToolStripMenuItem.Text = "Config"; + // + // informesToolStripMenuItem + // + informesToolStripMenuItem.Name = "informesToolStripMenuItem"; + informesToolStripMenuItem.Size = new Size(180, 22); + informesToolStripMenuItem.Text = "Informes"; + informesToolStripMenuItem.Click += informesToolStripMenuItem_Click; + // // PantallaPrincipal // AutoScaleDimensions = new SizeF(7F, 15F); @@ -133,5 +150,7 @@ private ToolStripMenuItem ordenDeCompraToolStripMenuItem; private ToolStripMenuItem pedidosPresupuestoToolStripMenuItem; private ToolStripMenuItem clientesToolStripMenuItem; + private ToolStripMenuItem configToolStripMenuItem; + private ToolStripMenuItem informesToolStripMenuItem; } } \ No newline at end of file diff --git a/Vista/PantallaPrincipal.cs b/Vista/PantallaPrincipal.cs index dc6fc89..99d47cb 100644 --- a/Vista/PantallaPrincipal.cs +++ b/Vista/PantallaPrincipal.cs @@ -85,5 +85,21 @@ namespace Vista Frm.MdiParent = this; Frm.Show(); } + + private void gestionarToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void informesToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmInforme(); + Frm.MdiParent = this; + Frm.Show(); + } } } \ No newline at end of file diff --git a/Vista/Program.cs b/Vista/Program.cs index 099c3aa..503aaf9 100644 --- a/Vista/Program.cs +++ b/Vista/Program.cs @@ -60,7 +60,14 @@ namespace Vista Descripcion = "Perfumeria" }); - + ControladoraProductos.Instance.Añadir(new Producto + { + Id = 1, + Categoria = ControladoraCategorias.Instance.Listar()[0], + Habilitado = true, + Nombre = "Pantalones Vaqueros", + Precio = 2000.2 + }); } } } \ No newline at end of file diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index 4d2a046..b55bb35 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -7,6 +7,9 @@ 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 ceaa92c..b4a95b6 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -13,6 +13,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\ @@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Vista\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\ >>>>>>> c493033 (cosas que faltaban) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Vista\ +>>>>>>> 6092f6f (cambios nachito a form factura) diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 64fef66..6141bd5 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, @@ -27,16 +28,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj": {} >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {} +>>>>>>> 6092f6f (cambios nachito a form factura) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,11 +58,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" + "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\\Final\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj" } } } @@ -92,14 +96,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -148,10 +152,11 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", @@ -171,10 +176,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -396,6 +404,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" @@ -403,6 +412,10 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "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) } } } @@ -446,6 +459,7 @@ } } }, +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": { "version": "1.0.0", @@ -457,14 +471,21 @@ "outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/", ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj": { +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": { +>>>>>>> 6092f6f (cambios nachito a form factura) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< 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) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -480,6 +501,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" @@ -503,6 +525,13 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj" + }, + "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) } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index edcd6c4..867f3e7 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -13548,6 +13548,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", @@ -13576,10 +13577,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj", >>>>>>> c493033 (cosas que faltaban) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", +>>>>>>> 6092f6f (cambios nachito a form factura) "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -13604,6 +13608,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -13632,6 +13637,13 @@ "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj" + }, + "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) } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index ef12cbc..130a7db 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==", "success": true, @@ -613,8 +614,11 @@ >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ======= "dgSpecHash": "aNFbNdDa22Mg1jfOxDzb7N16RdBndEphnWuh1X0WK6h4YNDptQDhQUjqbwCKBPcpGb6LmtlDSztOIxoXuc2UXQ==", +======= + "dgSpecHash": "WPBgDz5Ag7uyUpIln8eBMvu2+XqGSiWG0TNaL6A9IRZAEDYpI2SXVE367iYE3zDP7SrxjO4nhM2wKkdjx8Psbw==", +>>>>>>> 6092f6f (cambios nachito a form factura) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": []