diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo
index 0ade0f3..079dccf 100644
Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ
diff --git a/.vs/compabetov2.csproj.dtbcache.json b/.vs/compabetov2.csproj.dtbcache.json
index 9626749..ead3680 100644
--- a/.vs/compabetov2.csproj.dtbcache.json
+++ b/.vs/compabetov2.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cuentas.cs"},{"SourceFile":"cuentas.Designer.cs"},{"SourceFile":"database\\conexion.cs"},{"SourceFile":"database\\DAO.cs"},{"SourceFile":"database\\modelos\\Categoria.cs"},{"SourceFile":"database\\modelos\\Cliente.cs"},{"SourceFile":"database\\modelos\\Producto.cs"},{"SourceFile":"database\\modelos\\usuario.cs"},{"SourceFile":"database\\service.cs"},{"SourceFile":"envios.cs"},{"SourceFile":"envios.Designer.cs"},{"SourceFile":"inventario.cs"},{"SourceFile":"inventario.Designer.cs"},{"SourceFile":"login.cs"},{"SourceFile":"login.Designer.cs"},{"SourceFile":"MenuPrincipal.cs"},{"SourceFile":"MenuPrincipal.Designer.cs"},{"SourceFile":"mermas.cs"},{"SourceFile":"mermas.Designer.cs"},{"SourceFile":"personal.cs"},{"SourceFile":"personal.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"vender.cs"},{"SourceFile":"vender.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\bin\\Debug\\compabetov2.exe","OutputItemRelativePath":"compabetov2.exe"},{"OutputItemFullPath":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG\\bin\\Debug\\compabetov2.pdb","OutputItemRelativePath":"compabetov2.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cuentas.cs"},{"SourceFile":"cuentas.Designer.cs"},{"SourceFile":"database\\conexion.cs"},{"SourceFile":"database\\DAO.cs"},{"SourceFile":"database\\modelos\\Categoria.cs"},{"SourceFile":"database\\modelos\\Cliente.cs"},{"SourceFile":"database\\modelos\\Empleado.cs"},{"SourceFile":"database\\modelos\\Producto.cs"},{"SourceFile":"database\\modelos\\usuario.cs"},{"SourceFile":"database\\service.cs"},{"SourceFile":"envios.cs"},{"SourceFile":"envios.Designer.cs"},{"SourceFile":"inventario.cs"},{"SourceFile":"inventario.Designer.cs"},{"SourceFile":"login.cs"},{"SourceFile":"login.Designer.cs"},{"SourceFile":"MenuPrincipal.cs"},{"SourceFile":"MenuPrincipal.Designer.cs"},{"SourceFile":"mermas.cs"},{"SourceFile":"mermas.Designer.cs"},{"SourceFile":"personal.cs"},{"SourceFile":"personal.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"vender.cs"},{"SourceFile":"vender.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\bin\\Debug\\compabetov2.exe","OutputItemRelativePath":"compabetov2.exe"},{"OutputItemFullPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\bin\\Debug\\compabetov2.pdb","OutputItemRelativePath":"compabetov2.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe
index d46cdeb..48d058f 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 aab028b..59a6df0 100644
Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ
diff --git a/compabetov2.csproj b/compabetov2.csproj
index b150648..9d3a6ff 100644
--- a/compabetov2.csproj
+++ b/compabetov2.csproj
@@ -308,6 +308,9 @@
false
+
+
+
diff --git a/database/service.cs b/database/service.cs
index f221d1e..48e3a21 100644
--- a/database/service.cs
+++ b/database/service.cs
@@ -101,32 +101,29 @@ namespace compabetov2.database
List empleados = new List();
using (SQLiteDataReader reader = DAO.conseguirEmpleadosDAO()) {
- if(reader == null) { MessageBox.Show("null");
- return empleados;
- } else
- {
- while (reader.Read())
- {
- Empleado empleado = new Empleado(
- (int)reader["idempleado"],
- (string)reader["nombre"].ToString(),
- (string)reader["apellidos"].ToString(),
- (string)reader["calle"].ToString(),
- (string)reader["fecha_contratacion"].ToString(),
- (string)reader["estado"].ToString(),
- (string)reader["colonia"].ToString(),
- (string)reader["cp"].ToString(),
- (string)reader["no_ext"].ToString(),
- (string)reader["no_int"].ToString(),
- (string)reader["referencia"].ToString(),
- (string)reader["fecha_nac"].ToString(),
- (string)reader["telefono"].ToString()
- );
- empleados.Add(empleado);
- }
- return empleados;
- }
+
+ while (reader.Read())
+ {
+ Empleado empleado = new Empleado(
+ int.Parse(reader["idempleado"].ToString()),
+ reader["nombre"].ToString(),
+ reader["apellidos"].ToString(),
+ reader["calle"].ToString(),
+ reader["fecha_contratacion"].ToString(),
+ reader["estado"].ToString(),
+ reader["colonia"].ToString(),
+ reader["cp"].ToString(),
+ reader["no_ext"].ToString(),
+ reader["no_int"].ToString(),
+ reader["referencia"].ToString(),
+ reader["fecha_nac"].ToString(),
+ reader["telefono"].ToString()
+ );
+ empleados.Add(empleado);
+ }
+ return empleados;
+
}
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 10a1a65..5a38874 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 7c50885..5b9475c 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 d46cdeb..48d058f 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 aab028b..59a6df0 100644
Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ
diff --git a/personal.Designer.cs b/personal.Designer.cs
index 9a17900..56f367b 100644
--- a/personal.Designer.cs
+++ b/personal.Designer.cs
@@ -68,6 +68,19 @@
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.empleadoBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.conexionBindingSource = new System.Windows.Forms.BindingSource(this.components);
+ this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Nombre = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Apellidos = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.fecha_con = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.estado = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.calle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.calonia = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.cp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.no_ext = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.no_int = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.referencia = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.fecha_nac = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.telefono = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
this.panel2.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
@@ -517,9 +530,23 @@
// dataGridView1
//
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView1.Location = new System.Drawing.Point(444, 75);
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.Id,
+ this.Nombre,
+ this.Apellidos,
+ this.fecha_con,
+ this.estado,
+ this.calle,
+ this.calonia,
+ this.cp,
+ this.no_ext,
+ this.no_int,
+ this.referencia,
+ this.fecha_nac,
+ this.telefono});
+ this.dataGridView1.Location = new System.Drawing.Point(258, 75);
this.dataGridView1.Name = "dataGridView1";
- this.dataGridView1.Size = new System.Drawing.Size(240, 150);
+ this.dataGridView1.Size = new System.Drawing.Size(1100, 150);
this.dataGridView1.TabIndex = 44;
this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
//
@@ -531,11 +558,76 @@
//
this.conexionBindingSource.DataSource = typeof(compabetov2.database.Conexion);
//
+ // Id
+ //
+ this.Id.HeaderText = "Id";
+ this.Id.Name = "Id";
+ //
+ // Nombre
+ //
+ this.Nombre.HeaderText = "Nombre";
+ this.Nombre.Name = "Nombre";
+ //
+ // Apellidos
+ //
+ this.Apellidos.HeaderText = "Apellidos";
+ this.Apellidos.Name = "Apellidos";
+ //
+ // fecha_con
+ //
+ this.fecha_con.HeaderText = "Fecha contratacion";
+ this.fecha_con.Name = "fecha_con";
+ //
+ // estado
+ //
+ this.estado.HeaderText = "Estado";
+ this.estado.Name = "estado";
+ //
+ // calle
+ //
+ this.calle.HeaderText = "Calle";
+ this.calle.Name = "calle";
+ //
+ // calonia
+ //
+ this.calonia.HeaderText = "Calonia";
+ this.calonia.Name = "calonia";
+ //
+ // cp
+ //
+ this.cp.HeaderText = "Cp";
+ this.cp.Name = "cp";
+ //
+ // no_ext
+ //
+ this.no_ext.HeaderText = "No. Exterior";
+ this.no_ext.Name = "no_ext";
+ //
+ // no_int
+ //
+ this.no_int.HeaderText = "No. Interior";
+ this.no_int.Name = "no_int";
+ //
+ // referencia
+ //
+ this.referencia.HeaderText = "Referencia";
+ this.referencia.Name = "referencia";
+ //
+ // fecha_nac
+ //
+ this.fecha_nac.HeaderText = "Fecha nacimiento";
+ this.fecha_nac.Name = "fecha_nac";
+ //
+ // telefono
+ //
+ this.telefono.HeaderText = "Telefono";
+ this.telefono.Name = "telefono";
+ //
// personal
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1028, 609);
+ this.ClientSize = new System.Drawing.Size(1370, 609);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.label12);
this.Controls.Add(this.button9);
@@ -570,6 +662,7 @@
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();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
@@ -623,5 +716,18 @@
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.BindingSource conexionBindingSource;
private System.Windows.Forms.BindingSource empleadoBindingSource;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Id;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Nombre;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Apellidos;
+ private System.Windows.Forms.DataGridViewTextBoxColumn fecha_con;
+ private System.Windows.Forms.DataGridViewTextBoxColumn estado;
+ private System.Windows.Forms.DataGridViewTextBoxColumn calle;
+ private System.Windows.Forms.DataGridViewTextBoxColumn calonia;
+ private System.Windows.Forms.DataGridViewTextBoxColumn cp;
+ private System.Windows.Forms.DataGridViewTextBoxColumn no_ext;
+ private System.Windows.Forms.DataGridViewTextBoxColumn no_int;
+ private System.Windows.Forms.DataGridViewTextBoxColumn referencia;
+ private System.Windows.Forms.DataGridViewTextBoxColumn fecha_nac;
+ private System.Windows.Forms.DataGridViewTextBoxColumn telefono;
}
}
\ No newline at end of file
diff --git a/personal.cs b/personal.cs
index 6637d49..a284896 100644
--- a/personal.cs
+++ b/personal.cs
@@ -54,7 +54,29 @@ namespace compabetov2
private void llenarGrid()
{
List empleados = service.conseguirEmpleados();
- //dataGridView1.DataSource = empleados;
+ empleados.Reverse();
+ foreach(Empleado empleado in empleados)
+ {
+ dataGridView1.Rows.Insert(0,
+ empleado.idempleado,
+ empleado.nombre,
+ empleado.apellidos,
+ empleado.fecha_contratacion,
+ empleado.estado,
+ empleado.calle,
+ empleado.colonia,
+ empleado.cp,
+ empleado.no_ext,
+ empleado.no_int,
+ empleado.referencia,
+ empleado.fecha_nac,
+ empleado.telefono);
+ }
+ }
+
+ private void personal_Load(object sender, EventArgs e)
+ {
+
}
}
}
diff --git a/personal.resx b/personal.resx
index 415b6af..ef1e081 100644
--- a/personal.resx
+++ b/personal.resx
@@ -117,6 +117,45 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
197, 17