diff --git a/Empleados/ModificarContra.Designer.cs b/Empleados/ModificarContra.Designer.cs index b126c07..1629610 100644 --- a/Empleados/ModificarContra.Designer.cs +++ b/Empleados/ModificarContra.Designer.cs @@ -32,84 +32,120 @@ 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.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.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.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(96, 20); + 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.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.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(166, 20); + 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("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.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(233, 26); + 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("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.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(238, 26); + this.txtConfi.Size = new System.Drawing.Size(316, 42); this.txtConfi.TabIndex = 3; // - // btnConfirmar + // pictureBox2 // - 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); + 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); // - // btnCancelar + // pictureBox1 // - 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); + 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(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); 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.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.Text = "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(); @@ -121,7 +157,8 @@ 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; + 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/Empleados/ModificarContra.cs b/Empleados/ModificarContra.cs index 9007bef..46aa891 100644 --- a/Empleados/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/Inventario/inventario.Designer.cs b/Inventario/inventario.Designer.cs index b46004a..c8449fa 100644 --- a/Inventario/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); diff --git a/Merma/ActualizarMerma.Designer.cs b/Merma/ActualizarMerma.Designer.cs index ab9b868..ccc6261 100644 --- a/Merma/ActualizarMerma.Designer.cs +++ b/Merma/ActualizarMerma.Designer.cs @@ -150,7 +150,7 @@ 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); @@ -162,6 +162,7 @@ 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; diff --git a/Merma/agregarmermas.Designer.cs b/Merma/agregarmermas.Designer.cs index 7de0d43..65f8acc 100644 --- a/Merma/agregarmermas.Designer.cs +++ b/Merma/agregarmermas.Designer.cs @@ -80,7 +80,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 = 3; @@ -101,7 +101,7 @@ // 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 = 5; @@ -162,6 +162,7 @@ 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(3, 2, 3, 2); this.Name = "agregarmermas"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); diff --git a/Merma/verMerma.Designer.cs b/Merma/verMerma.Designer.cs index 00c596d..f09f1fa 100644 --- a/Merma/verMerma.Designer.cs +++ b/Merma/verMerma.Designer.cs @@ -145,6 +145,7 @@ 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 = "verMerma"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; diff --git a/Ventas/vender.Designer.cs b/Ventas/vender.Designer.cs index 94fd7c1..63ce4ee 100644 --- a/Ventas/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; @@ -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,56 +266,62 @@ // // 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, 884); this.ControlBox = false; this.Controls.Add(this.btnFiar); diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 9ce9346..4de166c 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 49c9392..cbf9996 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 1643a2e..b4126a5 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 226b359..1110b00 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 9ce9346..4de166c 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 49c9392..cbf9996 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ