diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index fc52d31..c9e037b 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,10 +2,6 @@ "ExpandedNodes": [ "" ], -<<<<<<< HEAD - "SelectedNode": "\\agregarmermas.cs", -======= - "SelectedNode": "\\vender.cs", ->>>>>>> 53dd047ba99d9fe2f8dc36472f5d1441d992e695 + "SelectedNode": "\\login.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index 58438ad..20c6f5d 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 31b7ac1..3fd46b6 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 b7eda20..581853a 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/envios.Designer.cs b/envios.Designer.cs index 20cd12d..860e7b8 100644 --- a/envios.Designer.cs +++ b/envios.Designer.cs @@ -43,7 +43,6 @@ this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox8 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -64,6 +63,9 @@ this.timer2 = new System.Windows.Forms.Timer(this.components); this.lblfecha = new System.Windows.Forms.Label(); this.lblhora = new System.Windows.Forms.Label(); + this.responsablecb = new System.Windows.Forms.ComboBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); this.flowLayoutPanel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); @@ -237,14 +239,6 @@ this.textBox5.Size = new System.Drawing.Size(365, 70); this.textBox5.TabIndex = 33; // - // textBox8 - // - this.textBox8.Font = new System.Drawing.Font("Poppins", 25F); - this.textBox8.Location = new System.Drawing.Point(555, 694); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(365, 70); - this.textBox8.TabIndex = 34; - // // label1 // this.label1.AutoSize = true; @@ -441,11 +435,53 @@ this.lblhora.TabIndex = 53; this.lblhora.Text = "label1"; // + // responsablecb + // + this.responsablecb.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); + 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(566, 711); + this.responsablecb.Name = "responsablecb"; + this.responsablecb.Size = new System.Drawing.Size(354, 46); + this.responsablecb.TabIndex = 55; + // + // comboBox1 + // + this.comboBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Enviado", + "Completado"}); + this.comboBox1.Location = new System.Drawing.Point(422, 839); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(354, 46); + this.comboBox1.TabIndex = 56; + // + // label10 + // + 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(415, 788); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(123, 39); + this.label10.TabIndex = 57; + this.label10.Text = "Estado"; + this.label10.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.label10.Click += new System.EventHandler(this.label10_Click); + // // envios // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1924, 1055); + this.Controls.Add(this.label10); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.responsablecb); this.Controls.Add(this.lblfecha); this.Controls.Add(this.lblhora); this.Controls.Add(this.button9); @@ -463,7 +499,6 @@ this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); - this.Controls.Add(this.textBox8); this.Controls.Add(this.textBox5); this.Controls.Add(this.textBox3); this.Controls.Add(this.textBox4); @@ -499,7 +534,6 @@ private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox8; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -520,5 +554,8 @@ private System.Windows.Forms.Timer timer2; private System.Windows.Forms.Label lblfecha; private System.Windows.Forms.Label lblhora; + private System.Windows.Forms.ComboBox responsablecb; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label10; } } \ No newline at end of file diff --git a/envios.cs b/envios.cs index 70cc171..f616eae 100644 --- a/envios.cs +++ b/envios.cs @@ -53,5 +53,10 @@ namespace compabetov2 lblfecha.Text = DateTime.Now.ToLongDateString(); } + + private void label10_Click(object sender, EventArgs e) + { + + } } } diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 3613537..10a1a65 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 679b506..dfe2b46 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 31b7ac1..3fd46b6 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 b7eda20..581853a 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/vender.Designer.cs b/vender.Designer.cs index 71621aa..5848136 100644 --- a/vender.Designer.cs +++ b/vender.Designer.cs @@ -309,7 +309,7 @@ this.bntImprimir.Name = "bntImprimir"; this.bntImprimir.Size = new System.Drawing.Size(75, 23); this.bntImprimir.TabIndex = 17; - this.bntImprimir.Text = "button6"; + this.bntImprimir.Text = "Vender"; this.bntImprimir.UseVisualStyleBackColor = true; this.bntImprimir.Click += new System.EventHandler(this.bntImprimir_Click); // @@ -325,6 +325,7 @@ this.responsablecb.Name = "responsablecb"; this.responsablecb.Size = new System.Drawing.Size(121, 24); this.responsablecb.TabIndex = 18; + this.responsablecb.SelectedIndexChanged += new System.EventHandler(this.responsablecb_SelectedIndexChanged); // // vender // diff --git a/vender.cs b/vender.cs index 92abf50..261b7bb 100644 --- a/vender.cs +++ b/vender.cs @@ -330,7 +330,11 @@ namespace compabetov2 } private void vender_Load(object sender, EventArgs e) + + { + bntImprimir.Enabled = false; + responsablecb.SelectedIndexChanged += responsablecb_SelectedIndexChanged; } @@ -585,6 +589,13 @@ namespace compabetov2 private void button6_Click(object sender, EventArgs e) { + } + + private void responsablecb_SelectedIndexChanged(object sender, EventArgs e) + { + bntImprimir.Enabled = responsablecb.SelectedIndex != -1; + + } } }