diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index f4d9ef7..71d0b15 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmMain.Designer.cs b/Mip/frmMain.Designer.cs index 6fdd074..c304ae0 100644 --- a/Mip/frmMain.Designer.cs +++ b/Mip/frmMain.Designer.cs @@ -907,6 +907,8 @@ this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.label175 = new System.Windows.Forms.Label(); this.label182 = new System.Windows.Forms.Label(); + this.button206 = new System.Windows.Forms.Button(); + this.button207 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -7163,6 +7165,8 @@ // tabPage12 // this.tabPage12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tabPage12.Controls.Add(this.button206); + this.tabPage12.Controls.Add(this.button207); this.tabPage12.Controls.Add(this.panel63); this.tabPage12.Controls.Add(this.button201); this.tabPage12.Controls.Add(this.panel75); @@ -7230,7 +7234,7 @@ // // button201 // - this.button201.Location = new System.Drawing.Point(692, 0); + this.button201.Location = new System.Drawing.Point(645, 0); this.button201.Name = "button201"; this.button201.Size = new System.Drawing.Size(104, 43); this.button201.TabIndex = 43; @@ -7288,9 +7292,9 @@ // // button169 // - this.button169.Location = new System.Drawing.Point(607, 0); + this.button169.Location = new System.Drawing.Point(564, 0); this.button169.Name = "button169"; - this.button169.Size = new System.Drawing.Size(86, 43); + this.button169.Size = new System.Drawing.Size(82, 43); this.button169.TabIndex = 40; this.button169.Text = "Opraviť iný názov"; this.button169.UseVisualStyleBackColor = true; @@ -7299,9 +7303,9 @@ // button168 // this.button168.Enabled = false; - this.button168.Location = new System.Drawing.Point(522, 0); + this.button168.Location = new System.Drawing.Point(483, 0); this.button168.Name = "button168"; - this.button168.Size = new System.Drawing.Size(86, 43); + this.button168.Size = new System.Drawing.Size(82, 43); this.button168.TabIndex = 39; this.button168.Text = "Editovať iné názvy"; this.button168.UseVisualStyleBackColor = true; @@ -7309,9 +7313,9 @@ // // button162 // - this.button162.Location = new System.Drawing.Point(437, 0); + this.button162.Location = new System.Drawing.Point(402, 0); this.button162.Name = "button162"; - this.button162.Size = new System.Drawing.Size(86, 43); + this.button162.Size = new System.Drawing.Size(82, 43); this.button162.TabIndex = 38; this.button162.Text = "Tlačiť cenovú ponuku"; this.button162.UseVisualStyleBackColor = true; @@ -7398,9 +7402,9 @@ // // button57 // - this.button57.Location = new System.Drawing.Point(352, 0); + this.button57.Location = new System.Drawing.Point(333, 0); this.button57.Name = "button57"; - this.button57.Size = new System.Drawing.Size(86, 43); + this.button57.Size = new System.Drawing.Size(70, 43); this.button57.TabIndex = 37; this.button57.Text = "Naceniť"; this.button57.UseVisualStyleBackColor = true; @@ -7410,7 +7414,7 @@ // this.button99.Location = new System.Drawing.Point(264, 0); this.button99.Name = "button99"; - this.button99.Size = new System.Drawing.Size(89, 43); + this.button99.Size = new System.Drawing.Size(70, 43); this.button99.TabIndex = 36; this.button99.Text = "Zrušiť"; this.button99.UseVisualStyleBackColor = true; @@ -12217,6 +12221,25 @@ this.label182.Text = "↗"; this.label182.Click += new System.EventHandler(this.label182_Click); // + // button206 + // + this.button206.Enabled = false; + this.button206.Location = new System.Drawing.Point(822, 0); + this.button206.Name = "button206"; + this.button206.Size = new System.Drawing.Size(82, 43); + this.button206.TabIndex = 45; + this.button206.Text = "Zobraziť vyhodnotenie"; + this.button206.UseVisualStyleBackColor = true; + // + // button207 + // + this.button207.Location = new System.Drawing.Point(748, 0); + this.button207.Name = "button207"; + this.button207.Size = new System.Drawing.Size(75, 43); + this.button207.TabIndex = 44; + this.button207.Text = "Vyhodnotiť"; + this.button207.UseVisualStyleBackColor = true; + // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -13380,6 +13403,8 @@ private System.Windows.Forms.Label label228; private System.Windows.Forms.Button button204; private System.Windows.Forms.Button button205; + private System.Windows.Forms.Button button206; + private System.Windows.Forms.Button button207; } } diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index fd3c5de..a2cdd41 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -167,20 +167,16 @@ namespace Mip { numericUpDown1.Visible = true; } - //if (FirstTimeLoad) - //{ - // button8_Click(null, null); - //} + if (FirstTimeLoad && !objObjectVyhodnocovanie.FormDataLoadedAndReady) + { + button8_Click(null, null); + } button9_Click(null, null); - //if (Form.ActiveForm != null) - //{ - //} FirstTimeLoad = false; - RefreshAll(); - objObjectVyhodnocovanie.SetDataToForm(this); + RefreshAll(); RefreshVyhodnotenieAll(); if (this.Text.ToString() == "Print") @@ -189,7 +185,6 @@ namespace Mip this.Close(); } - } private void VykresClick(object sender, EventArgs e) @@ -2807,6 +2802,9 @@ namespace Mip string.Format("{0:F2}", 0) : string.Format("{0:F2}", (Convert.ToDecimal(form.VyhodnocovanieCenaZaKus.Text) / Convert.ToDecimal(form.label547.Text) * 100) - 100); VyhodnotenyZisk = form.label548.Text; + form.VyhodnocovanieCenaMaterial.Value = Convert.ToDecimal(form.label182.Text); + form.VyhodnocovanieCenaImpregnaciaPraca.Value = Convert.ToDecimal(form.label181.Text); + form.VyhodnocovanieCenaImpregnaciaMaterial.Value = Convert.ToDecimal(form.label193.Text); //if (IDNacenovanie == 0) //{ // form.VyhodnocovanieCenaZaKus.Text = diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 0121979..26a2359 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -630,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{4CD1CB1C-F9D4-4DDB-B97D-BCA47D13C732}" - "PackageCode" = "8:{248867CF-C69A-4D8B-8AEC-F550A00A1E61}" + "ProductCode" = "8:{89C91A43-2550-40FB-A31E-D44256A72D62}" + "PackageCode" = "8:{2D789EA9-AF33-4D74-90DC-6616EFEAAF3A}" "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.6" + "ProductVersion" = "8:1.1.7" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index c97ea8a..6653668 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ