From 369a27bf332c4a7bd055d102323a2414ca8da27a Mon Sep 17 00:00:00 2001 From: "Culak-HP\\Culak" Date: Tue, 5 Jan 2021 17:07:25 +0100 Subject: [PATCH] vyhodnocovanie --- .gitignore | 3 + .vs/Mip_v1/v16/.suo | Bin 166400 -> 170496 bytes Mip/Mip.csproj | 2 +- Mip/bin/Debug/Mip.exe.config | 9 - Mip/classGlobal.cs | 4 +- Mip/frmLogin.cs | 18 +- Mip/frmMain.cs | 4 +- Mip/frmNacenovanie.Designer.cs | 334 +++++++----- Mip/frmNacenovanie.cs | 508 ++++++++++++++---- Mip/frmVybratTypVyhodnotenia.Designer.cs | 1 + Mip/frmVybratTypVyhodnotenia.cs | 13 + .../Debug/Mip.Properties.Resources.resources | Bin 592435 -> 584072 bytes .../Mip.csproj.ResolveComReference.cache | Bin 810 -> 810 bytes MipInstaller/MipInstaller.vdproj | 64 ++- 14 files changed, 676 insertions(+), 284 deletions(-) delete mode 100644 Mip/bin/Debug/Mip.exe.config diff --git a/.gitignore b/.gitignore index f80a4b1..b372200 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ Mip/obj/Debug/Mip.csproj.GenerateResource.cache Mip/obj/Debug/Mip.csprojAssemblyReference.cache Mip/obj/Debug/Mip.exe Mip/obj/Debug/Mip.pdb +Mip/bin/ +Mip/obj/ +MipInstaller/Debug/ diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 87c69dbd7adfbff0c2075d250e1ebc55432912da..f99961c741abdf24bd881b776dd4658dc7c33916 100644 GIT binary patch delta 13569 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 delta 9108 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 diff --git a/Mip/Mip.csproj b/Mip/Mip.csproj index 2207929..4c20151 100644 --- a/Mip/Mip.csproj +++ b/Mip/Mip.csproj @@ -8,7 +8,7 @@ WinExe Properties Mip - Mip + Mip1.1 v4.5 512 false diff --git a/Mip/bin/Debug/Mip.exe.config b/Mip/bin/Debug/Mip.exe.config deleted file mode 100644 index 8750cbb..0000000 --- a/Mip/bin/Debug/Mip.exe.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Mip/classGlobal.cs b/Mip/classGlobal.cs index 0fa312a..cfbebea 100644 --- a/Mip/classGlobal.cs +++ b/Mip/classGlobal.cs @@ -492,7 +492,7 @@ namespace Mip string IPaddress = ""; PingReply pingReply; - IPaddress = "192.168.2.12"; //IP Adresa MariaDB pre VLAN1 + IPaddress = "192.168.1.12"; //IP Adresa MariaDB pre VLAN1 //ked sa programuje mino firmu aby to hned naslo staticku ip //IPaddress = "87.197.164.107"; @@ -505,7 +505,7 @@ namespace Mip } else { - IPaddress = "192.168.2.13"; //IP Adresa MariaDB pre VLAN2 + IPaddress = "192.168.1.13"; //IP Adresa MariaDB pre VLAN2 pingReply = pingIP.Send(IPaddress); if (pingReply.Status.ToString() == "Success") { diff --git a/Mip/frmLogin.cs b/Mip/frmLogin.cs index 84806ce..7bfa94e 100644 --- a/Mip/frmLogin.cs +++ b/Mip/frmLogin.cs @@ -1,13 +1,7 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; using System.Windows.Forms; -using System.Data.Odbc; namespace Mip { @@ -36,7 +30,13 @@ namespace Mip { comboBox1.Items.Add(row["Titul"].ToString() + " " + row["Priezvisko"].ToString() + " " + row["Meno"].ToString()); } - + + if (Debugger.IsAttached) + { + comboBox1.Text = "Ing. Čulák Roman"; + textBox1.Text = "3"; + button2_Click(button2, new EventArgs()); + } } private void button2_Click(object sender, EventArgs e) @@ -53,7 +53,7 @@ namespace Mip classUser.Tab = Convert.ToInt32( myDrow[5]); classUser.Zaradenie = myDrow[7].ToString(); - this.Hide(); //Kontrola hesla + this.Close(); //Kontrola hesla } else { diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index fee0845..55712c4 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -2219,7 +2219,9 @@ namespace Mip private void frmMain_Shown(object sender, EventArgs e) { - if (classUser.ID == 1 || classUser.ID == 2) numericUpDown40.Value = 100; + //znizenie poctu nacitavanych riadkov + // if (classUser.ID == 1 || classUser.ID == 2) numericUpDown40.Value = 100; + /////////////////////////// zobrazenie povolenych zaloziek usera v tabcontroll //////////////////////////////////////////// int p1,p2,p3; // p1 pocitadlo cyklu, p2 - pocet zaloziek, p3 - ukazovatel na aktualnu zalozku Int32 intMaska; diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index de1491d..f991d07 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -575,6 +575,14 @@ this.myNumericUpDown102 = new MyTools.MyNumericUpDown(); this.label470 = new System.Windows.Forms.Label(); this.panel117 = new System.Windows.Forms.Panel(); + this.label562 = new System.Windows.Forms.Label(); + this.label563 = new System.Windows.Forms.Label(); + this.myNumericUpDown128 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown129 = new MyTools.MyNumericUpDown(); + this.label564 = new System.Windows.Forms.Label(); + this.label565 = new System.Windows.Forms.Label(); + this.label566 = new System.Windows.Forms.Label(); + this.label567 = new System.Windows.Forms.Label(); this.label471 = new System.Windows.Forms.Label(); this.label472 = new System.Windows.Forms.Label(); this.label473 = new System.Windows.Forms.Label(); @@ -681,18 +689,15 @@ this.panel122 = new System.Windows.Forms.Panel(); this.label550 = new System.Windows.Forms.Label(); this.panel123 = new System.Windows.Forms.Panel(); - this.button22 = new System.Windows.Forms.Button(); this.panel124 = new System.Windows.Forms.Panel(); - this.myNumericUpDown123 = new MyTools.MyNumericUpDown(); + this.label553 = new System.Windows.Forms.Label(); this.label551 = new System.Windows.Forms.Label(); this.panel125 = new System.Windows.Forms.Panel(); - this.button20 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); this.label552 = new System.Windows.Forms.Label(); this.panel126 = new System.Windows.Forms.Panel(); - this.label553 = new System.Windows.Forms.Label(); this.panel127 = new System.Windows.Forms.Panel(); this.label554 = new System.Windows.Forms.Label(); + this.myNumericUpDown123 = new MyTools.MyNumericUpDown(); this.panel12 = new System.Windows.Forms.Panel(); this.Sadzby = new System.Windows.Forms.Panel(); this.panel70 = new System.Windows.Forms.Panel(); @@ -1101,6 +1106,8 @@ this.panel116.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown102)).BeginInit(); this.panel117.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown128)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown129)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown103)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown104)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown105)).BeginInit(); @@ -1128,10 +1135,10 @@ this.panel122.SuspendLayout(); this.panel123.SuspendLayout(); this.panel124.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown123)).BeginInit(); this.panel125.SuspendLayout(); this.panel126.SuspendLayout(); this.panel127.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown123)).BeginInit(); this.Sadzby.SuspendLayout(); this.panel70.SuspendLayout(); this.panel73.SuspendLayout(); @@ -1198,7 +1205,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(551, 130); + this.panel1.Size = new System.Drawing.Size(1051, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1459,7 +1466,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(551, 0); + this.Výkres.Location = new System.Drawing.Point(1051, 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"; @@ -1549,7 +1556,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(474, 31); + this.button4.Location = new System.Drawing.Point(974, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1606,7 +1613,7 @@ this.panel17.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel17.Location = new System.Drawing.Point(0, 865); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(551, 56); + this.panel17.Size = new System.Drawing.Size(1051, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1617,7 +1624,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(549, 31); + this.panel24.Size = new System.Drawing.Size(1049, 31); this.panel24.TabIndex = 13; // // label14 @@ -1626,7 +1633,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(0, 29); + this.label14.Size = new System.Drawing.Size(500, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1657,7 +1664,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(551, 735); + this.panel16.Size = new System.Drawing.Size(1051, 735); this.panel16.TabIndex = 21; // // Polotovar @@ -1669,7 +1676,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(28, 0); + this.Polotovar.Location = new System.Drawing.Point(145, 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); @@ -2856,7 +2863,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(51, 0); + this.Materiál.Location = new System.Drawing.Point(168, 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); @@ -5238,7 +5245,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(74, 0); + this.Naceňovanie.Location = new System.Drawing.Point(191, 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); @@ -5299,7 +5306,7 @@ this.panel88.Controls.Add(this.panel89); this.panel88.Controls.Add(this.panel83); this.panel88.Dock = System.Windows.Forms.DockStyle.Top; - this.panel88.Location = new System.Drawing.Point(0, 71); + this.panel88.Location = new System.Drawing.Point(0, 74); this.panel88.Name = "panel88"; this.panel88.Size = new System.Drawing.Size(381, 367); this.panel88.TabIndex = 3; @@ -7014,7 +7021,7 @@ this.panel82.Dock = System.Windows.Forms.DockStyle.Top; this.panel82.Location = new System.Drawing.Point(0, 0); this.panel82.Name = "panel82"; - this.panel82.Size = new System.Drawing.Size(381, 71); + this.panel82.Size = new System.Drawing.Size(381, 74); this.panel82.TabIndex = 6; // // panel80 @@ -7025,7 +7032,7 @@ this.panel80.Controls.Add(this.panel81); this.panel80.Location = new System.Drawing.Point(190, 1); this.panel80.Name = "panel80"; - this.panel80.Size = new System.Drawing.Size(188, 67); + this.panel80.Size = new System.Drawing.Size(188, 70); this.panel80.TabIndex = 2; // // myNumericUpDown71 @@ -7037,7 +7044,7 @@ 0, 0, 131072}); - this.myNumericUpDown71.Location = new System.Drawing.Point(1, 19); + this.myNumericUpDown71.Location = new System.Drawing.Point(1, 22); this.myNumericUpDown71.Maximum = new decimal(new int[] { 100000, 0, @@ -7052,7 +7059,7 @@ // this.label141.AutoSize = true; this.label141.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label141.Location = new System.Drawing.Point(154, 22); + this.label141.Location = new System.Drawing.Point(154, 25); this.label141.Name = "label141"; this.label141.Size = new System.Drawing.Size(36, 39); this.label141.TabIndex = 2; @@ -7067,12 +7074,12 @@ this.panel81.Dock = System.Windows.Forms.DockStyle.Top; this.panel81.Location = new System.Drawing.Point(0, 0); this.panel81.Name = "panel81"; - this.panel81.Size = new System.Drawing.Size(186, 18); + this.panel81.Size = new System.Drawing.Size(186, 21); this.panel81.TabIndex = 0; // // button17 // - this.button17.Location = new System.Drawing.Point(117, -2); + this.button17.Location = new System.Drawing.Point(117, 0); this.button17.Name = "button17"; this.button17.Size = new System.Drawing.Size(35, 19); this.button17.TabIndex = 3; @@ -7082,7 +7089,7 @@ // // button16 // - this.button16.Location = new System.Drawing.Point(151, -2); + this.button16.Location = new System.Drawing.Point(151, 0); this.button16.Name = "button16"; this.button16.Size = new System.Drawing.Size(35, 19); this.button16.TabIndex = 2; @@ -7093,7 +7100,7 @@ // label136 // this.label136.AutoSize = true; - this.label136.Location = new System.Drawing.Point(15, 1); + this.label136.Location = new System.Drawing.Point(15, 3); this.label136.Name = "label136"; this.label136.Size = new System.Drawing.Size(66, 13); this.label136.TabIndex = 1; @@ -7107,13 +7114,13 @@ this.panel78.Controls.Add(this.panel79); this.panel78.Location = new System.Drawing.Point(1, 1); this.panel78.Name = "panel78"; - this.panel78.Size = new System.Drawing.Size(188, 67); + this.panel78.Size = new System.Drawing.Size(188, 70); this.panel78.TabIndex = 1; // // label137 // this.label137.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label137.Location = new System.Drawing.Point(3, 22); + this.label137.Location = new System.Drawing.Point(3, 25); this.label137.Name = "label137"; this.label137.Size = new System.Drawing.Size(181, 39); this.label137.TabIndex = 1; @@ -7127,13 +7134,13 @@ this.panel79.Dock = System.Windows.Forms.DockStyle.Top; this.panel79.Location = new System.Drawing.Point(0, 0); this.panel79.Name = "panel79"; - this.panel79.Size = new System.Drawing.Size(186, 18); + this.panel79.Size = new System.Drawing.Size(186, 21); this.panel79.TabIndex = 0; // // label135 // this.label135.AutoSize = true; - this.label135.Location = new System.Drawing.Point(18, 1); + this.label135.Location = new System.Drawing.Point(18, 3); this.label135.Name = "label135"; this.label135.Size = new System.Drawing.Size(141, 13); this.label135.TabIndex = 0; @@ -7155,12 +7162,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(480, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(597, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); - this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(700, 728); + 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(23, 728); + this.Vyhodnocovanie.Size = new System.Drawing.Size(406, 728); this.Vyhodnocovanie.TabIndex = 4; // // panel112 @@ -7171,9 +7178,10 @@ this.panel112.Controls.Add(this.panel121); this.panel112.Controls.Add(this.panel123); this.panel112.Location = new System.Drawing.Point(21, 21); - this.panel112.MaximumSize = new System.Drawing.Size(677, 705); + this.panel112.MaximumSize = new System.Drawing.Size(383, 705); + this.panel112.MinimumSize = new System.Drawing.Size(23, 705); this.panel112.Name = "panel112"; - this.panel112.Size = new System.Drawing.Size(677, 705); + this.panel112.Size = new System.Drawing.Size(383, 705); this.panel112.TabIndex = 3; // // panel113 @@ -7185,9 +7193,9 @@ this.panel113.Controls.Add(this.panel117); this.panel113.Controls.Add(this.panel118); this.panel113.Dock = System.Windows.Forms.DockStyle.Top; - this.panel113.Location = new System.Drawing.Point(0, 71); + this.panel113.Location = new System.Drawing.Point(0, 74); this.panel113.Name = "panel113"; - this.panel113.Size = new System.Drawing.Size(675, 335); + this.panel113.Size = new System.Drawing.Size(381, 367); this.panel113.TabIndex = 3; // // panel114 @@ -7208,7 +7216,7 @@ this.panel114.Controls.Add(this.label457); this.panel114.Controls.Add(this.label458); this.panel114.Controls.Add(this.label459); - this.panel114.Location = new System.Drawing.Point(1, 279); + this.panel114.Location = new System.Drawing.Point(1, 310); this.panel114.Name = "panel114"; this.panel114.Size = new System.Drawing.Size(377, 54); this.panel114.TabIndex = 33; @@ -7367,7 +7375,7 @@ this.panel115.Controls.Add(this.label462); this.panel115.Controls.Add(this.label463); this.panel115.Controls.Add(this.label464); - this.panel115.Location = new System.Drawing.Point(1, 255); + this.panel115.Location = new System.Drawing.Point(1, 285); this.panel115.Name = "panel115"; this.panel115.Size = new System.Drawing.Size(377, 24); this.panel115.TabIndex = 32; @@ -7459,9 +7467,9 @@ this.panel116.Controls.Add(this.label469); this.panel116.Controls.Add(this.myNumericUpDown102); this.panel116.Controls.Add(this.label470); - this.panel116.Location = new System.Drawing.Point(1, 231); + this.panel116.Location = new System.Drawing.Point(1, 257); this.panel116.Name = "panel116"; - this.panel116.Size = new System.Drawing.Size(377, 24); + this.panel116.Size = new System.Drawing.Size(377, 27); this.panel116.TabIndex = 31; // // label465 @@ -7470,7 +7478,7 @@ this.label465.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label465.Location = new System.Drawing.Point(175, 1); this.label465.Name = "label465"; - this.label465.Size = new System.Drawing.Size(58, 20); + this.label465.Size = new System.Drawing.Size(58, 23); this.label465.TabIndex = 87; this.label465.Text = "0"; this.label465.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7481,7 +7489,7 @@ this.label466.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label466.Location = new System.Drawing.Point(234, 1); this.label466.Name = "label466"; - this.label466.Size = new System.Drawing.Size(43, 20); + this.label466.Size = new System.Drawing.Size(43, 23); this.label466.TabIndex = 86; this.label466.Text = "[€/ks]"; this.label466.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7492,7 +7500,7 @@ this.label467.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label467.Location = new System.Drawing.Point(278, 1); this.label467.Name = "label467"; - this.label467.Size = new System.Drawing.Size(58, 20); + this.label467.Size = new System.Drawing.Size(58, 23); this.label467.TabIndex = 85; this.label467.Text = "0"; this.label467.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7503,7 +7511,7 @@ this.label468.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label468.Location = new System.Drawing.Point(337, 1); this.label468.Name = "label468"; - this.label468.Size = new System.Drawing.Size(37, 20); + this.label468.Size = new System.Drawing.Size(37, 23); this.label468.TabIndex = 84; this.label468.Text = "[€/ks]"; this.label468.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -7513,14 +7521,14 @@ this.label469.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label469.Location = new System.Drawing.Point(73, 1); this.label469.Name = "label469"; - this.label469.Size = new System.Drawing.Size(101, 20); + this.label469.Size = new System.Drawing.Size(101, 23); this.label469.TabIndex = 31; this.label469.Text = "Náklady s réžiou"; this.label469.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // myNumericUpDown102 // - this.myNumericUpDown102.Location = new System.Drawing.Point(34, 1); + this.myNumericUpDown102.Location = new System.Drawing.Point(34, 2); this.myNumericUpDown102.Maximum = new decimal(new int[] { 200, 0, @@ -7546,15 +7554,22 @@ this.label470.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label470.Location = new System.Drawing.Point(1, 1); this.label470.Name = "label470"; - this.label470.Size = new System.Drawing.Size(71, 20); + this.label470.Size = new System.Drawing.Size(71, 23); this.label470.TabIndex = 29; this.label470.Text = "Réžia"; this.label470.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // panel117 // - this.panel117.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel117.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel117.Controls.Add(this.label562); + this.panel117.Controls.Add(this.label563); + this.panel117.Controls.Add(this.myNumericUpDown128); + this.panel117.Controls.Add(this.myNumericUpDown129); + this.panel117.Controls.Add(this.label564); + this.panel117.Controls.Add(this.label565); + this.panel117.Controls.Add(this.label566); + this.panel117.Controls.Add(this.label567); this.panel117.Controls.Add(this.label471); this.panel117.Controls.Add(this.label472); this.panel117.Controls.Add(this.label473); @@ -7635,11 +7650,97 @@ this.panel117.Controls.Add(this.label528); this.panel117.Controls.Add(this.label529); this.panel117.Controls.Add(this.label530); - this.panel117.Location = new System.Drawing.Point(295, 19); + this.panel117.Location = new System.Drawing.Point(1, 19); this.panel117.Name = "panel117"; - this.panel117.Size = new System.Drawing.Size(377, 213); + this.panel117.Size = new System.Drawing.Size(377, 237); this.panel117.TabIndex = 18; // + // label562 + // + this.label562.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label562.Location = new System.Drawing.Point(337, 211); + this.label562.Name = "label562"; + this.label562.Size = new System.Drawing.Size(37, 20); + this.label562.TabIndex = 100; + this.label562.Text = "[€/ks]"; + this.label562.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label563 + // + this.label563.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label563.Location = new System.Drawing.Point(278, 211); + this.label563.Name = "label563"; + this.label563.Size = new System.Drawing.Size(58, 20); + this.label563.TabIndex = 99; + this.label563.Text = "0"; + this.label563.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // myNumericUpDown128 + // + this.myNumericUpDown128.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown128.Location = new System.Drawing.Point(225, 211); + this.myNumericUpDown128.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown128.Name = "myNumericUpDown128"; + this.myNumericUpDown128.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown128.TabIndex = 96; + this.myNumericUpDown128.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // myNumericUpDown129 + // + this.myNumericUpDown129.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown129.Location = new System.Drawing.Point(167, 211); + this.myNumericUpDown129.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown129.Name = "myNumericUpDown129"; + this.myNumericUpDown129.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown129.TabIndex = 95; + this.myNumericUpDown129.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown129.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left; + // + // label564 + // + this.label564.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label564.AutoSize = true; + this.label564.Location = new System.Drawing.Point(1, 213); + this.label564.Name = "label564"; + this.label564.Size = new System.Drawing.Size(73, 13); + this.label564.TabIndex = 94; + this.label564.Text = "Nová položka"; + // + // label565 + // + this.label565.AutoSize = true; + this.label565.Location = new System.Drawing.Point(216, 214); + this.label565.Name = "label565"; + this.label565.Size = new System.Drawing.Size(13, 13); + this.label565.TabIndex = 97; + this.label565.Text = "+"; + // + // label566 + // + this.label566.Location = new System.Drawing.Point(140, 210); + this.label566.Name = "label566"; + this.label566.Size = new System.Drawing.Size(30, 20); + this.label566.TabIndex = 98; + this.label566.Text = "[€/h]"; + this.label566.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label567 + // + this.label567.Location = new System.Drawing.Point(125, 210); + this.label567.Name = "label567"; + this.label567.Size = new System.Drawing.Size(19, 20); + this.label567.TabIndex = 101; + this.label567.Text = "0"; + this.label567.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // label471 // this.label471.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -8491,7 +8592,7 @@ this.panel118.Dock = System.Windows.Forms.DockStyle.Top; this.panel118.Location = new System.Drawing.Point(0, 0); this.panel118.Name = "panel118"; - this.panel118.Size = new System.Drawing.Size(673, 18); + this.panel118.Size = new System.Drawing.Size(379, 18); this.panel118.TabIndex = 0; // // label531 @@ -8529,7 +8630,7 @@ this.panel119.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel119.Location = new System.Drawing.Point(0, 557); this.panel119.Name = "panel119"; - this.panel119.Size = new System.Drawing.Size(675, 73); + this.panel119.Size = new System.Drawing.Size(381, 73); this.panel119.TabIndex = 5; // // label533 @@ -8623,7 +8724,7 @@ this.panel120.Dock = System.Windows.Forms.DockStyle.Top; this.panel120.Location = new System.Drawing.Point(0, 0); this.panel120.Name = "panel120"; - this.panel120.Size = new System.Drawing.Size(673, 18); + this.panel120.Size = new System.Drawing.Size(379, 18); this.panel120.TabIndex = 0; // // label541 @@ -8651,7 +8752,7 @@ this.panel121.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel121.Location = new System.Drawing.Point(0, 630); this.panel121.Name = "panel121"; - this.panel121.Size = new System.Drawing.Size(675, 73); + this.panel121.Size = new System.Drawing.Size(381, 73); this.panel121.TabIndex = 4; // // label542 @@ -8745,7 +8846,7 @@ this.panel122.Dock = System.Windows.Forms.DockStyle.Top; this.panel122.Location = new System.Drawing.Point(0, 0); this.panel122.Name = "panel122"; - this.panel122.Size = new System.Drawing.Size(673, 18); + this.panel122.Size = new System.Drawing.Size(379, 18); this.panel122.TabIndex = 0; // // label550 @@ -8761,59 +8862,40 @@ // panel123 // this.panel123.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel123.Controls.Add(this.button22); this.panel123.Controls.Add(this.panel124); this.panel123.Controls.Add(this.panel126); this.panel123.Dock = System.Windows.Forms.DockStyle.Top; this.panel123.Location = new System.Drawing.Point(0, 0); this.panel123.Name = "panel123"; - this.panel123.Size = new System.Drawing.Size(675, 71); + this.panel123.Size = new System.Drawing.Size(381, 74); this.panel123.TabIndex = 6; // - // button22 - // - this.button22.Location = new System.Drawing.Point(383, 2); - this.button22.Name = "button22"; - this.button22.Size = new System.Drawing.Size(75, 23); - this.button22.TabIndex = 3; - this.button22.Text = "button22"; - this.button22.UseVisualStyleBackColor = true; - // // panel124 // this.panel124.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel124.Controls.Add(this.myNumericUpDown123); + this.panel124.Controls.Add(this.label553); this.panel124.Controls.Add(this.label551); this.panel124.Controls.Add(this.panel125); this.panel124.Location = new System.Drawing.Point(190, 1); this.panel124.Name = "panel124"; - this.panel124.Size = new System.Drawing.Size(188, 67); + this.panel124.Size = new System.Drawing.Size(188, 70); this.panel124.TabIndex = 2; // - // myNumericUpDown123 + // label553 // - this.myNumericUpDown123.DecimalPlaces = 2; - this.myNumericUpDown123.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.myNumericUpDown123.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.myNumericUpDown123.Location = new System.Drawing.Point(1, 19); - this.myNumericUpDown123.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); - this.myNumericUpDown123.Name = "myNumericUpDown123"; - this.myNumericUpDown123.Size = new System.Drawing.Size(154, 45); - this.myNumericUpDown123.TabIndex = 0; + this.label553.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label553.Location = new System.Drawing.Point(4, 25); + this.label553.Name = "label553"; + this.label553.Size = new System.Drawing.Size(146, 39); + this.label553.TabIndex = 1; + this.label553.Text = "0"; + this.label553.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label551 // this.label551.AutoSize = true; this.label551.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label551.Location = new System.Drawing.Point(154, 22); + this.label551.Location = new System.Drawing.Point(154, 25); this.label551.Name = "label551"; this.label551.Size = new System.Drawing.Size(36, 39); this.label551.TabIndex = 2; @@ -8822,37 +8904,17 @@ // panel125 // this.panel125.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel125.Controls.Add(this.button20); - this.panel125.Controls.Add(this.button21); this.panel125.Controls.Add(this.label552); this.panel125.Dock = System.Windows.Forms.DockStyle.Top; this.panel125.Location = new System.Drawing.Point(0, 0); this.panel125.Name = "panel125"; - this.panel125.Size = new System.Drawing.Size(186, 18); + this.panel125.Size = new System.Drawing.Size(186, 21); this.panel125.TabIndex = 0; // - // button20 - // - this.button20.Location = new System.Drawing.Point(117, -2); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(35, 19); - this.button20.TabIndex = 3; - this.button20.Text = "0%"; - this.button20.UseVisualStyleBackColor = true; - // - // button21 - // - this.button21.Location = new System.Drawing.Point(151, -2); - this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(35, 19); - this.button21.TabIndex = 2; - this.button21.Text = "25%"; - this.button21.UseVisualStyleBackColor = true; - // // label552 // this.label552.AutoSize = true; - this.label552.Location = new System.Drawing.Point(15, 1); + this.label552.Location = new System.Drawing.Point(57, 3); this.label552.Name = "label552"; this.label552.Size = new System.Drawing.Size(66, 13); this.label552.TabIndex = 1; @@ -8862,23 +8924,13 @@ // panel126 // this.panel126.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel126.Controls.Add(this.label553); this.panel126.Controls.Add(this.panel127); + this.panel126.Controls.Add(this.myNumericUpDown123); this.panel126.Location = new System.Drawing.Point(1, 1); this.panel126.Name = "panel126"; - this.panel126.Size = new System.Drawing.Size(188, 67); + this.panel126.Size = new System.Drawing.Size(188, 70); this.panel126.TabIndex = 1; // - // label553 - // - this.label553.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label553.Location = new System.Drawing.Point(3, 22); - this.label553.Name = "label553"; - this.label553.Size = new System.Drawing.Size(181, 39); - this.label553.TabIndex = 1; - this.label553.Text = "0"; - this.label553.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // panel127 // this.panel127.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -8886,19 +8938,32 @@ this.panel127.Dock = System.Windows.Forms.DockStyle.Top; this.panel127.Location = new System.Drawing.Point(0, 0); this.panel127.Name = "panel127"; - this.panel127.Size = new System.Drawing.Size(186, 18); + this.panel127.Size = new System.Drawing.Size(186, 21); this.panel127.TabIndex = 0; // // label554 // this.label554.AutoSize = true; - this.label554.Location = new System.Drawing.Point(18, 1); + this.label554.Location = new System.Drawing.Point(25, 3); this.label554.Name = "label554"; - this.label554.Size = new System.Drawing.Size(141, 13); + this.label554.Size = new System.Drawing.Size(116, 13); this.label554.TabIndex = 0; - this.label554.Text = "Počet naceňovaných kusov"; + this.label554.Text = "Počet kusov do výroby"; this.label554.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // myNumericUpDown123 + // + this.myNumericUpDown123.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.myNumericUpDown123.Location = new System.Drawing.Point(3, 22); + this.myNumericUpDown123.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.myNumericUpDown123.Name = "myNumericUpDown123"; + this.myNumericUpDown123.Size = new System.Drawing.Size(180, 45); + this.myNumericUpDown123.TabIndex = 1; + // // panel12 // this.panel12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -8914,7 +8979,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(503, 0); + this.Sadzby.Location = new System.Drawing.Point(1003, 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); @@ -9633,7 +9698,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(526, 0); + this.Počty.Location = new System.Drawing.Point(1026, 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); @@ -11429,7 +11494,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(574, 921); + this.ClientSize = new System.Drawing.Size(1074, 921); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); @@ -11682,6 +11747,8 @@ ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown102)).EndInit(); this.panel117.ResumeLayout(false); this.panel117.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown128)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown129)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown103)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown104)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown105)).EndInit(); @@ -11713,12 +11780,12 @@ this.panel123.ResumeLayout(false); this.panel124.ResumeLayout(false); this.panel124.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown123)).EndInit(); this.panel125.ResumeLayout(false); this.panel125.PerformLayout(); this.panel126.ResumeLayout(false); this.panel127.ResumeLayout(false); this.panel127.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown123)).EndInit(); this.Sadzby.ResumeLayout(false); this.panel70.ResumeLayout(false); this.panel73.ResumeLayout(false); @@ -12643,13 +12710,10 @@ private System.Windows.Forms.Panel panel122; private System.Windows.Forms.Label label550; private System.Windows.Forms.Panel panel123; - private System.Windows.Forms.Button button22; private System.Windows.Forms.Panel panel124; private MyTools.MyNumericUpDown myNumericUpDown123; private System.Windows.Forms.Label label551; private System.Windows.Forms.Panel panel125; - private System.Windows.Forms.Button button20; - private System.Windows.Forms.Button button21; private System.Windows.Forms.Label label552; private System.Windows.Forms.Panel panel126; private System.Windows.Forms.Label label553; @@ -12667,5 +12731,13 @@ private MyTools.MyNumericUpDown myNumericUpDown126; private System.Windows.Forms.Label label561; private MyTools.MyNumericUpDown myNumericUpDown127; + private System.Windows.Forms.Label label562; + private System.Windows.Forms.Label label563; + private MyTools.MyNumericUpDown myNumericUpDown128; + private MyTools.MyNumericUpDown myNumericUpDown129; + private System.Windows.Forms.Label label564; + private System.Windows.Forms.Label label565; + private System.Windows.Forms.Label label566; + private System.Windows.Forms.Label label567; } } \ No newline at end of file diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index 07e7dcf..4d367bc 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -16,6 +16,7 @@ namespace Mip public static Int32 IDV; public static Int32 IDN; public static Int32 IDVykres; + public static Int32 IDVyhodnocovanie; public static decimal psdRozmer1; public static decimal psdRozmer2; public static decimal psdRozmer3; @@ -48,7 +49,7 @@ namespace Mip private bool showPocty = false; private bool showSadzby = false; - public frmNacenovanie(Int32 _IDNacenovanie, Int32 _IDVyrobok, bool _nacenovanie, bool _vyhodnocovanie, bool _polotovar, bool _material, bool _pocty, bool _sadzby) + public frmNacenovanie(Int32 _IDNacenovanie, Int32 _IDVyrobok, bool _nacenovanie, bool _vyhodnocovanie, bool _polotovar, bool _material, bool _pocty, bool _sadzby, Int32 idVydonocovanie = -1) { InitializeComponent(); if (_vyhodnocovanie == false) Vyhodnocovanie.Visible = false; @@ -67,6 +68,14 @@ namespace Mip IDN = _IDNacenovanie; IDV = _IDVyrobok; + IDVyhodnocovanie = idVydonocovanie; + + if (showVyhodnocovanie) + { + panel77.Enabled = false; + button19.Enabled = false; + checkBox36.Enabled = false; + } this.DoubleBuffered = true; this.pictureBox1.MouseWheel += new MouseEventHandler(picBoxMouseWheel); @@ -124,7 +133,7 @@ namespace Mip objObjectMaterial = new ObjectMaterial(IDN); objObjectNacenovanie = new ObjectNacenovanie(IDN); objObjectPocty = new ObjectPocty(IDN); - objObjectVyhodnocovanie = new ObjectVyhodnocovanie(); + objObjectVyhodnocovanie = new ObjectVyhodnocovanie(IDVyhodnocovanie); objObjectVyrobok.SetDataToForm(this); objObjectSadzby.SetDataToForm(this); @@ -132,6 +141,7 @@ namespace Mip objObjectMaterial.SetDataToForm(this); objObjectNacenovanie.SetDataToForm(this); objObjectPocty.SetDataToForm(this); + objObjectVyhodnocovanie.SetDataToForm(this); string strIDVykres = ""; classSQL.SQL("SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = " + IDV.ToString() + " AND IndexVykresu = 1", out strIDVykres); @@ -166,6 +176,7 @@ namespace Mip RefreshAll(); + RefreshVyhodnotenieAll(); this.ResumeLayout(); if (this.Text.ToString() == "Print") @@ -255,107 +266,112 @@ namespace Mip } + private void RefreshVyhodnotenieAll() + { + objObjectVyhodnocovanie.RefreshForm(this); + } + #region Nacenovany objekt /* public class NacenovanyObjekt { - */ - /* - public NacenovanyObjekt (DataGridViewRow _dgvrow) - { - } - */ - /* - // objem vypichu - public bool ch9 { private get; set; } - public bool ch10 { private get; set; } - public bool ch11 { private get; set; } - public decimal nud10 { private get; set; } - public decimal nud11 { private get; set; } - public decimal nud15 { private get; set; } - public decimal nud16 { private get; set; } - public decimal nud17 { private get; set; } - public string l64 { private get; set; } - // objem polotovaru - - #region Objem Výpichu - public decimal ObjemVypichu() - { - SetObjemVypichu(); - - decimal dObjemVypichu = 0; - - if (ch9 == true) - { - if (ch10 == true) - { - decimal Objem = nud17 * nud16 * nud15 / 1000000 * nud10 / 100; - dObjemVypichu = Objem; - } - if (ch11 == true) - { - double Objem = Math.PI * Math.Pow(Convert.ToDouble(nud11) / 2, 2) * Convert.ToDouble(l64) / 1000000 * Convert.ToDouble(nud10) / 100; - dObjemVypichu = Convert.ToDecimal(Objem); - } - } - - else dObjemVypichu = 0; - - return dObjemVypichu; - } - - private void SetObjemVypichu() - { - var form = Form.ActiveForm as frmNacenovanie; - - if (form != null) - { - ch9 = form.checkBox9.Checked; - ch10 = form.checkBox10.Checked; - ch11 = form.checkBox11.Checked; - nud10 = form.myNumericUpDown10.Value; - nud11 = form.myNumericUpDown11.Value; - nud15 = form.myNumericUpDown15.Value; - nud16 = form.myNumericUpDown16.Value; - nud17 = form.myNumericUpDown17.Value; - l64 = form.label64.Text; - } - } - #endregion Objem Výpichu - - #region Objem Polotovaru - public decimal ObjemPolotovaru() - { - SetObjemPolotovaru(); - decimal dObjemPolotovaru = 0; - - - return dObjemPolotovaru; - } - private void SetObjemPolotovaru() - { - var form = Form.ActiveForm as frmNacenovanie; - - if (form != null) - { - ch9 = form.checkBox9.Checked; - ch10 = form.checkBox10.Checked; - ch11 = form.checkBox11.Checked; - nud10 = form.myNumericUpDown10.Value; - nud11 = form.myNumericUpDown11.Value; - nud15 = form.myNumericUpDown15.Value; - nud16 = form.myNumericUpDown16.Value; - nud17 = form.myNumericUpDown17.Value; - l64 = form.label64.Text; - } - } - #endregion Objem polotovaru - - - - + */ + /* + public NacenovanyObjekt (DataGridViewRow _dgvrow) + { } - */ + */ + /* + // objem vypichu + public bool ch9 { private get; set; } + public bool ch10 { private get; set; } + public bool ch11 { private get; set; } + public decimal nud10 { private get; set; } + public decimal nud11 { private get; set; } + public decimal nud15 { private get; set; } + public decimal nud16 { private get; set; } + public decimal nud17 { private get; set; } + public string l64 { private get; set; } + // objem polotovaru + + #region Objem Výpichu + public decimal ObjemVypichu() + { + SetObjemVypichu(); + + decimal dObjemVypichu = 0; + + if (ch9 == true) + { + if (ch10 == true) + { + decimal Objem = nud17 * nud16 * nud15 / 1000000 * nud10 / 100; + dObjemVypichu = Objem; + } + if (ch11 == true) + { + double Objem = Math.PI * Math.Pow(Convert.ToDouble(nud11) / 2, 2) * Convert.ToDouble(l64) / 1000000 * Convert.ToDouble(nud10) / 100; + dObjemVypichu = Convert.ToDecimal(Objem); + } + } + + else dObjemVypichu = 0; + + return dObjemVypichu; + } + + private void SetObjemVypichu() + { + var form = Form.ActiveForm as frmNacenovanie; + + if (form != null) + { + ch9 = form.checkBox9.Checked; + ch10 = form.checkBox10.Checked; + ch11 = form.checkBox11.Checked; + nud10 = form.myNumericUpDown10.Value; + nud11 = form.myNumericUpDown11.Value; + nud15 = form.myNumericUpDown15.Value; + nud16 = form.myNumericUpDown16.Value; + nud17 = form.myNumericUpDown17.Value; + l64 = form.label64.Text; + } + } + #endregion Objem Výpichu + + #region Objem Polotovaru + public decimal ObjemPolotovaru() + { + SetObjemPolotovaru(); + decimal dObjemPolotovaru = 0; + + + return dObjemPolotovaru; + } + private void SetObjemPolotovaru() + { + var form = Form.ActiveForm as frmNacenovanie; + + if (form != null) + { + ch9 = form.checkBox9.Checked; + ch10 = form.checkBox10.Checked; + ch11 = form.checkBox11.Checked; + nud10 = form.myNumericUpDown10.Value; + nud11 = form.myNumericUpDown11.Value; + nud15 = form.myNumericUpDown15.Value; + nud16 = form.myNumericUpDown16.Value; + nud17 = form.myNumericUpDown17.Value; + l64 = form.label64.Text; + } + } + #endregion Objem polotovaru + + + + + } +*/ #endregion Nacenovany objekt public class ObjectVyrobok @@ -2051,10 +2067,274 @@ namespace Mip public class ObjectVyhodnocovanie { - - + public bool bEnableSQLUpdate = false; + + private Int32 IDNacenovanie; + private Int32 IDNacenovanieNacenovanie; + private string l206; + + public bool bEnableRefresh = false; + + #region Konštruktor + public ObjectVyhodnocovanie(Int32 idVyhodnocovanie) + { + //IDNacenovanie = idn; + + //DataTable tblObjectNacenovanie = new DataTable(); + //string cmd = "SELECT * FROM `tab-nacenovanie-nacenovanie` WHERE IDNacenovanie = 0 OR IDNacenovanie = " + IDNacenovanie.ToString() + ";"; + //classSQL.SQL(cmd, out tblObjectNacenovanie); + + //int intCisloRiadka = tblObjectNacenovanie.Rows.Count - 1; + + //myNuD84 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD84"].ToString()); + //myNuD83 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD83"].ToString()); + //myNuD82 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD82"].ToString()); + //myNuD81 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD81"].ToString()); + //myNuD80 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD80"].ToString()); + //myNuD79 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD79"].ToString()); + //myNuD78 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD78"].ToString()); + //myNuD77 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD77"].ToString()); + //myNuD76 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD76"].ToString()); + //myNuD73 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD73"].ToString()); + //myNuD96 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD96"].ToString()); + //myNuD95 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD95"].ToString()); + //myNuD94 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD94"].ToString()); + //myNuD93 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD93"].ToString()); + //myNuD92 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD92"].ToString()); + //myNuD91 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD91"].ToString()); + //myNuD90 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD90"].ToString()); + //myNuD89 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD89"].ToString()); + //myNuD88 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD88"].ToString()); + //myNuD85 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD85"].ToString()); + //myNuD72 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD72"].ToString()); + //myNuD99 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD99"].ToString()); + //myNuD97 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD97"].ToString()); + //myNuD71 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD71"].ToString()); + //myNuD124 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD124"].ToString()); + //myNuD125 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD125"].ToString()); + //nazovNovejPolozky = tblObjectNacenovanie.Rows[intCisloRiadka]["nazovNovejPolozky"].ToString(); + //IDNacenovanieNacenovanie = Convert.ToInt32(tblObjectNacenovanie.Rows[intCisloRiadka]["IDNacenovanieNacenovanie"].ToString()); + ////else nastavi hodnotu rezie na predvolenu (80) + //if (intCisloRiadka > 0) bEnableSQLUpdate = true; + ////else myNuD72 = objObjectSadzby.Rezia; + } + #endregion Konštruktor + + //#region Získaj údaje z formulára + //private void GetDataFromForm(Form inputForm) + //{ + // if (bEnableRefresh == true) + // { + // dynamic form = inputForm as frmNacenovanie; + + // if (form != null) + // { + // CasNastavRezanie = myNuD84 = form.myNumericUpDown84.Value; + // CasNastavKlasika = myNuD83 = form.myNumericUpDown83.Value; + // CasNastavBrusenie = myNuD82 = form.myNumericUpDown82.Value; + // CasNastavLapovanie = myNuD81 = form.myNumericUpDown81.Value; + // CasNastavKontrola = myNuD80 = form.myNumericUpDown80.Value; + // CasNastavBalenie = myNuD79 = form.myNumericUpDown79.Value; + // CasNastavCNCSustruh = myNuD78 = form.myNumericUpDown78.Value; + // CasNastavCNCFreza = myNuD77 = form.myNumericUpDown77.Value; + // CasNastavCNCSustruhSPU40 = myNuD76 = form.myNumericUpDown76.Value; + // CasNastavProgramovanie = myNuD73 = form.myNumericUpDown73.Value; + // CasNastavNovaPolozka = myNuD125 = form.myNumericUpDown125.Value; + // CasVyrobaRezanie = myNuD96 = form.myNumericUpDown96.Value; + // CasVyrobaKlasika = myNuD95 = form.myNumericUpDown95.Value; + // CasVyrobaBrusenie = myNuD94 = form.myNumericUpDown94.Value; + // CasVyrobaLapovanie = myNuD93 = form.myNumericUpDown93.Value; + // CasVyrobaKontrola = myNuD92 = form.myNumericUpDown92.Value; + // CasVyrobaBalenie = myNuD91 = form.myNumericUpDown91.Value; + // CasVyrobaCNCSustruh = myNuD90 = form.myNumericUpDown90.Value; + // CasVyrobaCNCFreza = myNuD89 = form.myNumericUpDown89.Value; + // CasVyrobaCNCSustruhSPU40 = myNuD88 = form.myNumericUpDown88.Value; + // CasVyrobaProgramovanie = myNuD85 = form.myNumericUpDown85.Value; + // CasVyrobaNovaPolozka = myNuD124 = form.myNumericUpDown124.Value; + // Rezia = myNuD72 = form.myNumericUpDown72.Value; + // myNuD99 = form.myNumericUpDown99.Value; + // myNuD97 = form.myNumericUpDown97.Value; + // myNuD71 = form.myNumericUpDown71.Value; + // CenaOstatne = myNuD99 * myNuD97 / objObjectVyrobok.ObjednanyPocetKusov; + // l206 = form.label206.Text; + // textBoxNazovNovejPolozky = nazovNovejPolozky = form.textBox1.Text; + // } + // } + //} + //#endregion Získaj údaje z formulára + + #region Nastav údaje do formulára + public void SetDataToForm(Form inputForm) + { + var form = inputForm as frmNacenovanie; + if (form != null) + { + form.myNumericUpDown122.Value = form.myNumericUpDown84.Value; + form.myNumericUpDown121.Value = form.myNumericUpDown83.Value; + form.myNumericUpDown120.Value = form.myNumericUpDown82.Value; + form.myNumericUpDown119.Value = form.myNumericUpDown81.Value; + form.myNumericUpDown118.Value = form.myNumericUpDown80.Value; + form.myNumericUpDown117.Value = form.myNumericUpDown79.Value; + form.myNumericUpDown116.Value = form.myNumericUpDown78.Value; + form.myNumericUpDown115.Value = form.myNumericUpDown77.Value; + form.myNumericUpDown114.Value = form.myNumericUpDown76.Value; + form.myNumericUpDown113.Value = form.myNumericUpDown73.Value; + form.myNumericUpDown112.Value = form.myNumericUpDown96.Value; + form.myNumericUpDown111.Value = form.myNumericUpDown95.Value; + form.myNumericUpDown110.Value = form.myNumericUpDown94.Value; + form.myNumericUpDown109.Value = form.myNumericUpDown93.Value; + form.myNumericUpDown108.Value = form.myNumericUpDown92.Value; + form.myNumericUpDown107.Value = form.myNumericUpDown91.Value; + form.myNumericUpDown106.Value = form.myNumericUpDown90.Value; + form.myNumericUpDown105.Value = form.myNumericUpDown89.Value; + form.myNumericUpDown104.Value = form.myNumericUpDown88.Value; + form.myNumericUpDown103.Value = form.myNumericUpDown85.Value; + form.myNumericUpDown102.Value = form.myNumericUpDown72.Value; + form.myNumericUpDown101.Value = form.myNumericUpDown99.Value; + form.myNumericUpDown100.Value = form.myNumericUpDown97.Value; + form.myNumericUpDown123.Value = Convert.ToInt32(form.label137.Text); + form.myNumericUpDown129.Value = form.myNumericUpDown125.Value; + form.myNumericUpDown128.Value = form.myNumericUpDown124.Value; + form.label564.Text = form.textBox1.Text; + + form.label530.Text = form.label270.Text; + form.label529.Text = form.label269.Text; + form.label528.Text = form.label268.Text; + form.label527.Text = form.label267.Text; + form.label526.Text = form.label266.Text; + form.label525.Text = form.label265.Text; + form.label524.Text = form.label264.Text; + form.label523.Text = form.label263.Text; + form.label522.Text = form.label262.Text; + form.label521.Text = form.label261.Text; + form.label567.Text = form.label560.Text; + form.label456.Text = form.label182.Text; + form.label455.Text = form.label181.Text; + form.label452.Text = form.label193.Text; + form.label444.Text = form.label271.Text; + form.label451.Text = form.label197.Text; + form.label443.Text = form.label272.Text; + form.label450.Text = form.label152.Text; + form.label553.Text = string.Format("{0:F3}", form.myNumericUpDown71.Value); + + //bEnableRefresh = true; + } + } + #endregion Nastav údaje do formulára + + public void RefreshForm(Form inputForm) + { + //GetDataFromForm(inputForm); + var form = inputForm as frmNacenovanie; + var PocetKusov = form.myNumericUpDown123.Value; + + if (form != null) + { + form.SuspendLayout(); + form.label490.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label530.Text), form.myNumericUpDown122.Value, form.myNumericUpDown112.Value, PocetKusov)); + form.label489.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label529.Text), form.myNumericUpDown121.Value, form.myNumericUpDown111.Value, PocetKusov)); + form.label488.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label528.Text), form.myNumericUpDown120.Value, form.myNumericUpDown110.Value, PocetKusov)); + form.label487.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label527.Text), form.myNumericUpDown119.Value, form.myNumericUpDown109.Value, PocetKusov)); + form.label486.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label526.Text), form.myNumericUpDown118.Value, form.myNumericUpDown108.Value, PocetKusov)); + form.label485.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label525.Text), form.myNumericUpDown117.Value, form.myNumericUpDown107.Value, PocetKusov)); + form.label484.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label524.Text), form.myNumericUpDown116.Value, form.myNumericUpDown106.Value, PocetKusov)); + form.label483.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label523.Text), form.myNumericUpDown115.Value, form.myNumericUpDown105.Value, PocetKusov)); + form.label482.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label522.Text), form.myNumericUpDown114.Value, form.myNumericUpDown104.Value, PocetKusov)); + form.label481.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label521.Text), form.myNumericUpDown113.Value, form.myNumericUpDown103.Value, PocetKusov)); + form.label563.Text = string.Format( + "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label567.Text), form.myNumericUpDown129.Value, form.myNumericUpDown128.Value, PocetKusov)); + var CenaPrace = + Convert.ToDecimal(form.label490.Text) + + Convert.ToDecimal(form.label489.Text) + + Convert.ToDecimal(form.label488.Text) + + Convert.ToDecimal(form.label487.Text) + + Convert.ToDecimal(form.label486.Text) + + Convert.ToDecimal(form.label485.Text) + + Convert.ToDecimal(form.label484.Text) + + Convert.ToDecimal(form.label483.Text) + + Convert.ToDecimal(form.label482.Text) + + Convert.ToDecimal(form.label481.Text) + + Convert.ToDecimal(form.label563.Text); + form.label467.Text = string.Format("{0:F3}", CenaPrace); + + var CenaPraceSReziou = CenaPrace * (1 + (form.myNumericUpDown102.Value / 100)); + form.label465.Text = string.Format("{0:F3}", CenaPraceSReziou); + + var CenaOstatne = form.myNumericUpDown101.Value * form.myNumericUpDown100.Value / form.myNumericUpDown123.Value; + form.label461.Text = string.Format("{0:F3}", CenaOstatne); + + + + form.label444.Text = form.label271.Text; + form.label443.Text = form.label272.Text; + + form.label537.Text = (Convert.ToDecimal(form.label465.Text) + + Convert.ToDecimal(form.label461.Text) + + Convert.ToDecimal(form.label456.Text) + + Convert.ToDecimal(form.label455.Text) + + Convert.ToDecimal(form.label452.Text)).ToString(); + if (Convert.ToDecimal(form.label537.Text) == 0) form.label548.Text = string.Format("{0:F2}", 0); + else form.label548.Text = string.Format("{0:F2}", (Convert.ToDecimal(form.label553.Text) / Convert.ToDecimal(form.label548.Text) * 100) - 100); + form.label553.Text = form.label537.Text; + + //form.label354.Text = form.label212.Text; ???zistit co to je + //Zisk = Convert.ToDecimal(form.label212.Text); + + //form.label549.Text = string.Format("{0:F2}", myNuD71 - Convert.ToDecimal(form.label206.Text)); + //form.label208.Text = string.Format("{0:F2}", Convert.ToDecimal(form.label549.Text) * objObjectVyrobok.ObjednanyPocetKusov); + //form.label200.Text = string.Format("{0:F0}", myNuD84 + myNuD83 + myNuD82 + myNuD81 + myNuD80 + myNuD79 + myNuD78 + myNuD77 + myNuD76 + myNuD73 + + // myNuD96 + myNuD95 + myNuD94 + myNuD93 + myNuD92 + myNuD91 + myNuD90 + myNuD89 + myNuD88 + myNuD85); + //form.label202.Text = string.Format("{0:F3}", Convert.ToDecimal(form.label200.Text) / 440); + + //decimal cas = Convert.ToDecimal(form.label200.Text) / objObjectVyrobok.ObjednanyPocetKusov * 60; + //int hodiny = Convert.ToInt32(Math.Floor(cas / 3600)); + //int minuty = Convert.ToInt32(Math.Floor((cas - (hodiny * 3600)) / 60)); + //int sekundy = Convert.ToInt32(cas - (hodiny * 3600) - (minuty * 60)); + //form.label204.Text = hodiny.ToString() + ":" + minuty.ToString() + ":" + sekundy.ToString(); + + //if (Convert.ToDecimal(form.label200.Text) == 0) form.label210.Text = "???"; + //else form.label210.Text = string.Format("{0:F3}", Convert.ToDecimal(form.label208.Text) / Convert.ToDecimal(form.label200.Text)); + //form.label338.Text = form.label210.Text; + + ////refresh sadzieb + //form.label270.Text = objObjectSadzby.Rezanie.ToString(); + //form.label269.Text = objObjectSadzby.Klasika.ToString(); + //form.label268.Text = objObjectSadzby.Brusenie.ToString(); + //form.label267.Text = objObjectSadzby.Lapovanie.ToString(); + //form.label266.Text = objObjectSadzby.Kontrola.ToString(); + //form.label265.Text = objObjectSadzby.Balenie.ToString(); + //form.label264.Text = objObjectSadzby.CNCSustruh.ToString(); + //form.label263.Text = objObjectSadzby.CNCFreza.ToString(); + //form.label262.Text = objObjectSadzby.CNCSustruhSPU40.ToString(); + //form.label261.Text = objObjectSadzby.Programovanie.ToString(); + //form.label560.Text = objObjectSadzby.NovaPolozka.ToString(); + //form.label137.Text = objObjectVyrobok.ObjednanyPocetKusov.ToString(); + //if (objObjectSadzby.Rezia > 0) form.myNumericUpDown72.Value = objObjectSadzby.Rezia; + + form.ResumeLayout(); + } + + } + + private decimal vypocetCeny(decimal _sadzba, decimal _minutyNastav, decimal _minutyPraca, decimal _pocetObjednanychKusov) + { + decimal returnValue = 0; + returnValue = (_minutyNastav + _minutyPraca) / 60 * _sadzba / _pocetObjednanychKusov; + + return returnValue; + } } - + public class ObjectSadzby { #region Premenné public @@ -4068,19 +4348,25 @@ namespace Mip private void button1_Click(object sender, EventArgs e) { - if (showPolotovar == true) objObjectPolotovar.SaveToMariaDB(); - if (showMaterial == true) objObjectMaterial.SaveToMariaDB(); - if (showNacenovanie == true) objObjectNacenovanie.SaveToMariaDB(); - if (showPocty == true) objObjectPocty.SaveToMariaDB(); + if (showVyhodnocovanie) + { + //objObjectVyhodnocovanie.SaveToMariaDB(); + } + else + { + if (showPolotovar == true) objObjectPolotovar.SaveToMariaDB(); + if (showMaterial == true) objObjectMaterial.SaveToMariaDB(); + if (showNacenovanie == true) objObjectNacenovanie.SaveToMariaDB(); + if (showPocty == true) objObjectPocty.SaveToMariaDB(); - //if (showVyhodnocovanie == true) objObjectVyhodnocovanie.SaveToMariaDB(); - //if (showSadzby == true) objObjectSadzby.SaveToMariaDB(); + //if (showSadzby == true) objObjectSadzby.SaveToMariaDB(); - string cmd; - cmd = "UPDATE `mip`.`tab-nacenovanie` SET `Status` = 'Nacenená' WHERE `IDNacenovanie`= " + IDN.ToString() + ";"; - classSQL.SQL(cmd); + string cmd; + cmd = "UPDATE `mip`.`tab-nacenovanie` SET `Status` = 'Nacenená' WHERE `IDNacenovanie`= " + IDN.ToString() + ";"; + classSQL.SQL(cmd); - this.Close(); + this.Close(); + } } private void button2_Click(object sender, EventArgs e) diff --git a/Mip/frmVybratTypVyhodnotenia.Designer.cs b/Mip/frmVybratTypVyhodnotenia.Designer.cs index 19a4e0f..2ef0842 100644 --- a/Mip/frmVybratTypVyhodnotenia.Designer.cs +++ b/Mip/frmVybratTypVyhodnotenia.Designer.cs @@ -73,6 +73,7 @@ this.button2.TabIndex = 11; this.button2.Text = "Vytvoriť vyhodnotenie"; this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // // panel1 // diff --git a/Mip/frmVybratTypVyhodnotenia.cs b/Mip/frmVybratTypVyhodnotenia.cs index 29e8abd..f286a9e 100644 --- a/Mip/frmVybratTypVyhodnotenia.cs +++ b/Mip/frmVybratTypVyhodnotenia.cs @@ -13,6 +13,9 @@ namespace Mip public partial class frmVybratTypVyhodnotenia : Form { DataTable dopyty; + Int32 idNacenovanie; + Int32 idVyrobok; + public frmVybratTypVyhodnotenia() { InitializeComponent(); @@ -41,6 +44,7 @@ namespace Mip left join `tab-nacenovanie-nacenovanie` on `tab-nacenovanie`.IDNacenovanie = `tab-nacenovanie-nacenovanie`.IDNacenovanie where `tab-nacenovanie-nacenovanie`.myNuD71 > 0"; classSQL.SQL(cmd, out dopyty); + refreshZoznamTypVyhodnotenia(); } @@ -277,6 +281,8 @@ namespace Mip textBox3.Text = dataGridView2.SelectedRows[0].Cells["Názov výrobku"].Value.ToString(); numericUpDown2.Value = Int32.Parse(dataGridView2.SelectedRows[0].Cells["Počet"].Value.ToString()); numericUpDown1.Value = Decimal.Parse(dataGridView2.SelectedRows[0].Cells["Cena"].Value.ToString()); + idNacenovanie = Int32.Parse(dataGridView2.SelectedRows[0].Cells["ID naceňovanie"].Value.ToString()); + idVyrobok = Int32.Parse(dataGridView2.SelectedRows[0].Cells["ID výrobok"].Value.ToString()); } private void numericUpDown1_ValueChanged(object sender, EventArgs e) @@ -289,5 +295,12 @@ namespace Mip { dataGridView2.ClearSelection(); } + + private void button2_Click(object sender, EventArgs e) + { + Form frmNacenovanie2 = new frmNacenovanie(idNacenovanie, idVyrobok, true, true, false, false, false, false); + frmNacenovanie2.Text = "Vyhodnocovanie"; + frmNacenovanie2.ShowDialog(); + } } } diff --git a/Mip/obj/Debug/Mip.Properties.Resources.resources b/Mip/obj/Debug/Mip.Properties.Resources.resources index 1017756ea1654a6bd476c7ab8c7de443989b5d38..cd80b01b739cfa02070f5053c99180ddc39a4236 100644 GIT binary patch delta 25 gcmdlyMWy4iazhJa3sVbo3rh=Y3tJ2O7LJaW0DTwSgim6!gLIN diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index 4b9db259717f62258b509dbdcae8f19f3387db60..32834ea5f23a11f191a3ad520abe6992769669f5 100644 GIT binary patch delta 19 acmZ3*wu)^-Jrg?<0|NsW7xUycrX>I`qy%vQ delta 19 acmZ3*wu)^-Jrg?%0|NsW7yINkrX>I`&IES= diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 98a01fc..368bb1f 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -106,12 +106,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } @@ -169,6 +163,12 @@ "OwnerKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -187,6 +187,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } + } } "Release" { @@ -203,6 +219,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -561,7 +585,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_DC8609E7010540EC9CC4B5D8F85195BA" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFilesFolder]\\Kompozitum\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -597,22 +621,22 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:MipInstaller" - "ProductCode" = "8:{3FF88A64-7F9B-4091-9073-B8013E064EA7}" - "PackageCode" = "8:{1F10932E-D5ED-4B5D-B281-130958FAF1BC}" + "ProductName" = "8:Mip1.1" + "ProductCode" = "8:{1D09E0F1-6CF3-42B0-9632-D806262A3269}" + "PackageCode" = "8:{30567C53-15E0-4B46-8DD7-89E4CA214781}" "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:Hewlett-Packard Company" + "ProductVersion" = "8:1.1.0" + "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:MipInstaller" "Subject" = "8:" - "ARPCONTACT" = "8:Hewlett-Packard Company" + "ARPCONTACT" = "8:CyberDream" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" @@ -1162,7 +1186,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" @@ -1190,7 +1214,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" @@ -1218,7 +1242,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" @@ -1246,7 +1270,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" @@ -1302,7 +1326,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" @@ -1316,7 +1340,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DF4DF5614F534F54B59021BDE12D5BB1" { - "SourcePath" = "8:..\\Mip\\obj\\Debug\\Mip.exe" + "SourcePath" = "8:..\\Mip\\obj\\Debug\\Mip1.1.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" @@ -1358,7 +1382,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:FALSE" "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1"