diff --git a/MenuPrincipal.Designer.cs b/MenuPrincipal.Designer.cs index 4fa98a1..6a93d98 100644 --- a/MenuPrincipal.Designer.cs +++ b/MenuPrincipal.Designer.cs @@ -77,18 +77,21 @@ this.panel1.Controls.Add(this.pictureBox1); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1924, 1055); + this.panel1.Size = new System.Drawing.Size(1028, 609); 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("Poppins SemiBold", 10F); + 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.Location = new System.Drawing.Point(1321, 35); + this.usuariolabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.usuariolabel.Name = "usuariolabel"; - this.usuariolabel.Size = new System.Drawing.Size(71, 30); + this.usuariolabel.Size = new System.Drawing.Size(47, 17); this.usuariolabel.TabIndex = 11; this.usuariolabel.Text = "Admin"; this.usuariolabel.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -96,11 +99,12 @@ // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + 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.Location = new System.Drawing.Point(1292, 7); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(161, 44); + this.label1.Size = new System.Drawing.Size(109, 25); this.label1.TabIndex = 10; this.label1.Text = "Bienvenido"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -109,11 +113,12 @@ // lblfecha // this.lblfecha.AutoSize = true; - this.lblfecha.Font = new System.Drawing.Font("Poppins SemiBold", 30F); + 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(776, 112); + this.lblfecha.Location = new System.Drawing.Point(582, 91); + this.lblfecha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblfecha.Name = "lblfecha"; - this.lblfecha.Size = new System.Drawing.Size(193, 88); + this.lblfecha.Size = new System.Drawing.Size(126, 46); this.lblfecha.TabIndex = 9; this.lblfecha.Text = "label2"; this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -122,11 +127,12 @@ // lblhora // this.lblhora.AutoSize = true; - this.lblhora.Font = new System.Drawing.Font("Poppins SemiBold", 60F); + 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(953, -6); + this.lblhora.Location = new System.Drawing.Point(715, -5); + this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(365, 177); + this.lblhora.Size = new System.Drawing.Size(249, 91); this.lblhora.TabIndex = 8; this.lblhora.Text = "label1"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); @@ -140,24 +146,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(-8, -6); + this.flowLayoutPanel1.Location = new System.Drawing.Point(-6, -5); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); + this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); this.flowLayoutPanel1.TabIndex = 7; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(3, 3); + this.panel2.Location = new System.Drawing.Point(2, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(312, 263); + this.panel2.Size = new System.Drawing.Size(234, 214); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(64, 35); + this.pictureBox7.Location = new System.Drawing.Point(48, 28); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -169,14 +178,15 @@ this.button1.BackColor = System.Drawing.Color.Transparent; this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); 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(3, 272); + this.button1.Location = new System.Drawing.Point(2, 220); + this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(312, 115); + this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(234, 93); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -187,14 +197,15 @@ this.button2.BackColor = System.Drawing.Color.Transparent; this.button2.FlatAppearance.BorderSize = 0; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button2.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); 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(3, 393); + this.button2.Location = new System.Drawing.Point(2, 317); + this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(312, 115); + this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(234, 93); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -205,14 +216,15 @@ this.button3.BackColor = System.Drawing.Color.Transparent; this.button3.FlatAppearance.BorderSize = 0; this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button3.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); 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(3, 514); + this.button3.Location = new System.Drawing.Point(2, 414); + this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(312, 115); + this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(234, 93); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -222,14 +234,15 @@ this.button4.BackColor = System.Drawing.Color.Transparent; this.button4.FlatAppearance.BorderSize = 0; this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); 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(3, 635); + this.button4.Location = new System.Drawing.Point(2, 511); + this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(312, 115); + this.button4.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button4.Size = new System.Drawing.Size(234, 93); this.button4.TabIndex = 11; this.button4.Text = "Reportes"; this.button4.UseVisualStyleBackColor = false; @@ -239,14 +252,15 @@ this.button5.BackColor = System.Drawing.Color.Transparent; this.button5.FlatAppearance.BorderSize = 0; this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button5.Font = new System.Drawing.Font("Poppins SemiBold", 15F); + this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); 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(3, 756); + this.button5.Location = new System.Drawing.Point(2, 608); + this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(312, 115); + this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(234, 93); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -255,9 +269,10 @@ // pictureBox4 // this.pictureBox4.Image = global::compabetov2.Properties.Resources.inventario; - this.pictureBox4.Location = new System.Drawing.Point(1450, 603); + this.pictureBox4.Location = new System.Drawing.Point(1088, 490); + this.pictureBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(293, 282); + this.pictureBox4.Size = new System.Drawing.Size(220, 229); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox4.TabIndex = 6; this.pictureBox4.TabStop = false; @@ -266,9 +281,10 @@ // pictureBox5 // this.pictureBox5.Image = global::compabetov2.Properties.Resources.Cuentas; - this.pictureBox5.Location = new System.Drawing.Point(584, 603); + this.pictureBox5.Location = new System.Drawing.Point(438, 490); + this.pictureBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(293, 282); + this.pictureBox5.Size = new System.Drawing.Size(220, 229); this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox5.TabIndex = 5; this.pictureBox5.TabStop = false; @@ -277,9 +293,10 @@ // pictureBox6 // this.pictureBox6.Image = global::compabetov2.Properties.Resources.mermas; - this.pictureBox6.Location = new System.Drawing.Point(1014, 603); + this.pictureBox6.Location = new System.Drawing.Point(760, 490); + this.pictureBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(293, 282); + this.pictureBox6.Size = new System.Drawing.Size(220, 229); this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox6.TabIndex = 4; this.pictureBox6.TabStop = false; @@ -288,9 +305,10 @@ // pictureBox3 // this.pictureBox3.Image = global::compabetov2.Properties.Resources.Envios; - this.pictureBox3.Location = new System.Drawing.Point(1450, 209); + this.pictureBox3.Location = new System.Drawing.Point(1088, 170); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(293, 282); + this.pictureBox3.Size = new System.Drawing.Size(220, 229); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox3.TabIndex = 3; this.pictureBox3.TabStop = false; @@ -299,9 +317,10 @@ // pictureBox2 // this.pictureBox2.Image = global::compabetov2.Properties.Resources.Vender; - this.pictureBox2.Location = new System.Drawing.Point(584, 209); + this.pictureBox2.Location = new System.Drawing.Point(438, 170); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(293, 282); + this.pictureBox2.Size = new System.Drawing.Size(220, 229); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 2; this.pictureBox2.TabStop = false; @@ -310,9 +329,10 @@ // pictureBox1 // this.pictureBox1.Image = global::compabetov2.Properties.Resources.Personal; - this.pictureBox1.Location = new System.Drawing.Point(1014, 209); + this.pictureBox1.Location = new System.Drawing.Point(760, 170); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(293, 282); + this.pictureBox1.Size = new System.Drawing.Size(220, 229); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; @@ -325,12 +345,11 @@ // // MenuPrincipal // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1924, 1055); + this.ClientSize = new System.Drawing.Size(1028, 609); 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; diff --git a/MenuPrincipal.cs b/MenuPrincipal.cs index dda8686..4508571 100644 --- a/MenuPrincipal.cs +++ b/MenuPrincipal.cs @@ -1,4 +1,5 @@ -using System; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -19,10 +20,11 @@ namespace compabetov2 public partial class MenuPrincipal : Form { private int childFormNumber = 0; - - public MenuPrincipal() + private LoginModel loginPrincipal; + public MenuPrincipal(LoginModel loginPrincipal) { InitializeComponent(); + this.loginPrincipal = loginPrincipal; } @@ -65,16 +67,17 @@ namespace compabetov2 private void button5_Click(object sender, EventArgs e) { - this.Dispose(); + login login = new login(); - login.Show(); + login.ShowDialog(); + this.Dispose(); } private void pictureBox4_Click(object sender, EventArgs e) { - inventario inventario = new inventario(); - inventario.Show(); + inventario inventario = new inventario(loginPrincipal); + inventario.ShowDialog(); this.Dispose(true); @@ -87,34 +90,34 @@ namespace compabetov2 private void pictureBox1_Click(object sender, EventArgs e) { - personal personal = new personal(); + personal personal = new personal(loginPrincipal); - personal.Show(); + personal.ShowDialog(); this.Dispose(true); } private void pictureBox3_Click(object sender, EventArgs e) { - envios envios = new envios(); + envios envios = new envios(loginPrincipal); - envios.Show(); + envios.ShowDialog(); this.Dispose(true); } private void pictureBox5_Click(object sender, EventArgs e) { - cuentas cuentas = new cuentas(); - cuentas.Show(); + cuentas cuentas = new cuentas(loginPrincipal); + cuentas.ShowDialog(); this.Dispose(true); } private void pictureBox6_Click(object sender, EventArgs e) { - mermas mermas = new mermas(); - mermas.Show(); + mermas mermas = new mermas(loginPrincipal); + mermas.ShowDialog(); this.Dispose(true); @@ -127,8 +130,8 @@ namespace compabetov2 private void pictureBox2_Click(object sender, EventArgs e) { - vender vender = new vender(); - vender.Show(); + vender vender = new vender(loginPrincipal); + vender.ShowDialog(); this.Dispose(true); } @@ -142,5 +145,10 @@ namespace compabetov2 { } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + + } } } diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 96b6b67..9ecc006 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 7bd6c56..da6e687 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/cuentas.cs b/cuentas.cs index b73ff08..3376ad3 100644 --- a/cuentas.cs +++ b/cuentas.cs @@ -1,4 +1,5 @@ -using System; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,14 +13,16 @@ namespace compabetov2 { public partial class cuentas : Form { - public cuentas() + private LoginModel loginPrincipal; + public cuentas(LoginModel loginPrincipal) { InitializeComponent(); + this.loginPrincipal = loginPrincipal; } private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(true); } diff --git a/database/DAO.cs b/database/DAO.cs index 52e876d..ba8a26c 100644 --- a/database/DAO.cs +++ b/database/DAO.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Data.SQLite; +using System.Diagnostics.Contracts; using System.IO; using System.Linq; using System.Security.Policy; @@ -76,6 +77,31 @@ namespace compabetov2.database } } + public static SQLiteDataReader conseguirInicioSesionDAO(string usuario) + { + SQLiteDataReader reader = null; + var db_conexion = new Conexion(); + try + { + SQLiteConnection conexion = db_conexion.get_connection(); + + conexion.Open(); + + string sql = "SELECT usuario, tipo FROM Login WHERE usuario = @param0"; + SQLiteCommand command = new SQLiteCommand(sql, conexion); + command.Parameters.AddWithValue($"@param{0}", usuario); + reader = command.ExecuteReader(); + + return reader; + + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return reader; + } + } + public static bool verificarExistenciaLoginDAO(LoginModel loginModel) { SQLiteDataReader reader = null; diff --git a/database/modelos/LoginModel.cs b/database/modelos/LoginModel.cs index 5c8307f..31f6076 100644 --- a/database/modelos/LoginModel.cs +++ b/database/modelos/LoginModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace compabetov2.database.modelos { - internal class LoginModel + public class LoginModel { public string usuario; public string contra; diff --git a/database/service.cs b/database/service.cs index c0c544a..f19110a 100644 --- a/database/service.cs +++ b/database/service.cs @@ -16,7 +16,21 @@ namespace compabetov2.database { return DAO.iniciarSesionDAO(usuario.nombreUsuario, usuario.contra); } + public static LoginModel conseguirInicioSesion(string usuario) + { + SQLiteDataReader reader = DAO.conseguirInicioSesionDAO(usuario); + while (reader.Read()) + { + return new LoginModel( + reader["usuario"].ToString(), + "", + reader["tipo"].ToString() + ); + } + + return null; + } public static bool crearLogin(LoginModel loginModel, int idEmpleado) { return DAO.crearLoginDAO(loginModel, idEmpleado); diff --git a/envios.cs b/envios.cs index a610856..47611e2 100644 --- a/envios.cs +++ b/envios.cs @@ -1,4 +1,5 @@ -using System; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,14 +13,16 @@ namespace compabetov2 { public partial class envios : Form { - public envios() + private LoginModel loginPrincipal; + public envios(LoginModel loginPrincipal) { InitializeComponent(); + this.loginPrincipal = loginPrincipal; } private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(true); } diff --git a/inventario.cs b/inventario.cs index af8b2b8..cc59d35 100644 --- a/inventario.cs +++ b/inventario.cs @@ -19,10 +19,12 @@ namespace compabetov2 public partial class inventario : Form { private List productos; - public inventario() + private LoginModel loginPrincipal; + public inventario(LoginModel loginPrincipal) { InitializeComponent(); llenarPanel(); + this.loginPrincipal = loginPrincipal; } private void llenarPanel() @@ -138,7 +140,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(); diff --git a/login.cs b/login.cs index 6db4783..35ffb3f 100644 --- a/login.cs +++ b/login.cs @@ -66,12 +66,12 @@ namespace compabetov2 { - MenuPrincipal principal = new MenuPrincipal(); - principal.Show(); + MenuPrincipal principal = new MenuPrincipal(service.conseguirInicioSesion(txtusuario.Text)); + principal.ShowDialog(); - this.Hide(); + this.Close(); diff --git a/mermas.cs b/mermas.cs index 06b6c0a..c3428f9 100644 --- a/mermas.cs +++ b/mermas.cs @@ -1,4 +1,5 @@ -using System; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,11 @@ namespace compabetov2 { public partial class mermas : Form { - public mermas() + private LoginModel loginPrincipal; + public mermas(LoginModel loginPrincipal) { InitializeComponent(); + this.loginPrincipal = loginPrincipal; } private void mermas_Load(object sender, EventArgs e) @@ -40,7 +43,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(true); } diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 3b0ba31..df7383c 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 9eacb92..5b34f37 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.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 7691eac..74b9fdb 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 96b6b67..9ecc006 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 7bd6c56..da6e687 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/personal.cs b/personal.cs index 8fd84ce..46855a7 100644 --- a/personal.cs +++ b/personal.cs @@ -17,10 +17,12 @@ namespace compabetov2 public partial class personal : Form { List empleados; - public personal() + private LoginModel loginPrincipal; + public personal(LoginModel loginPrincipal) { InitializeComponent(); llenarPanel(); + this.loginPrincipal = loginPrincipal; } public void llenarPanel() @@ -224,7 +226,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(true); } diff --git a/vender.cs b/vender.cs index b5fe1b8..b6bf9ef 100644 --- a/vender.cs +++ b/vender.cs @@ -29,14 +29,16 @@ namespace compabetov2 private List productos; private List cartas = new List(); private decimal total = 0; + private LoginModel loginPrincipal; - public vender() + public vender(LoginModel loginPrincipal) { InitializeComponent(); getData(); llenarLayout(); + this.loginPrincipal = loginPrincipal; } private void llenarLayout() @@ -375,7 +377,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { - MenuPrincipal menuPrincipal = new MenuPrincipal(); + MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); menuPrincipal.Show(); this.Dispose(true); }