diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 7f7a27b..0e9c579 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/classGlobal.cs b/Mip/classGlobal.cs index 71230ad..51cd20a 100644 --- a/Mip/classGlobal.cs +++ b/Mip/classGlobal.cs @@ -1,4 +1,4 @@ - using System; +using System; using System.Data; using System.Diagnostics; using System.Drawing; @@ -665,6 +665,7 @@ namespace Mip { case 1: case 4: + case 5: case 9: case 13: case 26: @@ -687,6 +688,7 @@ namespace Mip { case 1: case 4: + case 5: case 9: case 13: case 24: diff --git a/Mip/frmLogin.cs b/Mip/frmLogin.cs index 7bfa94e..1fb1b54 100644 --- a/Mip/frmLogin.cs +++ b/Mip/frmLogin.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; namespace Mip { - public partial class frmLogin : Form + public partial class frmLogin : Form { DataTable dTable; @@ -25,7 +25,7 @@ namespace Mip { classSQL.SQL("SELECT * FROM tabusers Where `Status` = 'Aktívny' ORDER BY Priezvisko;", out dTable); - + foreach (DataRow row in dTable.Rows) { comboBox1.Items.Add(row["Titul"].ToString() + " " + row["Priezvisko"].ToString() + " " + row["Meno"].ToString()); @@ -43,16 +43,16 @@ namespace Mip { DataRow myDrow; myDrow = dTable.Rows[comboBox1.SelectedIndex]; - + if (myDrow[3].ToString() == textBox1.Text) { classUser.Meno = myDrow[0].ToString(); classUser.Priezvisko = myDrow[1].ToString(); classUser.Titul = myDrow[2].ToString(); classUser.ID = Convert.ToInt32(myDrow["IDUsers"]); - classUser.Tab = Convert.ToInt32( myDrow[5]); + classUser.Tab = Convert.ToInt32(myDrow[5]); classUser.Zaradenie = myDrow[7].ToString(); - + this.Close(); //Kontrola hesla } else @@ -60,10 +60,10 @@ namespace Mip MessageBox.Show("Nesprávne heslo!"); textBox1.Clear(); } - + } - + private void comboBox1_SelectedValueChanged(object sender, EventArgs e) { @@ -72,7 +72,7 @@ namespace Mip textBox1.Select(); } - + private void textBox1_KeyPress(object sender, KeyPressEventArgs e) { @@ -83,8 +83,8 @@ namespace Mip { } - - - + + + } } diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index 72c74ae..bcf63f6 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -10611,9 +10611,11 @@ namespace Mip var IDVyrobok = Convert.ToInt32(dataGridView12.SelectedRows[0].Cells["IDVyrobok"].Value); // ulozi polotovar do tabpolotovar var frmUlozPolotovarZVyroby = new frmUlozPolotovarZVyroby(IDVyrobok); - frmUlozPolotovarZVyroby.ShowDialog(); - dataGridView12.SelectedRows[0].Cells["RozmerPolotovaru"].Value = frmUlozPolotovarZVyroby.VelkostPolotovaru; - button204.Text = "Upraviť polotovar"; + if (frmUlozPolotovarZVyroby.ShowDialog() == DialogResult.OK) + { + dataGridView12.SelectedRows[0].Cells["RozmerPolotovaru"].Value = frmUlozPolotovarZVyroby.VelkostPolotovaru; + button204.Text = "Upraviť polotovar"; + } frmUlozPolotovarZVyroby.Dispose(); } diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index abc5d61..7fdd071 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -643,6 +643,7 @@ this.panel14 = new System.Windows.Forms.Panel(); this.Vyhodnocovanie = new System.Windows.Forms.Panel(); this.panel112 = new System.Windows.Forms.Panel(); + this.button22 = new System.Windows.Forms.Button(); this.panel113 = new System.Windows.Forms.Panel(); this.panel114 = new System.Windows.Forms.Panel(); this.VyhodnocovanieCenaMaterial = new MyTools.MyNumericUpDown(); @@ -1047,7 +1048,6 @@ this.label355 = new System.Windows.Forms.Label(); this.label153 = new System.Windows.Forms.Label(); this.panel9 = new System.Windows.Forms.Panel(); - this.button22 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel19.SuspendLayout(); this.panel20.SuspendLayout(); @@ -1385,7 +1385,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(1); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1551, 130); + this.panel1.Size = new System.Drawing.Size(551, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1646,7 +1646,7 @@ this.Výkres.Controls.Add(this.panel15); this.Výkres.Controls.Add(this.panel105); this.Výkres.Dock = System.Windows.Forms.DockStyle.Right; - this.Výkres.Location = new System.Drawing.Point(1551, 0); + this.Výkres.Location = new System.Drawing.Point(551, 0); this.Výkres.MaximumSize = new System.Drawing.Size(1073, 916); this.Výkres.MinimumSize = new System.Drawing.Size(23, 916); this.Výkres.Name = "Výkres"; @@ -1736,7 +1736,7 @@ // button4 // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(1474, 31); + this.button4.Location = new System.Drawing.Point(474, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1793,7 +1793,7 @@ this.panel17.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel17.Location = new System.Drawing.Point(0, 860); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(1551, 56); + this.panel17.Size = new System.Drawing.Size(551, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1804,7 +1804,7 @@ this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(1549, 31); + this.panel24.Size = new System.Drawing.Size(549, 31); this.panel24.TabIndex = 13; // // label14 @@ -1813,7 +1813,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.label14.Location = new System.Drawing.Point(94, 1); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(1000, 29); + this.label14.Size = new System.Drawing.Size(0, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1844,7 +1844,7 @@ this.panel16.Location = new System.Drawing.Point(0, 130); this.panel16.MinimumSize = new System.Drawing.Size(551, 730); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1551, 730); + this.panel16.Size = new System.Drawing.Size(551, 730); this.panel16.TabIndex = 21; // // Polotovar @@ -1856,7 +1856,7 @@ this.Polotovar.Controls.Add(this.label17); this.Polotovar.Controls.Add(this.panel10); this.Polotovar.Dock = System.Windows.Forms.DockStyle.Right; - this.Polotovar.Location = new System.Drawing.Point(1028, 0); + this.Polotovar.Location = new System.Drawing.Point(411, 0); this.Polotovar.Margin = new System.Windows.Forms.Padding(1); this.Polotovar.MaximumSize = new System.Drawing.Size(324, 728); this.Polotovar.MinimumSize = new System.Drawing.Size(23, 728); @@ -4114,7 +4114,7 @@ this.Materiál.Controls.Add(this.label15); this.Materiál.Controls.Add(this.panel11); this.Materiál.Dock = System.Windows.Forms.DockStyle.Right; - this.Materiál.Location = new System.Drawing.Point(1051, 0); + this.Materiál.Location = new System.Drawing.Point(434, 0); this.Materiál.Margin = new System.Windows.Forms.Padding(1); this.Materiál.MaximumSize = new System.Drawing.Size(457, 728); this.Materiál.MinimumSize = new System.Drawing.Size(23, 728); @@ -6370,7 +6370,7 @@ this.Naceňovanie.Controls.Add(this.panel77); this.Naceňovanie.Controls.Add(this.panel14); this.Naceňovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Naceňovanie.Location = new System.Drawing.Point(1074, 0); + this.Naceňovanie.Location = new System.Drawing.Point(457, 0); this.Naceňovanie.Margin = new System.Windows.Forms.Padding(1); this.Naceňovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Naceňovanie.MinimumSize = new System.Drawing.Size(23, 728); @@ -8596,12 +8596,12 @@ this.Vyhodnocovanie.Controls.Add(this.panel112); this.Vyhodnocovanie.Controls.Add(this.panel12); this.Vyhodnocovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Vyhodnocovanie.Location = new System.Drawing.Point(1097, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(480, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Vyhodnocovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.Name = "Vyhodnocovanie"; - this.Vyhodnocovanie.Size = new System.Drawing.Size(406, 728); + this.Vyhodnocovanie.Size = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.TabIndex = 4; // // panel112 @@ -8618,6 +8618,16 @@ this.panel112.Size = new System.Drawing.Size(383, 705); this.panel112.TabIndex = 3; // + // button22 + // + this.button22.Location = new System.Drawing.Point(236, 516); + this.button22.Name = "button22"; + this.button22.Size = new System.Drawing.Size(143, 22); + this.button22.TabIndex = 4; + this.button22.Text = "Vložiť údaje z naceňovania"; + this.button22.UseVisualStyleBackColor = true; + this.button22.Click += new System.EventHandler(this.button22_Click); + // // panel113 // this.panel113.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -10610,7 +10620,7 @@ this.Sadzby.Controls.Add(this.panel70); this.Sadzby.Controls.Add(this.panel13); this.Sadzby.Dock = System.Windows.Forms.DockStyle.Right; - this.Sadzby.Location = new System.Drawing.Point(1503, 0); + this.Sadzby.Location = new System.Drawing.Point(503, 0); this.Sadzby.Margin = new System.Windows.Forms.Padding(1); this.Sadzby.MaximumSize = new System.Drawing.Size(350, 728); this.Sadzby.MinimumSize = new System.Drawing.Size(23, 728); @@ -11447,7 +11457,7 @@ this.Počty.Controls.Add(this.panel98); this.Počty.Controls.Add(this.panel9); this.Počty.Dock = System.Windows.Forms.DockStyle.Right; - this.Počty.Location = new System.Drawing.Point(1526, 0); + this.Počty.Location = new System.Drawing.Point(526, 0); this.Počty.Margin = new System.Windows.Forms.Padding(1); this.Počty.MaximumSize = new System.Drawing.Size(403, 728); this.Počty.MinimumSize = new System.Drawing.Size(23, 728); @@ -13239,21 +13249,11 @@ this.panel9.Size = new System.Drawing.Size(19, 19); this.panel9.TabIndex = 0; // - // button22 - // - this.button22.Location = new System.Drawing.Point(236, 516); - this.button22.Name = "button22"; - this.button22.Size = new System.Drawing.Size(143, 22); - this.button22.TabIndex = 4; - this.button22.Text = "Vložiť údaje z naceňovania"; - this.button22.UseVisualStyleBackColor = true; - this.button22.Click += new System.EventHandler(this.button22_Click); - // // frmNacenovanie // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1574, 916); + this.ClientSize = new System.Drawing.Size(574, 916); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); diff --git a/Mip/frmUlozPolotovarZVyroby.Designer.cs b/Mip/frmUlozPolotovarZVyroby.Designer.cs index 9b11181..05e2921 100644 --- a/Mip/frmUlozPolotovarZVyroby.Designer.cs +++ b/Mip/frmUlozPolotovarZVyroby.Designer.cs @@ -114,6 +114,7 @@ // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.button1.Location = new System.Drawing.Point(330, 208); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 23); @@ -125,6 +126,7 @@ // button2 // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button2.DialogResult = System.Windows.Forms.DialogResult.OK; this.button2.Location = new System.Drawing.Point(4, 208); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(114, 23); @@ -148,6 +150,7 @@ this.numericUpDown2.TabIndex = 15; this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); + this.numericUpDown2.Enter += new System.EventHandler(this.numericUpDown2_Enter); // // numericUpDown3 // @@ -164,6 +167,7 @@ this.numericUpDown3.TabIndex = 16; this.numericUpDown3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.numericUpDown3.ValueChanged += new System.EventHandler(this.numericUpDown3_ValueChanged); + this.numericUpDown3.Enter += new System.EventHandler(this.numericUpDown3_Enter); // // numericUpDown4 // @@ -180,6 +184,7 @@ this.numericUpDown4.TabIndex = 17; this.numericUpDown4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.numericUpDown4.ValueChanged += new System.EventHandler(this.numericUpDown4_ValueChanged); + this.numericUpDown4.Enter += new System.EventHandler(this.numericUpDown4_Enter); // // numericUpDown5 // @@ -201,10 +206,11 @@ 0, 0}); this.numericUpDown5.ValueChanged += new System.EventHandler(this.numericUpDown5_ValueChanged); + this.numericUpDown5.Enter += new System.EventHandler(this.numericUpDown5_Enter); // // label6 // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label6.Location = new System.Drawing.Point(4, 168); @@ -216,7 +222,7 @@ // // label12 // - this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); diff --git a/Mip/frmUlozPolotovarZVyroby.cs b/Mip/frmUlozPolotovarZVyroby.cs index 0371f2a..7794086 100644 --- a/Mip/frmUlozPolotovarZVyroby.cs +++ b/Mip/frmUlozPolotovarZVyroby.cs @@ -102,6 +102,7 @@ namespace Mip private void frmUlozPolotovar_Shown(object sender, EventArgs e) { + numericUpDown2.Focus(); RefreshPolotovar(); } @@ -168,5 +169,29 @@ namespace Mip numericUpDown3.Value = rozmer2Vyrobku; numericUpDown4.Value = rozmer3Vyrobku; } + + private void numericUpDown2_Enter(object sender, EventArgs e) + { + var numeric = sender as NumericUpDown; + numeric.Select(0, numeric.Text.Length); + } + + private void numericUpDown3_Enter(object sender, EventArgs e) + { + var numeric = sender as NumericUpDown; + numeric.Select(0, numeric.Text.Length); + } + + private void numericUpDown4_Enter(object sender, EventArgs e) + { + var numeric = sender as NumericUpDown; + numeric.Select(0, numeric.Text.Length); + } + + private void numericUpDown5_Enter(object sender, EventArgs e) + { + var numeric = sender as NumericUpDown; + numeric.Select(0, numeric.Text.Length); + } } } diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index d5fe7e7..fc1efdf 100644 Binary files a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache differ diff --git a/Mip/obj/Release/Mip.csproj.ResolveComReference.cache b/Mip/obj/Release/Mip.csproj.ResolveComReference.cache index fc1efdf..d5fe7e7 100644 Binary files a/Mip/obj/Release/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Release/Mip.csproj.ResolveComReference.cache differ diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 5daa176..5f6c3fb 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -630,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{D97395FB-9568-4273-95B8-5CE34EA174CF}" - "PackageCode" = "8:{0BA4FB34-E859-4174-A50C-125BD81C3ADA}" + "ProductCode" = "8:{F2D86B63-AD8A-40C4-9E80-2969F8815850}" + "PackageCode" = "8:{7CABACB3-CA4C-4040-A0BE-96F7EA2DACDA}" "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.8" + "ProductVersion" = "8:1.1.9" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 1322c10..1d5b447 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ