diff --git a/Controladora/ControladoraLotes.cs b/Controladora/ControladoraLotes.cs index e2b7001..d52dd60 100644 --- a/Controladora/ControladoraLotes.cs +++ b/Controladora/ControladoraLotes.cs @@ -11,62 +11,6 @@ namespace Controladora { public class ControladoraLotes : Singleton { - /* - public string Añadir(Lote t) - { - if (t == null) return "El Lote es nulo, falló la carga"; - - try - { - bool resultado = RepositorioLote.Instance.Add(t); - return resultado ? - $"El Lote con el ID {t.Id} se cargó correctamente" : - $"Falló la carga del Lote con el ID {t.Id}"; - } - catch (Exception ex) - { - // Captura cualquier excepción no prevista - return $"Ocurrió un error inesperado: {ex.Message}"; - } - } - - public string Modificar(Lote t) - { - if (t == null) return "El Lote es nulo, falló la modificación"; - - try - { - bool resultado = RepositorioLote.Instance.Mod(t); - return resultado ? - $"El Lote con el ID {t.Id} se modificó correctamente" : - $"Falló la modificación del Lote con el ID {t.Id}"; - } - catch (Exception ex) - { - // Captura cualquier excepción no prevista - return $"Ocurrió un error inesperado: {ex.Message}"; - } - } - - public string Eliminar(Lote t) - { - if (t == null) return "El Lote es nulo, falló la eliminación"; - - try - { - bool resultado = RepositorioLote.Instance.Del(t); - return resultado ? - $"El Lote con el ID {t.Id} se eliminó correctamente" : - $"Falló la eliminación del Lote con el ID {t.Id}"; - } - catch (Exception ex) - { - // Captura cualquier excepción no prevista - return $"Ocurrió un error inesperado: {ex.Message}"; - } - } - */ - public string DisminuirStock(ReadOnlyCollection detalleFactura) { var ret = false; @@ -75,9 +19,9 @@ namespace Controladora if (detalle == null) return "El detalle es nulo"; if (detalle.Producto.Id < 0) return "Esta mal cargada la Id de producto"; var productos = RepositorioProductos.Instance.Listar(); - if (productos.Any(x => x.Id != detalle.Producto.Id)) return "No hay Productos con esa id"; + if (!productos.Any(x => x.Id == detalle.Producto.Id)) return "No hay Productos con esa id"; ret = RepositorioLote.Instance.DisminuirStock(detalle); - + } return (ret) ? @@ -91,7 +35,7 @@ namespace Controladora if (producto == null) return 0; if (producto.Id < 0) return 0; var lotes = RepositorioLote.Instance.Listar(); - if (lotes.Any(x => x.Producto.Id != producto.Id)) return 0; // basicamente no hay productos con esa id + if (!lotes.Any(x => x.Producto.Id == producto.Id)) return 0; // basicamente no hay productos con esa id var CantidadStock = lotes .Where(x => x.Producto.Id == producto.Id) diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 8f7a8e9..dcfa5ef 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {} }, @@ -51,12 +52,15 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {} >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {} +>>>>>>> 855ce7c (AAAAAAAAAAA) }, "projects": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", "projectName": "Controladora", <<<<<<< HEAD <<<<<<< HEAD @@ -64,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -114,6 +119,11 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -145,6 +155,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -226,6 +237,13 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } @@ -271,6 +289,7 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "version": "1.0.0", @@ -410,12 +429,16 @@ ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { +>>>>>>> 855ce7c (AAAAAAAAAAA) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", <<<<<<< HEAD ======= @@ -430,6 +453,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -478,13 +504,14 @@ } } }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", <<<<<<< HEAD ======= @@ -499,6 +526,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -516,6 +546,7 @@ "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" <<<<<<< HEAD @@ -525,6 +556,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 536f904..62b93e0 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -85,4 +85,24 @@ C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.d 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 +<<<<<<< HEAD >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Controladora.deps.json +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Controladora.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Controladora.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Entidades.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Modelo.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Modelo.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\bin\Debug\net6.0\Entidades.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\refint\Controladora.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\ref\Controladora.dll +>>>>>>> 855ce7c (AAAAAAAAAAA) diff --git a/Controladora/obj/project.assets.json b/Controladora/obj/project.assets.json index 7c85bf5..c75aa15 100644 --- a/Controladora/obj/project.assets.json +++ b/Controladora/obj/project.assets.json @@ -65,6 +65,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "projectName": "Controladora", @@ -110,9 +111,13 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\", <<<<<<< HEAD ======= @@ -124,6 +129,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -155,6 +163,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -236,6 +245,13 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index 2afc785..e519a5d 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, @@ -51,12 +52,15 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {} >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {} +>>>>>>> 855ce7c (AAAAAAAAAAA) }, "projects": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD @@ -64,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -114,6 +119,11 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "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 da0e31b..1e82bcf 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -27,6 +27,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", @@ -72,9 +73,13 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", <<<<<<< HEAD ======= @@ -86,6 +91,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig index 197f89f..8e7e19d 100644 --- a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig +++ b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig @@ -10,6 +10,7 @@ build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Informes <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\ ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Informes\ @@ -17,3 +18,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\ ======= build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\ +>>>>>>> 855ce7c (AAAAAAAAAAA) diff --git a/Informes/obj/Debug/net6.0/Informes.assets.cache b/Informes/obj/Debug/net6.0/Informes.assets.cache index 161d96b..aa5b1dd 100644 Binary files a/Informes/obj/Debug/net6.0/Informes.assets.cache and b/Informes/obj/Debug/net6.0/Informes.assets.cache differ diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache b/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache index 4f1310f..410337b 100644 --- a/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache +++ b/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5 ======= 100fa21bf2f76b06ab70964d65200e354f5837e3 @@ -7,3 +8,6 @@ ======= b8f7575a0ad69c743b6dc87a6ac87340793ee335 >>>>>>> 8b80e42 (falta que se actualize numProducto y los infomes) +======= +ad77f22dc36643a40b80d001672cc4f6dc648e45 +>>>>>>> 855ce7c (AAAAAAAAAAA) diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt b/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt index 022cfd8..424f2f9 100644 --- a/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt +++ b/Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt @@ -75,4 +75,22 @@ 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 +<<<<<<< HEAD >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.deps.json +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Entidades.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Entidades.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\refint\Informes.dll +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.pdb +C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\ref\Informes.dll +>>>>>>> 855ce7c (AAAAAAAAAAA) diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json index 4dc5a5a..efcf622 100644 --- a/Informes/obj/Informes.csproj.nuget.dgspec.json +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -1,16 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {} + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", <<<<<<< HEAD ======= @@ -28,6 +29,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -76,13 +80,14 @@ } } }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", <<<<<<< HEAD ======= @@ -97,6 +102,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -114,6 +122,7 @@ "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" <<<<<<< HEAD @@ -123,6 +132,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json index ef91def..1f855c3 100644 --- a/Informes/obj/project.assets.json +++ b/Informes/obj/project.assets.json @@ -32,10 +32,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", <<<<<<< HEAD ======= @@ -47,6 +48,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -64,6 +68,7 @@ "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" <<<<<<< HEAD @@ -73,6 +78,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache index 2498386..4a608d0 100644 --- a/Informes/obj/project.nuget.cache +++ b/Informes/obj/project.nuget.cache @@ -1,6 +1,7 @@ { "version": 2, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==", "success": true, @@ -15,6 +16,11 @@ "success": true, "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "dgSpecHash": "+fAmxvUxzXFJdL6cjwnLzpFPUy6kbZ77RHAmwP73fYrskGO9Qznx7rWzPtjjeDphCNfQ5J+s1nW7KRZF6IabWg==", + "success": true, + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/RepositorioLote.cs b/Modelo/RepositorioLote.cs index e80a3f9..434e47f 100644 --- a/Modelo/RepositorioLote.cs +++ b/Modelo/RepositorioLote.cs @@ -82,22 +82,22 @@ namespace Modelo } public bool DisminuirStock(DetalleFactura detalleFactura) { - bool ret = false; - while (detalleFactura.Cantidad > 0) + bool ret = false; int cantidad = detalleFactura.Cantidad; + while (cantidad > 0) { var elementoAdisminuir = almacen.Where(x=> x.Habilitado == true) .First(x => x.Producto.Id == detalleFactura.Producto.Id); - detalleFactura.Cantidad -= elementoAdisminuir.Cantidad; + cantidad -= elementoAdisminuir.Cantidad; - if (detalleFactura.Cantidad > 0) + if (cantidad >= 0) { elementoAdisminuir.Cantidad = 0; elementoAdisminuir.Habilitado = false; } else { - elementoAdisminuir.Cantidad = -detalleFactura.Cantidad; + elementoAdisminuir.Cantidad = -cantidad; ret = true; } } diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 8d3b071..cbe7bf6 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, @@ -51,12 +52,15 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {} >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {} +>>>>>>> 855ce7c (AAAAAAAAAAA) }, "projects": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD @@ -64,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -114,6 +119,11 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -204,6 +214,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) @@ -227,9 +238,12 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { +>>>>>>> 855ce7c (AAAAAAAAAAA) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", "projectName": "Modelo", <<<<<<< HEAD <<<<<<< HEAD @@ -237,6 +251,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -284,6 +299,11 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -315,6 +335,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -362,6 +383,10 @@ "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index 3a6f209..3fad522 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -46,6 +46,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", @@ -91,9 +92,13 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", <<<<<<< HEAD ======= @@ -105,6 +110,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -136,6 +144,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -183,6 +192,10 @@ "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index f06de3c..86921f6 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, @@ -51,15 +52,19 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": {} >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": {} +>>>>>>> 855ce7c (AAAAAAAAAAA) }, "projects": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\", <<<<<<< HEAD ======= @@ -77,6 +82,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -94,9 +102,10 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj" <<<<<<< HEAD @@ -109,6 +118,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } @@ -142,13 +155,14 @@ } } }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\", <<<<<<< HEAD ======= @@ -163,6 +177,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -211,13 +228,14 @@ } } }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\", <<<<<<< HEAD ======= @@ -232,6 +250,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -249,6 +270,7 @@ "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" <<<<<<< HEAD @@ -258,6 +280,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } @@ -291,7 +317,7 @@ } } }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { <<<<<<< HEAD @@ -300,6 +326,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", @@ -334,9 +361,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\", <<<<<<< HEAD "projectStyle": "PackageReference", @@ -479,6 +510,9 @@ "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\", ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -496,6 +530,7 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj" @@ -503,6 +538,10 @@ "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } @@ -536,6 +575,7 @@ } } }, +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": { "version": "1.0.0", @@ -548,14 +588,21 @@ >>>>>>> 88e614d (god) ======= "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": { +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": { +>>>>>>> 855ce7c (AAAAAAAAAAA) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\", >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -804,6 +851,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -857,12 +905,17 @@ "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj" >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" @@ -892,6 +945,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index 21b3e0d..6303b28 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -13578,6 +13578,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", @@ -13623,9 +13624,13 @@ >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", +<<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\", <<<<<<< HEAD ======= @@ -13637,6 +13642,9 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\", +>>>>>>> 855ce7c (AAAAAAAAAAA) "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -13668,6 +13676,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -13726,12 +13735,17 @@ "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj" >>>>>>> d9b810b (guardado hecho hasta ordenes de compra) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) }, - "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj" }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" @@ -13761,6 +13775,10 @@ >>>>>>> 88e614d (god) ======= >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no) +======= + "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj" +>>>>>>> 855ce7c (AAAAAAAAAAA) } } }