version 1.0.1

This commit is contained in:
carlos
2024-02-03 08:37:37 -06:00
parent 752dffcaea
commit e71d125580
11 changed files with 36 additions and 88 deletions
+34 -34
View File
@@ -51,8 +51,8 @@
// pictureBox7
//
this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu;
this.pictureBox7.Location = new System.Drawing.Point(64, 34);
this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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;
@@ -63,10 +63,10 @@
//
this.panel2.BackColor = System.Drawing.Color.Transparent;
this.panel2.Controls.Add(this.pictureBox7);
this.panel2.Location = new System.Drawing.Point(3, 2);
this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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;
//
// button1
@@ -78,11 +78,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(3, 269);
this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(51, 0, 0, 0);
this.button1.Size = new System.Drawing.Size(312, 114);
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;
@@ -97,11 +97,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(3, 387);
this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(51, 0, 0, 0);
this.button2.Size = new System.Drawing.Size(312, 114);
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 = "Reportes";
this.button2.UseVisualStyleBackColor = false;
@@ -116,11 +116,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(3, 505);
this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(51, 0, 0, 0);
this.button3.Size = new System.Drawing.Size(312, 114);
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;
@@ -134,11 +134,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(3, 623);
this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button5.Location = new System.Drawing.Point(2, 511);
this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button5.Name = "button5";
this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0);
this.button5.Size = new System.Drawing.Size(312, 114);
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;
@@ -152,17 +152,17 @@
this.flowLayoutPanel1.Controls.Add(this.button3);
this.flowLayoutPanel1.Controls.Add(this.button5);
this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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 = 8;
//
// personalPanel
//
this.personalPanel.Location = new System.Drawing.Point(460, 308);
this.personalPanel.Margin = new System.Windows.Forms.Padding(4);
this.personalPanel.AutoScroll = true;
this.personalPanel.Location = new System.Drawing.Point(345, 250);
this.personalPanel.Name = "personalPanel";
this.personalPanel.Size = new System.Drawing.Size(1212, 553);
this.personalPanel.Size = new System.Drawing.Size(909, 449);
this.personalPanel.TabIndex = 9;
this.personalPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel3_Paint);
//
@@ -171,19 +171,19 @@
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(868, 80);
this.lblhora.Location = new System.Drawing.Point(651, 65);
this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhora.Name = "lblhora";
this.lblhora.Size = new System.Drawing.Size(445, 113);
this.lblhora.Size = new System.Drawing.Size(352, 91);
this.lblhora.TabIndex = 11;
this.lblhora.Text = "Personal";
this.lblhora.Click += new System.EventHandler(this.lblhora_Click);
//
// btnAgregar
//
this.btnAgregar.Location = new System.Drawing.Point(984, 220);
this.btnAgregar.Margin = new System.Windows.Forms.Padding(4);
this.btnAgregar.Location = new System.Drawing.Point(738, 179);
this.btnAgregar.Name = "btnAgregar";
this.btnAgregar.Size = new System.Drawing.Size(167, 43);
this.btnAgregar.Size = new System.Drawing.Size(125, 35);
this.btnAgregar.TabIndex = 12;
this.btnAgregar.Text = "Agregar";
this.btnAgregar.UseVisualStyleBackColor = true;
@@ -199,15 +199,15 @@
//
// personal
//
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(1827, 922);
this.ClientSize = new System.Drawing.Size(1028, 627);
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.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "personal";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.personal_Load);
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,3 @@
<<<<<<< HEAD
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
@@ -37,6 +36,8 @@ C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.re
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.personal.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.vender.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
@@ -46,56 +47,3 @@ C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.pdb
=======
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.config
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.pdb
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.xml
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.xml
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.cuentas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.envios.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.inventario.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.login.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.mermas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.personal.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.vender.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.application
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb
>>>>>>> c401f0a5d425880eadaf1bd65205d8559b5d39bc
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
Binary file not shown.
Binary file not shown.
Binary file not shown.