diff --git a/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 b/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 index bb1e936..6d4e20c 100644 Binary files a/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 and b/.vs/Final_OOP/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Final_OOP/v17/.futdcache.v2 b/.vs/Final_OOP/v17/.futdcache.v2 index c6650af..d91069f 100644 Binary files a/.vs/Final_OOP/v17/.futdcache.v2 and b/.vs/Final_OOP/v17/.futdcache.v2 differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 2c2df5c..dc8b57e 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 83e0433..9ac7dbf 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/", +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": {} + }, + "projects": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "projectName": "Controladora", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -27,11 +41,19 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" }, "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj" +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj" +>>>>>>> 8ad9dc6 (faltan controladoras) } } } @@ -216,6 +238,130 @@ "runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json" } } + }, + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + } + } + }, + "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + } + } } } } \ No newline at end of file diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs index d1a4d5e..d1f8ae6 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs +++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs @@ -18,10 +18,14 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] >>>>>>> 3616449 (preparando merge) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] +>>>>>>> 8ad9dc6 (faltan controladoras) [assembly: System.Reflection.AssemblyProductAttribute("Controladora")] [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache index aaacfbb..8d3f8b0 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7 ======= f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0 >>>>>>> 3616449 (preparando merge) +======= +bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537 +>>>>>>> 8ad9dc6 (faltan controladoras) diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig index b526605..6dc1d01 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -9,7 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Controladora <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/ +======= +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ +>>>>>>> 8ad9dc6 (faltan controladoras) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = ======= diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 4302a26..94665ac 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -13,3 +13,6 @@ C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\ref\Controladora. C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.dll C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll +C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll +C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb diff --git a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs index dc77d59..d45f32a 100644 --- a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs +++ b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Este código fue generado por una herramienta. +// Versión de runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si +// se vuelve a generar el código. // //------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Controladora")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] [assembly: System.Reflection.AssemblyProductAttribute("Controladora")] [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Generado por la clase WriteCodeFragment de MSBuild. diff --git a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache index 3f17e2d..5e5f4f9 100644 --- a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache +++ b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache @@ -1 +1 @@ -1a11c83cae779abe705573d149b53d62cfc015f0 +1300c7ac552248a2e20058b6f2d7f7eb38539ca91bc222d9d6bfd7bbcb24e9ab diff --git a/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig index f21c62b..0750616 100644 --- a/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Controladora -build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Controladora\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Controladora/obj/Release/net6.0/Controladora.assets.cache b/Controladora/obj/Release/net6.0/Controladora.assets.cache index e62e3f1..cc1d7f3 100644 Binary files a/Controladora/obj/Release/net6.0/Controladora.assets.cache and b/Controladora/obj/Release/net6.0/Controladora.assets.cache differ diff --git a/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache b/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache index 9a03f4b..62093d4 100644 Binary files a/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache and b/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache differ diff --git a/Controladora/obj/project.assets.json b/Controladora/obj/project.assets.json index 77b0902..e6e3099 100644 --- a/Controladora/obj/project.assets.json +++ b/Controladora/obj/project.assets.json @@ -13475,11 +13475,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "projectName": "Controladora", "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/", +======= + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "projectName": "Controladora", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -13495,11 +13503,19 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" }, "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj" +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj" +>>>>>>> 8ad9dc6 (faltan controladoras) } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index 6cc6ce4..ac25056 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -1,8 +1,14 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==", "success": true, "projectFilePath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", +======= + "dgSpecHash": "u1rF4F4W8YOwisGSU+O4Veb7LPgLsngYMYPVbuML0HSqxYI2+tPRsVgjjntnLp9J+4QB/odgwOICD9/fwie5gQ==", + "success": false, + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj", +>>>>>>> 8ad9dc6 (faltan controladoras) "expectedPackageFiles": [ "/home/fede/.nuget/packages/emailer/1.0.0/emailer.1.0.0.nupkg.sha512", "/home/fede/.nuget/packages/libuv/1.10.0/libuv.1.10.0.nupkg.sha512", diff --git a/Entidades/Proveedor.cs b/Entidades/Proveedor.cs index edc6afa..06d7741 100644 --- a/Entidades/Proveedor.cs +++ b/Entidades/Proveedor.cs @@ -11,6 +11,7 @@ namespace Entidades public Int64 Cuit { get; set; } public string Nombre { get; set; } public string RazonSocial { get; set; } + public string Direccion { get; set; } public bool Habilitado { get; set; } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs index a590c33..c7148eb 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs +++ b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs @@ -13,7 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Entidades")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] +>>>>>>> 8ad9dc6 (faltan controladoras) [assembly: System.Reflection.AssemblyProductAttribute("Entidades")] [assembly: System.Reflection.AssemblyTitleAttribute("Entidades")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache index 2c4f3de..884293c 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache +++ b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973 +======= +390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af +>>>>>>> 8ad9dc6 (faltan controladoras) diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index 0c35ddc..e1b0ed5 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entidades +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/ +======= +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\ +>>>>>>> 8ad9dc6 (faltan controladoras) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index 555bbdb..ccbc2ec 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {} + }, + "projects": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" diff --git a/Entidades/obj/Release/net6.0/Entidades.AssemblyInfo.cs b/Entidades/obj/Release/net6.0/Entidades.AssemblyInfo.cs index 8abc0c7..c502b58 100644 --- a/Entidades/obj/Release/net6.0/Entidades.AssemblyInfo.cs +++ b/Entidades/obj/Release/net6.0/Entidades.AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Este código fue generado por una herramienta. +// Versión de runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si +// se vuelve a generar el código. // //------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Entidades")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] [assembly: System.Reflection.AssemblyProductAttribute("Entidades")] [assembly: System.Reflection.AssemblyTitleAttribute("Entidades")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Generado por la clase WriteCodeFragment de MSBuild. diff --git a/Entidades/obj/Release/net6.0/Entidades.AssemblyInfoInputs.cache b/Entidades/obj/Release/net6.0/Entidades.AssemblyInfoInputs.cache index afe15aa..f1e8231 100644 --- a/Entidades/obj/Release/net6.0/Entidades.AssemblyInfoInputs.cache +++ b/Entidades/obj/Release/net6.0/Entidades.AssemblyInfoInputs.cache @@ -1 +1 @@ -1dac91cef82b545d186b8ab941058cf01df1dea3 +0f23a71dabcab7104ee2511db3de6cc1ef434f03702a8d033e7694541758b7dd diff --git a/Entidades/obj/Release/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Release/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index c17f225..a9ec198 100644 --- a/Entidades/obj/Release/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Release/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entidades -build_property.ProjectDir = C:\Users\fedpo\Source\Repos\Final_OOP\Entidades\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Entidades/obj/Release/net6.0/Entidades.assets.cache b/Entidades/obj/Release/net6.0/Entidades.assets.cache index cd66634..49f6b8f 100644 Binary files a/Entidades/obj/Release/net6.0/Entidades.assets.cache and b/Entidades/obj/Release/net6.0/Entidades.assets.cache differ diff --git a/Entidades/obj/Release/net6.0/Entidades.csproj.AssemblyReference.cache b/Entidades/obj/Release/net6.0/Entidades.csproj.AssemblyReference.cache deleted file mode 100644 index 9a03f4b..0000000 Binary files a/Entidades/obj/Release/net6.0/Entidades.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index 9987c6e..5988670 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -13,11 +13,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", +======= + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index c82448e..ed94780 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==", "success": true, "projectFilePath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", @@ -7,5 +8,11 @@ "/home/fede/.nuget/packages/microsoft.netcore.app.ref/6.0.31/microsoft.netcore.app.ref.6.0.31.nupkg.sha512", "/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512" ], +======= + "dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==", + "success": true, + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "expectedPackageFiles": [], +>>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] } \ No newline at end of file diff --git a/Final_OOP.sln b/Final_OOP.sln index 9c7f6a3..35a811d 100644 --- a/Final_OOP.sln +++ b/Final_OOP.sln @@ -7,9 +7,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controladora", "Controlador EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entidades", "Entidades\Entidades.csproj", "{78A331E5-86D4-427E-AA45-5879F9E5E98B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modelo", "Modelo\Modelo.csproj", "{9A0960D9-C909-4B68-8BBB-8C44B9CD0E97}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modelo", "Modelo\Modelo.csproj", "{9A0960D9-C909-4B68-8BBB-8C44B9CD0E97}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vista", "Vista\Vista.csproj", "{8C9E8090-5D8F-42AE-9813-C68D384C6863}" + ProjectSection(ProjectDependencies) = postProject + {7168B549-F229-4D49-8C53-AF1CEB9BBB6B} = {7168B549-F229-4D49-8C53-AF1CEB9BBB6B} + {78A331E5-86D4-427E-AA45-5879F9E5E98B} = {78A331E5-86D4-427E-AA45-5879F9E5E98B} + {9A0960D9-C909-4B68-8BBB-8C44B9CD0E97} = {9A0960D9-C909-4B68-8BBB-8C44B9CD0E97} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs b/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs new file mode 100644 index 0000000..9adc184 --- /dev/null +++ b/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Informes")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Informes")] +[assembly: System.Reflection.AssemblyTitleAttribute("Informes")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs index e36a8b9..724aa57 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs +++ b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs @@ -13,7 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Modelo")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] +>>>>>>> 8ad9dc6 (faltan controladoras) [assembly: System.Reflection.AssemblyProductAttribute("Modelo")] [assembly: System.Reflection.AssemblyTitleAttribute("Modelo")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache index 8940272..a1de216 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache +++ b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587 +======= +6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b +>>>>>>> 8ad9dc6 (faltan controladoras) diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index d29227f..6d9970d 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Modelo +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/ +======= +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\ +>>>>>>> 8ad9dc6 (faltan controladoras) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 7b5926e..3fc54fd 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {} + }, + "projects": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -68,6 +82,7 @@ } } }, +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "version": "1.0.0", "restore": { @@ -76,6 +91,16 @@ "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/", +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -91,8 +116,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" +>>>>>>> 8ad9dc6 (faltan controladoras) } } } diff --git a/Modelo/obj/Release/net6.0/Modelo.AssemblyInfo.cs b/Modelo/obj/Release/net6.0/Modelo.AssemblyInfo.cs index 275e472..cbd8855 100644 --- a/Modelo/obj/Release/net6.0/Modelo.AssemblyInfo.cs +++ b/Modelo/obj/Release/net6.0/Modelo.AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Este código fue generado por una herramienta. +// Versión de runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si +// se vuelve a generar el código. // //------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Modelo")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] [assembly: System.Reflection.AssemblyProductAttribute("Modelo")] [assembly: System.Reflection.AssemblyTitleAttribute("Modelo")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Generado por la clase WriteCodeFragment de MSBuild. diff --git a/Modelo/obj/Release/net6.0/Modelo.AssemblyInfoInputs.cache b/Modelo/obj/Release/net6.0/Modelo.AssemblyInfoInputs.cache index 0b0231d..2842b1b 100644 --- a/Modelo/obj/Release/net6.0/Modelo.AssemblyInfoInputs.cache +++ b/Modelo/obj/Release/net6.0/Modelo.AssemblyInfoInputs.cache @@ -1 +1 @@ -62b2a3bcc43d28f54304e0bcd7e2b7d409425118 +3e36c8c77cd831cf7c05eae84ca674fcaae78b66286858be7486e7662b80b494 diff --git a/Modelo/obj/Release/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Release/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index c2cd440..5687b99 100644 --- a/Modelo/obj/Release/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Release/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Modelo -build_property.ProjectDir = C:\Users\fedpo\Source\Repos\Final_OOP\Modelo\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Modelo/obj/Release/net6.0/Modelo.assets.cache b/Modelo/obj/Release/net6.0/Modelo.assets.cache index 5a11507..15d0ca8 100644 Binary files a/Modelo/obj/Release/net6.0/Modelo.assets.cache and b/Modelo/obj/Release/net6.0/Modelo.assets.cache differ diff --git a/Modelo/obj/Release/net6.0/Modelo.csproj.AssemblyReference.cache b/Modelo/obj/Release/net6.0/Modelo.csproj.AssemblyReference.cache deleted file mode 100644 index 9a03f4b..0000000 Binary files a/Modelo/obj/Release/net6.0/Modelo.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index 754bb38..ac8867f 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -32,11 +32,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/", +======= + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -52,8 +60,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" +>>>>>>> 8ad9dc6 (faltan controladoras) } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index c4f6dae..e855cb2 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==", "success": true, "projectFilePath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", @@ -7,5 +8,11 @@ "/home/fede/.nuget/packages/microsoft.netcore.app.ref/6.0.31/microsoft.netcore.app.ref.6.0.31.nupkg.sha512", "/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512" ], +======= + "dgSpecHash": "xK3JnXpdCUpoZcekhyP91lNk41C1CsX+md42EcLnzhmp4nv0wa9QUPqxaUDvd+ItjZUDnL5nqMnWsYofgtcCWA==", + "success": true, + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj", + "expectedPackageFiles": [], +>>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] } \ No newline at end of file diff --git a/Vista/Form1.cs b/Vista/Form1.cs deleted file mode 100644 index c6b8bb1..0000000 --- a/Vista/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Vista -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Vista/Form1.Designer.cs b/Vista/FrmAddVentas.Designer.cs similarity index 54% rename from Vista/Form1.Designer.cs rename to Vista/FrmAddVentas.Designer.cs index 915b2e1..8bb56e8 100644 --- a/Vista/Form1.Designer.cs +++ b/Vista/FrmAddVentas.Designer.cs @@ -1,14 +1,14 @@ namespace Vista { - partial class Form1 + partial class FrmAddVentas { /// - /// Required designer variable. + /// Required designer variable. /// private System.ComponentModel.IContainer components = null; /// - /// Clean up any resources being used. + /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) @@ -23,15 +23,22 @@ #region Windows Form Designer generated code /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; + SuspendLayout(); + // + // FrmAddVentas + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(495, 229); + Name = "FrmAddVentas"; + Text = "Form1"; + + ResumeLayout(false); } #endregion diff --git a/Vista/FrmAddVentas.cs b/Vista/FrmAddVentas.cs new file mode 100644 index 0000000..39d0e62 --- /dev/null +++ b/Vista/FrmAddVentas.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 FrmAddVentas : Form + { + public FrmAddVentas() + { + InitializeComponent(); + } + } +} diff --git a/Vista/Form1.resx b/Vista/FrmAddVentas.resx similarity index 93% rename from Vista/Form1.resx rename to Vista/FrmAddVentas.resx index 1af7de1..af32865 100644 --- a/Vista/Form1.resx +++ b/Vista/FrmAddVentas.resx @@ -1,17 +1,17 @@  - diff --git a/Vista/FrmClientes.Designer.cs b/Vista/FrmClientes.Designer.cs new file mode 100644 index 0000000..8a5e0bf --- /dev/null +++ b/Vista/FrmClientes.Designer.cs @@ -0,0 +1,102 @@ +namespace Vista +{ + partial class FrmClientes + { + /// + /// 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() + { + BtnModificar = new Button(); + BtnEliminar = new Button(); + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 2); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 3; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.AllowUserToAddRows = false; + dataGridView1.AllowUserToDeleteRows = false; + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.MultiSelect = false; + dataGridView1.Name = "dataGridView1"; + dataGridView1.ReadOnly = true; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // FrmClientes + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmClientes"; + Text = "Clientes"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + private Button BtnModificar; + private Button BtnEliminar; + private GroupBox groupBox1; + private DataGridView dataGridView1; + } +} \ No newline at end of file diff --git a/Vista/FrmClientes.cs b/Vista/FrmClientes.cs new file mode 100644 index 0000000..f22b333 --- /dev/null +++ b/Vista/FrmClientes.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 FrmClientes : Form + { + public FrmClientes() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmClientes.resx b/Vista/FrmClientes.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmClientes.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/FrmOrdenDeCompra.Designer.cs b/Vista/FrmOrdenDeCompra.Designer.cs new file mode 100644 index 0000000..5338ef3 --- /dev/null +++ b/Vista/FrmOrdenDeCompra.Designer.cs @@ -0,0 +1,111 @@ +namespace Vista +{ + partial class FrmOrdenDeCompra + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + BtnEliminar = new Button(); + BtnModificar = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 3); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 4; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 302); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + BtnAdd.Click += BtnAdd_Click; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // FrmOrdenDeCompra + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmOrdenDeCompra"; + Text = "OrdenDeCompra"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + private Button BtnEliminar; + private Button BtnModificar; + } +} \ No newline at end of file diff --git a/Vista/FrmOrdenDeCompra.cs b/Vista/FrmOrdenDeCompra.cs new file mode 100644 index 0000000..003a857 --- /dev/null +++ b/Vista/FrmOrdenDeCompra.cs @@ -0,0 +1,25 @@ +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 FrmOrdenDeCompra : Form + { + public FrmOrdenDeCompra() + { + InitializeComponent(); + } + + private void BtnAdd_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/Vista/FrmOrdenDeCompra.resx b/Vista/FrmOrdenDeCompra.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmOrdenDeCompra.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/FrmPedidosDePresupuestos.Designer.cs b/Vista/FrmPedidosDePresupuestos.Designer.cs new file mode 100644 index 0000000..d965f25 --- /dev/null +++ b/Vista/FrmPedidosDePresupuestos.Designer.cs @@ -0,0 +1,110 @@ +namespace Vista +{ + partial class FrmPedidosDePresupuestos + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + BtnEliminar = new Button(); + BtnModificar = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 2); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 4; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 302); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // FrmPedidosDePresupuestos + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmPedidosDePresupuestos"; + Text = "PedidosDePresupuestos"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + private Button BtnEliminar; + private Button BtnModificar; + } +} \ No newline at end of file diff --git a/Vista/FrmPedidosDePresupuestos.cs b/Vista/FrmPedidosDePresupuestos.cs new file mode 100644 index 0000000..ffbb217 --- /dev/null +++ b/Vista/FrmPedidosDePresupuestos.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 FrmPedidosDePresupuestos : Form + { + public FrmPedidosDePresupuestos() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmPedidosDePresupuestos.resx b/Vista/FrmPedidosDePresupuestos.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmPedidosDePresupuestos.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 new file mode 100644 index 0000000..e615703 --- /dev/null +++ b/Vista/FrmProductos.Designer.cs @@ -0,0 +1,110 @@ +namespace Vista +{ + partial class FrmProductos + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + BtnEliminar = new Button(); + BtnModificar = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 0); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 5; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 302); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // FrmProductos + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmProductos"; + Text = "Productos"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + private Button BtnEliminar; + private Button BtnModificar; + } +} \ No newline at end of file diff --git a/Vista/FrmProductos.cs b/Vista/FrmProductos.cs new file mode 100644 index 0000000..968b70b --- /dev/null +++ b/Vista/FrmProductos.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 FrmProductos : Form + { + public FrmProductos() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmProductos.resx b/Vista/FrmProductos.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmProductos.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/FrmProveedor.Designer.cs b/Vista/FrmProveedor.Designer.cs new file mode 100644 index 0000000..5de29ce --- /dev/null +++ b/Vista/FrmProveedor.Designer.cs @@ -0,0 +1,176 @@ +namespace Vista +{ + partial class FrmProveedor + { + /// + /// 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() + { + BtnAceptarr = new Button(); + txtNombre = new TextBox(); + txtDireccion = new TextBox(); + txtSocial = new TextBox(); + numCuit = new NumericUpDown(); + Nombre = new Label(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + checkBoxHabilitado = new CheckBox(); + label4 = new Label(); + ((System.ComponentModel.ISupportInitialize)numCuit).BeginInit(); + SuspendLayout(); + // + // BtnAceptarr + // + BtnAceptarr.Location = new Point(19, 195); + BtnAceptarr.Name = "BtnAceptarr"; + BtnAceptarr.Size = new Size(75, 23); + BtnAceptarr.TabIndex = 0; + BtnAceptarr.Text = "Aceptar"; + BtnAceptarr.UseVisualStyleBackColor = true; + BtnAceptarr.Click += BtnAceptarr_Click; + // + // txtNombre + // + txtNombre.Location = new Point(110, 19); + txtNombre.Name = "txtNombre"; + txtNombre.Size = new Size(100, 23); + txtNombre.TabIndex = 1; + // + // txtDireccion + // + txtDireccion.Location = new Point(110, 53); + txtDireccion.Name = "txtDireccion"; + txtDireccion.Size = new Size(100, 23); + txtDireccion.TabIndex = 2; + // + // txtSocial + // + txtSocial.Location = new Point(110, 88); + txtSocial.Name = "txtSocial"; + txtSocial.Size = new Size(100, 23); + txtSocial.TabIndex = 3; + // + // numCuit + // + numCuit.Location = new Point(110, 117); + numCuit.Name = "numCuit"; + numCuit.Size = new Size(100, 23); + numCuit.TabIndex = 4; + numCuit.ValueChanged += numCuit_ValueChanged; + // + // Nombre + // + Nombre.AutoSize = true; + Nombre.Location = new Point(24, 22); + Nombre.Name = "Nombre"; + Nombre.Size = new Size(51, 15); + Nombre.TabIndex = 5; + Nombre.Text = "Nombre"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(24, 61); + label1.Name = "label1"; + label1.Size = new Size(57, 15); + label1.TabIndex = 6; + label1.Text = "Direccion"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(24, 88); + label2.Name = "label2"; + label2.Size = new Size(70, 15); + label2.TabIndex = 7; + label2.Text = "RazonSocial"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(24, 117); + label3.Name = "label3"; + label3.Size = new Size(29, 15); + label3.TabIndex = 8; + label3.Text = "Cuit"; + // + // checkBoxHabilitado + // + checkBoxHabilitado.AutoSize = true; + checkBoxHabilitado.Location = new Point(110, 154); + checkBoxHabilitado.Name = "checkBoxHabilitado"; + checkBoxHabilitado.Size = new Size(15, 14); + checkBoxHabilitado.TabIndex = 9; + checkBoxHabilitado.UseVisualStyleBackColor = true; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(19, 153); + label4.Name = "label4"; + label4.Size = new Size(62, 15); + label4.TabIndex = 10; + label4.Text = "Habilitado"; + // + // FrmProveedor + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(409, 230); + Controls.Add(label4); + Controls.Add(checkBoxHabilitado); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(Nombre); + Controls.Add(numCuit); + Controls.Add(txtSocial); + Controls.Add(txtDireccion); + Controls.Add(txtNombre); + Controls.Add(BtnAceptarr); + Name = "FrmProveedor"; + Text = "Form1"; + ((System.ComponentModel.ISupportInitialize)numCuit).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button btnAceptar; + private Button BtnAceptarr; + private TextBox txtNombre; + private TextBox txtDireccion; + private TextBox txtSocial; + private NumericUpDown numCuit; + private Label Nombre; + private Label label1; + private Label label2; + private Label label3; + private CheckBox checkBoxHabilitado; + private Label label4; + } +} \ No newline at end of file diff --git a/Vista/FrmProveedor.cs b/Vista/FrmProveedor.cs new file mode 100644 index 0000000..3528c4c --- /dev/null +++ b/Vista/FrmProveedor.cs @@ -0,0 +1,91 @@ +using Entidades; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Vista +{ + public partial class FrmProveedor : Form + { + Proveedor proveedor; + + public FrmProveedor(Proveedor? proveedor = null) + { + InitializeComponent(); + InitializeComponent(); + this.proveedor = proveedor; + + this.Text = (proveedor == null) ? + "Agregar Proveedor" : + "Modificar Proveedor"; + } + private bool ValidarDatos() + { + string devolucion = ""; + + /* + * complicado de leer pero en estas lineas estan todas las comprobaciones + * que pude pensar en el momento. + */ + + if (string.IsNullOrEmpty(txtDireccion.Text)) devolucion += "La direccion no deberia ser nulo o vacio\n"; + if (txtDireccion.Text.Length > 200) devolucion += "La direccion no puede superar los 200 chars\n"; + if (string.IsNullOrEmpty(txtSocial.Text)) devolucion += "La razon social no puede ser nulo o vacio\n"; + if (txtSocial.Text.Length > 50) devolucion += "La razon social no puede superar los 50 chars\n"; + if (string.IsNullOrEmpty(txtNombre.Text)) devolucion += "El Nombre no puede ser nulo o vacio\n"; + + if (devolucion == "") + { + return true; + } + else + { + MessageBox.Show(devolucion); + return false; + } + + } + + private void BtnAceptarr_Click(object sender, EventArgs e) + { + string msg; + if (ValidarDatos()) + { + if (proveedor == null) + { + proveedor = new Proveedor + { + Nombre = txtNombre.Text, + Cuit = (Int64)numCuit.Value, + Direccion = txtDireccion.Text, + RazonSocial = txtSocial.Text, + Habilitado = checkBoxHabilitado.Checked; + }; + + msg = ControladoraProveedores.Instance.AgregarProveedor(proveedor); + } + else + { + proveedor.Nombre = txtNombre.Text; + proveedor.Direccion = txtDireccion.Text; + proveedor.RazonSocial = txtSocial.Text; + proveedor.Cuit = (Int64)numCuit.Value; + msg = ControladoraProveedores.Instance.ModificarProveedor(proveedor); + } + MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); + Close(); + } + + private void numCuit_ValueChanged(object sender, EventArgs e) + { + + } + } +} + } diff --git a/Vista/FrmProveedor.resx b/Vista/FrmProveedor.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmProveedor.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/FrmProveedores.Designer.cs b/Vista/FrmProveedores.Designer.cs new file mode 100644 index 0000000..9ae6879 --- /dev/null +++ b/Vista/FrmProveedores.Designer.cs @@ -0,0 +1,111 @@ +namespace Vista +{ + partial class FrmProveedores + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + BtnEliminar = new Button(); + BtnModificar = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 12); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 5; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 302); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + BtnAdd.Click += BtnAdd_Click; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // FrmProveedores + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmProveedores"; + Text = "Proveedores"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + private Button BtnEliminar; + private Button BtnModificar; + } +} \ No newline at end of file diff --git a/Vista/FrmProveedores.cs b/Vista/FrmProveedores.cs new file mode 100644 index 0000000..793db37 --- /dev/null +++ b/Vista/FrmProveedores.cs @@ -0,0 +1,32 @@ +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 FrmProveedores : Form + { + public FrmProveedores() + { + InitializeComponent(); + } + private void ActualizarGrilla() + { + + dataGridView1.DataSource = null; + //revisar dataGridView1.DataSource = ControladoraProveedor.Instance.RecuperarProveedores(); + } + private void BtnAdd_Click(object sender, EventArgs e) + { + var form = new FrmProveedor(); + form.ShowDialog(); + ActualizarGrilla(); + } + } +} diff --git a/Vista/FrmProveedores.resx b/Vista/FrmProveedores.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmProveedores.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/FrmRemitos.Designer.cs b/Vista/FrmRemitos.Designer.cs new file mode 100644 index 0000000..2c2ec34 --- /dev/null +++ b/Vista/FrmRemitos.Designer.cs @@ -0,0 +1,110 @@ +namespace Vista +{ + partial class FrmRemitos + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + BtnEliminar = new Button(); + BtnModificar = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Controls.Add(BtnEliminar); + groupBox1.Controls.Add(BtnModificar); + groupBox1.Location = new Point(12, 12); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 5; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 302); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + // + // BtnEliminar + // + BtnEliminar.Location = new Point(215, 302); + BtnEliminar.Name = "BtnEliminar"; + BtnEliminar.Size = new Size(75, 23); + BtnEliminar.TabIndex = 2; + BtnEliminar.Text = "Eliminar"; + BtnEliminar.UseVisualStyleBackColor = true; + // + // BtnModificar + // + BtnModificar.Location = new Point(108, 302); + BtnModificar.Name = "BtnModificar"; + BtnModificar.Size = new Size(75, 23); + BtnModificar.TabIndex = 1; + BtnModificar.Text = "Modificar"; + BtnModificar.UseVisualStyleBackColor = true; + // + // FrmRemitos + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmRemitos"; + Text = "Remitos"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + private Button BtnEliminar; + private Button BtnModificar; + } +} \ No newline at end of file diff --git a/Vista/FrmRemitos.cs b/Vista/FrmRemitos.cs new file mode 100644 index 0000000..e001046 --- /dev/null +++ b/Vista/FrmRemitos.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 FrmRemitos : Form + { + public FrmRemitos() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmRemitos.resx b/Vista/FrmRemitos.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmRemitos.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/FrmVentas.Designer.cs b/Vista/FrmVentas.Designer.cs new file mode 100644 index 0000000..a1d3896 --- /dev/null +++ b/Vista/FrmVentas.Designer.cs @@ -0,0 +1,87 @@ +namespace Vista +{ + partial class FrmVentas + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + BtnAdd = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(BtnAdd); + groupBox1.Location = new Point(12, 12); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(776, 351); + groupBox1.TabIndex = 5; + groupBox1.TabStop = false; + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(6, 22); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(550, 235); + dataGridView1.TabIndex = 3; + // + // BtnAdd + // + BtnAdd.Location = new Point(6, 299); + BtnAdd.Name = "BtnAdd"; + BtnAdd.Size = new Size(75, 23); + BtnAdd.TabIndex = 0; + BtnAdd.Text = "Añadir"; + BtnAdd.UseVisualStyleBackColor = true; + + // + // FrmVentas + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(groupBox1); + Name = "FrmVentas"; + Text = "Ventas"; + WindowState = FormWindowState.Maximized; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private DataGridView dataGridView1; + private Button BtnAdd; + } +} \ No newline at end of file diff --git a/Vista/FrmVentas.cs b/Vista/FrmVentas.cs new file mode 100644 index 0000000..67c4889 --- /dev/null +++ b/Vista/FrmVentas.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 FrmVentas : Form + { + public FrmVentas() + { + InitializeComponent(); + } + } +} diff --git a/Vista/FrmVentas.resx b/Vista/FrmVentas.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Vista/FrmVentas.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 new file mode 100644 index 0000000..5dc70f8 --- /dev/null +++ b/Vista/PantallaPrincipal.Designer.cs @@ -0,0 +1,137 @@ +namespace Vista +{ + partial class PantallaPrincipal + { + /// + /// 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() + { + menuStrip1 = new MenuStrip(); + gestionarToolStripMenuItem = new ToolStripMenuItem(); + clientesToolStripMenuItem = new ToolStripMenuItem(); + ventasToolStripMenuItem = new ToolStripMenuItem(); + proveedoresToolStripMenuItem = new ToolStripMenuItem(); + productosToolStripMenuItem = new ToolStripMenuItem(); + remitosToolStripMenuItem = new ToolStripMenuItem(); + ordenDeCompraToolStripMenuItem = new ToolStripMenuItem(); + pedidosPresupuestoToolStripMenuItem = new ToolStripMenuItem(); + menuStrip1.SuspendLayout(); + SuspendLayout(); + // + // menuStrip1 + // + menuStrip1.Items.AddRange(new ToolStripItem[] { gestionarToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Size = new Size(800, 24); + menuStrip1.TabIndex = 0; + menuStrip1.Text = "menuStrip1"; + // + // gestionarToolStripMenuItem + // + gestionarToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { clientesToolStripMenuItem, ventasToolStripMenuItem, proveedoresToolStripMenuItem, productosToolStripMenuItem, remitosToolStripMenuItem, ordenDeCompraToolStripMenuItem, pedidosPresupuestoToolStripMenuItem }); + gestionarToolStripMenuItem.Name = "gestionarToolStripMenuItem"; + gestionarToolStripMenuItem.Size = new Size(69, 20); + gestionarToolStripMenuItem.Text = "Gestionar"; + // + // clientesToolStripMenuItem + // + clientesToolStripMenuItem.Name = "clientesToolStripMenuItem"; + clientesToolStripMenuItem.Size = new Size(181, 22); + clientesToolStripMenuItem.Text = "Clientes"; + clientesToolStripMenuItem.Click += clientesToolStripMenuItem_Click; + // + // ventasToolStripMenuItem + // + ventasToolStripMenuItem.Name = "ventasToolStripMenuItem"; + ventasToolStripMenuItem.Size = new Size(181, 22); + ventasToolStripMenuItem.Text = "Ventas"; + ventasToolStripMenuItem.Click += ventasToolStripMenuItem_Click; + // + // proveedoresToolStripMenuItem + // + proveedoresToolStripMenuItem.Name = "proveedoresToolStripMenuItem"; + proveedoresToolStripMenuItem.Size = new Size(181, 22); + proveedoresToolStripMenuItem.Text = "Proveedores"; + proveedoresToolStripMenuItem.Click += proveedoresToolStripMenuItem_Click; + // + // productosToolStripMenuItem + // + productosToolStripMenuItem.Name = "productosToolStripMenuItem"; + productosToolStripMenuItem.Size = new Size(181, 22); + productosToolStripMenuItem.Text = "Productos"; + productosToolStripMenuItem.Click += productosToolStripMenuItem_Click; + // + // remitosToolStripMenuItem + // + remitosToolStripMenuItem.Name = "remitosToolStripMenuItem"; + remitosToolStripMenuItem.Size = new Size(181, 22); + remitosToolStripMenuItem.Text = "Remitos"; + remitosToolStripMenuItem.Click += remitosToolStripMenuItem_Click; + // + // ordenDeCompraToolStripMenuItem + // + ordenDeCompraToolStripMenuItem.Name = "ordenDeCompraToolStripMenuItem"; + ordenDeCompraToolStripMenuItem.Size = new Size(181, 22); + ordenDeCompraToolStripMenuItem.Text = "OrdenDeCompra"; + ordenDeCompraToolStripMenuItem.Click += ordenDeCompraToolStripMenuItem_Click; + // + // pedidosPresupuestoToolStripMenuItem + // + pedidosPresupuestoToolStripMenuItem.Name = "pedidosPresupuestoToolStripMenuItem"; + pedidosPresupuestoToolStripMenuItem.Size = new Size(181, 22); + pedidosPresupuestoToolStripMenuItem.Text = "PedidosPresupuesto"; + pedidosPresupuestoToolStripMenuItem.Click += pedidosPresupuestoToolStripMenuItem_Click; + // + // PantallaPrincipal + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(menuStrip1); + IsMdiContainer = true; + MainMenuStrip = menuStrip1; + Name = "PantallaPrincipal"; + Text = "Form1"; + WindowState = FormWindowState.Maximized; + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private MenuStrip menuStrip1; + private ToolStripMenuItem gestionarToolStripMenuItem; + private ToolStripMenuItem ventasToolStripMenuItem; + private ToolStripMenuItem proveedoresToolStripMenuItem; + private ToolStripMenuItem productosToolStripMenuItem; + private ToolStripMenuItem remitosToolStripMenuItem; + private ToolStripMenuItem ordenDeCompraToolStripMenuItem; + private ToolStripMenuItem pedidosPresupuestoToolStripMenuItem; + private ToolStripMenuItem clientesToolStripMenuItem; + } +} \ No newline at end of file diff --git a/Vista/PantallaPrincipal.cs b/Vista/PantallaPrincipal.cs new file mode 100644 index 0000000..ef31fb7 --- /dev/null +++ b/Vista/PantallaPrincipal.cs @@ -0,0 +1,89 @@ +namespace Vista +{ + public partial class PantallaPrincipal : Form + { + public PantallaPrincipal() + { + InitializeComponent(); + } + + private void clientesToolStripMenuItem_Click(object sender, EventArgs e) + { + // Cerrar el formulario secundario actual si hay alguno + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmClientes(); + Frm.MdiParent = this; + Frm.Show(); + + } + + private void ventasToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmVentas(); + Frm.MdiParent = this; + Frm.Show(); + } + + private void proveedoresToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmProveedores(); + Frm.MdiParent = this; + Frm.Show(); + } + + private void productosToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmProductos(); + Frm.MdiParent = this; + Frm.Show(); + } + + private void remitosToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmRemitos(); + Frm.MdiParent = this; + Frm.Show(); + } + + private void ordenDeCompraToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmOrdenDeCompra(); + Frm.MdiParent = this; + Frm.Show(); + } + + private void pedidosPresupuestoToolStripMenuItem_Click(object sender, EventArgs e) + { + if (ActiveMdiChild != null) + { + ActiveMdiChild.Close(); + } + var Frm = new FrmPedidosDePresupuestos(); + Frm.MdiParent = this; + Frm.Show(); + } + } +} \ No newline at end of file diff --git a/Vista/PantallaPrincipal.resx b/Vista/PantallaPrincipal.resx new file mode 100644 index 0000000..a39c409 --- /dev/null +++ b/Vista/PantallaPrincipal.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + 25 + + \ No newline at end of file diff --git a/Vista/Program.cs b/Vista/Program.cs index f5e281a..40dc43a 100644 --- a/Vista/Program.cs +++ b/Vista/Program.cs @@ -11,7 +11,7 @@ namespace Vista // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new PantallaPrincipal()); } } } \ No newline at end of file diff --git a/Vista/Vista.csproj b/Vista/Vista.csproj index 26607aa..c308538 100644 --- a/Vista/Vista.csproj +++ b/Vista/Vista.csproj @@ -14,4 +14,8 @@ true + + + + \ No newline at end of file diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index 7814ea2..188a96d 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -1,8 +1,35 @@  - - - Form - - - + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + \ No newline at end of file diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs index c4602ec..5877391 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs +++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs @@ -18,10 +18,14 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] <<<<<<< HEAD +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")] ======= [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] >>>>>>> 3616449 (preparando merge) +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] +>>>>>>> 8ad9dc6 (faltan controladoras) [assembly: System.Reflection.AssemblyProductAttribute("Vista")] [assembly: System.Reflection.AssemblyTitleAttribute("Vista")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache index 8329291..217b422 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache +++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD 5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305 ======= a90b7be7f25b3be585c8c3eda0cd50696de263dc >>>>>>> 3616449 (preparando merge) +======= +244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6 +>>>>>>> 8ad9dc6 (faltan controladoras) diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig index 38c7c8c..3515758 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -9,7 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Vista <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/ +======= +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\ +>>>>>>> 8ad9dc6 (faltan controladoras) build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = ======= diff --git a/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfo.cs b/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfo.cs index 4498341..044bb9d 100644 --- a/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfo.cs +++ b/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Este código fue generado por una herramienta. +// Versión de runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si +// se vuelve a generar el código. // //------------------------------------------------------------------------------ @@ -14,12 +14,12 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Vista")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] [assembly: System.Reflection.AssemblyProductAttribute("Vista")] [assembly: System.Reflection.AssemblyTitleAttribute("Vista")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] [assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Generado por la clase WriteCodeFragment de MSBuild. diff --git a/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfoInputs.cache b/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfoInputs.cache index f846335..231b757 100644 --- a/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfoInputs.cache +++ b/Vista/obj/Release/net6.0-windows/Vista.AssemblyInfoInputs.cache @@ -1 +1 @@ -5c7eeffe8c03c0c0400edc2779c1a5f49505ced7 +281e45d05d567e56bd25031aebcd2e38799f1146d63fd738a708cca7c575e649 diff --git a/Vista/obj/Release/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Release/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig index 0aa13c7..a294098 100644 --- a/Vista/obj/Release/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Release/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Vista -build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Vista\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Vista/obj/Release/net6.0-windows/Vista.csproj.AssemblyReference.cache b/Vista/obj/Release/net6.0-windows/Vista.csproj.AssemblyReference.cache deleted file mode 100644 index 10d4e2a..0000000 Binary files a/Vista/obj/Release/net6.0-windows/Vista.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 967670c..894ec08 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, "projects": { @@ -12,6 +13,79 @@ "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/", +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {} + }, + "projects": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + } + } + }, + "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectName": "Vista", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -24,6 +98,7 @@ "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} }, "frameworks": { +<<<<<<< HEAD "net6.0": { "targetAlias": "net6.0", "projectReferences": { @@ -108,6 +183,15 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": {} +======= + "net6.0-windows7.0": { + "targetAlias": "net6.0-windows", + "projectReferences": { + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" + } + } +>>>>>>> 8ad9dc6 (faltan controladoras) } }, "warningProperties": { diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index 1fed161..0460a5c 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -2,6 +2,7 @@ "version": 3, "targets": { "net6.0-windows7.0": { +<<<<<<< HEAD "Emailer/1.0.0": { "type": "package", "dependencies": { @@ -5451,6 +5452,8 @@ "bin/placeholder/Controladora.dll": {} } }, +======= +>>>>>>> 8ad9dc6 (faltan controladoras) "Entidades/1.0.0": { "type": "project", "framework": ".NETCoreApp,Version=v6.0", @@ -5460,6 +5463,7 @@ "runtime": { "bin/placeholder/Entidades.dll": {} } +<<<<<<< HEAD }, "Modelo/1.0.0": { "type": "project", @@ -5473,10 +5477,13 @@ "runtime": { "bin/placeholder/Modelo.dll": {} } +======= +>>>>>>> 8ad9dc6 (faltan controladoras) } } }, "libraries": { +<<<<<<< HEAD "Emailer/1.0.0": { "sha512": "MKz/p7Nq4omeANwvqEm0RJRX2VRTkFwn0dmGHkxt5/TeWilN/rBEUMiGTX2ySHqh/QbQviPXnwfZQFaTK6JbGA==", "type": "package", @@ -13471,20 +13478,28 @@ "path": "../Controladora/Controladora.csproj", "msbuildProject": "../Controladora/Controladora.csproj" }, +======= +>>>>>>> 8ad9dc6 (faltan controladoras) "Entidades/1.0.0": { "type": "project", "path": "../Entidades/Entidades.csproj", "msbuildProject": "../Entidades/Entidades.csproj" +<<<<<<< HEAD }, "Modelo/1.0.0": { "type": "project", "path": "../Modelo/Modelo.csproj", "msbuildProject": "../Modelo/Modelo.csproj" +======= +>>>>>>> 8ad9dc6 (faltan controladoras) } }, "projectFileDependencyGroups": { "net6.0-windows7.0": [ +<<<<<<< HEAD "Controladora >= 1.0.0", +======= +>>>>>>> 8ad9dc6 (faltan controladoras) "Entidades >= 1.0.0" ] }, @@ -13494,11 +13509,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", "projectPath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/", +======= + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "projectName": "Vista", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\", +>>>>>>> 8ad9dc6 (faltan controladoras) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -13514,11 +13537,16 @@ "net6.0-windows7.0": { "targetAlias": "net6.0-windows", "projectReferences": { +<<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" }, "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" +======= + "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj" +>>>>>>> 8ad9dc6 (faltan controladoras) } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index 8849732..7a5ff53 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -1,5 +1,6 @@ { "version": 2, +<<<<<<< HEAD "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==", "success": true, "projectFilePath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", @@ -300,5 +301,11 @@ "/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512", "/home/fede/.nuget/packages/microsoft.netcore.app.host.linux-x64/6.0.31/microsoft.netcore.app.host.linux-x64.6.0.31.nupkg.sha512" ], +======= + "dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==", + "success": true, + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj", + "expectedPackageFiles": [], +>>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] } \ No newline at end of file