diff --git a/Controladora/bin/Debug/net6.0/Controladora.deps.json b/Controladora/bin/Debug/net6.0/Controladora.deps.json deleted file mode 100644 index 3498de1..0000000 --- a/Controladora/bin/Debug/net6.0/Controladora.deps.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "Controladora/1.0.0": { - "dependencies": { - "Entidades": "1.0.0", - "Modelo": "1.0.0" - }, - "runtime": { - "Controladora.dll": {} - } - }, - "Entidades/1.0.0": { - "runtime": { - "Entidades.dll": {} - } - }, - "Modelo/1.0.0": { - "dependencies": { - "Entidades": "1.0.0" - }, - "runtime": { - "Modelo.dll": {} - } - } - } - }, - "libraries": { - "Controladora/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Entidades/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Modelo/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll deleted file mode 100644 index 347cd62..0000000 Binary files a/Controladora/bin/Debug/net6.0/Controladora.dll and /dev/null differ diff --git a/Controladora/bin/Debug/net6.0/Controladora.pdb b/Controladora/bin/Debug/net6.0/Controladora.pdb deleted file mode 100644 index d5738a8..0000000 Binary files a/Controladora/bin/Debug/net6.0/Controladora.pdb and /dev/null differ diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 115a70f..29db889 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 "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "projectName": "Controladora", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -29,11 +43,19 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" }, "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } @@ -67,6 +89,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { @@ -75,6 +98,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -123,6 +156,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { @@ -131,6 +165,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -148,8 +192,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs deleted file mode 100644 index 5831642..0000000 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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("Controladora")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Controladora")] -[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Generated by the MSBuild WriteCodeFragment class. - diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache deleted file mode 100644 index 0be2eda..0000000 --- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0 diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 2a4d5f6..0000000 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Controladora -build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Controladora\ diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache deleted file mode 100644 index 5c6cd31..0000000 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -de87b0b29efe8d95b2a1e8b4f776d31f322c9a28 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 771db74..c65b434 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -49,20 +49,3 @@ C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll deleted file mode 100644 index 347cd62..0000000 Binary files a/Controladora/obj/Debug/net6.0/Controladora.dll and /dev/null differ diff --git a/Controladora/obj/Debug/net6.0/Controladora.pdb b/Controladora/obj/Debug/net6.0/Controladora.pdb deleted file mode 100644 index d5738a8..0000000 Binary files a/Controladora/obj/Debug/net6.0/Controladora.pdb and /dev/null differ diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll deleted file mode 100644 index f726175..0000000 Binary files a/Controladora/obj/Debug/net6.0/ref/Controladora.dll and /dev/null differ diff --git a/Controladora/obj/Debug/net6.0/refint/Controladora.dll b/Controladora/obj/Debug/net6.0/refint/Controladora.dll deleted file mode 100644 index f726175..0000000 Binary files a/Controladora/obj/Debug/net6.0/refint/Controladora.dll and /dev/null differ diff --git a/Controladora/obj/project.assets.json b/Controladora/obj/project.assets.json index 7c11aa3..ffe3249 100644 --- a/Controladora/obj/project.assets.json +++ b/Controladora/obj/project.assets.json @@ -51,11 +51,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\", +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "projectName": "Controladora", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -73,11 +81,19 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" }, "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache deleted file mode 100644 index 67d9c7d..0000000 --- a/Controladora/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "np352cObafySekJtDAqC2j8SApn6fgTohMHmvXCjxDtYRAbC7VcWOpg6GF7hfyKvsXu6RvlV5bEzt/dHdTMzpg==", - "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file diff --git a/Entidades/Producto.cs b/Entidades/Producto.cs index efaba67..4a8371f 100644 --- a/Entidades/Producto.cs +++ b/Entidades/Producto.cs @@ -9,7 +9,7 @@ namespace Entidades public string Nombre { get; set; } public double Precio { get; set; } public bool Habilitado { get; set; } - + public bool EsPerecedero { get; set; } [Browsable(false)] public Categoria Categoria { get; set; } @@ -21,7 +21,7 @@ namespace Entidades } } - private List proveedores = new List(); + public List proveedores = new List(); public void AñadirProveedor(Proveedor proveedor) { diff --git a/Entidades/ProductoNoPercedero.cs b/Entidades/ProductoNoPercedero.cs index 7101f87..8bdf15b 100644 --- a/Entidades/ProductoNoPercedero.cs +++ b/Entidades/ProductoNoPercedero.cs @@ -9,6 +9,11 @@ namespace Entidades public class ProductoNoPercedero : Producto { public EnvaseTipo TipoDeEnvase { get; set; } + + public ProductoNoPercedero() + { + EsPerecedero = false; // Indica que este producto no es perecedero + } } } diff --git a/Entidades/ProductoPercedero.cs b/Entidades/ProductoPercedero.cs index 7ae4ad8..58b2876 100644 --- a/Entidades/ProductoPercedero.cs +++ b/Entidades/ProductoPercedero.cs @@ -10,6 +10,11 @@ namespace Entidades { public int MesesHastaConsumoPreferente { get; set; } public int MesesHastaVencimiento { get; set; } + + public ProductoPercedero() + { + EsPerecedero = true; // Indica que este producto es perecedero + } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs deleted file mode 100644 index 7819913..0000000 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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("Entidades")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Entidades")] -[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Generated by the MSBuild WriteCodeFragment class. - diff --git a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache b/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache deleted file mode 100644 index 631e83c..0000000 --- a/Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -1589bc3738d4d92e8df1687e356ae3d2c87cb333 diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 4424f3a..0000000 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Entidades -build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Entidades\ diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index 855bcba..455a679 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 "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index 41615fc..6b5776d 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": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache deleted file mode 100644 index 4ada873..0000000 --- a/Entidades/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "/0GTyO6ckhdqO7zKMB1HLRdsMAWD7uaqWqeG9E3ixe4uSgyRj78n0jNxMGk/5CW97RRUL5P0Sy15/HFST15qhA==", - "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file diff --git a/Informes/bin/Debug/net6.0/Entidades.dll b/Informes/bin/Debug/net6.0/Entidades.dll deleted file mode 100644 index 287edd7..0000000 Binary files a/Informes/bin/Debug/net6.0/Entidades.dll and /dev/null differ diff --git a/Informes/bin/Debug/net6.0/Entidades.pdb b/Informes/bin/Debug/net6.0/Entidades.pdb deleted file mode 100644 index a97a8ec..0000000 Binary files a/Informes/bin/Debug/net6.0/Entidades.pdb and /dev/null differ diff --git a/Informes/bin/Debug/net6.0/Informes.deps.json b/Informes/bin/Debug/net6.0/Informes.deps.json deleted file mode 100644 index 0f33dc6..0000000 --- a/Informes/bin/Debug/net6.0/Informes.deps.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "Informes/1.0.0": { - "dependencies": { - "Entidades": "1.0.0" - }, - "runtime": { - "Informes.dll": {} - } - }, - "Entidades/1.0.0": { - "runtime": { - "Entidades.dll": {} - } - } - } - }, - "libraries": { - "Informes/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Entidades/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/Informes/bin/Debug/net6.0/Informes.dll b/Informes/bin/Debug/net6.0/Informes.dll deleted file mode 100644 index 03b20de..0000000 Binary files a/Informes/bin/Debug/net6.0/Informes.dll and /dev/null differ diff --git a/Informes/bin/Debug/net6.0/Informes.pdb b/Informes/bin/Debug/net6.0/Informes.pdb deleted file mode 100644 index 2cf45f4..0000000 Binary files a/Informes/bin/Debug/net6.0/Informes.pdb and /dev/null differ diff --git a/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs b/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs deleted file mode 100644 index 9adc184..0000000 --- a/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache b/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache deleted file mode 100644 index f8aafb3..0000000 --- a/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -55f9793ce92bee586e65f5b38a3a7676261de34c diff --git a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 3131900..0000000 --- a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Informes -build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\ diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache b/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache deleted file mode 100644 index 09469f1..0000000 Binary files a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete b/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache b/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache deleted file mode 100644 index 49630e3..0000000 --- a/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -100fa21bf2f76b06ab70964d65200e354f5837e3 diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt b/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt index 8de8d9e..f4b68f0 100644 --- a/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt +++ b/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt @@ -43,18 +43,3 @@ C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.dll C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\refint\Informes.dll C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.pdb C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\ref\Informes.dll -C:\Users\fedpo\Desktop\final actual\Informes\bin\Debug\net6.0\Informes.deps.json -C:\Users\fedpo\Desktop\final actual\Informes\bin\Debug\net6.0\Informes.dll -C:\Users\fedpo\Desktop\final actual\Informes\bin\Debug\net6.0\Informes.pdb -C:\Users\fedpo\Desktop\final actual\Informes\bin\Debug\net6.0\Entidades.dll -C:\Users\fedpo\Desktop\final actual\Informes\bin\Debug\net6.0\Entidades.pdb -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.dll -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\refint\Informes.dll -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\Informes.pdb -C:\Users\fedpo\Desktop\final actual\Informes\obj\Debug\net6.0\ref\Informes.dll diff --git a/Informes/obj/Debug/net6.0/Informes.dll b/Informes/obj/Debug/net6.0/Informes.dll deleted file mode 100644 index 03b20de..0000000 Binary files a/Informes/obj/Debug/net6.0/Informes.dll and /dev/null differ diff --git a/Informes/obj/Debug/net6.0/Informes.pdb b/Informes/obj/Debug/net6.0/Informes.pdb deleted file mode 100644 index 2cf45f4..0000000 Binary files a/Informes/obj/Debug/net6.0/Informes.pdb and /dev/null differ diff --git a/Informes/obj/Debug/net6.0/ref/Informes.dll b/Informes/obj/Debug/net6.0/ref/Informes.dll deleted file mode 100644 index c627a33..0000000 Binary files a/Informes/obj/Debug/net6.0/ref/Informes.dll and /dev/null differ diff --git a/Informes/obj/Debug/net6.0/refint/Informes.dll b/Informes/obj/Debug/net6.0/refint/Informes.dll deleted file mode 100644 index c627a33..0000000 Binary files a/Informes/obj/Debug/net6.0/refint/Informes.dll and /dev/null differ diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json index 4da9f7d..8a0282d 100644 --- a/Informes/obj/Informes.csproj.nuget.dgspec.json +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -1,6 +1,7 @@ { "format": 1, "restore": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -60,6 +74,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { @@ -68,6 +83,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "projectName": "Informes", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -85,8 +110,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json index ebfbc50..798d56f 100644 --- a/Informes/obj/project.assets.json +++ b/Informes/obj/project.assets.json @@ -32,11 +32,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", "projectName": "Informes", "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "projectName": "Informes", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,8 +62,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache deleted file mode 100644 index 0fbb6b4..0000000 --- a/Informes/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==", - "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs deleted file mode 100644 index 2887e42..0000000 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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("Modelo")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Modelo")] -[assembly: System.Reflection.AssemblyTitleAttribute("Modelo")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Generated by the MSBuild WriteCodeFragment class. - diff --git a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache b/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache deleted file mode 100644 index 80eacf3..0000000 --- a/Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -96d0d59bfa69a3c27ef653a551fb81c45157d195 diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 2c49218..0000000 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Modelo -build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Modelo\ diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index d634459..ec7cb7b 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 "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -60,6 +74,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { @@ -68,6 +83,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -85,8 +110,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index eb06342..04cda91 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": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,8 +62,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache deleted file mode 100644 index e088078..0000000 --- a/Modelo/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "LrWJOMqIMenAWC4paM9402b7FV896gLe4vhXhTZKn46p/6wvpgyZUKfeH8XUIMVZeE7LLlGd9Hai9lsFf8WBhA==", - "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file diff --git a/Vista/FrmProducto.Designer.cs b/Vista/FrmProducto.Designer.cs index 9b4a3df..7ddcd0b 100644 --- a/Vista/FrmProducto.Designer.cs +++ b/Vista/FrmProducto.Designer.cs @@ -46,10 +46,19 @@ dgvProveedor = new DataGridView(); btnaddProveedor = new Button(); btnrmProveedor = new Button(); + checkBox1 = new CheckBox(); + label8 = new Label(); + label9 = new Label(); + label10 = new Label(); + numericUpDown1 = new NumericUpDown(); + numericUpDown2 = new NumericUpDown(); + comboBox1 = new ComboBox(); ((System.ComponentModel.ISupportInitialize)numId).BeginInit(); ((System.ComponentModel.ISupportInitialize)numPrecio).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedorAñadido).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedor).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown2).BeginInit(); SuspendLayout(); // // label1 @@ -142,7 +151,7 @@ // // btnacept // - btnacept.Location = new Point(13, 194); + btnacept.Location = new Point(14, 336); btnacept.Name = "btnacept"; btnacept.Size = new Size(72, 21); btnacept.TabIndex = 10; @@ -152,7 +161,7 @@ // // btncancel // - btncancel.Location = new Point(122, 194); + btncancel.Location = new Point(106, 336); btncancel.Name = "btncancel"; btncancel.Size = new Size(68, 21); btncancel.TabIndex = 11; @@ -221,13 +230,85 @@ btnrmProveedor.UseVisualStyleBackColor = true; btnrmProveedor.Click += btnrmProveedor_Click; // + // checkBox1 + // + checkBox1.AutoSize = true; + checkBox1.Location = new Point(7, 187); + checkBox1.Name = "checkBox1"; + checkBox1.Size = new Size(79, 19); + checkBox1.TabIndex = 18; + checkBox1.Text = "Percedero"; + checkBox1.UseVisualStyleBackColor = true; + checkBox1.CheckedChanged += checkBox1_CheckedChanged; + // + // label8 + // + label8.AutoSize = true; + label8.Location = new Point(25, 230); + label8.Name = "label8"; + label8.Size = new Size(185, 15); + label8.TabIndex = 20; + label8.Text = "Meses Hasta Consumo Preferente"; + // + // label9 + // + label9.AutoSize = true; + label9.Location = new Point(141, 289); + label9.Name = "label9"; + label9.Size = new Size(69, 15); + label9.TabIndex = 21; + label9.Text = "Tipo Envase"; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new Point(68, 259); + label10.Name = "label10"; + label10.Size = new Size(142, 15); + label10.TabIndex = 22; + label10.Text = "Meses Hasta Vencimiento"; + // + // numericUpDown1 + // + numericUpDown1.Enabled = false; + numericUpDown1.Location = new Point(230, 222); + numericUpDown1.Name = "numericUpDown1"; + numericUpDown1.Size = new Size(120, 23); + numericUpDown1.TabIndex = 23; + numericUpDown1.ValueChanged += numericUpDown1_ValueChanged; + // + // numericUpDown2 + // + numericUpDown2.Enabled = false; + numericUpDown2.Location = new Point(229, 252); + numericUpDown2.Name = "numericUpDown2"; + numericUpDown2.Size = new Size(120, 23); + numericUpDown2.TabIndex = 24; + numericUpDown2.ValueChanged += numericUpDown2_ValueChanged; + // + // comboBox1 + // + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; + comboBox1.FormattingEnabled = true; + comboBox1.Location = new Point(228, 281); + comboBox1.Name = "comboBox1"; + comboBox1.Size = new Size(121, 23); + comboBox1.TabIndex = 25; + // // FrmProducto // AcceptButton = btnacept; AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; CancelButton = btncancel; - ClientSize = new Size(877, 228); + ClientSize = new Size(877, 369); + Controls.Add(comboBox1); + Controls.Add(numericUpDown2); + Controls.Add(numericUpDown1); + Controls.Add(label10); + Controls.Add(label9); + Controls.Add(label8); + Controls.Add(checkBox1); Controls.Add(btnrmProveedor); Controls.Add(btnaddProveedor); Controls.Add(dgvProveedor); @@ -252,6 +333,8 @@ ((System.ComponentModel.ISupportInitialize)numPrecio).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedorAñadido).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedor).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown2).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -276,5 +359,12 @@ private DataGridView dgvProveedor; private Button btnaddProveedor; private Button btnrmProveedor; + private CheckBox checkBox1; + private Label label8; + private Label label9; + private Label label10; + private NumericUpDown numericUpDown1; + private NumericUpDown numericUpDown2; + private ComboBox comboBox1; } } \ No newline at end of file diff --git a/Vista/FrmProducto.cs b/Vista/FrmProducto.cs index 59fecb1..f70b831 100644 --- a/Vista/FrmProducto.cs +++ b/Vista/FrmProducto.cs @@ -22,6 +22,8 @@ namespace Vista InitializeComponent(); CargarCategorias(); CargarTabla(); + cargarcombo(); + if (producto != null) { nuevoproducto = producto; @@ -29,8 +31,10 @@ namespace Vista InicializarFormulario(); } } - - + private void cargarcombo() + { + comboBox1.DataSource = Enum.GetValues(typeof(EnvaseTipo)); + } private void InicializarFormulario() { numId.Value = nuevoproducto.Id; @@ -83,7 +87,6 @@ namespace Vista // Validar Nombre if (string.IsNullOrEmpty(txtNombre.Text)) { devolucion += "El nombre del producto no puede estar vacío.\n"; } if (txtNombre.Text.Length > 100) { devolucion += "El nombre del producto no puede superar los 100 caracteres.\n"; } - if (numId.Value <= 0) { devolucion += "NO es un cuit válido"; }; // Validar Precio if (numPrecio.Value <= 0) @@ -103,6 +106,20 @@ namespace Vista devolucion += "Debe seleccionar una categoría.\n"; } + // Validar Tipo de Producto + if (!checkBox1.Checked && comboBox1.SelectedItem == null) + { + devolucion += "Debe seleccionar un tipo de envase para el producto no perecedero.\n"; + } + + if (checkBox1.Checked) // Producto Perecedero + { + if (numericUpDown1.Value <= 0 || numericUpDown2.Value <= 0) + { + devolucion += "Los meses hasta consumo preferente y vencimiento deben ser mayores a cero.\n"; + } + } + if (devolucion == "") { return true; @@ -118,23 +135,48 @@ namespace Vista { if (ValidarDatos()) { - nuevoproducto.Nombre = txtNombre.Text; - nuevoproducto.Precio = (double)numPrecio.Value; - nuevoproducto.Habilitado = checkHabilitado.Checked; - nuevoproducto.Categoria = (Categoria)cmbCategoria.SelectedItem; + var proveedores = new List(nuevoproducto.ListarProveedores()); - string mensaje; - if (mod) + if (checkBox1.Checked) // Producto Perecedero { - mensaje = ControladoraProductos.Instance.Modificar(nuevoproducto); + var productoPerecedero = new ProductoPercedero + { + Id = (int)numId.Value, + Nombre = txtNombre.Text, + Precio = (double)numPrecio.Value, + Habilitado = checkHabilitado.Checked, + Categoria = (Categoria)cmbCategoria.SelectedItem, + MesesHastaConsumoPreferente = (int)numericUpDown1.Value, + MesesHastaVencimiento = (int)numericUpDown2.Value, + proveedores = proveedores + }; + + string mensaje = mod + ? ControladoraProductos.Instance.Modificar(productoPerecedero) + : ControladoraProductos.Instance.Añadir(productoPerecedero); + + MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); } - else + else // Producto No Perecedero { - nuevoproducto.Id = (int)numId.Value; - mensaje = ControladoraProductos.Instance.Añadir(nuevoproducto); + var productoNoPerecedero = new ProductoNoPercedero + { + Id = (int)numId.Value, + Nombre = txtNombre.Text, + Precio = (double)numPrecio.Value, + Habilitado = checkHabilitado.Checked, + Categoria = (Categoria)cmbCategoria.SelectedItem, + TipoDeEnvase = (EnvaseTipo)comboBox1.SelectedItem, + proveedores = proveedores + }; + + string mensaje = mod + ? ControladoraProductos.Instance.Modificar(productoNoPerecedero) + : ControladoraProductos.Instance.Añadir(productoNoPerecedero); + + MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); } - MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); Close(); } } @@ -146,7 +188,7 @@ namespace Vista private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) { - // Puedes usar este método para manejar cambios en el ComboBox si es necesario + } private void btnaddProveedor_Click(object sender, EventArgs e) @@ -199,5 +241,23 @@ namespace Vista } } + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + bool esPerecedero = checkBox1.Checked; + + numericUpDown1.Enabled = esPerecedero; + numericUpDown2.Enabled = esPerecedero; + comboBox1.Enabled = !esPerecedero; + } + + private void numericUpDown2_ValueChanged(object sender, EventArgs e) + { + + } + + private void numericUpDown1_ValueChanged(object sender, EventArgs e) + { + + } } } diff --git a/Vista/FrmProducto.resx b/Vista/FrmProducto.resx index a395bff..af32865 100644 --- a/Vista/FrmProducto.resx +++ b/Vista/FrmProducto.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/FrmProductos.Designer.cs b/Vista/FrmProductos.Designer.cs index 201e21f..39d7344 100644 --- a/Vista/FrmProductos.Designer.cs +++ b/Vista/FrmProductos.Designer.cs @@ -39,10 +39,16 @@ button1 = new Button(); dgvCategorias = new DataGridView(); label1 = new Label(); + dataGridView1 = new DataGridView(); + dataGridView2 = new DataGridView(); + label4 = new Label(); + label5 = new Label(); groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dgvProveedores).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvProductos).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvCategorias).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); SuspendLayout(); // // groupBox1 @@ -162,11 +168,55 @@ label1.TabIndex = 7; label1.Text = "Categorias"; // + // dataGridView1 + // + dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(18, 341); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView1.Size = new Size(439, 245); + dataGridView1.TabIndex = 8; + dataGridView1.CellContentClick += dataGridView1_CellContentClick; + // + // dataGridView2 + // + dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView2.Location = new Point(587, 341); + dataGridView2.Name = "dataGridView2"; + dataGridView2.RowTemplate.Height = 25; + dataGridView2.Size = new Size(420, 245); + dataGridView2.TabIndex = 9; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(587, 323); + label4.Name = "label4"; + label4.Size = new Size(143, 15); + label4.TabIndex = 12; + label4.Text = "Productos NO Percederos"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new Point(18, 323); + label5.Name = "label5"; + label5.Size = new Size(125, 15); + label5.TabIndex = 13; + label5.Text = "Productos Percederos"; + // // FrmProductos // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1088, 515); + ClientSize = new Size(1088, 589); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(dataGridView2); + Controls.Add(dataGridView1); Controls.Add(label1); Controls.Add(button1); Controls.Add(dgvCategorias); @@ -179,6 +229,8 @@ ((System.ComponentModel.ISupportInitialize)dgvProveedores).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvProductos).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvCategorias).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -196,5 +248,9 @@ private DataGridView dgvProveedores; private Label label3; private Button btnModificar; + private DataGridView dataGridView1; + private DataGridView dataGridView2; + private Label label4; + private Label label5; } } \ No newline at end of file diff --git a/Vista/FrmProductos.cs b/Vista/FrmProductos.cs index b96419e..0f35f40 100644 --- a/Vista/FrmProductos.cs +++ b/Vista/FrmProductos.cs @@ -23,9 +23,79 @@ namespace Vista { InitializeComponent(); ConfigurarDataGridView(); + ConfigurarDataGridViewPerecedero(); + ConfigurarDataGridViewNoPerecedero(); ActualizarGrilla(); - } + } + private void ConfigurarDataGridViewNoPerecedero() + { + dataGridView2.AutoGenerateColumns = false; + + // Crear una columna para el nombre + var colNombre = new DataGridViewTextBoxColumn + { + DataPropertyName = "Nombre", + HeaderText = "Nombre", + Name = "Nombre", + Width = 150 + }; + + // Crear una columna para el tipo de envase + var colTipoDeEnvase = new DataGridViewTextBoxColumn + { + DataPropertyName = "TipoDeEnvase", + HeaderText = "Tipo de Envase", + Name = "TipoDeEnvase", + Width = 200 + }; + + // Limpiar columnas existentes + dataGridView2.Columns.Clear(); + + // Agregar las columnas al DataGridView + dataGridView2.Columns.Add(colNombre); + dataGridView2.Columns.Add(colTipoDeEnvase); + } + private void ConfigurarDataGridViewPerecedero() + { + dataGridView1.AutoGenerateColumns = false; + + // Crear una columna para el nombre + var colNombre = new DataGridViewTextBoxColumn + { + DataPropertyName = "Nombre", + HeaderText = "Nombre", + Name = "Nombre", + + }; + + // Crear una columna para los meses hasta consumo preferente + var colMesesHastaConsumoPreferente = new DataGridViewTextBoxColumn + { + DataPropertyName = "MesesHastaConsumoPreferente", + HeaderText = "Meses Hasta Consumo Preferente", + Name = "MesesHastaConsumoPreferente", + + }; + + // Crear una columna para los meses hasta vencimiento + var colMesesHastaVencimiento = new DataGridViewTextBoxColumn + { + DataPropertyName = "MesesHastaVencimiento", + HeaderText = "Meses Hasta Vencimiento", + Name = "MesesHastaVencimiento", + + }; + + // Limpiar columnas existentes + dataGridView1.Columns.Clear(); + + // Agregar las columnas al DataGridView + dataGridView1.Columns.Add(colNombre); + dataGridView1.Columns.Add(colMesesHastaConsumoPreferente); + dataGridView1.Columns.Add(colMesesHastaVencimiento); + } private void ConfigurarDataGridView() { dgvProductos.AutoGenerateColumns = false; @@ -53,7 +123,7 @@ namespace Vista HeaderText = "Precio", Name = "Precio" }; - var colHabilitado = new DataGridViewTextBoxColumn + var colHabilitado = new DataGridViewCheckBoxColumn { DataPropertyName = "Habilitado", HeaderText = "Habilitado", @@ -77,6 +147,17 @@ namespace Vista private void ActualizarGrilla() { + // Obtén todos los productos de la controladora o la fuente de datos + var todosLosProductos = ControladoraProductos.Instance.Listar(); + + // Filtra los productos perecederos y no perecederos + var productosPerecederos = todosLosProductos.OfType().ToList(); + var productosNoPerecederos = todosLosProductos.OfType().ToList(); + dataGridView1.DataSource = null; // Limpiar la fuente de datos + dataGridView1.DataSource = productosPerecederos; + dataGridView2.DataSource = null; // Limpiar la fuente de datos + dataGridView2.DataSource = productosNoPerecederos; + dgvProductos.DataSource = null; dgvCategorias.DataSource = null; var categorias = ControladoraCategorias.Instance.Listar(); @@ -197,6 +278,11 @@ namespace Vista dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto); } } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } } } diff --git a/Vista/FrmProductos.resx b/Vista/FrmProductos.resx index a395bff..af32865 100644 --- a/Vista/FrmProductos.resx +++ b/Vista/FrmProductos.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs deleted file mode 100644 index 2bd3293..0000000 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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("Vista")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[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. - diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache deleted file mode 100644 index 4817387..0000000 --- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -a90b7be7f25b3be585c8c3eda0cd50696de263dc diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index bd0dedb..0000000 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -is_global = true -build_property.ApplicationManifest = -build_property.StartupObject = -build_property.ApplicationDefaultFont = -build_property.ApplicationHighDpiMode = -build_property.ApplicationUseCompatibleTextRendering = -build_property.ApplicationVisualStyles = -build_property.TargetFramework = net6.0-windows -build_property.TargetPlatformMinVersion = 7.0 -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Vista -build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Vista\ diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index a284a3e..a3d7486 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 "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": {} }, "projects": { @@ -12,6 +13,19 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "projectName": "Controladora", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -29,11 +43,19 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" }, "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } @@ -67,6 +89,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { @@ -75,6 +98,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -123,6 +156,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { @@ -131,6 +165,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "projectName": "Informes", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -148,8 +192,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } @@ -183,6 +232,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { @@ -191,6 +241,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "projectName": "Modelo", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -208,8 +268,13 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } @@ -243,6 +308,7 @@ } } }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": { "version": "1.0.0", "restore": { @@ -251,6 +317,16 @@ "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\", +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj", + "projectName": "Vista", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -268,6 +344,7 @@ "net6.0-windows7.0": { "targetAlias": "net6.0-windows", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj" }, @@ -276,6 +353,16 @@ }, "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index d189f35..cb61187 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -89,11 +89,19 @@ "project": { "version": "1.0.0", "restore": { +<<<<<<< HEAD "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", "projectName": "Vista", "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\", +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj", + "projectName": "Vista", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\obj\\", +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -111,6 +119,7 @@ "net6.0-windows7.0": { "targetAlias": "net6.0-windows", "projectReferences": { +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj" }, @@ -119,6 +128,16 @@ }, "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj" +>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857 } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache deleted file mode 100644 index b12779f..0000000 --- a/Vista/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "gyaSDyhAEltsBq1SxwLKEOqPbB2IW2zDbINK1KYLaJWegAP+gIwAtx825hGyReI296cfGwKvGufohyuIn4hSwA==", - "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file