diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 27cbc7f..100ef07 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index 9cdac59..0b592a1 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -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(28, 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(51, 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(74, 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(97, 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 diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index a2a96bf..fd3c5de 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -257,6 +257,8 @@ namespace Mip } + button8_Click(null, null); + this.CenterToScreen(); } @@ -1775,7 +1777,15 @@ namespace Mip { decimal decCenaKusu = 0; - if ((objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca).ToString() != "") decCenaKusu = (_cenaImp * _sadzba / (objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca)); + + if ((objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca).ToString() != "") + { + var impregnaciaSpolu = objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca; + if (impregnaciaSpolu != 0) + { + decCenaKusu = (_cenaImp * _sadzba / impregnaciaSpolu); + } + } return decCenaKusu; } diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index 70bf029..d5fe7e7 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 d5fe7e7..fc1efdf 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 9d2f860..0121979 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -630,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{77282D18-5DD6-4471-AACD-CFACA28746FA}" - "PackageCode" = "8:{51DE15E8-AC04-4CFE-9ECC-14BFE630E5B4}" + "ProductCode" = "8:{4CD1CB1C-F9D4-4DDB-B97D-BCA47D13C732}" + "PackageCode" = "8:{248867CF-C69A-4D8B-8AEC-F550A00A1E61}" "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.5" + "ProductVersion" = "8:1.1.6" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 9979076..c97ea8a 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ