diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 6b61141..4d919a5 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,6 +1,9 @@ { "ExpandedNodes": [ - "" + "", + "\\Properties", + "\\Properties\\DataSources" ], + "SelectedNode": "\\mermas.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index e3b3602..24f8c36 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/ActualizarMerma.Designer.cs b/ActualizarMerma.Designer.cs new file mode 100644 index 0000000..1970c35 --- /dev/null +++ b/ActualizarMerma.Designer.cs @@ -0,0 +1,153 @@ +namespace compabetov2 +{ + partial class ActualizarMerma + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnCancelar = new System.Windows.Forms.Button(); + this.btnAgregar = new System.Windows.Forms.Button(); + this.txtResponsable = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.dtFecha = new System.Windows.Forms.DateTimePicker(); + this.txtDescripcion = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // btnCancelar + // + this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnCancelar.Location = new System.Drawing.Point(483, 340); + this.btnCancelar.Name = "btnCancelar"; + this.btnCancelar.Size = new System.Drawing.Size(93, 45); + this.btnCancelar.TabIndex = 15; + this.btnCancelar.Text = "Cancelar"; + this.btnCancelar.UseVisualStyleBackColor = true; + // + // btnAgregar + // + this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnAgregar.Location = new System.Drawing.Point(375, 340); + this.btnAgregar.Name = "btnAgregar"; + this.btnAgregar.Size = new System.Drawing.Size(93, 45); + this.btnAgregar.TabIndex = 14; + this.btnAgregar.Text = "Editar"; + this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); + // + // txtResponsable + // + this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtResponsable.Location = new System.Drawing.Point(241, 10); + this.txtResponsable.Name = "txtResponsable"; + this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.TabIndex = 13; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(110, 10); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.TabIndex = 12; + this.label3.Text = "Responsable:"; + // + // dtFecha + // + this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dtFecha.Location = new System.Drawing.Point(241, 85); + this.dtFecha.Name = "dtFecha"; + this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.TabIndex = 11; + // + // txtDescripcion + // + this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtDescripcion.Location = new System.Drawing.Point(11, 119); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Multiline = true; + this.txtDescripcion.Name = "txtDescripcion"; + this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.TabIndex = 10; + this.txtDescripcion.TextChanged += new System.EventHandler(this.txtDescripcion_TextChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(11, 85); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(115, 24); + this.label2.TabIndex = 9; + this.label2.Text = "Descripcion:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(167, 89); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 24); + this.label1.TabIndex = 8; + this.label1.Text = "Fecha:"; + // + // ActualizarMerma + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(605, 399); + this.Controls.Add(this.btnCancelar); + this.Controls.Add(this.btnAgregar); + this.Controls.Add(this.txtResponsable); + this.Controls.Add(this.label3); + this.Controls.Add(this.dtFecha); + this.Controls.Add(this.txtDescripcion); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "ActualizarMerma"; + this.Text = "Modificar Merma"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnCancelar; + private System.Windows.Forms.Button btnAgregar; + private System.Windows.Forms.TextBox txtResponsable; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dtFecha; + private System.Windows.Forms.TextBox txtDescripcion; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/ActualizarMerma.cs b/ActualizarMerma.cs new file mode 100644 index 0000000..5ec100b --- /dev/null +++ b/ActualizarMerma.cs @@ -0,0 +1,51 @@ +using compabetov2.database; +using compabetov2.database.modelos; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace compabetov2 +{ + public partial class ActualizarMerma : Form + { + private Merma merma; + private mermas ventanaPadre; + public ActualizarMerma(Merma merma, mermas ventanaPadre) + { + InitializeComponent(); + this.merma = merma; + this.ventanaPadre = ventanaPadre; + llenarCampos(); + } + + private void llenarCampos() + { + txtDescripcion.Text = merma.razon; + txtResponsable.Text = merma.responsable; + dtFecha.Text = merma.fecha; + } + + private void btnAgregar_Click(object sender, EventArgs e) + { + Merma nuevaMerma = new Merma(merma.idMerma,dtFecha.Text,txtResponsable.Text,txtDescripcion.Text); + if (service.actualizarMerma(nuevaMerma)) + { + MessageBox.Show("Merma actualizada"); + ventanaPadre.llenarPanel(); + Close(); + } + + } + + private void txtDescripcion_TextChanged(object sender, EventArgs e) + { + + } + } +} diff --git a/ActualizarMerma.resx b/ActualizarMerma.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ActualizarMerma.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/agregarmermas.Designer.cs b/agregarmermas.Designer.cs index f61054f..8905ea3 100644 --- a/agregarmermas.Designer.cs +++ b/agregarmermas.Designer.cs @@ -30,44 +30,111 @@ { this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.txtDescripcion = new System.Windows.Forms.TextBox(); + this.dtFecha = new System.Windows.Forms.DateTimePicker(); + this.label3 = new System.Windows.Forms.Label(); + this.txtResponsable = new System.Windows.Forms.TextBox(); + this.btnAgregar = new System.Windows.Forms.Button(); + this.btnCancelar = new System.Windows.Forms.Button(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(351, 98); + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(167, 96); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 16); + this.label1.Size = new System.Drawing.Size(69, 24); this.label1.TabIndex = 0; - this.label1.Text = "label1"; + this.label1.Text = "Fecha:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(331, 192); + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(11, 92); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 16); + this.label2.Size = new System.Drawing.Size(115, 24); this.label2.TabIndex = 1; - this.label2.Text = "label2"; + this.label2.Text = "Descripcion:"; + this.label2.Click += new System.EventHandler(this.label2_Click); // - // textBox1 + // txtDescripcion // - this.textBox1.Location = new System.Drawing.Point(258, 140); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(229, 22); - this.textBox1.TabIndex = 2; + this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtDescripcion.Location = new System.Drawing.Point(11, 126); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Multiline = true; + this.txtDescripcion.Name = "txtDescripcion"; + this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.TabIndex = 2; + // + // dtFecha + // + this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dtFecha.Location = new System.Drawing.Point(241, 92); + this.dtFecha.Name = "dtFecha"; + this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.TabIndex = 3; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(110, 17); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.TabIndex = 4; + this.label3.Text = "Responsable:"; + // + // txtResponsable + // + this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtResponsable.Location = new System.Drawing.Point(241, 17); + this.txtResponsable.Name = "txtResponsable"; + this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.TabIndex = 5; + // + // btnAgregar + // + this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnAgregar.Location = new System.Drawing.Point(375, 347); + this.btnAgregar.Name = "btnAgregar"; + this.btnAgregar.Size = new System.Drawing.Size(93, 45); + this.btnAgregar.TabIndex = 6; + this.btnAgregar.Text = "Agregar"; + this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); + // + // btnCancelar + // + this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnCancelar.Location = new System.Drawing.Point(483, 347); + this.btnCancelar.Name = "btnCancelar"; + this.btnCancelar.Size = new System.Drawing.Size(93, 45); + this.btnCancelar.TabIndex = 7; + this.btnCancelar.Text = "Cancelar"; + this.btnCancelar.UseVisualStyleBackColor = true; // // agregarmermas // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.textBox1); + this.ClientSize = new System.Drawing.Size(600, 404); + this.Controls.Add(this.btnCancelar); + this.Controls.Add(this.btnAgregar); + this.Controls.Add(this.txtResponsable); + this.Controls.Add(this.label3); + this.Controls.Add(this.dtFecha); + this.Controls.Add(this.txtDescripcion); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "agregarmermas"; - this.Text = "agregarmermas"; + this.Text = "Agregar Merma"; this.ResumeLayout(false); this.PerformLayout(); @@ -77,6 +144,11 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox txtDescripcion; + private System.Windows.Forms.DateTimePicker dtFecha; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtResponsable; + private System.Windows.Forms.Button btnAgregar; + private System.Windows.Forms.Button btnCancelar; } } \ No newline at end of file diff --git a/agregarmermas.cs b/agregarmermas.cs index d962dda..c4cadd9 100644 --- a/agregarmermas.cs +++ b/agregarmermas.cs @@ -1,4 +1,6 @@ -using System; +using compabetov2.database; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +14,28 @@ namespace compabetov2 { public partial class agregarmermas : Form { - public agregarmermas() + private mermas ventanaPadre; + public agregarmermas(mermas ventanaPadre) { InitializeComponent(); + this.ventanaPadre = ventanaPadre; + } + + private void label2_Click(object sender, EventArgs e) + { + + } + + private void btnAgregar_Click(object sender, EventArgs e) + { + string descripcion = txtDescripcion.Text; + string fecha = dtFecha.Text; + string responsable = txtResponsable.Text; + Merma merma = new Merma(-1,fecha,responsable,descripcion); + if (service.insertarMerma(merma)) { + ventanaPadre.llenarPanel(); + Close(); + } } } } diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index f39885a..71207d1 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index dbc352e..de750b3 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/bin/Debug/data.db b/bin/Debug/data.db index 1ce7111..db35893 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/compabetov2.csproj b/compabetov2.csproj index a9204ae..fbb5e8d 100644 --- a/compabetov2.csproj +++ b/compabetov2.csproj @@ -103,6 +103,12 @@ + + Form + + + ActualizarMerma.cs + Form @@ -201,6 +207,15 @@ vender.cs + + Form + + + verMerma.cs + + + ActualizarMerma.cs + AgregarEmpleado.cs Designer @@ -256,6 +271,9 @@ vender.cs + + verMerma.cs + diff --git a/database/DAO.cs b/database/DAO.cs index 5d29145..6c10cc6 100644 --- a/database/DAO.cs +++ b/database/DAO.cs @@ -721,6 +721,36 @@ namespace compabetov2.database } } + public static bool insertarMermaDAO(Merma merma) + { + var db_conexion = new Conexion(); + try + { + using (SQLiteConnection conexion = db_conexion.get_connection()) + { + conexion.Open(); + + string sql = "INSERT INTO Merma (fecha, responsable, razon) VALUES(@fecha, @responsable, @razon);"; + + using (SQLiteCommand command = new SQLiteCommand(sql, conexion)) + { + command.Parameters.AddWithValue("@fecha", merma.fecha); + command.Parameters.AddWithValue("@responsable", merma.responsable); + command.Parameters.AddWithValue("@razon", merma.razon); + int filasAfectadas = command.ExecuteNonQuery(); + + if (filasAfectadas > 0) { return true; } + else { return false; } + } + } + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + public static bool crearVentaDAO(VentaModel venta, List detalleVentas) { var db_conexion = new Conexion(); @@ -781,6 +811,67 @@ namespace compabetov2.database } } + public static bool eliminarMermaDAO(Merma merma) + { + var db_conexion = new Conexion(); + try + { + using (SQLiteConnection conexion = db_conexion.get_connection()) + { + conexion.Open(); + + string sql = "DELETE FROM Merma WHERE idmerma = @idmerma;"; + + using (SQLiteCommand command = new SQLiteCommand(sql, conexion)) + { + command.Parameters.AddWithValue("@idmerma", merma.idMerma); + int filasAfectadas = command.ExecuteNonQuery(); + + if (filasAfectadas > 0) { return true; } + else { return false; } + } + } + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + + public static bool actualizarMermaDAO(Merma merma) + { + var db_conexion = new Conexion(); + try + { + using (SQLiteConnection conexion = db_conexion.get_connection()) + { + conexion.Open(); + + string sql = "UPDATE Merma SET fecha = @fecha, responsable = @responsable, razon = @razon WHERE idmerma = @idmerma; "; + + using (SQLiteCommand command = new SQLiteCommand(sql, conexion)) + { + command.Parameters.AddWithValue("@fecha", merma.fecha); + command.Parameters.AddWithValue("@responsable", merma.responsable); + command.Parameters.AddWithValue("@razon", merma.razon); + command.Parameters.AddWithValue("@idmerma", merma.idMerma); + + int filasAfectadas = command.ExecuteNonQuery(); + + if (filasAfectadas > 0) { return true; } + else { return false; } + } + } + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + + private static void crearDB() { var db_conexion = new Conexion(); diff --git a/database/service.cs b/database/service.cs index 1ca1619..eeaa496 100644 --- a/database/service.cs +++ b/database/service.cs @@ -207,5 +207,20 @@ namespace compabetov2.database { return DAO.crearVentaDAO(venta, detalleVentas); } + + public static bool insertarMerma(Merma merma) + { + return DAO.insertarMermaDAO(merma); + } + + public static bool eliminarMerma(Merma merma) + { + return DAO.eliminarMermaDAO(merma); + } + + public static bool actualizarMerma(Merma merma) + { + return DAO.actualizarMermaDAO(merma); + } } } diff --git a/mermas.Designer.cs b/mermas.Designer.cs index a84516f..2faa4ff 100644 --- a/mermas.Designer.cs +++ b/mermas.Designer.cs @@ -57,7 +57,7 @@ this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); this.flowLayoutPanel1.TabIndex = 9; @@ -67,7 +67,7 @@ this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); this.panel2.Location = new System.Drawing.Point(2, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(234, 214); this.panel2.TabIndex = 8; @@ -76,7 +76,7 @@ // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; this.pictureBox7.Location = new System.Drawing.Point(48, 28); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -93,7 +93,7 @@ this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button1.Location = new System.Drawing.Point(2, 220); - this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button1.Margin = new System.Windows.Forms.Padding(2); this.button1.Name = "button1"; this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); this.button1.Size = new System.Drawing.Size(234, 93); @@ -112,7 +112,7 @@ this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button2.Location = new System.Drawing.Point(2, 317); - this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button2.Margin = new System.Windows.Forms.Padding(2); this.button2.Name = "button2"; this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); this.button2.Size = new System.Drawing.Size(234, 93); @@ -131,7 +131,7 @@ this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button3.Location = new System.Drawing.Point(2, 414); - this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button3.Margin = new System.Windows.Forms.Padding(2); this.button3.Name = "button3"; this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); this.button3.Size = new System.Drawing.Size(234, 93); @@ -149,7 +149,7 @@ this.button4.Image = global::compabetov2.Properties.Resources.reportesi; this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button4.Location = new System.Drawing.Point(2, 511); - this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button4.Margin = new System.Windows.Forms.Padding(2); this.button4.Name = "button4"; this.button4.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); this.button4.Size = new System.Drawing.Size(234, 93); @@ -167,7 +167,7 @@ this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.Location = new System.Drawing.Point(2, 608); - this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button5.Margin = new System.Windows.Forms.Padding(2); this.button5.Name = "button5"; this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); this.button5.Size = new System.Drawing.Size(234, 93); @@ -222,6 +222,7 @@ this.btnAgregar.TabIndex = 17; this.btnAgregar.Text = "Agregar"; this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); // // mermas // @@ -233,7 +234,7 @@ this.Controls.Add(this.lblfecha); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "mermas"; this.Text = "mermas"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; diff --git a/mermas.cs b/mermas.cs index b72853f..17c2348 100644 --- a/mermas.cs +++ b/mermas.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -20,12 +21,13 @@ namespace compabetov2 { InitializeComponent(); this.loginPrincipal = loginPrincipal; - getData(); llenarPanel(); } - private void llenarPanel() + public void llenarPanel() { + mermaPanel.Controls.Clear(); + getData(); foreach (Merma merma in mermasList) { TableLayoutPanel carta = new TableLayoutPanel(); @@ -43,7 +45,7 @@ namespace compabetov2 fecha.Text = merma.fecha; fecha.Dock = DockStyle.Fill; fecha.TextAlign = ContentAlignment.MiddleLeft; - fecha.Font = new Font(fecha.Font.FontFamily, 20, FontStyle.Bold); + fecha.Font = new Font(fecha.Font.FontFamily, 16, FontStyle.Bold); TableLayoutPanel panelBotones = new TableLayoutPanel(); panelBotones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); @@ -60,6 +62,12 @@ namespace compabetov2 btnVer.BackColor = Color.FromArgb(33, 90, 255); btnVer.Font = new Font(btnVer.Font.FontFamily, 16); btnVer.ForeColor = Color.White; + btnVer.Click += new EventHandler(delegate (object sender, EventArgs e) + { + verMerma ver = new verMerma(merma); + ver.Owner = this; + ver.Show(); + }); Button btnEditar = new Button(); btnEditar.Text = "Editar"; @@ -69,6 +77,12 @@ namespace compabetov2 btnEditar.BackColor = Color.FromArgb(33, 90, 255); btnEditar.Font = new Font(btnVer.Font.FontFamily, 16); btnEditar.ForeColor = Color.White; + btnEditar.Click += new EventHandler(delegate (object sender, EventArgs e) + { + ActualizarMerma ver = new ActualizarMerma(merma,this); + ver.Owner = this; + ver.Show(); + }); Button btnEliminar = new Button(); @@ -79,6 +93,18 @@ namespace compabetov2 btnEliminar.FlatAppearance.BorderSize = 0; btnEliminar.Font = new Font(btnVer.Font.FontFamily, 16); btnEliminar.ForeColor = Color.White; + btnEliminar.Click += new EventHandler(delegate (object sender, EventArgs e) + { + DialogResult result = MessageBox.Show("¿Está seguro de que desea eliminar este registro?", + "Confirmación", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (result == DialogResult.Yes) + { + if (service.eliminarMerma(merma)) + { + llenarPanel(); + } + } + }); panelBotones.Controls.Add(btnVer,0,0); @@ -129,5 +155,12 @@ namespace compabetov2 { } + + private void btnAgregar_Click(object sender, EventArgs e) + { + agregarmermas agregarmermas = new agregarmermas(this); + agregarmermas.Owner = this; + agregarmermas.Show(); + } } } diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9..201f966 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 8fecec9..d42d58f 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -add1f73ce2bf2b73b081cea9681469f294862eb3a0025ca3ac0f3b97504729d5 +e7b283fd9dec9796e62566ed2ce6772e4416d895838c25e6d8d2c5043500a36a diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index c1581f4..05e00e8 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -101,3 +101,5 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resource >>>>>>> c224b1f121cf870873d6bc2414ec92b69d8a3668 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources +C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources +C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 8db6f6e..2101c2f 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index f39885a..71207d1 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index dbc352e..de750b3 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/verMerma.Designer.cs b/verMerma.Designer.cs new file mode 100644 index 0000000..c4d2206 --- /dev/null +++ b/verMerma.Designer.cs @@ -0,0 +1,126 @@ +namespace compabetov2 +{ + partial class verMerma + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.txtResponsable = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.dtFecha = new System.Windows.Forms.DateTimePicker(); + this.txtDescripcion = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // txtResponsable + // + this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtResponsable.Location = new System.Drawing.Point(241, 10); + this.txtResponsable.Name = "txtResponsable"; + this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.TabIndex = 11; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(110, 10); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.TabIndex = 10; + this.label3.Text = "Responsable:"; + // + // dtFecha + // + this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dtFecha.Location = new System.Drawing.Point(241, 85); + this.dtFecha.Name = "dtFecha"; + this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.TabIndex = 9; + // + // txtDescripcion + // + this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtDescripcion.Location = new System.Drawing.Point(11, 119); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Multiline = true; + this.txtDescripcion.Name = "txtDescripcion"; + this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.TabIndex = 8; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(11, 85); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(115, 24); + this.label2.TabIndex = 7; + this.label2.Text = "Descripcion:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(167, 89); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 24); + this.label1.TabIndex = 6; + this.label1.Text = "Fecha:"; + // + // verMerma + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(615, 325); + this.Controls.Add(this.txtResponsable); + this.Controls.Add(this.label3); + this.Controls.Add(this.dtFecha); + this.Controls.Add(this.txtDescripcion); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "verMerma"; + this.Text = "Merma"; + this.Load += new System.EventHandler(this.verMerma_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox txtResponsable; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dtFecha; + private System.Windows.Forms.TextBox txtDescripcion; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/verMerma.cs b/verMerma.cs new file mode 100644 index 0000000..5db024f --- /dev/null +++ b/verMerma.cs @@ -0,0 +1,36 @@ +using compabetov2.database.modelos; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace compabetov2 +{ + public partial class verMerma : Form + { + private Merma merma; + public verMerma(Merma merma) + { + InitializeComponent(); + this.merma = merma; + llenarComponentes(); + } + + private void llenarComponentes() + { + txtDescripcion.Text = merma.razon; + txtResponsable.Text = merma.responsable; + dtFecha.Text = merma.fecha; + } + + private void verMerma_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/verMerma.resx b/verMerma.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/verMerma.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file