fede/Final_OOP
Archived
2
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

Merge pull request 'Merge final de las ramas de entidades' (#23) from entidadesSINFunciones into entidades

Browse Source 
Reviewed-on: #23
This commit was merged in pull request #23.
This commit is contained in:
fedpo
2024-02-24 17:09:28 -03:00
parent 80293cb76b ee0ec5f0e8
commit 0b073d51b9
27 changed files with 122 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx Normal file
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx Normal file
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx Normal file
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx Normal file
View File

Binary file not shown.

BIN
.vs/Final_OOP/FileContentIndex/f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx
View File

Binary file not shown.

BIN
.vs/Final_OOP/v17/.suo
View File

Binary file not shown.

30
.vs/Final_OOP/xs/UserPrefs.xml
View File

@@ -1,30 +0,0 @@
<Properties>
<MonoDevelop.Ide.Workbench ActiveDocument="Modelo/RepositorioProductos.cs">
<Files>
<File FileName="Modelo/IRepositorio.cs" Line="20" Column="2" />
<File FileName="Modelo/RepositorioProductos.cs" Line="57" Column="35" NotebookId="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="Final_OOP" expanded="True">
<Node name="Entidades" expanded="True" />
<Node name="Modelo" expanded="True">
<Node name="RepositorioProductos.cs" selected="True" />
</Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<DisabledProjects>
<String>Vista/Vista.csproj</String>
<String>Controladora/Controladora.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>

8
Controladora/obj/Controladora.csproj.nuget.dgspec.json
View File

@@ -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",

4
Controladora/obj/project.nuget.cache
View File

@@ -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": []
}

2
Entidades/DetallePedido.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Entidades
{
internal class DetallePedido
internal class DetallePedido : Detalle <T>
{
public int IdPedido { get; set; }
}

2
Entidades/EnvaseTipo.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Entidades
{
public enum TipoEnvase
public enum EnvaseTipo
{
Plastico,
Enlatado,

18
Entidades/Factura.cs
View File

@@ -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<DetalleFactura> detalles { get; set; }
public ReadOnlyCollection<DetalleFactura> MostrarDetalles()
{
}
public void AñadirDetalle(DetalleFactura detalle)
{
}
public void ModificarDetalle(DetalleFactura detalle)
{
}
public void EliminarDetalle(DetalleFactura detalle)
{
}
}
}

20
Entidades/OrdenDeCompra.cs
View File

@@ -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<DetalleOrdenDeCompra> MostrarDetalles()
{
}
public void AñadirDetalle(DetalleOrdenDeCompra detalle)
{
}
public void ModificarDetalle(DetalleOrdenDeCompra detalle)
{
}
public void EliminarDetalle(DetalleOrdenDeCompra detalle)
{
}
}
}

30
Entidades/PedidoDePresupuesto.cs
View File

@@ -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<DetallePedido> detallesPedidos { get; set; }
public Proveedor Proveedor { get; set; }
public void AñadirDetalle(DetallePedido detalle)
{
{
try
{
detallesPedidos.Add(detalle);
}
catch (Exception)
{
throw;
}
}
}
public ReadOnlyCollection<DetallePedido> MostrarDetalles()
{
return detallesPedidos.AsReadOnly();
}
public void EliminarDetalle(DetallePedido detalle)
{
var aeliminar = detallesPedidos.Find(x => x.Id == detalle.Id);
detallesPedidos.Remove(aeliminar);
}
}
}

3
Entidades/Presupuesto.cs
View File

@@ -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<DetallePresupuesto> Detalles { get; set; }
public Proveedor Proveedor { get; set; }
}
}

2
Entidades/ProductoNoPercedero.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Entidades
{
internal class ProductoNoPercedero
public class ProductoNoPercedero
{
public EnvaseTipo TipoDeEnvase { get; set; }
}

22
Entidades/Remito.cs
View File

@@ -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<Lote> LotesDeProductosEntregados { get; set; }
public Proveedor Proveedor { get; set; }
public ReadOnlyCollection<Lote> MostrarLotes()
{
return LotesDeProductosEntregados.AsReadOnly();
}
public bool AñadirLote(Lote lote)
{
bool ret = false;
try
{
LotesDeProductosEntregados.Add(lote);
ret= true;
}
catch (Exception)
{
throw;
}
return ret;
}
}
}

2
Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -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\

BIN
Entidades/obj/Debug/net6.0/Entidades.assets.cache
View File

Binary file not shown.

10
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -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"

4
Entidades/obj/project.nuget.cache
View File

@@ -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": []
}

8
Modelo/obj/Modelo.csproj.nuget.dgspec.json
View File

@@ -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",

4
Modelo/obj/project.nuget.cache
View File

@@ -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": []
}

8
Vista/obj/Vista.csproj.nuget.dgspec.json
View File

@@ -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",

4
Vista/obj/project.nuget.cache
View File

@@ -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": []
}