From 72f75505732a4ded90c87badd8d0c5948e114fac Mon Sep 17 00:00:00 2001 From: "Culak-HP\\Culak" Date: Thu, 7 Jan 2021 13:16:26 +0100 Subject: [PATCH] Opravy --- .vs/Mip_v1/v16/.suo | Bin 170496 -> 173568 bytes Mip/classGlobal.cs | 9 +++--- Mip/frmMain.cs | 49 ++++++++++++++------------------- Mip/frmNacenovanie.Designer.cs | 32 ++++++++++----------- Mip/frmNacenovanie.cs | 2 +- 5 files changed, 42 insertions(+), 50 deletions(-) diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index f99961c741abdf24bd881b776dd4658dc7c33916..74eff96ff7519f947f3887993d43690371079cbc 100644 GIT binary patch delta 9618 zcmeHN3tW`fm7jAM1_V?)?C@K4I-Mub<8U}YbOekC76DJx?4@0eecHI8-?7Ss_b`OFPkbY2K)YhIo$X+8x>PH2rKTl*5x5NGy7KyiHUV>hJYWJa9S8zcokGx6z&KzQunb5AzC_*-P>>c! zH<&aa47klHbQFUQ$A=ezP64I@QNWLZ9|6%o2@nYk1U3S<0Jj5^0oAz=>W>5#Bkc>! z12zB?fl6R3;Bf4!@M)Q^aSq2)P&KrLp!Wd@z!yL^Pzo#uE&+|e4798Vtpl2Yl|U=7 z0#KS$8k_;F13Q6T6LiGx>=0$9^RsIHzDQLZ5en2&=05ph5|moE+7$56Howz;S=224@G)5;MV@n zz^h(rL6d-+wXgbgX}{uY)vqcm^{)eNRzI>d^(ze+Fo-lzxAupFSK3d4yhucP4oLVq zeYc^6(zj|!={q0jqdrH}cn)jvLQ3gx0H8`J{V3fk-u)=udZUKYt&%C-dLgZJo8giv z-MY)~?8PgY(ycqM8obi2D;?<|*6A2flb{Fn0t|pR&<7C4(jbxQ6Es>C2!bFS2nJL- z6m+nQ4|CBTvBKx^zLVW4lujrTR=y=|qxwkXYBhD(2rI`w!p>kO^D`z64Z1J&FSA(>l{5*cuVr<8qpN!0=$o6c~%aQkTr6!b{?&WMM6*)EIJ+^8qK-QQJVI!-BPZ%RI_D1x4jz_n1jrCpdLsDCh0`9dAwgJ z%zp?_4v}ay7e7X0Ekk&oyV|zol?coJ6>mqiCpZ18sIVQK@acVLqV6AfPi|35!TjOF zruZNEgQ$rJvO1RNN&K@ZSPZ`V;l59L=yd%tsy+yArSeQVhl*$R52kWKYjWk$ED9EL zw?Az8k-=X){>*b%i--QhnTUr5djx0hvHH)fCC_41JtcO0+p*`nTlU(iB{{JS_sr4G6zt`pvtI)MA0fx(KvgjWs{+8 zze%+2A1prIA1KeIbC4K#e1qk2YHRE^WI+9rCt>zbU-}lw~7Z9%0Kq zA4@u09^sDh-neZml?ckol0B&uY@Ko7am~L2Z}jg7YsA4WYRfW{pXT0$ zz1;iqEo<55D{d_=Pg;B3rJsx=YsAb_rz4M6j{Nz5-&}S+A5Z#MF=fK|LbkV>Wrs?b zU$~P!SoHjM4LvDVzt}=i;_{2df;Ytf!hD2isAxXw@H~Z*$bD(8;a+HF-+Xap`4z+H z>(k%)vYBYAXnv)|;0NiPFzc0947{r*hT-+G&!z{2L#ldIk5YCd;_!fkC`i>nA|O#Y z(MXR1Vt^#bVnO48cpzCtZhaa!VShGTct7WtREUJCrk*J-ek$lRV7e<^3|a!HZV(=R zbKMGjH7jU)@%Ed)TbPgBZ8)ll$s9){J770tih*4~e9r^B|@ z{V32=pP!qNDeoCTD=Z&yM-cJXbkK4b)$vuDe&+vb$|;@h^?uWT9Ge?@q&wj9z9k1% z&P~W2EV{9KOaIgFA^-B?Gf%+~>Q91y;ia)>b-JVdRx5sQ^Pp$XJ{bGfqY1gE9{TvR z^Tk_UeG~lKYsS7--_`SH#W$CgzK+Adus2YC_AL)>08d9{YbcpQUWVxY+dlYW!uuZS zTRx1--SyNTAKvzQVxF{zQh49qgV9L}qY3R{6eLT-C|=qJP>x4YL8d1su zgv0D&4twv16&wK62FKbR6GI}rEJhseYZT_P5`Ie8wjt5lUFJszTIc5JFH&*CX9y2kW&;RP3N#Q#j~GmJq63c%XEzk zl1&&s71^FUMLE>oMHcbL$A=;oD8JE8)bh158YVyLqQ_*Ti9!N2xw{ipOy-nOf~?+5 zp|*m}^e-gsXUV8SqHZ;gmqpmxHR^7aE$1kySlMOor|W{lp|telAZ zh9;bvim-*RhdfcY0Owq@&MX}t(m+}I5j@585xo|0*4$&6Xge0LKUBBxrT&f=NJMgY zwAQ~a5AAD%QXR3*;A~p&W~Rw~9-KJL*--4;~Zj%v*YGq|WMc?#EOh_j+&&m3&hhL%cb@<22M;{0WU#CvA0DO~rdH zPR40KvMx`yd_r?%*?EfXI8P*N&r`Up`iw@%SezIJGFx& zn2)~w3fX0&k|z(LQ2F{5ityCBkQ1)bA!+KNR%zF>NqWWcF!_onr^&PF93rQU;s9B1 z;6dW_{s6D!y}2uU_G6@Y^AxTp`os6 zv{EvkmOg;B^4Z|6>1xo+q3nX{Dg|5okvKettT@Gm8K^9psuzD0*a z5T0*sv^N^*!*(C$AKEtiv;A*oi?l%GES?bH-l-}2lXb>;qdb|;V=|I(W0$MhdkVND z{N>@wGC`LE`%l6<0VyM>5m#Vi@h;H*Cd#$vDNa6S;OxjG)Xsq477&DC-6BF_>C#EN)j?K?a$jr~p$15{0Ej>LwB_k*4 zC+pJc#@1xkEKE*FU6hiVkeZg9l#rR0xhNrZVRCBbf|``1w3KA|z);>p17yZ9K7aGb z`}!_wS~^V)69XYo_%0cbxp9@8w|^7 zY`x?z!wQY#N*_#}b|B8X(fv-@KA*?+B4hHLL;`GrHHAs@UFw&QKeVu7Gl?^ z_`e=o9TWM`nCrX13~V_UVN*928<;wT;Y2jG5*PN%(O4a}q~q~xg^zr&lJk9g^(rUi z^M+C1+;s-RdMcn6fJ7OvjR&{yE#RrLs(=fmzJSYR_e@Tdt(Dj|hfiW3nkEBEc&yy($$|K>AT+5h=V*neItibKY430&$OVt3mLs4`d1vx716&U|1OT_#gE9qGLHK8&SsaL z#T+V|N-*cfVosKu7IVCuK7$i^rcP|wktMq}aR`l+%S*VD=3mo*pWK;2QNGGeoWFZw znm6#UAI>{VzN2?y7}p-BpJ=~C>U8eAczJ9$?8LO2H+kUqQ0b-TNX>~nwbJ5Dew2K6 z1`pLHK*Z(5$O|)JXWDc$D3gYnO_9b~JX2X%wsXb~EaHCfX_KGZ{i5Na;$qGiXQRsL zdi5dg`8Yh8c4D9M>2CJdy!8Ko|1ABXtZSq=mmmJ0R8lFAkhP^;B}bI9i87TPkCe~P z#^HD7Z0J=#o2T~ z7FR7X2$GR9VHTqL0V59N7s}BASFl<2UoB@=qVGI8uK-4sSqV?p+EL-ub0E5(CJ&Y3 zl#d_s!fpG0!kbAMbcORX;*^^kWVv#9G!rGBSU6M;ErsasV4~vXx>k;-Ro4QJ7V@WP z`VhDMQY{@b<-83%*ER9t(SM47tVG^g&ZA}P91aaozeE+{{FS9G=J=lp6~jhr3&HoC z`}wjdoMI)Gh@q729HIYW4)j#J>gh6R7N^LrB$$9RI#x)U4eeFm0q6Ih#NOgpCqpsR zzOuLy!`XKSuamW#cpBw8TY^#oWyL03=XGvk3siM|`9ddt?J68^kTZVDGh}B42U3;X zI~RwqZ*K^4UnLC3vYk)ha`AfOuo)j^C?TF3@fo#R4$M1Up5Dq!WLp(3l%B06gDqka zmf~+VqeOXUD@S}E#o?-J`$nGeL(FWoY#{wN9onE$5u>&G2M)vW|H=)-`V$dA(&FdoH{sm~(%7W>Cb=t-J1N-R@m|tl#YY z{rBtt+W-CdFudtuc)_D1T{}Th6ldVN)oMke5a0q#0iG{^oI2~=jjYzIZv8WNxBT0? zG#+Hd$TzZ$5?}-n0dxRbAQo@~f`9~|7RUjv0wV#*g)1rZl=*m>1{4DtAPUF_ zB&$=A&IMKh$v`d;3M2u}VB!v>A;4r{9#9CxgPz61+3ck(axVX;tBE127Q?2HJtuKqX-B%W6$WJ|1vEt1_f(0cn*wM_P}x3Xs-n1ge3- zwiU?F8S*aa_uPEvR$A?)+YzvR(`_bn@ukqEs5xlB!5-zv(wJ?0oZDExR^)~nRMzt0 z_rlDB=8}}5=Gt*{bn8%aZ2^6#xeRzGNIcwHvOj4pnGUy>q&ckBs$4^*L37E1L30J8 z(=3$D1nvgHfrY?!Kngq5cn^R!+;|M_wSe?PPhb`xeQz-!+b>6IwRTqc)Jj9jk?%$7 z3Je@}&Gda(XzjL=!GO)W>d3>c)#bgL`_jKCR3*~3V? zfJYqfyiBj-hRBPm0T4RNHN0hfY2>$#!hWQwfMoYO2hHk872?-Nj{ZkV<)bl?zBGDVSDJMp5^t+mWor#8kn4%{q-k4$~ zSKc_e)md8QocZchS7uDpvp0!1rEQ@?ekIL1LWU(7VdOK5XRk~U>MbnLJR{5E+O?Od zxGJ+w)SV?2-;mitQ_WX0J*j)9*3GQVUqCK$(j*bz`1030d8>vSwpOasK$4o0j>Ny* z8n|N6%5t*FI4R%dRd4F&ekMPs-%wPS{RL>%vKm|j#M}>Sgn27;a0+WEd05$Q*vP^a8kgB|{EI(XI zqC>fqaFU}iAL$)H3NV@Y*|HR#T<-0Cx1(5&vkuie%TJk_+>CL07^^X^l?u#P;yj6O zJ)kjb43~-YoPN8+y!5dr$h6JH_?(^=@y6$@%nENf*e;H0DToKHczVQulYK36$0}#! zZD)dm=FXYbP*Gn~r*A0LmoFj`8D+jI5k;*QvApecyJ=>AW2`Szy70tFbVJP>8KL#Ku8#4$C7&x`Iq#*j+Z=LxT*yS?vd%=NGAuu%^) z(i5eMMkm^7Jhp)bc=NGV8Yh~QDV|5Ys#E;|T+0aar2bW+P~Ldl>MVOxc=KzUT=t-F z-x72G>l+EiZG5BE#T^4I4lwt>;lhl?`Km)VS{D;d;f*DQZj#sC4zfonGM6wBF~;=+ zO}EU{A7GpxZ4VS*j$>}Ty}d~s3S_?A_e=oIgrntg*Y~cPPLp~Z`W*@Q0pjRo@^z_b z=yUT|M4Og{@T_-wy3c2kSQmk|8E0a-;RA!Q3_;}c%Vc_=b>CwkKEH4RFDne;oq6#* zfsHWrs!WyStRx{obLXl7(?_iPYaQ02|2WNDWVqW)=KgP8h#M})SYjCE|0vaR{j0l- z*ZXJ;zjD2mM)OANPHq^D2;O&|jK}r2Y5i9i=vJ+J*tE|3=N9~s#$D_h=Nm^vnZvK0 zr|!=UPQ#^ih}26jP#-zVy_Flk`pv*l0f(?_ZnU;Cdo6L*iCSr&rCCKj&Z?a3>DiXu z(X@`4E;DYJsufxlmD-CRpw@lp7i`uW8OlY&OcmudgsYF$`uA5$`WUMNGttB8SGo;KYr8f zmmM@QXDDA9LB2H2U5#SNwjyTu(qzx+v-65=uONI?NC9Hc3mz0^WVy+4@PehsM(rx8<$;$YGV!*uen#H7>d*!_FSP3$Y6NU>oX z1zWPVQ4fiG#*jvM2b0PYm`Rsh_isnzLqtscW*d20)X%~Z_vewv{@;^}_vg-)Km{>NG;w;z~yzL~uUPxOkTQ1RkWT6dYrQsv)?Be>#S1hvFVV%Gn676z$c(0Hsm)RInKAs=1e>8`qxn%bCsULC)pFSP|^n<6`xZW zE!k2Ni8c&6<_B7cX=f?1P*Kv*L#0v@wUbhg8n4z2S*ug5t(PRSO3IYE9F%?Y~fBzn%0CdLEhdK}AYY?m3sYAY2e ztFehL`{?>t`m;^B=g!jDAh{Wry0?kR6c@YZNO2J!=O~Y=`O$eXBH$ePuu?^gI!A${ z;?Pqiv|Eq9R!ZfFk>?NzPP(%a*92UG;7?5JrTN0p3y)aYOa4#y^g>(R_fnJSs3xsA z(nKznM^4fT>bi)))bk;JPJK!VqV6JjTYA(ii}s&_3-%GSyWH{rvCDORNt{5=*qtqOvDoBi ze1?UtrytSrf`+B@^Ob?Ph~eIQBV|@(`LQ1HygREOkpQXW1>oQH{_k=0r{U=A`+QQK z(nX3N`TxV*53c`H>cDexfTH+90czzz@!(OLj9~Y#xt(gTh#eC=6nm^zaR;TJ%h1lf=DaSf*!ka&k^ePD=9TmLK2hx72R$ zYu{*=Z0R4vx=9p-vqx!^xD?JlbFIuxOTeEvn$N~tsv}u}tACKZNVGpaeaQPGpF6ad zl2Y~}`A6SaVtjg*qgt@6Hk@&7aCQCao5#$mxFK$tC|xm9eH+EaP7$5cS*+NR%f@?1 z4kS~#w<$e)Iy+#ANMjRd>_;-p*&d%BU+^Z647r_Tmv7UgJ0>ONie4=X7O4~2^#4*T zuZu%kc9*oZvn4-|jU@4T8bfqXW0AsRD!Wtn&W)k`d%khxhYls4AIl@$llHJ|OHL|#8T+AG z_?0^cMdVIl=^`$c1zX~x*mmb1X*`uQp0LhlN8J{@CD&NIRZExV zlvjxORjd{=Er4(&n7l6Dp+PRwU1 zqimf0uen!L*8+B4R4!y?Hd)1ISFrD0vJf2hJ%Q;8VZEtVJh6z?h+_*`uZUO<0kf)E zk~p-Ut+dPA+rd0|{CO|jSj*2cr8a%=cwIO|Un#pGd zqPLlq(UKclQHzcV6z*DK+XpQdYpYp2|6N9u_`DYEph1kh+KQ8Wri;p*cs;cU%R$R# z=IvRJy;y_oyGXV8s+P^R^Lc0+^Xh705yH^IvP47+D;;7Wh~^>Q+|0ZvUwqii#tB(l z_7;po7YsE{a_hkl)@UF`ka($uWz!;U zC5@+DGq&BR$lk)H@&Qv6IuAqVX*MnLzs>X#y$0q2PGtp=kWZsU-Bxg8YGZnPf9i)> zxHE#jqmA9he&Xm>HXEwwTnzzZHwB9$vemx(;23Gs*$egnG-_x7>O)kRBErVAg+s!K zoOA2$WqX|^Q_4>i3=VH&kt7WFvn6)7z+Cg`3b83#UT-u>U4(TNu%4gm%(r0XYv`A0 z_sg{V-f3sSwA=ne4t{eXndz9eLfy`Ews^!>J(G+ebB`$B$x5hbNPLrVM9kZXNM~EB z?4dhDhHm*as6fnV!%nO>l>8mRW)Z0AqOFA`ijGbM1j9qj1H;Lqyd&hVK@D5jNEAzU zv(e&0GXkzHmez%mnonEmCL(tuMDE+oTCkT#08JF5r{h3nk7n{ZI?o=wq8A5)=@4z~fRK4wj0sq60iF*{^*09{P z(ma0frI!Z^M?dy~?x`Rr|I|nSUJEcMAIE1T9Hv?}*>-Qk+uydUOHP=a6qA^0-^Nv} zs#&u;{R=6{&iF9= zE-5SU8Ls4GQrhv~0$+ShiZ>1hBL_&4-zh?`k?rf-lSrMg0w4a4loYhThU>5|@IJtp jascV?RZMBZm-x)FOtGMRLo8E5k`?9ga$L`4&F}e7-T5qw diff --git a/Mip/classGlobal.cs b/Mip/classGlobal.cs index cfbebea..562a818 100644 --- a/Mip/classGlobal.cs +++ b/Mip/classGlobal.cs @@ -492,8 +492,8 @@ namespace Mip string IPaddress = ""; PingReply pingReply; - IPaddress = "192.168.1.12"; //IP Adresa MariaDB pre VLAN1 - + IPaddress = Debugger.IsAttached ? "192.168.2.12" : "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"; @@ -501,11 +501,11 @@ namespace Mip if (pingReply.Status.ToString() == "Success") { classUser.MariaDBServerIPAddress = IPaddress; - } else { - IPaddress = "192.168.1.13"; //IP Adresa MariaDB pre VLAN2 + IPaddress = Debugger.IsAttached? "192.168.2.13" : "192.168.1.13"; //IP Adresa MariaDB pre VLAN2 + pingReply = pingIP.Send(IPaddress); if (pingReply.Status.ToString() == "Success") { @@ -528,7 +528,6 @@ namespace Mip + "Program Mip bude ukončený! "); Environment.Exit(0); - } //IPaddress = "87.197.164.107"; //pingReply = pingIP.Send(IPaddress); diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index 55712c4..291f575 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -6571,40 +6571,33 @@ namespace Mip { if (dataGridView7.SelectedRows.Count > 0) { - if(classUser.ID == 1 || classUser.ID == 4 || classUser.ID == 26) - { - Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), true, false, true, true, true, true); - frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; - frmNacenovanie2.ShowDialog(); - } - else - { - Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), false, false, false, false, true, false); - frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; - frmNacenovanie2.ShowDialog(); - } - + OpenNacenovanie(); } refreshNacenovanie(); } private void dataGridView7_CellDoubleClick(object sender, DataGridViewCellEventArgs e) - { - if (classUser.ID == 1 || classUser.ID == 4) - { - Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), true, false, true, true, true, true); - frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; - frmNacenovanie2.ShowDialog(); - } - else - { - Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), false, false, false, false, true, false); - frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; - frmNacenovanie2.ShowDialog(); - } - } + { + OpenNacenovanie(); + } - private void button112_Click(object sender, EventArgs e) + private void OpenNacenovanie() + { + if (classUser.ID == 1 || classUser.ID == 4 || classUser.ID == 26) + { + Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), true, false, true, true, true, true); + frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; + frmNacenovanie2.ShowDialog(); + } + else + { + Form frmNacenovanie2 = new frmNacenovanie(Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDNacenovanie"].Value), Convert.ToInt32(dataGridView7.SelectedRows[0].Cells["IDVyrobokNac"].Value), false, false, false, false, true, false); + frmNacenovanie2.Text = "Naceňovanie - vyhodnocovanie"; + frmNacenovanie2.ShowDialog(); + } + } + + private void button112_Click(object sender, EventArgs e) { classGlobal.DeleteRamDisk(); classGlobal.CreateRamDisk(); classSQL.ExportFormToHDD("Plán preventívnych údržieb.xls", @"W:\PU.xls"); diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index f991d07..4ce1e48 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -1205,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(1051, 130); + this.panel1.Size = new System.Drawing.Size(551, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1466,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(1051, 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"; @@ -1556,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(974, 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); @@ -1613,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(1051, 56); + this.panel17.Size = new System.Drawing.Size(551, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1624,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(1049, 31); + this.panel24.Size = new System.Drawing.Size(549, 31); this.panel24.TabIndex = 13; // // label14 @@ -1633,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(500, 29); + this.label14.Size = new System.Drawing.Size(0, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1664,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(1051, 735); + this.panel16.Size = new System.Drawing.Size(551, 735); this.panel16.TabIndex = 21; // // Polotovar @@ -1676,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(145, 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); @@ -2863,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(168, 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); @@ -5245,12 +5245,12 @@ 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(191, 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); this.Naceňovanie.Name = "Naceňovanie"; - this.Naceňovanie.Size = new System.Drawing.Size(406, 728); + this.Naceňovanie.Size = new System.Drawing.Size(23, 728); this.Naceňovanie.TabIndex = 6; // // panel110 @@ -7162,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(597, 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 @@ -8979,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(1003, 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); @@ -9698,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(1026, 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); @@ -11494,7 +11494,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1074, 921); + this.ClientSize = new System.Drawing.Size(574, 921); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index 4d367bc..ce2c4da 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -2284,7 +2284,7 @@ namespace Mip 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); + else form.label548.Text = "0";//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