diff --git a/cuentas.Designer.cs b/Cuentas/cuentas.Designer.cs similarity index 77% rename from cuentas.Designer.cs rename to Cuentas/cuentas.Designer.cs index 6286758..f11cf34 100644 --- a/cuentas.Designer.cs +++ b/Cuentas/cuentas.Designer.cs @@ -46,17 +46,27 @@ // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); +<<<<<<< HEAD:cuentas.Designer.cs this.panel2.Location = new System.Drawing.Point(2, 2); this.panel2.Margin = new System.Windows.Forms.Padding(2); +======= + this.panel2.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; +<<<<<<< HEAD:cuentas.Designer.cs this.pictureBox7.Location = new System.Drawing.Point(48, 28); this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); +======= + this.pictureBox7.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -72,11 +82,16 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; +<<<<<<< HEAD:cuentas.Designer.cs this.button1.Location = new System.Drawing.Point(2, 220); this.button1.Margin = new System.Windows.Forms.Padding(2); +======= + this.button1.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs 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); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -91,11 +106,16 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; +<<<<<<< HEAD:cuentas.Designer.cs this.button2.Location = new System.Drawing.Point(2, 317); this.button2.Margin = new System.Windows.Forms.Padding(2); +======= + this.button2.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs 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); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -110,11 +130,16 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; +<<<<<<< HEAD:cuentas.Designer.cs this.button3.Location = new System.Drawing.Point(2, 414); this.button3.Margin = new System.Windows.Forms.Padding(2); +======= + this.button3.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs 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); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -128,11 +153,16 @@ this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button4.Image = global::compabetov2.Properties.Resources.reportesi; this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; +<<<<<<< HEAD:cuentas.Designer.cs this.button4.Location = new System.Drawing.Point(2, 511); this.button4.Margin = new System.Windows.Forms.Padding(2); +======= + this.button4.Location = new System.Drawing.Point(3, 623); + this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs 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); + this.button4.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button4.Size = new System.Drawing.Size(312, 114); this.button4.TabIndex = 11; this.button4.Text = "Reportes"; this.button4.UseVisualStyleBackColor = false; @@ -146,11 +176,16 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; +<<<<<<< HEAD:cuentas.Designer.cs this.button5.Location = new System.Drawing.Point(2, 608); this.button5.Margin = new System.Windows.Forms.Padding(2); +======= + this.button5.Location = new System.Drawing.Point(3, 741); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs 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); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -165,29 +200,38 @@ this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1); +<<<<<<< HEAD:cuentas.Designer.cs this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); +======= + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); this.flowLayoutPanel1.TabIndex = 8; // // panelCuenta // - this.panelCuenta.Location = new System.Drawing.Point(393, 237); + this.panelCuenta.Location = new System.Drawing.Point(524, 292); + this.panelCuenta.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelCuenta.Name = "panelCuenta"; - this.panelCuenta.Size = new System.Drawing.Size(831, 439); + this.panelCuenta.Size = new System.Drawing.Size(1108, 540); this.panelCuenta.TabIndex = 9; this.panelCuenta.Paint += new System.Windows.Forms.PaintEventHandler(this.panelCuenta_Paint); // // cuentas // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1370, 749); + this.ClientSize = new System.Drawing.Size(1827, 922); + this.ControlBox = false; this.Controls.Add(this.panelCuenta); this.Controls.Add(this.flowLayoutPanel1); +<<<<<<< HEAD:cuentas.Designer.cs this.Margin = new System.Windows.Forms.Padding(2); +======= + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs this.Name = "cuentas"; - this.Text = "cuentas"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.cuentas_Load); this.panel2.ResumeLayout(false); diff --git a/cuentas.cs b/Cuentas/cuentas.cs similarity index 100% rename from cuentas.cs rename to Cuentas/cuentas.cs diff --git a/cuentas.resx b/Cuentas/cuentas.resx similarity index 100% rename from cuentas.resx rename to Cuentas/cuentas.resx diff --git a/AgregarEmpleado.Designer.cs b/Empleados/AgregarEmpleado.Designer.cs similarity index 100% rename from AgregarEmpleado.Designer.cs rename to Empleados/AgregarEmpleado.Designer.cs diff --git a/AgregarEmpleado.cs b/Empleados/AgregarEmpleado.cs similarity index 100% rename from AgregarEmpleado.cs rename to Empleados/AgregarEmpleado.cs diff --git a/AgregarEmpleado.resx b/Empleados/AgregarEmpleado.resx similarity index 100% rename from AgregarEmpleado.resx rename to Empleados/AgregarEmpleado.resx diff --git a/AgregarLogin.Designer.cs b/Empleados/AgregarLogin.Designer.cs similarity index 82% rename from AgregarLogin.Designer.cs rename to Empleados/AgregarLogin.Designer.cs index e7b2061..4e6d484 100644 --- a/AgregarLogin.Designer.cs +++ b/Empleados/AgregarLogin.Designer.cs @@ -29,6 +29,9 @@ private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.btnAceptar = new System.Windows.Forms.Button(); + this.btnCancelar = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.txtNombre = new System.Windows.Forms.TextBox(); @@ -38,17 +41,14 @@ this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); this.label3 = new System.Windows.Forms.Label(); this.txtContraConf = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.btnAceptar = new System.Windows.Forms.Button(); - this.btnCancelar = new System.Windows.Forms.Button(); this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel(); this.label4 = new System.Windows.Forms.Label(); this.cbTipo = new System.Windows.Forms.ComboBox(); this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.flowLayoutPanel2.SuspendLayout(); this.flowLayoutPanel3.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); this.flowLayoutPanel4.SuspendLayout(); this.SuspendLayout(); // @@ -64,132 +64,43 @@ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel4, 0, 3); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 5; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 51.07914F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 48.92086F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 82F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 71F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 73F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(354, 387); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 101F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 87F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(472, 476); this.tableLayoutPanel1.TabIndex = 0; // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Controls.Add(this.label1); - this.flowLayoutPanel1.Controls.Add(this.txtNombre); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(348, 76); - this.flowLayoutPanel1.TabIndex = 0; - // - // 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(3, 0); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); - this.label1.Size = new System.Drawing.Size(178, 34); - this.label1.TabIndex = 0; - this.label1.Text = "Nombre de usuario:"; - // - // txtNombre - // - this.txtNombre.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNombre.Location = new System.Drawing.Point(3, 37); - this.txtNombre.Name = "txtNombre"; - this.txtNombre.Size = new System.Drawing.Size(345, 26); - this.txtNombre.TabIndex = 1; - // - // flowLayoutPanel2 - // - this.flowLayoutPanel2.Controls.Add(this.label2); - this.flowLayoutPanel2.Controls.Add(this.txtContra); - this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 85); - this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(348, 72); - this.flowLayoutPanel2.TabIndex = 1; - // - // 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(3, 0); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); - this.label2.Size = new System.Drawing.Size(103, 34); - this.label2.TabIndex = 0; - this.label2.Text = "contraseña"; - // - // txtContra - // - this.txtContra.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtContra.Location = new System.Drawing.Point(3, 37); - this.txtContra.Name = "txtContra"; - this.txtContra.PasswordChar = '*'; - this.txtContra.Size = new System.Drawing.Size(345, 26); - this.txtContra.TabIndex = 1; - // - // flowLayoutPanel3 - // - this.flowLayoutPanel3.Controls.Add(this.label3); - this.flowLayoutPanel3.Controls.Add(this.txtContraConf); - this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel3.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel3.Location = new System.Drawing.Point(3, 163); - this.flowLayoutPanel3.Name = "flowLayoutPanel3"; - this.flowLayoutPanel3.Size = new System.Drawing.Size(348, 76); - this.flowLayoutPanel3.TabIndex = 2; - // - // 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(3, 0); - this.label3.Name = "label3"; - this.label3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); - this.label3.Size = new System.Drawing.Size(186, 34); - this.label3.TabIndex = 0; - this.label3.Text = "confirmar contraseña"; - // - // txtContraConf - // - this.txtContraConf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtContraConf.Location = new System.Drawing.Point(3, 37); - this.txtContraConf.Name = "txtContraConf"; - this.txtContraConf.PasswordChar = '*'; - this.txtContraConf.Size = new System.Drawing.Size(342, 26); - this.txtContraConf.TabIndex = 1; - // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 3; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.52941F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.47059F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 92F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 125F)); this.tableLayoutPanel2.Controls.Add(this.btnAceptar, 1, 0); this.tableLayoutPanel2.Controls.Add(this.btnCancelar, 2, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 316); + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 389); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(348, 68); + this.tableLayoutPanel2.Size = new System.Drawing.Size(464, 83); this.tableLayoutPanel2.TabIndex = 4; // // btnAceptar // this.btnAceptar.Dock = System.Windows.Forms.DockStyle.Fill; this.btnAceptar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAceptar.Location = new System.Drawing.Point(165, 3); + this.btnAceptar.Location = new System.Drawing.Point(219, 4); + this.btnAceptar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAceptar.Name = "btnAceptar"; - this.btnAceptar.Size = new System.Drawing.Size(87, 62); + this.btnAceptar.Size = new System.Drawing.Size(115, 75); this.btnAceptar.TabIndex = 0; this.btnAceptar.Text = "Aceptar"; this.btnAceptar.UseVisualStyleBackColor = true; @@ -199,31 +110,135 @@ // this.btnCancelar.Dock = System.Windows.Forms.DockStyle.Fill; this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancelar.Location = new System.Drawing.Point(258, 3); + this.btnCancelar.Location = new System.Drawing.Point(342, 4); + this.btnCancelar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCancelar.Name = "btnCancelar"; - this.btnCancelar.Size = new System.Drawing.Size(87, 62); + this.btnCancelar.Size = new System.Drawing.Size(118, 75); this.btnCancelar.TabIndex = 1; this.btnCancelar.Text = "Cancelar"; this.btnCancelar.UseVisualStyleBackColor = true; // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Controls.Add(this.label1); + this.flowLayoutPanel1.Controls.Add(this.txtNombre); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 4); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(464, 93); + this.flowLayoutPanel1.TabIndex = 0; + // + // 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(4, 0); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 12); + this.label1.Size = new System.Drawing.Size(226, 41); + this.label1.TabIndex = 0; + this.label1.Text = "Nombre de usuario:"; + // + // txtNombre + // + this.txtNombre.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtNombre.Location = new System.Drawing.Point(4, 45); + this.txtNombre.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtNombre.Name = "txtNombre"; + this.txtNombre.Size = new System.Drawing.Size(459, 30); + this.txtNombre.TabIndex = 1; + // + // flowLayoutPanel2 + // + this.flowLayoutPanel2.Controls.Add(this.label2); + this.flowLayoutPanel2.Controls.Add(this.txtContra); + this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flowLayoutPanel2.Location = new System.Drawing.Point(4, 105); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + this.flowLayoutPanel2.Size = new System.Drawing.Size(464, 88); + this.flowLayoutPanel2.TabIndex = 1; + // + // 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(4, 0); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(0, 0, 0, 12); + this.label2.Size = new System.Drawing.Size(131, 41); + this.label2.TabIndex = 0; + this.label2.Text = "contraseña"; + // + // txtContra + // + this.txtContra.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtContra.Location = new System.Drawing.Point(4, 45); + this.txtContra.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtContra.Name = "txtContra"; + this.txtContra.PasswordChar = '*'; + this.txtContra.Size = new System.Drawing.Size(459, 30); + this.txtContra.TabIndex = 1; + // + // flowLayoutPanel3 + // + this.flowLayoutPanel3.Controls.Add(this.label3); + this.flowLayoutPanel3.Controls.Add(this.txtContraConf); + this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel3.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flowLayoutPanel3.Location = new System.Drawing.Point(4, 201); + this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.flowLayoutPanel3.Name = "flowLayoutPanel3"; + this.flowLayoutPanel3.Size = new System.Drawing.Size(464, 93); + this.flowLayoutPanel3.TabIndex = 2; + // + // 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(4, 0); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 12); + this.label3.Size = new System.Drawing.Size(237, 41); + this.label3.TabIndex = 0; + this.label3.Text = "confirmar contraseña"; + // + // txtContraConf + // + this.txtContraConf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtContraConf.Location = new System.Drawing.Point(4, 45); + this.txtContraConf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtContraConf.Name = "txtContraConf"; + this.txtContraConf.PasswordChar = '*'; + this.txtContraConf.Size = new System.Drawing.Size(455, 30); + this.txtContraConf.TabIndex = 1; + // // flowLayoutPanel4 // this.flowLayoutPanel4.Controls.Add(this.label4); this.flowLayoutPanel4.Controls.Add(this.cbTipo); this.flowLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel4.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel4.Location = new System.Drawing.Point(3, 245); + this.flowLayoutPanel4.Location = new System.Drawing.Point(4, 302); + this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel4.Name = "flowLayoutPanel4"; - this.flowLayoutPanel4.Size = new System.Drawing.Size(348, 65); + this.flowLayoutPanel4.Size = new System.Drawing.Size(464, 79); this.flowLayoutPanel4.TabIndex = 5; // // label4 // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(3, 0); + this.label4.Location = new System.Drawing.Point(4, 0); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(43, 20); + this.label4.Size = new System.Drawing.Size(57, 25); this.label4.TabIndex = 0; this.label4.Text = "Tipo:"; // @@ -234,28 +249,30 @@ this.cbTipo.Items.AddRange(new object[] { "admin", "empleado"}); - this.cbTipo.Location = new System.Drawing.Point(3, 23); + this.cbTipo.Location = new System.Drawing.Point(4, 29); + this.cbTipo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbTipo.Name = "cbTipo"; - this.cbTipo.Size = new System.Drawing.Size(121, 28); + this.cbTipo.Size = new System.Drawing.Size(160, 33); this.cbTipo.TabIndex = 1; this.cbTipo.Text = "empleado"; // // AgregarLogin // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(354, 387); + this.ClientSize = new System.Drawing.Size(472, 476); this.Controls.Add(this.tableLayoutPanel1); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "AgregarLogin"; this.Text = "Crear Login"; this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); this.flowLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel2.PerformLayout(); this.flowLayoutPanel3.ResumeLayout(false); this.flowLayoutPanel3.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel4.ResumeLayout(false); this.flowLayoutPanel4.PerformLayout(); this.ResumeLayout(false); diff --git a/AgregarLogin.cs b/Empleados/AgregarLogin.cs similarity index 100% rename from AgregarLogin.cs rename to Empleados/AgregarLogin.cs diff --git a/AgregarLogin.resx b/Empleados/AgregarLogin.resx similarity index 100% rename from AgregarLogin.resx rename to Empleados/AgregarLogin.resx diff --git a/EditarEmpleado.Designer.cs b/Empleados/EditarEmpleado.Designer.cs similarity index 100% rename from EditarEmpleado.Designer.cs rename to Empleados/EditarEmpleado.Designer.cs diff --git a/EditarEmpleado.cs b/Empleados/EditarEmpleado.cs similarity index 100% rename from EditarEmpleado.cs rename to Empleados/EditarEmpleado.cs diff --git a/EditarEmpleado.resx b/Empleados/EditarEmpleado.resx similarity index 100% rename from EditarEmpleado.resx rename to Empleados/EditarEmpleado.resx diff --git a/Empleados/ModificarContra.Designer.cs b/Empleados/ModificarContra.Designer.cs new file mode 100644 index 0000000..1629610 --- /dev/null +++ b/Empleados/ModificarContra.Designer.cs @@ -0,0 +1,164 @@ +namespace compabetov2 +{ + partial class ModificarContra + { + /// + /// 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.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txtContra = new System.Windows.Forms.TextBox(); + this.txtConfi = new System.Windows.Forms.TextBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label3 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Poppins", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.Transparent; + this.label1.Location = new System.Drawing.Point(393, 244); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(160, 40); + this.label1.TabIndex = 0; + this.label1.Text = "Contraseña:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Poppins", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.ForeColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(339, 374); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(282, 40); + this.label2.TabIndex = 1; + this.label2.Text = "Confirmar contraseña:"; + // + // txtContra + // + this.txtContra.Font = new System.Drawing.Font("Poppins", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtContra.Location = new System.Drawing.Point(328, 299); + this.txtContra.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtContra.Name = "txtContra"; + this.txtContra.PasswordChar = '*'; + this.txtContra.Size = new System.Drawing.Size(309, 42); + this.txtContra.TabIndex = 2; + this.txtContra.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + // + // txtConfi + // + this.txtConfi.Font = new System.Drawing.Font("Poppins", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtConfi.Location = new System.Drawing.Point(321, 429); + this.txtConfi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtConfi.Name = "txtConfi"; + this.txtConfi.PasswordChar = '*'; + this.txtConfi.Size = new System.Drawing.Size(316, 42); + this.txtConfi.TabIndex = 3; + // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox2.Image = global::compabetov2.Properties.Resources.check1; + this.pictureBox2.Location = new System.Drawing.Point(389, 492); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.TabIndex = 22; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1; + this.pictureBox1.Location = new System.Drawing.Point(495, 492); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(100, 69); + this.pictureBox1.TabIndex = 21; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; + this.label3.Font = new System.Drawing.Font("Poppins", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.ForeColor = System.Drawing.Color.Transparent; + this.label3.Location = new System.Drawing.Point(350, 157); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(271, 40); + this.label3.TabIndex = 23; + this.label3.Text = "Modificar Contraseña"; + // + // ModificarContra + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.BackgroundImage = global::compabetov2.Properties.Resources.Form; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.ClientSize = new System.Drawing.Size(951, 716); + this.ControlBox = false; + this.Controls.Add(this.label3); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.txtConfi); + this.Controls.Add(this.txtContra); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Name = "ModificarContra"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtContra; + private System.Windows.Forms.TextBox txtConfi; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label3; + } +} \ No newline at end of file diff --git a/ModificarContra.cs b/Empleados/ModificarContra.cs similarity index 66% rename from ModificarContra.cs rename to Empleados/ModificarContra.cs index 9007bef..46aa891 100644 --- a/ModificarContra.cs +++ b/Empleados/ModificarContra.cs @@ -48,5 +48,29 @@ namespace compabetov2 { } + + private void pictureBox2_Click(object sender, EventArgs e) + { + string contra = txtContra.Text; + string contraConfi = txtConfi.Text; + if (contra.Equals(contraConfi)) + { + if (service.modificarContra(empleado, contra)) + { + + Close(); + } + } + else + { + MessageBox.Show("Las contraseña no son iguales", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.Close(); + + } } } diff --git a/ModificarContra.resx b/Empleados/ModificarContra.resx similarity index 100% rename from ModificarContra.resx rename to Empleados/ModificarContra.resx diff --git a/personal.Designer.cs b/Empleados/personal.Designer.cs similarity index 99% rename from personal.Designer.cs rename to Empleados/personal.Designer.cs index 86e1be5..4ca0837 100644 --- a/personal.Designer.cs +++ b/Empleados/personal.Designer.cs @@ -38,9 +38,9 @@ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.personalPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblhora = new System.Windows.Forms.Label(); + this.btnAgregar = new System.Windows.Forms.Button(); this.empleadoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.conexionBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.btnAgregar = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); this.panel2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -151,7 +151,7 @@ this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(-3, -2); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); @@ -178,14 +178,6 @@ this.lblhora.Text = "Personal"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); // - // empleadoBindingSource - // - this.empleadoBindingSource.DataSource = typeof(compabetov2.database.modelos.Empleado); - // - // conexionBindingSource - // - this.conexionBindingSource.DataSource = typeof(compabetov2.database.Conexion); - // // btnAgregar // this.btnAgregar.Location = new System.Drawing.Point(984, 220); @@ -197,18 +189,26 @@ this.btnAgregar.UseVisualStyleBackColor = true; this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); // + // empleadoBindingSource + // + this.empleadoBindingSource.DataSource = typeof(compabetov2.database.modelos.Empleado); + // + // conexionBindingSource + // + this.conexionBindingSource.DataSource = typeof(compabetov2.database.Conexion); + // // personal // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1827, 922); + this.ControlBox = false; this.Controls.Add(this.btnAgregar); this.Controls.Add(this.lblhora); this.Controls.Add(this.personalPanel); this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "personal"; - this.Text = "personal"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.personal_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); diff --git a/personal.cs b/Empleados/personal.cs similarity index 100% rename from personal.cs rename to Empleados/personal.cs diff --git a/personal.resx b/Empleados/personal.resx similarity index 100% rename from personal.resx rename to Empleados/personal.resx diff --git a/preguntaLogin.Designer.cs b/Empleados/preguntaLogin.Designer.cs similarity index 100% rename from preguntaLogin.Designer.cs rename to Empleados/preguntaLogin.Designer.cs diff --git a/preguntaLogin.cs b/Empleados/preguntaLogin.cs similarity index 100% rename from preguntaLogin.cs rename to Empleados/preguntaLogin.cs diff --git a/preguntaLogin.resx b/Empleados/preguntaLogin.resx similarity index 100% rename from preguntaLogin.resx rename to Empleados/preguntaLogin.resx diff --git a/envios.Designer.cs b/Envios/envios.Designer.cs similarity index 81% rename from envios.Designer.cs rename to Envios/envios.Designer.cs index 9a301f0..b4f67ce 100644 --- a/envios.Designer.cs +++ b/Envios/envios.Designer.cs @@ -80,27 +80,27 @@ this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 0); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); this.flowLayoutPanel1.TabIndex = 9; // // panel2 // 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.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // 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.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -116,11 +116,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; 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.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -135,11 +135,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; 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.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -154,11 +154,11 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; 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.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -172,11 +172,11 @@ this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; 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.Location = new System.Drawing.Point(3, 623); + this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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); + this.button4.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button4.Size = new System.Drawing.Size(312, 114); this.button4.TabIndex = 11; this.button4.Text = "Reportes"; this.button4.UseVisualStyleBackColor = false; @@ -190,11 +190,11 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; 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.Location = new System.Drawing.Point(3, 741); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -202,55 +202,55 @@ // textBox1 // this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox1.Location = new System.Drawing.Point(707, 299); - this.textBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox1.Location = new System.Drawing.Point(943, 368); + this.textBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(275, 45); + this.textBox1.Size = new System.Drawing.Size(365, 55); this.textBox1.TabIndex = 10; // // dateTimePicker1 // this.dateTimePicker1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.dateTimePicker1.Location = new System.Drawing.Point(444, 319); - this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.dateTimePicker1.Location = new System.Drawing.Point(592, 393); + this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(223, 30); + this.dateTimePicker1.Size = new System.Drawing.Size(296, 36); this.dateTimePicker1.TabIndex = 29; // // textBox2 // this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox2.Location = new System.Drawing.Point(1023, 302); - this.textBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox2.Location = new System.Drawing.Point(1364, 372); + this.textBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(275, 45); + this.textBox2.Size = new System.Drawing.Size(365, 55); this.textBox2.TabIndex = 30; // // textBox3 // this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox3.Location = new System.Drawing.Point(732, 443); - this.textBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox3.Location = new System.Drawing.Point(976, 545); + this.textBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(275, 45); + this.textBox3.Size = new System.Drawing.Size(365, 55); this.textBox3.TabIndex = 32; // // textBox4 // this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox4.Location = new System.Drawing.Point(416, 440); - this.textBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox4.Location = new System.Drawing.Point(555, 542); + this.textBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(275, 45); + this.textBox4.Size = new System.Drawing.Size(365, 55); this.textBox4.TabIndex = 31; // // textBox5 // this.textBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox5.Location = new System.Drawing.Point(1030, 443); - this.textBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox5.Location = new System.Drawing.Point(1373, 545); + this.textBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(275, 45); + this.textBox5.Size = new System.Drawing.Size(365, 55); this.textBox5.TabIndex = 33; // // label1 @@ -258,10 +258,9 @@ this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label1.ForeColor = System.Drawing.Color.Navy; - this.label1.Location = new System.Drawing.Point(439, 266); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(585, 327); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(90, 31); + this.label1.Size = new System.Drawing.Size(112, 39); this.label1.TabIndex = 38; this.label1.Text = "Fecha"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -271,10 +270,9 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label2.ForeColor = System.Drawing.Color.Navy; - this.label2.Location = new System.Drawing.Point(702, 247); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(936, 304); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(160, 31); + this.label2.Size = new System.Drawing.Size(199, 39); this.label2.TabIndex = 39; this.label2.Text = "Destinatario"; this.label2.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -284,10 +282,9 @@ this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label3.ForeColor = System.Drawing.Color.Navy; - this.label3.Location = new System.Drawing.Point(1025, 247); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(1367, 304); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(128, 31); + this.label3.Size = new System.Drawing.Size(160, 39); this.label3.TabIndex = 40; this.label3.Text = "Direccion"; this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -297,10 +294,9 @@ this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label4.ForeColor = System.Drawing.Color.Navy; - this.label4.Location = new System.Drawing.Point(411, 396); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(548, 487); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(106, 31); + this.label4.Size = new System.Drawing.Size(134, 39); this.label4.TabIndex = 41; this.label4.Text = "Colonia"; this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -310,10 +306,9 @@ this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label5.ForeColor = System.Drawing.Color.Navy; - this.label5.Location = new System.Drawing.Point(727, 396); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(969, 487); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(183, 31); + this.label5.Size = new System.Drawing.Size(230, 39); this.label5.TabIndex = 42; this.label5.Text = "Codigo Postal"; this.label5.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -323,10 +318,9 @@ this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label6.ForeColor = System.Drawing.Color.Navy; - this.label6.Location = new System.Drawing.Point(1025, 396); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(1367, 487); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(146, 31); + this.label6.Size = new System.Drawing.Size(182, 39); this.label6.TabIndex = 43; this.label6.Text = "Referencia"; this.label6.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -336,10 +330,9 @@ this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label7.ForeColor = System.Drawing.Color.Navy; - this.label7.Location = new System.Drawing.Point(419, 516); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(559, 635); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(173, 31); + this.label7.Size = new System.Drawing.Size(217, 39); this.label7.TabIndex = 44; this.label7.Text = "Responsable"; this.label7.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -349,10 +342,9 @@ this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label8.ForeColor = System.Drawing.Color.Navy; - this.label8.Location = new System.Drawing.Point(735, 516); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(980, 635); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(120, 31); + this.label8.Size = new System.Drawing.Size(150, 39); this.label8.TabIndex = 46; this.label8.Text = "Telefono"; this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -360,19 +352,19 @@ // textBox6 // this.textBox6.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox6.Location = new System.Drawing.Point(732, 564); - this.textBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox6.Location = new System.Drawing.Point(976, 694); + this.textBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(275, 45); + this.textBox6.Size = new System.Drawing.Size(365, 55); this.textBox6.TabIndex = 45; // // textBox7 // this.textBox7.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); - this.textBox7.Location = new System.Drawing.Point(1030, 564); - this.textBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox7.Location = new System.Drawing.Point(1373, 694); + this.textBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(275, 45); + this.textBox7.Size = new System.Drawing.Size(365, 55); this.textBox7.TabIndex = 47; // // label9 @@ -380,10 +372,9 @@ this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label9.ForeColor = System.Drawing.Color.Navy; - this.label9.Location = new System.Drawing.Point(1033, 530); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(1377, 652); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(120, 31); + this.label9.Size = new System.Drawing.Size(150, 39); this.label9.TabIndex = 48; this.label9.Text = "Telefono"; this.label9.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -391,10 +382,10 @@ // button9 // this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button9.Location = new System.Drawing.Point(1095, 662); - this.button9.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button9.Location = new System.Drawing.Point(1460, 815); + this.button9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(128, 57); + this.button9.Size = new System.Drawing.Size(171, 70); this.button9.TabIndex = 52; this.button9.Text = "Eliminar"; this.button9.UseVisualStyleBackColor = true; @@ -402,10 +393,10 @@ // button8 // this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button8.Location = new System.Drawing.Point(945, 662); - this.button8.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button8.Location = new System.Drawing.Point(1260, 815); + this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(128, 57); + this.button8.Size = new System.Drawing.Size(171, 70); this.button8.TabIndex = 51; this.button8.Text = "Editar"; this.button8.UseVisualStyleBackColor = true; @@ -413,10 +404,10 @@ // button7 // this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button7.Location = new System.Drawing.Point(795, 662); - this.button7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button7.Location = new System.Drawing.Point(1060, 815); + this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(128, 57); + this.button7.Size = new System.Drawing.Size(171, 70); this.button7.TabIndex = 50; this.button7.Text = "Buscar"; this.button7.UseVisualStyleBackColor = true; @@ -424,10 +415,10 @@ // button6 // this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button6.Location = new System.Drawing.Point(646, 662); - this.button6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button6.Location = new System.Drawing.Point(861, 815); + this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(128, 57); + this.button6.Size = new System.Drawing.Size(171, 70); this.button6.TabIndex = 49; this.button6.Text = "Agregar"; this.button6.UseVisualStyleBackColor = true; @@ -442,10 +433,9 @@ this.lblfecha.AutoSize = true; this.lblfecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F); this.lblfecha.ForeColor = System.Drawing.Color.Navy; - this.lblfecha.Location = new System.Drawing.Point(544, 115); - this.lblfecha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblfecha.Location = new System.Drawing.Point(725, 142); this.lblfecha.Name = "lblfecha"; - this.lblfecha.Size = new System.Drawing.Size(126, 46); + this.lblfecha.Size = new System.Drawing.Size(159, 58); this.lblfecha.TabIndex = 54; this.lblfecha.Text = "label2"; this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -455,10 +445,9 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(685, 19); - this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblhora.Location = new System.Drawing.Point(913, 23); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(249, 91); + this.lblhora.Size = new System.Drawing.Size(318, 113); this.lblhora.TabIndex = 53; this.lblhora.Text = "label1"; // @@ -471,10 +460,10 @@ "Cristofer Perez ", "Angel Alexander", "Emilio Urenda"}); - this.responsablecb.Location = new System.Drawing.Point(424, 578); - this.responsablecb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.responsablecb.Location = new System.Drawing.Point(565, 711); + this.responsablecb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.responsablecb.Name = "responsablecb"; - this.responsablecb.Size = new System.Drawing.Size(266, 39); + this.responsablecb.Size = new System.Drawing.Size(353, 46); this.responsablecb.TabIndex = 55; // // comboBox1 @@ -484,10 +473,10 @@ this.comboBox1.Items.AddRange(new object[] { "Enviado", "Completado"}); - this.comboBox1.Location = new System.Drawing.Point(316, 682); - this.comboBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.comboBox1.Location = new System.Drawing.Point(421, 839); + this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(266, 39); + this.comboBox1.Size = new System.Drawing.Size(353, 46); this.comboBox1.TabIndex = 56; // // label10 @@ -495,10 +484,9 @@ this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label10.ForeColor = System.Drawing.Color.Navy; - this.label10.Location = new System.Drawing.Point(311, 640); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(415, 788); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(99, 31); + this.label10.Size = new System.Drawing.Size(123, 39); this.label10.TabIndex = 57; this.label10.Text = "Estado"; this.label10.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -506,9 +494,10 @@ // // envios // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1028, 609); + this.ClientSize = new System.Drawing.Size(1371, 965); + this.ControlBox = false; this.Controls.Add(this.label10); this.Controls.Add(this.comboBox1); this.Controls.Add(this.responsablecb); @@ -536,9 +525,8 @@ this.Controls.Add(this.dateTimePicker1); this.Controls.Add(this.textBox1); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "envios"; - this.Text = "envios"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.envios_Load); this.flowLayoutPanel1.ResumeLayout(false); diff --git a/envios.cs b/Envios/envios.cs similarity index 100% rename from envios.cs rename to Envios/envios.cs diff --git a/envios.resx b/Envios/envios.resx similarity index 100% rename from envios.resx rename to Envios/envios.resx diff --git a/inventario.Designer.cs b/Inventario/inventario.Designer.cs similarity index 98% rename from inventario.Designer.cs rename to Inventario/inventario.Designer.cs index dcae5fb..c8449fa 100644 --- a/inventario.Designer.cs +++ b/Inventario/inventario.Designer.cs @@ -47,7 +47,7 @@ // this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); - this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; + this.lblhora.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); this.lblhora.Location = new System.Drawing.Point(933, 9); this.lblhora.Name = "lblhora"; this.lblhora.Size = new System.Drawing.Size(299, 113); @@ -62,7 +62,7 @@ this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); @@ -166,7 +166,7 @@ // btnAgregarStock // this.btnAgregarStock.Location = new System.Drawing.Point(992, 181); - this.btnAgregarStock.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAgregarStock.Margin = new System.Windows.Forms.Padding(4); this.btnAgregarStock.Name = "btnAgregarStock"; this.btnAgregarStock.Size = new System.Drawing.Size(133, 28); this.btnAgregarStock.TabIndex = 12; @@ -177,7 +177,7 @@ // stockPanel // this.stockPanel.Location = new System.Drawing.Point(525, 245); - this.stockPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.stockPanel.Margin = new System.Windows.Forms.Padding(4); this.stockPanel.Name = "stockPanel"; this.stockPanel.Size = new System.Drawing.Size(1112, 638); this.stockPanel.TabIndex = 13; @@ -188,13 +188,13 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1827, 922); + this.ControlBox = false; this.Controls.Add(this.stockPanel); this.Controls.Add(this.btnAgregarStock); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "inventario"; - this.Text = "inventario"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.inventario_Load); this.flowLayoutPanel1.ResumeLayout(false); diff --git a/inventario.cs b/Inventario/inventario.cs similarity index 100% rename from inventario.cs rename to Inventario/inventario.cs diff --git a/inventario.resx b/Inventario/inventario.resx similarity index 100% rename from inventario.resx rename to Inventario/inventario.resx diff --git a/ActualizarMerma.Designer.cs b/Merma/ActualizarMerma.Designer.cs similarity index 77% rename from ActualizarMerma.Designer.cs rename to Merma/ActualizarMerma.Designer.cs index 7e81d5d..ccc6261 100644 --- a/ActualizarMerma.Designer.cs +++ b/Merma/ActualizarMerma.Designer.cs @@ -28,8 +28,6 @@ /// 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(); @@ -37,31 +35,12 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); 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(585, 695); - this.btnCancelar.Margin = new System.Windows.Forms.Padding(4); - this.btnCancelar.Name = "btnCancelar"; - this.btnCancelar.Size = new System.Drawing.Size(124, 55); - 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(412, 695); - this.btnAgregar.Margin = new System.Windows.Forms.Padding(4); - this.btnAgregar.Name = "btnAgregar"; - this.btnAgregar.Size = new System.Drawing.Size(124, 55); - 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))); @@ -140,6 +119,30 @@ this.label4.TabIndex = 16; this.label4.Text = "Modificar Merma"; // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1; + this.pictureBox1.Location = new System.Drawing.Point(611, 695); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(100, 69); + this.pictureBox1.TabIndex = 17; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); + // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox2.Image = global::compabetov2.Properties.Resources.check1; + this.pictureBox2.Location = new System.Drawing.Point(471, 695); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.TabIndex = 18; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); + // // ActualizarMerma // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -147,11 +150,11 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); this.BackgroundImage = global::compabetov2.Properties.Resources.Form; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1102, 776); + this.ClientSize = new System.Drawing.Size(1050, 776); this.ControlBox = false; + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.label4); - 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); @@ -159,18 +162,18 @@ this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Margin = new System.Windows.Forms.Padding(4); this.Name = "ActualizarMerma"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); 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; @@ -178,5 +181,7 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label4; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pictureBox2; } } \ No newline at end of file diff --git a/ActualizarMerma.cs b/Merma/ActualizarMerma.cs similarity index 56% rename from ActualizarMerma.cs rename to Merma/ActualizarMerma.cs index 077d9be..b2213e4 100644 --- a/ActualizarMerma.cs +++ b/Merma/ActualizarMerma.cs @@ -52,5 +52,32 @@ namespace compabetov2 { } + + private void pictureBox2_Click(object sender, EventArgs e) + { + // Mostrar mensaje de confirmación + DialogResult result = MessageBox.Show("¿En realidad quieres hacer esta modificación a esta merma?", "Confirmar Modificación", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + + // Verificar la respuesta del usuario + if (result == DialogResult.Yes) + { + // Si el usuario hace clic en "Sí", proceder con la actualización + Merma nuevaMerma = new Merma(merma.idMerma, dtFecha.Text, txtResponsable.Text, txtDescripcion.Text); + + if (service.actualizarMerma(nuevaMerma)) + { + MessageBox.Show("Merma actualizada"); + ventanaPadre.llenarPanel(); + Close(); + } + } + // Si el usuario hace clic en "No" o cierra la advertencia, no se realiza la actualización + } + + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/ActualizarMerma.resx b/Merma/ActualizarMerma.resx similarity index 100% rename from ActualizarMerma.resx rename to Merma/ActualizarMerma.resx diff --git a/agregarmermas.Designer.cs b/Merma/agregarmermas.Designer.cs similarity index 50% rename from agregarmermas.Designer.cs rename to Merma/agregarmermas.Designer.cs index 8905ea3..65f8acc 100644 --- a/agregarmermas.Designer.cs +++ b/Merma/agregarmermas.Designer.cs @@ -34,29 +34,34 @@ 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.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label4 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; 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.ForeColor = System.Drawing.Color.Transparent; + this.label1.Location = new System.Drawing.Point(203, 319); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 24); + this.label1.Size = new System.Drawing.Size(86, 29); this.label1.TabIndex = 0; this.label1.Text = "Fecha:"; // // label2 // this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; 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.ForeColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(475, 381); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(115, 24); + this.label2.Size = new System.Drawing.Size(147, 29); this.label2.TabIndex = 1; this.label2.Text = "Descripcion:"; this.label2.Click += new System.EventHandler(this.label2_Click); @@ -64,77 +69,104 @@ // 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, 126); - this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Location = new System.Drawing.Point(198, 423); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtDescripcion.Multiline = true; this.txtDescripcion.Name = "txtDescripcion"; - this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.Size = new System.Drawing.Size(769, 239); 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.Location = new System.Drawing.Point(371, 314); + this.dtFecha.Margin = new System.Windows.Forms.Padding(4); this.dtFecha.Name = "dtFecha"; - this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.Size = new System.Drawing.Size(463, 34); this.dtFecha.TabIndex = 3; // // label3 // this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; 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.ForeColor = System.Drawing.Color.Transparent; + this.label3.Location = new System.Drawing.Point(193, 233); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.Size = new System.Drawing.Size(162, 29); 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.Location = new System.Drawing.Point(371, 233); + this.txtResponsable.Margin = new System.Windows.Forms.Padding(4); this.txtResponsable.Name = "txtResponsable"; - this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.Size = new System.Drawing.Size(463, 34); this.txtResponsable.TabIndex = 5; // - // btnAgregar + // pictureBox2 // - 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); + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox2.Image = global::compabetov2.Properties.Resources.check1; + this.pictureBox2.Location = new System.Drawing.Point(475, 684); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.TabIndex = 20; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); // - // btnCancelar + // pictureBox1 // - 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; + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1; + this.pictureBox1.Location = new System.Drawing.Point(581, 684); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(100, 69); + this.pictureBox1.TabIndex = 19; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.BackColor = System.Drawing.Color.Transparent; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.ForeColor = System.Drawing.Color.Transparent; + this.label4.Location = new System.Drawing.Point(455, 161); + this.label4.Name = "label4"; + this.label4.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.label4.Size = new System.Drawing.Size(180, 29); + this.label4.TabIndex = 21; + this.label4.Text = "Agregar Merma"; // // agregarmermas // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 404); - this.Controls.Add(this.btnCancelar); - this.Controls.Add(this.btnAgregar); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.BackgroundImage = global::compabetov2.Properties.Resources.Form; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.ClientSize = new System.Drawing.Size(1102, 747); + this.ControlBox = false; + this.Controls.Add(this.label4); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); 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.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "agregarmermas"; - this.Text = "Agregar Merma"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -148,7 +180,8 @@ 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; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/Merma/agregarmermas.cs b/Merma/agregarmermas.cs new file mode 100644 index 0000000..8476c67 --- /dev/null +++ b/Merma/agregarmermas.cs @@ -0,0 +1,70 @@ +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 agregarmermas : Form + { + 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(); + } + } + + private void pictureBox2_Click(object sender, EventArgs e) + { + // Mostrar mensaje de confirmación + DialogResult result = MessageBox.Show("¿En realidad quieres agregar esta nueva merma?", "Confirmar Agregar", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + + // Verificar la respuesta del usuario + if (result == DialogResult.Yes) + { + // Si el usuario hace clic en "Sí", proceder con la inserción + string descripcion = txtDescripcion.Text; + string fecha = dtFecha.Text; + string responsable = txtResponsable.Text; + + Merma nuevaMerma = new Merma(-1, fecha, responsable, descripcion); + + if (service.insertarMerma(nuevaMerma)) + { + MessageBox.Show("Nueva merma agregada"); + ventanaPadre.llenarPanel(); + Close(); + } + } + } + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.Close (); + } + } +} diff --git a/agregarmermas.resx b/Merma/agregarmermas.resx similarity index 100% rename from agregarmermas.resx rename to Merma/agregarmermas.resx diff --git a/mermas.Designer.cs b/Merma/mermas.Designer.cs similarity index 98% rename from mermas.Designer.cs rename to Merma/mermas.Designer.cs index 9042e2a..41bc4ee 100644 --- a/mermas.Designer.cs +++ b/Merma/mermas.Designer.cs @@ -54,7 +54,7 @@ this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); @@ -186,7 +186,7 @@ // mermaPanel // this.mermaPanel.Location = new System.Drawing.Point(572, 348); - this.mermaPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.mermaPanel.Margin = new System.Windows.Forms.Padding(4); this.mermaPanel.Name = "mermaPanel"; this.mermaPanel.Size = new System.Drawing.Size(1039, 495); this.mermaPanel.TabIndex = 16; @@ -196,7 +196,7 @@ // this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnAgregar.Location = new System.Drawing.Point(1049, 270); - this.btnAgregar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAgregar.Margin = new System.Windows.Forms.Padding(4); this.btnAgregar.Name = "btnAgregar"; this.btnAgregar.Size = new System.Drawing.Size(119, 34); this.btnAgregar.TabIndex = 17; @@ -208,7 +208,8 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1827, 922); + this.ClientSize = new System.Drawing.Size(1827, 1055); + this.ControlBox = false; this.Controls.Add(this.btnAgregar); this.Controls.Add(this.mermaPanel); this.Controls.Add(this.lblfecha); @@ -216,7 +217,7 @@ this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "mermas"; - this.Text = "mermas"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.mermas_Load); this.flowLayoutPanel1.ResumeLayout(false); diff --git a/mermas.cs b/Merma/mermas.cs similarity index 100% rename from mermas.cs rename to Merma/mermas.cs diff --git a/mermas.resx b/Merma/mermas.resx similarity index 100% rename from mermas.resx rename to Merma/mermas.resx diff --git a/verMerma.Designer.cs b/Merma/verMerma.Designer.cs similarity index 80% rename from verMerma.Designer.cs rename to Merma/verMerma.Designer.cs index 4ce8977..f09f1fa 100644 --- a/verMerma.Designer.cs +++ b/Merma/verMerma.Designer.cs @@ -35,13 +35,15 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); + this.cerrarlabel = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.cerrarlabel)).BeginInit(); 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(371, 233); - this.txtResponsable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtResponsable.Margin = new System.Windows.Forms.Padding(4); this.txtResponsable.Name = "txtResponsable"; this.txtResponsable.Size = new System.Drawing.Size(463, 34); this.txtResponsable.TabIndex = 11; @@ -62,7 +64,7 @@ // 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(371, 314); - this.dtFecha.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtFecha.Margin = new System.Windows.Forms.Padding(4); this.dtFecha.Name = "dtFecha"; this.dtFecha.Size = new System.Drawing.Size(463, 34); this.dtFecha.TabIndex = 9; @@ -107,20 +109,34 @@ this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Transparent; - this.label4.Location = new System.Drawing.Point(448, 169); + this.label4.Location = new System.Drawing.Point(491, 178); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(193, 29); + this.label4.Size = new System.Drawing.Size(131, 29); this.label4.TabIndex = 17; - this.label4.Text = "Modificar Merma"; + this.label4.Text = "Ver Merma"; + // + // cerrarlabel + // + this.cerrarlabel.BackColor = System.Drawing.Color.Transparent; + this.cerrarlabel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.cerrarlabel.Image = global::compabetov2.Properties.Resources.cancel1; + this.cerrarlabel.Location = new System.Drawing.Point(541, 720); + this.cerrarlabel.Name = "cerrarlabel"; + this.cerrarlabel.Size = new System.Drawing.Size(125, 76); + this.cerrarlabel.TabIndex = 18; + this.cerrarlabel.TabStop = false; + this.cerrarlabel.Click += new System.EventHandler(this.pictureBox1_Click); // // verMerma // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); this.BackgroundImage = global::compabetov2.Properties.Resources.Form; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1102, 747); + this.ClientSize = new System.Drawing.Size(1102, 808); this.ControlBox = false; + this.Controls.Add(this.cerrarlabel); this.Controls.Add(this.label4); this.Controls.Add(this.txtResponsable); this.Controls.Add(this.label3); @@ -129,9 +145,12 @@ this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.DoubleBuffered = true; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "verMerma"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Load += new System.EventHandler(this.verMerma_Load); + ((System.ComponentModel.ISupportInitialize)(this.cerrarlabel)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -146,5 +165,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label4; + private System.Windows.Forms.PictureBox cerrarlabel; } } \ No newline at end of file diff --git a/verMerma.cs b/Merma/verMerma.cs similarity index 85% rename from verMerma.cs rename to Merma/verMerma.cs index 5db024f..331fd0b 100644 --- a/verMerma.cs +++ b/Merma/verMerma.cs @@ -19,8 +19,12 @@ namespace compabetov2 InitializeComponent(); this.merma = merma; llenarComponentes(); + } + + + private void llenarComponentes() { txtDescripcion.Text = merma.razon; @@ -28,9 +32,16 @@ namespace compabetov2 dtFecha.Text = merma.fecha; } + + private void verMerma_Load(object sender, EventArgs e) { } + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/verMerma.resx b/Merma/verMerma.resx similarity index 100% rename from verMerma.resx rename to Merma/verMerma.resx diff --git a/ModificarContra.Designer.cs b/ModificarContra.Designer.cs deleted file mode 100644 index b126c07..0000000 --- a/ModificarContra.Designer.cs +++ /dev/null @@ -1,127 +0,0 @@ -namespace compabetov2 -{ - partial class ModificarContra - { - /// - /// 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.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.txtContra = new System.Windows.Forms.TextBox(); - this.txtConfi = new System.Windows.Forms.TextBox(); - this.btnConfirmar = new System.Windows.Forms.Button(); - this.btnCancelar = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(13, 13); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(96, 20); - this.label1.TabIndex = 0; - this.label1.Text = "Contraseña:"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(8, 101); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(166, 20); - this.label2.TabIndex = 1; - this.label2.Text = "Confirmar contraseña:"; - // - // txtContra - // - this.txtContra.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtContra.Location = new System.Drawing.Point(12, 54); - this.txtContra.Name = "txtContra"; - this.txtContra.PasswordChar = '*'; - this.txtContra.Size = new System.Drawing.Size(233, 26); - this.txtContra.TabIndex = 2; - this.txtContra.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // - // txtConfi - // - this.txtConfi.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtConfi.Location = new System.Drawing.Point(12, 145); - this.txtConfi.Name = "txtConfi"; - this.txtConfi.PasswordChar = '*'; - this.txtConfi.Size = new System.Drawing.Size(238, 26); - this.txtConfi.TabIndex = 3; - // - // btnConfirmar - // - this.btnConfirmar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnConfirmar.Location = new System.Drawing.Point(12, 210); - this.btnConfirmar.Name = "btnConfirmar"; - this.btnConfirmar.Size = new System.Drawing.Size(92, 32); - this.btnConfirmar.TabIndex = 4; - this.btnConfirmar.Text = "Confirmar"; - this.btnConfirmar.UseVisualStyleBackColor = true; - this.btnConfirmar.Click += new System.EventHandler(this.btnConfirmar_Click); - // - // btnCancelar - // - this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancelar.Location = new System.Drawing.Point(158, 210); - this.btnCancelar.Name = "btnCancelar"; - this.btnCancelar.Size = new System.Drawing.Size(92, 32); - this.btnCancelar.TabIndex = 5; - this.btnCancelar.Text = "Cancelar"; - this.btnCancelar.UseVisualStyleBackColor = true; - this.btnCancelar.Click += new System.EventHandler(this.btnCancelar_Click); - // - // ModificarContra - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(262, 254); - this.Controls.Add(this.btnCancelar); - this.Controls.Add(this.btnConfirmar); - this.Controls.Add(this.txtConfi); - this.Controls.Add(this.txtContra); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Name = "ModificarContra"; - this.Text = "ModificarContra"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox txtContra; - private System.Windows.Forms.TextBox txtConfi; - private System.Windows.Forms.Button btnConfirmar; - private System.Windows.Forms.Button btnCancelar; - } -} \ No newline at end of file diff --git a/MenuPrincipal.Designer.cs b/Principal/MenuPrincipal.Designer.cs similarity index 91% rename from MenuPrincipal.Designer.cs rename to Principal/MenuPrincipal.Designer.cs index beb2881..44645df 100644 --- a/MenuPrincipal.Designer.cs +++ b/Principal/MenuPrincipal.Designer.cs @@ -30,11 +30,8 @@ { this.components = new System.ComponentModel.Container(); this.panel1 = new System.Windows.Forms.Panel(); - this.usuariolabel = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.lblfecha = new System.Windows.Forms.Label(); this.lblhora = new System.Windows.Forms.Label(); - this.horafecha = new System.Windows.Forms.Timer(this.components); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.panel2 = new System.Windows.Forms.Panel(); this.pictureBox7 = new System.Windows.Forms.PictureBox(); @@ -48,6 +45,7 @@ this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.horafecha = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -63,8 +61,6 @@ // panel1 // this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.panel1.Controls.Add(this.usuariolabel); - this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.lblfecha); this.panel1.Controls.Add(this.lblhora); this.panel1.Controls.Add(this.flowLayoutPanel1); @@ -82,31 +78,6 @@ this.panel1.TabIndex = 4; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // - // usuariolabel - // - this.usuariolabel.AutoSize = true; - this.usuariolabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.usuariolabel.ForeColor = System.Drawing.Color.Navy; - this.usuariolabel.Location = new System.Drawing.Point(1761, 43); - this.usuariolabel.Name = "usuariolabel"; - this.usuariolabel.Size = new System.Drawing.Size(56, 20); - this.usuariolabel.TabIndex = 11; - this.usuariolabel.Text = "Admin"; - this.usuariolabel.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.label1.ForeColor = System.Drawing.Color.Navy; - this.label1.Location = new System.Drawing.Point(1723, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(139, 29); - this.label1.TabIndex = 10; - this.label1.Text = "Bienvenido"; - this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.label1.Click += new System.EventHandler(this.label1_Click); - // // lblfecha // this.lblfecha.AutoSize = true; @@ -132,11 +103,6 @@ this.lblhora.Text = "label1"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); // - // horafecha - // - this.horafecha.Enabled = true; - this.horafecha.Tick += new System.EventHandler(this.horafecha_Tick); - // // flowLayoutPanel1 // this.flowLayoutPanel1.BackgroundImage = global::compabetov2.Properties.Resources.rec; @@ -145,7 +111,7 @@ this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(-8, -6); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); @@ -227,7 +193,6 @@ this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; - // // button5 // @@ -320,16 +285,21 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // + // horafecha + // + this.horafecha.Enabled = true; + this.horafecha.Tick += new System.EventHandler(this.horafecha_Tick); + // // MenuPrincipal // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1924, 938); + this.ControlBox = false; this.Controls.Add(this.panel1); this.IsMdiContainer = true; this.Margin = new System.Windows.Forms.Padding(4); this.Name = "MenuPrincipal"; - this.Text = "Menu "; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.MenuPrincipal_Load); this.panel1.ResumeLayout(false); @@ -365,8 +335,6 @@ private System.Windows.Forms.Label lblfecha; private System.Windows.Forms.Label lblhora; private System.Windows.Forms.Timer horafecha; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label usuariolabel; } } diff --git a/MenuPrincipal.cs b/Principal/MenuPrincipal.cs similarity index 100% rename from MenuPrincipal.cs rename to Principal/MenuPrincipal.cs diff --git a/MenuPrincipal.resx b/Principal/MenuPrincipal.resx similarity index 100% rename from MenuPrincipal.resx rename to Principal/MenuPrincipal.resx diff --git a/login.Designer.cs b/Principal/login.Designer.cs similarity index 100% rename from login.Designer.cs rename to Principal/login.Designer.cs diff --git a/login.cs b/Principal/login.cs similarity index 100% rename from login.cs rename to Principal/login.cs diff --git a/login.resx b/Principal/login.resx similarity index 100% rename from login.resx rename to Principal/login.resx diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index efceae2..268a1ed 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -80,6 +80,46 @@ namespace compabetov2.Properties { } } + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap cancel { + get { + object obj = ResourceManager.GetObject("cancel", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap cancel1 { + get { + object obj = ResourceManager.GetObject("cancel1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap check { + get { + object obj = ResourceManager.GetObject("check", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap check1 { + get { + object obj = ResourceManager.GetObject("check1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index f8e57f5..fbb84a8 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\Cuadro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Cuentas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -139,6 +142,9 @@ ..\Resources\Rectangle 1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Envios.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,12 +160,6 @@ ..\Resources\cua1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Menui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\mermas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,6 +178,9 @@ ..\Resources\cua.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\LoginOriginal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,11 +190,14 @@ ..\Resources\mas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\HomeroMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\productoi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Menui1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Menui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\rec.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,16 +208,22 @@ ..\Resources\Modelo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\HomeroMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\reportesi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Menui1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\reportesi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\check1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Resources/cancel.png b/Resources/cancel.png new file mode 100644 index 0000000..d84e79e Binary files /dev/null and b/Resources/cancel.png differ diff --git a/Resources/cancel1.png b/Resources/cancel1.png new file mode 100644 index 0000000..285f5a1 Binary files /dev/null and b/Resources/cancel1.png differ diff --git a/Resources/check.png b/Resources/check.png new file mode 100644 index 0000000..8991b9e Binary files /dev/null and b/Resources/check.png differ diff --git a/Resources/check1.png b/Resources/check1.png new file mode 100644 index 0000000..ce7280b Binary files /dev/null and b/Resources/check1.png differ diff --git a/vender.Designer.cs b/Ventas/vender.Designer.cs similarity index 91% rename from vender.Designer.cs rename to Ventas/vender.Designer.cs index 12980e8..63ce4ee 100644 --- a/vender.Designer.cs +++ b/Ventas/vender.Designer.cs @@ -68,7 +68,7 @@ this.lblfecha.AutoSize = true; this.lblfecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F); this.lblfecha.ForeColor = System.Drawing.Color.Navy; - this.lblfecha.Location = new System.Drawing.Point(493, 105); + this.lblfecha.Location = new System.Drawing.Point(619, 128); this.lblfecha.Name = "lblfecha"; this.lblfecha.Size = new System.Drawing.Size(159, 58); this.lblfecha.TabIndex = 13; @@ -81,7 +81,7 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(681, -14); + this.lblhora.Location = new System.Drawing.Point(807, 9); this.lblhora.Name = "lblhora"; this.lblhora.Size = new System.Drawing.Size(318, 113); this.lblhora.TabIndex = 12; @@ -154,7 +154,7 @@ this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 0); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1199); @@ -256,6 +256,7 @@ // // flowLayoutPanel3 // + this.flowLayoutPanel3.AutoScroll = true; this.flowLayoutPanel3.Location = new System.Drawing.Point(325, 283); this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel3.Name = "flowLayoutPanel3"; @@ -265,57 +266,64 @@ // // txtbusqueda // - this.txtbusqueda.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.txtbusqueda.Location = new System.Drawing.Point(365, 229); + this.txtbusqueda.Font = new System.Drawing.Font("Poppins", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtbusqueda.Location = new System.Drawing.Point(329, 219); this.txtbusqueda.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtbusqueda.Name = "txtbusqueda"; - this.txtbusqueda.Size = new System.Drawing.Size(666, 36); + this.txtbusqueda.Size = new System.Drawing.Size(702, 45); this.txtbusqueda.TabIndex = 15; this.txtbusqueda.TextChanged += new System.EventHandler(this.txtbusqueda_TextChanged); // // bntImprimir // - this.bntImprimir.Location = new System.Drawing.Point(1347, 76); + this.bntImprimir.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.bntImprimir.Font = new System.Drawing.Font("Poppins", 15F); + this.bntImprimir.ForeColor = System.Drawing.Color.Transparent; + this.bntImprimir.Location = new System.Drawing.Point(1055, 210); this.bntImprimir.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.bntImprimir.Name = "bntImprimir"; - this.bntImprimir.Size = new System.Drawing.Size(75, 23); + this.bntImprimir.Size = new System.Drawing.Size(151, 54); this.bntImprimir.TabIndex = 17; this.bntImprimir.Text = "Vender"; - this.bntImprimir.UseVisualStyleBackColor = true; + this.bntImprimir.UseVisualStyleBackColor = false; this.bntImprimir.Click += new System.EventHandler(this.bntImprimir_Click); // // responsablecb // + this.responsablecb.Font = new System.Drawing.Font("Poppins", 15F); this.responsablecb.FormattingEnabled = true; this.responsablecb.Items.AddRange(new object[] { "Fabian Herrera", "Cristofer Perez ", "Angel Alexander", "Emilio Urenda"}); - this.responsablecb.Location = new System.Drawing.Point(1441, 76); + this.responsablecb.Location = new System.Drawing.Point(1371, 212); this.responsablecb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.responsablecb.Name = "responsablecb"; - this.responsablecb.Size = new System.Drawing.Size(121, 24); + this.responsablecb.Size = new System.Drawing.Size(227, 52); this.responsablecb.TabIndex = 18; this.responsablecb.SelectedIndexChanged += new System.EventHandler(this.responsablecb_SelectedIndexChanged); // // btnFiar // - this.btnFiar.Location = new System.Drawing.Point(1363, 122); + this.btnFiar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.btnFiar.Font = new System.Drawing.Font("Poppins", 15F); + this.btnFiar.ForeColor = System.Drawing.Color.Transparent; + this.btnFiar.Location = new System.Drawing.Point(1213, 210); this.btnFiar.Margin = new System.Windows.Forms.Padding(4); this.btnFiar.Name = "btnFiar"; - this.btnFiar.Size = new System.Drawing.Size(100, 28); + this.btnFiar.Size = new System.Drawing.Size(151, 54); this.btnFiar.TabIndex = 19; - this.btnFiar.Text = "Fiar"; - this.btnFiar.UseVisualStyleBackColor = true; + this.btnFiar.Text = "Cuenta"; + this.btnFiar.UseVisualStyleBackColor = false; this.btnFiar.Click += new System.EventHandler(this.btnFiar_Click); // // vender // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1827, 750); + this.ClientSize = new System.Drawing.Size(1827, 884); + this.ControlBox = false; this.Controls.Add(this.btnFiar); this.Controls.Add(this.responsablecb); this.Controls.Add(this.bntImprimir); @@ -327,7 +335,6 @@ this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "vender"; - this.Text = "vender"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.vender_Load); this.flowLayoutPanel2.ResumeLayout(false); diff --git a/vender.cs b/Ventas/vender.cs similarity index 100% rename from vender.cs rename to Ventas/vender.cs diff --git a/vender.resx b/Ventas/vender.resx similarity index 100% rename from vender.resx rename to Ventas/vender.resx diff --git a/agregarmermas.cs b/agregarmermas.cs deleted file mode 100644 index c4cadd9..0000000 --- a/agregarmermas.cs +++ /dev/null @@ -1,41 +0,0 @@ -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 agregarmermas : Form - { - 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/compabetov2.csproj b/compabetov2.csproj index 1853e91..ffd9c82 100644 --- a/compabetov2.csproj +++ b/compabetov2.csproj @@ -106,34 +106,34 @@ - + Form - + ActualizarMerma.cs - + Form - + AgregarEmpleado.cs - + Form - + AgregarLogin.cs - + Form - + agregarmermas.cs - + Form - + cuentas.cs @@ -150,118 +150,118 @@ - + Form - + EditarEmpleado.cs - + Form - + envios.cs - + Form - + inventario.cs - + Form - + login.cs - + Form - + MenuPrincipal.cs - + Form - + mermas.cs - + Form - + ModificarContra.cs - + Form - + personal.cs - + Form - + preguntaLogin.cs - + Form - + vender.cs - + Form - + verMerma.cs - + ActualizarMerma.cs - + AgregarEmpleado.cs Designer - + AgregarLogin.cs Designer - + agregarmermas.cs - + cuentas.cs Designer - + EditarEmpleado.cs - + envios.cs - + inventario.cs - + login.cs - + MenuPrincipal.cs - + mermas.cs - + ModificarContra.cs - + personal.cs - + preguntaLogin.cs @@ -274,10 +274,10 @@ Resources.resx True - + vender.cs - + verMerma.cs @@ -382,6 +382,10 @@ + + + + PreserveNewest diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6b1876a..d031cc8 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index daacd26..9bf445e 100644 Binary files a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/obj/Debug/compabetov2.Properties.Resources.resources b/obj/Debug/compabetov2.Properties.Resources.resources index fd77073..e72cb9f 100644 Binary files a/obj/Debug/compabetov2.Properties.Resources.resources and b/obj/Debug/compabetov2.Properties.Resources.resources differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index efffae9..1770d6a 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 59d0b6f..d2031b5 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD e667a4e3b4d9c621799848a8f3cd089577a0f35fe509181b78fb7de1d38d3880 +======= +04b35c54eccc37d11ee5587dfd28c3431df872e63afd80729ce6fb26c7e0a185 +>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c