diff --git a/.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx b/.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx new file mode 100644 index 0000000..c00c02a Binary files /dev/null and b/.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx differ diff --git a/.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx b/.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx deleted file mode 100644 index b3d9cac..0000000 Binary files a/.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx and /dev/null differ diff --git a/.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx b/.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx new file mode 100644 index 0000000..2e2f853 Binary files /dev/null and b/.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx differ diff --git a/.vs/Final_OOP/FileContentIndex/51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx b/.vs/Final_OOP/FileContentIndex/51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx deleted file mode 100644 index 8011fa5..0000000 Binary files a/.vs/Final_OOP/FileContentIndex/51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx and /dev/null differ diff --git a/.vs/Final_OOP/FileContentIndex/5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx b/.vs/Final_OOP/FileContentIndex/5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx new file mode 100644 index 0000000..6bc5d4b Binary files /dev/null and b/.vs/Final_OOP/FileContentIndex/5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx differ diff --git a/.vs/Final_OOP/FileContentIndex/953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx b/.vs/Final_OOP/FileContentIndex/953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx new file mode 100644 index 0000000..abc4c41 Binary files /dev/null and b/.vs/Final_OOP/FileContentIndex/953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx differ diff --git a/.vs/Final_OOP/FileContentIndex/f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx b/.vs/Final_OOP/FileContentIndex/f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx deleted file mode 100644 index f386afd..0000000 Binary files a/.vs/Final_OOP/FileContentIndex/f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx and /dev/null differ diff --git a/.vs/Final_OOP/v17/.suo b/.vs/Final_OOP/v17/.suo index 6fc6282..fd1050b 100644 Binary files a/.vs/Final_OOP/v17/.suo and b/.vs/Final_OOP/v17/.suo differ diff --git a/.vs/Final_OOP/xs/UserPrefs.xml b/.vs/Final_OOP/xs/UserPrefs.xml deleted file mode 100644 index ac2024d..0000000 --- a/.vs/Final_OOP/xs/UserPrefs.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Vista/Vista.csproj - Controladora/Controladora.csproj - - - - - - - \ No newline at end of file diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 5473f0f..0070a53 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\", "projectStyle": "PackageReference", diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index 56c68c8..07acff5 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vHHOtMmBjQqzXm8NSpg1FnEXriZ26IA/fDBeSkAZG6VLggulaiBXf/KsOl8pSWWWG0B7MsrBnYnbQEeXJ0/Z6Q==", + "dgSpecHash": "140GQtxtriF311DaiieaDmJ7ak0iQV6xE1oZAEWCfylxdH5wonwlzBX1b52fBGkwqH0ImewKn7GUDfiemxqKiA==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Entidades/DetallePedido.cs b/Entidades/DetallePedido.cs index 1371dc0..a025a05 100644 --- a/Entidades/DetallePedido.cs +++ b/Entidades/DetallePedido.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - internal class DetallePedido + internal class DetallePedido : Detalle { public int IdPedido { get; set; } } diff --git a/Entidades/EnvaseTipo.cs b/Entidades/EnvaseTipo.cs index 9cddb0d..242499e 100644 --- a/Entidades/EnvaseTipo.cs +++ b/Entidades/EnvaseTipo.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - public enum TipoEnvase + public enum EnvaseTipo { Plastico, Enlatado, diff --git a/Entidades/Factura.cs b/Entidades/Factura.cs index 740e501..f8efa78 100644 --- a/Entidades/Factura.cs +++ b/Entidades/Factura.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -15,7 +16,24 @@ namespace Entidades private List detalles { get; set; } + public ReadOnlyCollection MostrarDetalles() + { + } + public void AñadirDetalle(DetalleFactura detalle) + { + + } + + public void ModificarDetalle(DetalleFactura detalle) + { + + } + + public void EliminarDetalle(DetalleFactura detalle) + { + + } } } diff --git a/Entidades/OrdenDeCompra.cs b/Entidades/OrdenDeCompra.cs index d817f19..ae2122b 100644 --- a/Entidades/OrdenDeCompra.cs +++ b/Entidades/OrdenDeCompra.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -14,5 +15,24 @@ namespace Entidades public Proveedor Proveedor { get; set; } + public ReadOnlyCollection MostrarDetalles() + { + + } + + public void AñadirDetalle(DetalleOrdenDeCompra detalle) + { + + } + + public void ModificarDetalle(DetalleOrdenDeCompra detalle) + { + + } + + public void EliminarDetalle(DetalleOrdenDeCompra detalle) + { + + } } } diff --git a/Entidades/PedidoDePresupuesto.cs b/Entidades/PedidoDePresupuesto.cs index 39ea00c..6e54a2f 100644 --- a/Entidades/PedidoDePresupuesto.cs +++ b/Entidades/PedidoDePresupuesto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -15,5 +16,34 @@ namespace Entidades private List detallesPedidos { get; set; } public Proveedor Proveedor { get; set; } + + public void AñadirDetalle(DetallePedido detalle) + { + { + + try + { + detallesPedidos.Add(detalle); + + } + catch (Exception) + { + + throw; + } + + } + } + + public ReadOnlyCollection MostrarDetalles() + { + return detallesPedidos.AsReadOnly(); + } + + public void EliminarDetalle(DetallePedido detalle) + { + var aeliminar = detallesPedidos.Find(x => x.Id == detalle.Id); + detallesPedidos.Remove(aeliminar); + } } } diff --git a/Entidades/Presupuesto.cs b/Entidades/Presupuesto.cs index e45f711..2113169 100644 --- a/Entidades/Presupuesto.cs +++ b/Entidades/Presupuesto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -19,5 +20,7 @@ namespace Entidades private List Detalles { get; set; } public Proveedor Proveedor { get; set; } + + } } diff --git a/Entidades/ProductoNoPercedero.cs b/Entidades/ProductoNoPercedero.cs index ccfdbbc..b7ee695 100644 --- a/Entidades/ProductoNoPercedero.cs +++ b/Entidades/ProductoNoPercedero.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - internal class ProductoNoPercedero + public class ProductoNoPercedero { public EnvaseTipo TipoDeEnvase { get; set; } } diff --git a/Entidades/Remito.cs b/Entidades/Remito.cs index b2c5c8d..980cd21 100644 --- a/Entidades/Remito.cs +++ b/Entidades/Remito.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; @@ -13,5 +15,25 @@ namespace Entidades private List LotesDeProductosEntregados { get; set; } public Proveedor Proveedor { get; set; } + + public ReadOnlyCollection MostrarLotes() + { + return LotesDeProductosEntregados.AsReadOnly(); + } + public bool AñadirLote(Lote lote) + { + bool ret = false; + try + { + LotesDeProductosEntregados.Add(lote); + ret= true; + } + catch (Exception) + { + + throw; + } + return ret; + } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index 7a05dbb..02b5b6b 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entidades -build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final_OOP\Entidades\ diff --git a/Entidades/obj/Debug/net6.0/Entidades.assets.cache b/Entidades/obj/Debug/net6.0/Entidades.assets.cache index e684dc4..7581549 100644 Binary files a/Entidades/obj/Debug/net6.0/Entidades.assets.cache and b/Entidades/obj/Debug/net6.0/Entidades.assets.cache differ diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index a1ba0f4..e74df4f 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index 01aa310..3b6119c 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "PVHbAkBavzDaKw3OCgyd9rnGdDfX8by0UmuqYuanHJ+yk6ZVoLP+E3bU6vhQ/0x1vtX0M598J9FWQPCpvqRiVA==", + "dgSpecHash": "tvasUP43wH1NBUEUPJHfWfHDb7vl/ue6UGCiCs9/RHVC8i0KjmP5A48yb1CHnF1ar9ummXM37j0MdF/dyo/7GA==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index f6f84c1..1299f42 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", "projectStyle": "PackageReference", diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index bce4f2d..77bc834 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "gNYEMR8kZQSyK9Ju8U6QpQzGIqwlxHxK/b7OWV2CrzlkBOLJTUVCBVjcmnQpofstLURjEEzUez2fFtzN8UYA4A==", + "dgSpecHash": "yCpP6BPpuRXuofATVjtKmfhwUZrb2GPo991luvSdq/4autcaFU4YO7LtiPjZL2G6wWMNzzjcoV/PWwpAeT1Rww==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 2de1c13..1ce4a33 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\", "projectStyle": "PackageReference", diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index 09c7e80..2df8b22 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "3DvijgwI6aIGVuwP6GmOKPJ5wb7Wv1SrZkk52PrGeifqQwNFgGXg9iYcN5nP+NtiK79D+Dnyplxj64AJXgSAqQ==", + "dgSpecHash": "sxAlnK8kqG49TG7auamL3JNePu/HJD0xU6R4+XkcFQYuUWkucBmICEdtCGCih+UlUCQHlI0zBm3UwUWPp8J1kw==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file