diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index 13030f5..750cce1 100644 Binary files a/Controladora/bin/Debug/net6.0/Controladora.dll and b/Controladora/bin/Debug/net6.0/Controladora.dll differ diff --git a/Controladora/bin/Debug/net6.0/Controladora.pdb b/Controladora/bin/Debug/net6.0/Controladora.pdb index 41a5ad2..a33d107 100644 Binary files a/Controladora/bin/Debug/net6.0/Controladora.pdb and b/Controladora/bin/Debug/net6.0/Controladora.pdb differ diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 7658e09..d0af5da 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD +07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491 +======= a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 98c01d0..e362374 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -115,6 +115,8 @@ C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.d C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll +<<<<<<< HEAD +======= C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb @@ -132,3 +134,4 @@ C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0 C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 13030f5..750cce1 100644 Binary files a/Controladora/obj/Debug/net6.0/Controladora.dll and b/Controladora/obj/Debug/net6.0/Controladora.dll differ diff --git a/Controladora/obj/Debug/net6.0/Controladora.pdb b/Controladora/obj/Debug/net6.0/Controladora.pdb index 41a5ad2..a33d107 100644 Binary files a/Controladora/obj/Debug/net6.0/Controladora.pdb and b/Controladora/obj/Debug/net6.0/Controladora.pdb differ diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 344a73d..8a0bf5b 100644 Binary files a/Controladora/obj/Debug/net6.0/ref/Controladora.dll and b/Controladora/obj/Debug/net6.0/ref/Controladora.dll differ diff --git a/Controladora/obj/Debug/net6.0/refint/Controladora.dll b/Controladora/obj/Debug/net6.0/refint/Controladora.dll index 344a73d..8a0bf5b 100644 Binary files a/Controladora/obj/Debug/net6.0/refint/Controladora.dll and b/Controladora/obj/Debug/net6.0/refint/Controladora.dll differ diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index e6781ec..c555008 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -12,5 +12,17 @@ namespace Entidades { get { return Producto?.Nombre ?? string.Empty; } } +<<<<<<< HEAD + public double PrecioUnitario + { + get { return Producto?.Precio ?? 0; } + } + public double Subtotal + { + get { return PrecioUnitario * CantidadDeProductos; } + } +======= +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 } + } diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json new file mode 100644 index 0000000..1389a7a --- /dev/null +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -0,0 +1,124 @@ +{ + "format": 1, + "restore": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {} + }, + "projects": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "projectName": "Entidades", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + } + } + }, + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectName": "Informes", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/Informes/obj/Informes.csproj.nuget.g.props b/Informes/obj/Informes.csproj.nuget.g.props new file mode 100644 index 0000000..89bfc77 --- /dev/null +++ b/Informes/obj/Informes.csproj.nuget.g.props @@ -0,0 +1,15 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + $(UserProfile)\.nuget\packages\ + C:\Users\fedpo\.nuget\packages\ + PackageReference + 6.6.0 + + + + + \ No newline at end of file diff --git a/Informes/obj/Informes.csproj.nuget.g.targets b/Informes/obj/Informes.csproj.nuget.g.targets new file mode 100644 index 0000000..3dc06ef --- /dev/null +++ b/Informes/obj/Informes.csproj.nuget.g.targets @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json new file mode 100644 index 0000000..98d292c --- /dev/null +++ b/Informes/obj/project.assets.json @@ -0,0 +1,92 @@ +{ + "version": 3, + "targets": { + "net6.0": { + "Entidades/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v6.0", + "compile": { + "bin/placeholder/Entidades.dll": {} + }, + "runtime": { + "bin/placeholder/Entidades.dll": {} + } + } + } + }, + "libraries": { + "Entidades/1.0.0": { + "type": "project", + "path": "../Entidades/Entidades.csproj", + "msbuildProject": "../Entidades/Entidades.csproj" + } + }, + "projectFileDependencyGroups": { + "net6.0": [ + "Entidades >= 1.0.0" + ] + }, + "packageFolders": { + "C:\\Users\\fedpo\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "projectName": "Informes", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache new file mode 100644 index 0000000..5ddc6e9 --- /dev/null +++ b/Informes/obj/project.nuget.cache @@ -0,0 +1,8 @@ +{ + "version": 2, + "dgSpecHash": "INVcMeeXX3RoJw93Ye8x1Z2zKXKisJfXRKwLszX9TOBmcSCPTpBbhbgBcrnpGdxF2t/KPFVRZ2CzsnGvpyudOQ==", + "success": true, + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj", + "expectedPackageFiles": [], + "logs": [] +} \ No newline at end of file diff --git a/Vista/FrmFacturas.Designer.cs b/Vista/FrmFacturas.Designer.cs index 030b4c1..21766e3 100644 --- a/Vista/FrmFacturas.Designer.cs +++ b/Vista/FrmFacturas.Designer.cs @@ -29,33 +29,49 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); + dataGridView2 = new DataGridView(); dataGridView1 = new DataGridView(); BtnAdd = new Button(); groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); SuspendLayout(); // // groupBox1 // + groupBox1.Controls.Add(dataGridView2); groupBox1.Controls.Add(dataGridView1); groupBox1.Controls.Add(BtnAdd); groupBox1.Location = new Point(12, 12); groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(776, 351); + groupBox1.Size = new Size(1041, 426); groupBox1.TabIndex = 5; groupBox1.TabStop = false; // + // dataGridView2 + // + dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView2.Location = new Point(623, 0); + dataGridView2.Name = "dataGridView2"; + dataGridView2.RowTemplate.Height = 25; + dataGridView2.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView2.Size = new Size(384, 426); + dataGridView2.TabIndex = 4; + // // dataGridView1 // dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Location = new Point(6, 22); + dataGridView1.Location = new Point(6, 16); dataGridView1.Name = "dataGridView1"; dataGridView1.RowTemplate.Height = 25; dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(594, 235); + dataGridView1.Size = new Size(508, 241); dataGridView1.TabIndex = 3; dataGridView1.CellBorderStyleChanged += dataGridView1_CellBorderStyleChanged; + dataGridView1.CellClick += dataGridView1_CellClick; + dataGridView1.CellContentClick += dataGridView1_CellContentClick; // // BtnAdd // @@ -71,12 +87,13 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(1068, 450); Controls.Add(groupBox1); Name = "FrmFacturas"; Text = "Ventas"; WindowState = FormWindowState.Maximized; groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ResumeLayout(false); } @@ -86,5 +103,6 @@ private GroupBox groupBox1; private DataGridView dataGridView1; private Button BtnAdd; + private DataGridView dataGridView2; } } \ No newline at end of file diff --git a/Vista/FrmFacturas.cs b/Vista/FrmFacturas.cs index 027eaa5..a4661d2 100644 --- a/Vista/FrmFacturas.cs +++ b/Vista/FrmFacturas.cs @@ -1,4 +1,6 @@ using Controladora; +using Entidades; +using System.Collections.ObjectModel; namespace Vista { @@ -9,6 +11,8 @@ namespace Vista { InitializeComponent(); ActualizarGrilla(); + dataGridView1.CellClick += dataGridView1_CellClick; + ConfigurarDataGridView2(); } private void ActualizarGrilla() { @@ -26,5 +30,60 @@ namespace Vista { } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } + private void ConfigurarDataGridView2() + { + dataGridView2.AutoGenerateColumns = false; + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Producto", + HeaderText = "Producto" + }); + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Cantidad", + HeaderText = "Cantidad" + }); + + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "PrecioUnitario", + HeaderText = "PrecioUnitariod" + }); + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Subtotal", + HeaderText = "Subtotal" + }); + } + private void ActualizarGrillaLotes(ReadOnlyCollection lotes) + { + dataGridView2.DataSource = null; + if (lotes.Any()) + { + var loteDatos = lotes.Select(lote => new + { + Producto = lote.NombreProducto, + Cantidad = lote.CantidadDeProductos, + Subtotal = lote.Subtotal, + PrecioUnitario = lote.PrecioUnitario, + }).ToList(); + + dataGridView2.DataSource = loteDatos; + } + } + private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex >= 0) + { + var selectedFactura = (Factura)dataGridView1.Rows[e.RowIndex].DataBoundItem; + var lotes = ControladoraLotes.Instance.ListarPorFacturaId(selectedFactura.Id); + ActualizarGrillaLotes(lotes); + } + } } } diff --git a/Vista/Vista - Backup.csproj.user b/Vista/Vista - Backup.csproj.user new file mode 100644 index 0000000..fb55c6b --- /dev/null +++ b/Vista/Vista - Backup.csproj.user @@ -0,0 +1,56 @@ + + + + + Form + + + Form + +<<<<<<< HEAD + + Form + +======= +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + \ No newline at end of file diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index b55bb35..19b2365 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -1,5 +1,6 @@  + Form @@ -7,43 +8,43 @@ Form - - Form - - - Form - Form + + Form + Form - + + Form + + Form Form + + Form + + + Form + Form - - Form - - - Form - Form + + Form + Form - - Form - - + Form