Index: /trunk/BazaReklam/ProductionForm.resx =================================================================== --- /trunk/BazaReklam/ProductionForm.resx (revision 65) +++ /trunk/BazaReklam/ProductionForm.resx (revision 560) @@ -214,18 +214,18 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuNJREFUOE910ntI - U1EcB/DjIzUfiY+UUtN8JUomWUIRJBJCQfRH1D8VphaVhctt5iu3TM1sOoyJr6GYtjkbZVkQaClMB0Fm - vkNtw1JbmuYj81G5b78LJoh54cPhcs/3e8+955iwlav0FLM3dWLF1tYskoEtmFmw5V9LbLilkyXJm1kH - TVsg+Dd/3VgdzwofJphCm78bGsku1IsY2koZKnisnSbvJ9YbhrkH5ZdZ/59mPvD+LtCRi+6ySDTkMMjF - zGhjwRJoigcx2bBEk+kyjM48oK8IMLTAOKrFoFaOphqxMTVVWEHBULJpw4KJqsMKtGUCE+1Q11RCJBYj - MSUVF2JjfkdHRzdT8CRx3LBALw0SQlcPtaICrQN6zAJ4uwAoDUBOcc1UVFTUcwoHEov/liREOLrNdil+ - ijIyME7hKSOgmVxC5cA8igYAKhik4Dnisq5AyVjwC3+7Hp1aAUFyGl5/Bxq/LqJWN4fCjmkU9AICoXCR - giLitaYgjzHn1nB7A5Rh+FxbhrQ0EYp1QEnvLAreTeH2mxmU9xvB4/G4cyAh/mt2Q0ati9IQLEr3YKkh - G8oiKWTqRmR1AtkdRpT0GSEpLIMkPx890ng9hQ8Sq9VVPPax08xkBWFSHIjxlAD8aJKjWnYP6UkCCPh8 - pCcKIMnLR582D1+y9i4/OO7FbWnA6pa+DNkyMsr3wzDPF0PXfKC76AVDeRLGnhTCUFeGYVURRmTxWE4P - Bj4lYFocOP/0qGspFXgSc6ZysHxWFWxvHIrzxkCMFz6c9UDXSXe0HdsGbbgzXu1zQHu6EBPSqxi9FLoM - vRjJd+5PUvg0ceI+xTWcsRtxliZ1su1W3UpPi29qb5s5havllMzR7CN/s6nmCGOqm3Fxj64E2lalZGSP - hR04pKKckLhzBdzB2EEiSCxJJTkrfzyXxlvkOjlPzpBowicnyOrJNKMbW241K9/mS6Mf4cadxI1sJc6E - O0jcm7nlm/8FKZl19zsyCGoAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE910ntI + U1EcB/DjIzUfiY+UUtN8JUomWUIRJBJCQfSH1D8VNqUoC5fbzFdumZrZdBgTHxPFR5uzUZYFgWbCdBBk + 5jvUJpbK0jQfmY/KfftdMEHMCx8Ol3u+33vuPceErV2lZ5m9qRMrtrZmkQxsycyCrf5aYaOtXSyprIV1 + 0rQlgn/zN4018azwUYIpdPn7oZXuQ4OYob2UoYLPOmjyYWK9ZZh7UH6VDfxpEQAf7gOduehRRKIxh0Eh + YUYbC5ZAUzyIyZYl2kyXUXTlAf1FgKEVxnEdhnRlaFZJjKmpogoKhpJtWxZMVR9Xoj0TmOqAprYSYokE + iSmpiI3h/ebxeC0UjCKOWxYMy4JE0DdAo6xA2+Aw5gG8WwJUBiCnuHYmOjr6BYUDicV/SxIiHN3mu5U/ + xRkZmKTwjBHQTq+gcnARRYMAFQxR8CJx2VSgYiz4pb9dr16jhDA5Dc3fgaavy6jTL6CwcxYFfYBQJFqm + oJh4bSjIY8y5LdzeAFUYvtQpkJYmRrEeKOmbR8H7Gdx9O4fyASP4fD53DqTEf8NuyKl1WRaCZdkBrDRm + Q1Ukg1zThKwuILvTiJJ+I6SFCkjz89Erix+m8FFitb6KJz522rmsIExLAjGZEoAfb8pQI3+A9CQhhAIB + 0hOFkOblo1+Xh/Gsg6tVp724LQ1Y39JXITvGxgV+GOX7YuSGD/SXvWAoT8LE00IY6hUYVRdhTB6P1fRg + 4HMCZiWBi89OupZSgScxZ2oHy+dVwfbGkThvDMZ44eMFD3RHuaP91C7owp3x+pADOtJFmJJdx9iV0FUM + S5B87+E0hc8RJ+5TXMMZuxVnaVIv323Vo/K0+KbxtllQulrOyB3NPgm2m2pPMKa+HRf3+FqgbXVKRvZE + 2JFjasqJiDtXwB2MPSSCxJJUkrP2x3NpvENukkvkPOERATlD1k+mGd3YcqtZ+zZfGv0IN+4lbmQncSbc + QeLezC3f/C8TEnXtqUNWKQAAAABJRU5ErkJggg== @@ -258,31 +258,31 @@ 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 - 8Q8Jv6BRrrFp/wAAAABJRU5ErkJggg== + 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 + PwYCoFA6jooFAAAAAElFTkSuQmCC @@ -290,18 +290,18 @@ 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 @@ -310,17 +310,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtxJREFUOE9dk1tI - VGEUhdccx8LMRh2zvEyKqKmZ2E3zMkqhVkpao2SpSYlhWWEPXQiMLhBED5FRQXQxjYKCojJIyZCIiHwJ - i5IKKYioDMGEJMd0tY7ZMHU438ve/9p7/3vvH/D6ngE5HcDVc0C2zH7C8tfdBdS2WfCwCSgLAmyy+3hr - 8RY49dKVOT56pJwPLJanci4S/uYhBV75OizEzYp4fkyx8aZh6ZE5Rkz1BHkTaf/AC/XksXJ+LpjHTcBx - OWPvAendEX5D3JJKro1iX0YI9wFt8ukIZnkCtANN7kYXeXgNeaCI7cFTvpUBDV1BM76yfim5LpZDheFs - sRqfpgCXJKwWMz0BdO/M7uz4cR5SgD35dNek8U5IwDh3ZpOVSRwrjWaXw38sCWiV6JBI/ecKZtM6DOMJ - G4vIXcvI7Vnkjgyyej65Po69aXZu+1P6abFKBHo32azEOAlUvc+NI3dKXLtY4hRyw1z2F0TwhAWv1PbL - OlcjIsW/U3gEOG4DnZ+LJdqaNilOIMti2O8M5WENwxc4KuHC/0u3PAbqHocFD47WO8m6JeTGZGWWuDSG - LHaQq8M54AzmWQM9aUCBAkz3lH8fcPWlR5ENmcoqYUUiWR7PX65osiSSY4VhdBeE0p0fwiGnjdd9jS+b - Af0TPTDMeax4t3C2Oq2MGpWZ9XtRBJsDfEf7Um0cLwzlSJ6dw8sCOZwzg4PZ06h7mIuWO1HJLW3VyFoJ - XaqixMEvebPYOtU64ACubAfu9qUEcGR5EH84AziY5c/OcCszgGaJzSpCcV4rPJw3mz9Xh/HFgkCeNCyv - tevmrM2GVRwErvUm+LE3xY9tdh9qe+7KfkYUChtcQFyLYTxvtvp8LAZuaDYX5dgrsoS5qvG7gfOV8mnt - lA8nRJWYI6zm/M0HkSy0J9gv1otEr05rcyceTokoF5kiXGiqfz7zyZpP1zRGCbu3c/KMmUk3Q/DkWc8z - /w1N+ynFYrpqGwAAAABJRU5ErkJggg== + VGEUhdccx8JsGnXMcnQyJE2tBrtpXiYp1EpJa5QsLSkxKkvqoQuBkQZB9BAVFUQXyygoKCSDkgyJiKiX + KEipkAIJuyCYkOSYs1rHbJg6nO9l73/tvf+99w8Efc+Bpe3A9fNArsxhwvLX3QnUtlnw6BRQHgnYZQ8J + 1uIdcPq1N9s/cqSCDy2WZ3IuFOHmIQVe2RUb7WNlMnvddt42LK9kThQTA0Hexjs+8mIdeayCfYVzuBk4 + Luese0Dmi7iwQW5NJ9cmsCcrmgeANvl0BNMCAR4Ap3wNXrJpDXmomA+iJnwrB3Z3Rk75wrol5LpZHCxy + 8qrV+DQBuCxhtZgaCKB7Zz/PTfazUQH2FdBXk8HWaJuf9blkVRpHy2ay0xU+mga0SNQo0v+5gtm0dsN4 + yoZics8ycmcOuSuLrJ5Hrk9id4aDO/6UfkasEhHBTTYrMU4CGz/kJZH1EtcukthNbpjNr4VxPGHBG7X9 + is7ViHjx7xQeA65WoKOvRKLtGePiFLI8kV89MWzSMEKBoxIu+L90yxNg25PYqIGROg+5bTG5aa4yS1yW + SJa4yNVO9nuieM7AqwygUAEmB8q/D3h7MhPI3dnKKmFlKlmRzF/emWRpPEeLYukrjKGvIJqDHjtvhhqf + twD6x3pgmPNY8X7BdHVaGTUqM+v34jg220JHetLt9BfFcDjfwaFlERxaOoUDuZOoe5iLljdWyR1t1fBa + Cb2qotTFz/nT2DLR2u8Cru0E7va4bRxeHskfHhsHcsLZ4bQyC2iW2KwiBhe0wkP50/lzdSxfz4/gScPS + pV03Z202rPIwcKM7JYzd7jC2OUKo7bkr+1lRJOzwAklXDeNlszWktwS4pdlckmO/yBHmqibvBS5Uyae1 + Uz6cEBvFDGE1528+iLlCe4KDYr1IDeq0Nnfs4ZSKCpEtnEJT/fOZT9Z8uqYxQTiCneNnzEy6GaLGzwae + +W9ESynC0gHDNwAAAABJRU5ErkJggg== @@ -345,16 +345,16 @@ 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 AABJRU5ErkJggg== @@ -523,32 +523,4 @@ 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 - 21+YLNUQAIL12AAAAABJRU5ErkJggg== @@ -903,28 +875,28 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABSxJREFUSEuVlltM - k2ccxsvEwMwyN6dZ3HDzvF3ojctcduESL7jZMrK4mF3pBc5EFrVbXEI2s3WN7qA4DqWAiCIoiIIRJGIF - OZ8sBaSUFpByKjgLpRXaQksF+ux5v1pW3Rb1S375vq/f+3+e//t/Tw2TPeNKT7e8PjU1uy88HF9GRsrW - ORwuvdttvpiYePCGTDY5w/D5Z2n853eFAuFqte07tdrsKC21ornZiZYWL3Q6HxSKbL9SebMpJib+EwYv - I2EvZJKX59uanDzQXlg4grq6cTQ0ONDY6KLJLA3modeDZgs4ebLFHRub9j3FV5Lw5zLJyXkUl5Ex6tFo - LKistKKmxk4TJ8U90Grn0NYG3L0LdHQAXV1gb1T+uLgz5yIiItbSYOn/mmRmti0/e7aqSKFQ+C9dqsSV - Kw24elWL4mI9SktN0Gj6UVExgtpaG+rrJ6UeNTXNSCW7fNmM/fvTyqKi1m2lQcS/TDIyvGsTEy364uIC - WMdGMTjUD3PfPfT09sBkNKDT0IEOfSt0rVpoW5rQ2FSH+oYa1FZXoLKqHNXV5SgrK8HRownNq1dv+IAG - Ly+apKVNfJiUdM964WILNDdLACwA/lneg/j4HMojvj/NAibGhpF55gbi4lKaV6yI2r5oolZ7HNnZBuTn - N6CsOBuYtwOeBy+Gbxx/DbSzrFW4du0ey3WqkQaBciUlTXrb2/1QpY7iZmE6kzMDrl7A+QJ4zBg3V0GV - dAUpKS1QKou9FI8jqyUD9hlut5+D5UTnHSPF7wAPdYD9GTj43aWDc1iLdFUtKm4PCCkcOyYZ/EE20sAu - GQQvvX4Gebm9cPVXAxPlwPht3isAxy3AxncHmRC/kfEKlORXI+ucAR7v/KKGXF4gDBLJZhqMPWEgWs1y - TIuujqKurBawFqLmehXUqQacP9+PNFUDOiqvw1inQXJKG4YtrtD8pGe5/ELQ4D0ajC4aLHACefnmYozH - AzQ2T7Keepi6nxTR6h4g/odbmJ4Ws4kJccL5mNTcXMBLLk8KNbBIBkJ8epoVcLDn44DR6INK1c3Af7oe - murc3DwSEjTcMu5jcjIQY+cEFDpPGXRIBjMzgQZWq9gGZpGaysF+jiszs5wr3ojhYWBwkHPjoTBICO1B - wEB8EOJdXfNITu5clPb7A48is0esiECUUSDKKL7n5t4mrTCZAItFGPz2pIEIttmAoSHg1Ck9AxckISHg - dgfGZGoKUilECScmAu3HxgJJid9Pny5FdnYb+vqAw4d/CTW46xWDI4JSUrrYTa8kJsol6ioEHnBh378P - jIwEMhSJiHL090MSNHNtihKdOJHHlTzIHshDDVqlEhUUDHCXtEuCwXoOcN2IYCHSy4Xd3Q309EAqhZFD - JBBbdhDRRqnMwoEDiwZiHdzxmkxO5OSYpayCQkJEIIKFkMEA6aBpavJx67ahqKiPJdGy1xqeCQp/fPzv - k7Gx8p5du/Y27NwZXcJFpiQbaFDvTUszSpm1t4P7/SwF7Ny4hriwOqVghaLMc+RI1tCePT/qYmK+Lt+x - 4/OiLVs+yl2zZn3W8uUrM5YsWZpOMRU5QX4m35IvyCrZ8eNVToWi0nboUJZh9+6faqKjY0u2b/8sf9Om - bedWrYrKjIxclh4WFpbKxn+SYySefEP2kl0kmnz8ePfczPs6EkXeINIxuoYcJL+So4/d9/H+FfmUiIN9 - G3mfrCfvkLek7GSy18grRJxiQkwc/kGEtnSJj8JkA3mXvE3eJCvIq0ScTuKsfekpgef6J/E3nS6FCP42 - 1VcAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABS1JREFUSEuVlltM + k2ccxmFiYGaZm9Msbrh5mG4XeuMyl124xAtutowsLmZXeoFbIovaLS4hm9m6RndQHIfSgoggKIiCESRi + BTlDsZyklBaQcio4C6UV2kJLBfrseb9aVt0W9Ut++b6v3/t/nv/7f08ND3vKlZ5ueXV6em5/RAS+iIoK + 2+BwuPRut/lCUtLB62FhU7MMX3iaxn9+l8sRoVLZvlOpzI6yMiuam51oafGitdUHuTzbr1Dc0MbGJnzM + 4BUk/LlM8vN921JSBjuKikZRXz+BxkYHmppcNJmjwQL0etBsESdPtrjj4tTfU3w1iXgmk9zch/EZGWMe + jcaCqioramvtNHFS3AOdbh7t7cCdO0BnJ9DdDfYm1R8ffyY7MjJyPQ2W/69JZmb7yrNnq4vlcrn/4sUq + XL7ciCtXdCgp0aOszASNZgCVlaOoq7OhoWFK6pFWOyuV7NIlM77+Wl0eHb1hGw0i/2WSkeFdn5Rk0ZeU + FMI6Poah4QGY+++it68XJqMBXYZOdOrb0Nqmg65FiyZtPRoaa1FXU4mq6grU1FSgvLwUR48mNq9du+l9 + Gry4ZKJWT36QnHzXev5CCzQ3SgEsAv453oP4+BzKQ74/ySImx0eQeeY64uNTm1etit6xZKJSeRw5OQYU + FDSivCQHWLADnvvPh28Cfw12sKzVuHr1Lst1qokGgXIlJ095Ozr8UKaN4UZROpMzA64+wPkceMyYMFdD + mXwZqaktUChKvBSPJ2slA/YZbrefg+VE120jxW8DD1oB+1Nw8LurFc4RHdKVdai8NSikcOyYZPAHeYcG + dskgeOn1s8jP64NroAaYrAAmbvFeCThuAja+O8ik+I1MVKK0oAZZ2QZ4vAtLGjJZoTBIIltoMP6YgWg1 + xzEtvjKG+vI6wFqE2mvVUKUZcO7cANTKRnRWXYOxXoOU1HaMWFyh+UnPMtn5oMG7NBhbMljkBPLyzcUY + jwdoap5iPfUw9Twuomu9j4QfbmJmRswmJsQJ52NS8/MBL5ksOdTAIhkI8ZkZVsDBnk8ARqMPSmUPA//p + emiq8/MLSEzUcMu4h6mpQIydE1DoPGHQKRnMzgYaWK1iG5hDWhoH+xmuzMwKrngjRkaAoSHOjQfCIDG0 + BwED8UGId3cvICWla0na7w88iswesiICUUaBKKP4npd3i7TBZAIsFmHw2+MGIthmA4aHgVOn9AxclISE + gNsdGJPpaUilECWcnAy0Hx8PJCV+P326DDk57ejvBw4f/iXU4I5XDI4ISk3tZje9kpgol6irELjPhX3v + HjA6GshQJCLKMTAASdDMtSlKdOJEPlfyEHsgCzVok0pUWDjIXdIuCQbrOch1I4KFSB8Xdk8P0NsLqRRG + DpFAbNlBRBuFIgsHDiwZiHVw22syOZGba5ayCgoJEYEIFkIGA6SDRqv1ceu2obi4nyXRsdcanglyf0LC + 71NxcbLe3bv3Ne7aFVPKRaYgm2jQ4FWrjVJmHR3gfj9HATs3rmEurC4pWC4v9xw5kjW8d++PrbGxX1Xs + 3PlZ8datH+atW7cxa+XK1RnLli1Pp5iSnCA/k2/J52RN2PHj1U65vMp26FCWYc+en2pjYuJKd+z4tGDz + 5u3Za9ZEZ0ZFrUgPDw9PY+M/yTGSQL4h+8huEkM+erR7buF9A4kmrxHpGF1HDpJfydFH7vt5/5J8QsTB + vp28RzaSt8gbUnZhYa+Ql4g4xYSYOPyDCG3pEh+FySbyNnmTvE5WkZeJOJ3EWfvCEwLP9E/ib4z8hQYz + 9P/hAAAAAElFTkSuQmCC @@ -932,31 +904,31 @@ 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 - 5/8CpxyOF2HGCAoAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABeZJREFUSEuNlQlM + VEccxt8KXgiVWFsQFdTGoqbGKlqlWLVVW63YGA3GWEhTE6m1aaFWoWpkRamI4nIohwvsKS6CiIoocrgo + UFYElBsKcsh9w8Kuuxz79f8WpBLrMckv84553zfzzbwZDvMOJbxAtby3vsuxQz1o26QanKlVaWDYr2nU + drcr2htrYpP5+x6RjJbQvYPcf00UKtUsWVXvTRdBsW6tuBBLpULMDarEh7xnmHC6AsZexbDhJui2/JEU + P8fuxyX05SSC804mmX3apfzS3EbHh3PwfZoLDhXZ4nCxHX7PX4gV4c2wCqiC0elyMNxiTHTLhc3+xPrZ + y/d8R+LvvdUkrkM92+9xbtPu7JlwKbGFe8YT+BbG4WLDTzhTfA5Ocb1kUgdzXhUMvGrAHKkgo1+wzDmk + wcjc5tu3mvAfK28fLtkCYZkPLqc24nZuP+4/A261x0D8TyaOpKiw7UoLrPybMEPgAEMvGRhPF1hy92K+ + fWgiGdiMxPVqWskN6tW+d2J1QaIciMPbEX+9A5GSelwIKkZRzQDuVmtxKl0Jx9g2WAc1Y550B0xEDBi3 + VIw78SXWOu0ZmmS+7CApzyLGjXFwcIg2kEY3J4QG1yE5qRUZGT1QKJ4jN1eHR9k6nPd/gnh5HSIKNHC4 + 2oKPg57B2LsFHM+/wRwLBMNjsCFgMUwX/RpFwnbE5FGDyEjldF/fxmSZrBapKU1IS+siAzUePtQhLw/I + zweKi0GjeYrQqCK43lPCjOZgkncDJofYgAmmUZxlYBtiillrz+SSsBMxXW8QGqpdHBwsrIuOjoFMdgWX + IqMhkURBLL6iRyS+SvVViETXIL0UD97ZcARduoutsR1gPKrAOZYExt8UzMmZWOHpDKutXnUke4iYzfB4 + bV/xeOWdEQIJhsvQaxig54NEv/59cGAYjp9Px5ro22AuUu8DCVd3rHS5BssN51iDE8Q8xt9f3S0SFSEi + xA/QtQKq+jejbqB2LZAKhAgLzoaXOBU7Ur4B4z0NE3eXYA1vCUyXe+SMGkil7Zq8PB0CfDMAZRFRAHS9 + hm563ksoC+FxVApZZD48/BTYFRMBZi8fFsc/w7rT88GxcIgdjYg1YIPp7gHlW4/KnCwySAXa04BOOV3f + I6jupPseOXLkcvD8stDapsagdgCHvVOwU3gfBqcYrDg/Htbrdw4xE94PJwNH/SSLxS16gxclPbMLN6IV + 6Cm7gShROvj8QvCD5ChMu0l1OjIym0bb9vaocPDkLeyKuAZrWqLrfazB+cg1iYT9ic/1y1QkqtcbDNHc + 9vVR/CogPaMTfv4l6FOzEz5crt8ohVCk0F9r6It+muvuLjLwjIK74BG+dj8I4y/caxjOZBEJO4/8aBwa + Qa3eQKkE2tpA674XQmH5y4Mava6oaISPTzzq6oDmZuBpZQ+OewvgI0rBFJsz1Yzhe2ISPkp8SkzU/wMi + kUKj01Hk7aAfSoOwsJIx4uy7AVqhLOx1dXUXPD0vo7QUePJYCbdj3EHL1W53Gc4E4Yg4G40JMbxtC4UK + DTvk6uohBATk64WeP6fF0ksRdNPcdg6bt9IKZnvN1vn57fDwEOi3kU2btrOZC4ifR3puPCr+YgRaLUi8 + gIberxdooKXOxlBbyxpTFE+Bysphyik99j6VdlkuNxSbN29jd88/iU+IVw8ciUShSUiohVzegZoaoKJi + WKSsDPoYSiixwkIgK6sfiYnNiIkpRXj4AwQG3sSBA9zBjRu3XCfhfcSMMT3X50MlMDBdI5FUU/46pKR0 + Iy6uHlJpCfUuVsflSjXu7hE1Tk5Hsu3tf0i0s9scs2jRMrGFhRXfxGRqCIdjcIEk/iK2EdNeaI6pudw7 + Cmfn0Af29r/dWrVqu2zBglVCM7O5F42MTII5HE4QNeYRJwk3Yj/B7pKs4HpiJbGA+IAw/F8Demgx8pEr + 1ez63U1sJdYR7Mm0kJhHWBJsDOwWbEpMIdilaEC88aBnG5kR7AlkPiIwlWojYjzBnkqswMu8rrOvPP8X + Xc6OC0yKNoUAAAAASUVORK5CYII= @@ -965,37 +937,37 @@ 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 YII= Index: /trunk/BazaReklam/MDIBazaReklam.cs =================================================================== --- /trunk/BazaReklam/MDIBazaReklam.cs (revision 554) +++ /trunk/BazaReklam/MDIBazaReklam.cs (revision 560) @@ -1,4 +1,5 @@ using System; using System.Windows.Forms; +using Baza_Reklam.Classes.Helpers; namespace Baza_Reklam @@ -222,5 +223,5 @@ private void MDIBazaReklam_FormClosing(object sender, FormClosingEventArgs e) { - if (MessageBox.Show("Czy na pewno chcesz wyjœæ z programu?", "", MessageBoxButtons.YesNo) == DialogResult.No) + if (MessageBox.Show("Czy na pewno chcesz wyjœæ z programu?", "Baza Reklam", MessageBoxButtons.YesNo) == DialogResult.No) { e.Cancel = true; @@ -228,4 +229,6 @@ } + PdfHelper.CleanPdfFolder(); + e.Cancel = false; Index: /trunk/BazaReklam/OrdersForm.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.cs (revision 490) +++ /trunk/BazaReklam/OrdersForm.cs (revision 560) @@ -3,7 +3,6 @@ using System.Data; using System.Data.SqlClient; -using System.Diagnostics; using System.Windows.Forms; -using System.IO; +using Baza_Reklam.Classes.Helpers; namespace Baza_Reklam @@ -23,5 +22,5 @@ " NR.DATA_W AS '1emisja', A.Symbol AS agencja, (r.[CENA JEDN] - r.[RABAT WARTOŒÆ]) / r.SZER * r.WYS AS [CENA MODU£U],NM.CENA_MIN, NM.CENA, K.firstname, Z.idZamowienia " + " FROM dbo.AGENCI A2 JOIN dbo.AGENCJE A ON A.Id_agencji = A2.ID_AGENCJI " + - " RIGHT JOIN REKLAMA R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] " + + " RIGHT JOIN REKLAMA R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] " + " LEFT JOIN dbo.VIEW_REKLAMA_OD_DO O ON R.ReklamaID = O.ReklamaId" + " LEFT JOIN NR ON R.TYTU£ = NR.TYT AND O.OD = NR.NRW " + @@ -32,5 +31,5 @@ protected REKLAMADataSet.ReklamyZestawienieRow Reklama { - get + get { if (reklamyZestawienieBindingSource.Current == null) return null; @@ -44,5 +43,6 @@ public static OrdersForm getOrderForm(MDIBazaReklam parent) { - if (orderForm == null) { + if (orderForm == null) + { orderForm = new OrdersForm(parent); } @@ -62,5 +62,5 @@ kLIENCITableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; pROMOCJETableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - + SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); @@ -68,5 +68,5 @@ command.CommandType = CommandType.Text; command.CommandText = query; - command.Connection = conn; + command.Connection = conn; sqlDataAdapter = new SqlDataAdapter(); @@ -86,5 +86,5 @@ WindowState = FormWindowState.Maximized; - + DBBindings.bindujAgencje(agencjaToolStripComboBox); DBBindings.bindujAgentow(agentToolStripComboBox); @@ -467,5 +467,5 @@ break; - + default: break; @@ -476,18 +476,56 @@ } break; - - case 3: - switch (e.Node.Parent.Parent.Parent.Name) + + case 3: + switch (e.Node.Parent.Parent.Parent.Name) + { + case "Tytuly": + + Cursor = Cursors.WaitCursor; + + zatwierdzoneNiezaplaconeColumns(); + rEKLAMADataSet.ReklamyZestawienie.Clear(); + command.CommandText += " where R.[Tytu³]=@tytul and datepart(year,NR.DATA_W)=@rok and datepart(month,NR.DATA_W)=@miesiac aND (r.SZER * r.WYS)<>0 order by R.[DATA ZAMÓWIENIA] desc"; + command.Parameters.AddWithValue("@tytul", e.Node.Parent.Parent.Name); + command.Parameters.AddWithValue("@rok", e.Node.Parent.Name); + command.Parameters.AddWithValue("@miesiac", e.Node.Name); + sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); + commandExecuted = true; + reklamaDataGridView.Refresh(); + + Cursor = Cursors.Default; + + break; + case "MojeZamowienia": + + Cursor = Cursors.WaitCursor; + + zatwierdzoneNiezaplaconeColumns(); + rEKLAMADataSet.ReklamyZestawienie.Clear(); + command.CommandText += " where R.[symbol akwizytora]=@agent AND R.[Tytu³]=@tytul and datepart(year,NR.DATA_W)=@rok and datepart(month,NR.DATA_W)=@miesiac aND (r.SZER * r.WYS)<>0 order by R.[DATA ZAMÓWIENIA] desc"; + command.Parameters.AddWithValue("@agent", User.getUser().Symbol_agenta); + command.Parameters.AddWithValue("@tytul", e.Node.Parent.Parent.Name); + command.Parameters.AddWithValue("@rok", e.Node.Parent.Name); + command.Parameters.AddWithValue("@miesiac", e.Node.Name); + sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); + commandExecuted = true; + reklamaDataGridView.Refresh(); + + Cursor = Cursors.Default; + + break; + case "AnalizaCenyModulu": + switch (e.Node.Parent.Parent.Name) { - case "Tytuly": + case "ZaTani50": Cursor = Cursors.WaitCursor; - zatwierdzoneNiezaplaconeColumns(); + analizaCenyModuluColumns(); rEKLAMADataSet.ReklamyZestawienie.Clear(); - command.CommandText += " where R.[Tytu³]=@tytul and datepart(year,NR.DATA_W)=@rok and datepart(month,NR.DATA_W)=@miesiac aND (r.SZER * r.WYS)<>0 order by R.[DATA ZAMÓWIENIA] desc"; - command.Parameters.AddWithValue("@tytul", e.Node.Parent.Parent.Name); - command.Parameters.AddWithValue("@rok", e.Node.Parent.Name); - command.Parameters.AddWithValue("@miesiac", e.Node.Name); + command.CommandText += "WHERE (R.SZER * R.WYS <> 0) AND (((R.[CENA JEDN] - R.[RABAT WARTOŒÆ]) " + + "/ (R.SZER * R.WYS))NM.[CENA]) AND A.symbol=@agencja AND R.[symbol akwizytora]=@agent AND datediff(month,R.[DATA ZAMÓWIENIA],getdate()) <= 3 ORDER BY R.[DATA ZAMÓWIENIA] DESC"; - command.Parameters.AddWithValue("@agencja", e.Node.Parent.Text); - command.Parameters.AddWithValue("@agent", e.Node.Name); - sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); - commandExecuted = true; - reklamaDataGridView.Refresh(); - - Cursor = Cursors.Default; - - break; - - default: - break; - } - break; + case "ZaDrogi": + + Cursor = Cursors.WaitCursor; + + analizaCenyModuluColumns(); + rEKLAMADataSet.ReklamyZestawienie.Clear(); + command.CommandText += "WHERE (R.SZER * R.WYS <> 0) AND (((R.[CENA JEDN] - R.[RABAT WARTOŒÆ]) " + + "/( R.SZER * R.WYS))>NM.[CENA]) AND A.symbol=@agencja AND R.[symbol akwizytora]=@agent AND datediff(month,R.[DATA ZAMÓWIENIA],getdate()) <= 3 ORDER BY R.[DATA ZAMÓWIENIA] DESC"; + command.Parameters.AddWithValue("@agencja", e.Node.Parent.Text); + command.Parameters.AddWithValue("@agent", e.Node.Name); + sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); + commandExecuted = true; + reklamaDataGridView.Refresh(); + + Cursor = Cursors.Default; + + break; + default: break; @@ -581,7 +577,11 @@ break; } - } - } - + break; + default: + break; + } + } + } + private void toolStripButton6_Click(object sender, EventArgs e) { @@ -616,5 +616,6 @@ { int i; - if (!Int32.TryParse(rokToolStripTextBox.Text.Trim(),out i)) { + if (!Int32.TryParse(rokToolStripTextBox.Text.Trim(), out i)) + { MessageBox.Show("Podaj prawid³owy rok."); Cursor = Cursors.Default; @@ -622,5 +623,5 @@ } - command.Parameters.AddWithValue("@rok", rokToolStripTextBox.Text.Trim()); + command.Parameters.AddWithValue("@rok", rokToolStripTextBox.Text.Trim()); } @@ -641,5 +642,5 @@ if (tytToolStripComboBox.SelectedIndex != -1) { - command.Parameters.AddWithValue("@tytul",tytToolStripComboBox.Text.Trim()); + command.Parameters.AddWithValue("@tytul", tytToolStripComboBox.Text.Trim()); } @@ -654,9 +655,9 @@ } - if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Checked) + if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Checked) { command.Parameters.AddWithValue("@zd", true); } - else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Unchecked) + else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState == CheckState.Unchecked) { command.Parameters.AddWithValue("@zd", false); @@ -671,5 +672,5 @@ command.Parameters.AddWithValue("@fw", false); } - + if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).CheckState == CheckState.Checked) { @@ -684,5 +685,5 @@ { command.Parameters.AddWithValue("@wy", true); - } + } else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Unchecked) { @@ -706,5 +707,5 @@ sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); commandExecuted = true; - + reklamaDataGridView.Refresh(); @@ -712,10 +713,10 @@ treeView1.SelectedNode = null; - Cursor = Cursors.Default; + Cursor = Cursors.Default; } private void reklamaDataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e) - { + { if (reklamyZestawienieBindingSource.Current != null) { @@ -723,14 +724,15 @@ int idRek = Int32.Parse(row["reklamaId"].ToString()); - + OrderDetails.getOrderDetails().pokazSzczegolyZamowienia(idRek); DialogResult result = OrderDetails.getOrderDetails().ShowDialog(); - - if (result == DialogResult.OK) { + + if (result == DialogResult.OK) + { rEKLAMADataSet.ReklamyZestawienie.Clear(); - sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); + sqlDataAdapter.Fill(rEKLAMADataSet.ReklamyZestawienie); } } - + } @@ -868,9 +870,9 @@ if (reklama == null || reklama.IsCustomerIDNull()) return; - ClientsForm.getClientsForm((MDIBazaReklam) MdiParent).pokazKlienta(reklama.CustomerID); + ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).pokazKlienta(reklama.CustomerID); Hide(); - ClientsForm.getClientsForm((MDIBazaReklam) MdiParent).Show(); + ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).Show(); } @@ -879,5 +881,5 @@ REKLAMADataSet.ReklamyZestawienieRow reklama = Reklama; - if(reklama == null || ReklamaHelper.IsReklamaNew(reklama)) return; + if (reklama == null || ReklamaHelper.IsReklamaNew(reklama)) return; Facturer f = new Facturer(reklama.ReklamaID); @@ -894,5 +896,5 @@ p.ShowDialog(); } - + private void reklamaDataGridView_Leave(object sender, EventArgs e) { @@ -905,5 +907,5 @@ { szukajToolStripButton.PerformClick(); - } + } } @@ -918,5 +920,5 @@ tytToolStripComboBox.Text = ""; agencjaToolStripComboBox.SelectedIndex = -1; - agencjaToolStripComboBox.Text = ""; + agencjaToolStripComboBox.Text = ""; agentToolStripComboBox.SelectedIndex = -1; agentToolStripComboBox.Text = ""; @@ -924,5 +926,5 @@ typToolStripComboBox.Text = ""; cbPromocje.SelectedIndex = -1; - + ResetCheckBoxes(szukajToolStrip); } @@ -934,5 +936,5 @@ DataRowView row = (DataRowView)reklamyZestawienieBindingSource.Current; int idRek = Int32.Parse(row["reklamaId"].ToString()); - + OrderDetails.getOrderDetails().pokazSzczegolyZamowienia(idRek); OrderDetails.getOrderDetails().ShowDialog(); @@ -1098,5 +1100,5 @@ reklamaDataGridView.Columns["TYP"].Visible = true; - reklamaDataGridView.Columns["tYTU£DataGridViewTextBoxColumn"].Visible = false; + reklamaDataGridView.Columns["tYTU£DataGridViewTextBoxColumn"].Visible = false; reklamaDataGridView.Columns["oDDataGridViewTextBoxColumn"].Visible = false; reklamaDataGridView.Columns["FirstName"].Visible = false; @@ -1160,5 +1162,5 @@ private void drukujToolStripButton_Click(object sender, EventArgs e) { - PrintDGV.Print_DataGridView(reklamaDataGridView,50); + PrintDGV.Print_DataGridView(reklamaDataGridView, 50); } @@ -1183,78 +1185,29 @@ agentToolStripComboBox.Text = User.getUser().Login; } - + } private void OrdersForm_Leave(object sender, EventArgs e) { - - } - - private void podgladJPGToolStripButton_Click(object sender, EventArgs e) - { - if (reklamyZestawienieBindingSource.Current != null) - { - Cursor = Cursors.WaitCursor; - - DataRowView row = (DataRowView)reklamyZestawienieBindingSource.Current; - int reklamaId = Convert.ToInt32(row["reklamaId"]); - string idReklamy = row["id reklamy"].ToString(); - - string tytul; - int grzbiet; - string miasto; - byte staryNowyArchiwum; - - - Produkcja.argumentyDoSciezki(reklamaId,idReklamy, out tytul, out grzbiet, out miasto, out staryNowyArchiwum); - - string sciezka = Produkcja.GetReklamaFileName(idReklamy, tytul, grzbiet, miasto, staryNowyArchiwum, "jpg"); - + + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + REKLAMADataSet.ReklamyZestawienieRow reklama = Reklama; + if (reklama == null) return; + Cursor = Cursors.WaitCursor; + try + { + PdfHelper pdfHelper = new PdfHelper(reklama.ID_REKLAMY); + if (!pdfHelper.DisplayPdf()) + MessageBox.Show(pdfHelper.ErrorMessage); + } + finally + { Cursor = Cursors.Default; - - if (File.Exists(sciezka)) - { - Process.Start(sciezka); - } - else - { - MessageBox.Show("Nie znaleziono pliku:" + sciezka); - } - } - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - if (reklamyZestawienieBindingSource.Current != null) - { - Cursor = Cursors.WaitCursor; - - DataRowView row = (DataRowView)reklamyZestawienieBindingSource.Current; - int reklamaId = Convert.ToInt32(row["reklamaId"]); - string idReklamy = row["id reklamy"].ToString(); - - string tytul; - int grzbiet; - string miasto; - byte staryNowyArchiwum; - - Produkcja.argumentyDoSciezki(reklamaId,idReklamy, out tytul, out grzbiet, out miasto, out staryNowyArchiwum); - - string sciezka = Produkcja.GetReklamaFileName(idReklamy, tytul, grzbiet, miasto, staryNowyArchiwum, "pdf"); - - Cursor = Cursors.Default; - - if (File.Exists(sciezka)) - { - Process.Start(sciezka); - } - else - { - MessageBox.Show("Nie znaleziono pliku: " + sciezka); - } - - } - } - + } + } + private void excelToolStripButton_Click(object sender, EventArgs e) { Index: /trunk/BazaReklam/Baza Reklam.csproj =================================================================== --- /trunk/BazaReklam/Baza Reklam.csproj (revision 557) +++ /trunk/BazaReklam/Baza Reklam.csproj (revision 560) @@ -111,4 +111,6 @@ + + Index: /trunk/BazaReklam/OrdersForm.resx =================================================================== --- /trunk/BazaReklam/OrdersForm.resx (revision 399) +++ /trunk/BazaReklam/OrdersForm.resx (revision 560) @@ -383,59 +383,31 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABehJREFUSEuVlX00 - 1Xccx793V/RIo1Gr7S5ZmePoaTrZjuO0aSt1PV0sD6VEKeEKiSHqKkpNJQwpS55KspVEmkwZ0YP0OPJQ - Tl2hWHmI673P75dt/dHj95zX+d77Pb/7+ry/n9/9/n4C9h7ju4JJ6srPlVYKMMxMdbja5P7BAcWj9o47 - Pa19+Q1HnmbJy591kE5B4D20Ly5dWq1r7Vxm9Ghvkxdy/96BnM7tONoZiaz2CGy+vhzzUyfXT5OOFdOl - Y4gP3quA42V9J7+regOcOPOxDGmtYUiVh+LggxCeNPkmIgwW6TO6JlqOciK5OiF4bZFNjCkRXAqBdeXn - 2u7njZ4e69qBw23hSH0YigMPgpHSEoTke4FIat5IBCC5ORAHW4IxN15ULxzFvhnayf812nSYaq8OC+me - qVLbYjrhee081e6Gceziyu1afyS3ByO9fTOf9oV4IxKbNiCh0R/xd30Rx1HvS2sB2HDBFpoLhu8msy6h - xFfo1WVT+wyFfw2EmQEH3YEkNyDBBYhxhUfhbCQdN0UKJd9P8kRKm9DgR8L1iK3zwd47Uuy5443dt71p - liKxYQMmeo0sJa0Focb45HOEdUhYAcQRuxyAqCVAxBIMhttgS+18KOTuiMw0QiLtIP6uH/bxYm/suuWJ - 6JvrsP2GB6Kur0UUzbF1vjCImthEcm/iY9YiYmEDoQuB2OUktgdkdsAmGyDYGv0BlgitngN02OFyySzs - KHfEvno/xNz2wg6SbatdA1mNO8KvriZW8XP0LSl0ZZr3SB5GTGb39IU3kEgtiaTU4ba8GBssAF9zwMMc - 0jPawMNpQIM6tmbORFKLB3bXuWPrdXeE1axC8GVXBFa7YCPBzVturMU4V5UKkocT2qxBpNmPPcteyIOs - AD9zDHqLAU8zDKxejOnSEBgF5sI4/A7GrauClvQcZoTFIbByFUJrnOF3cTl8KpZBSvhVrcDSgsVQMRRm - kNyXmMSapqv1INoJ+JGSU2qFlxiDHmYodXWGmlsFglIaEXX5CtDdDunpC0iCAp41cqi6lcEqwxfrq+2x - 5rwD1pQ5wocKiAI1HgmEbD/Jbfjz8OcEVoFtDhj0t4CCkvd5LEKN6w/Q8LqG0pJOFJ+UwzerCjvLKuBU - VIXork5EtMkha2uBpscFSHJWw+2CHdzKl0L0k6hfSST4Zag9BjQrswNjmVerzSwgwAq96yi9uymmOB3F - icLHKDglR+6xJpw80gj72GKY5JchoLERWx7cR2hzAzberYOqYw5sCo0xYZPGEyVtwSGS7iIWEmP50zyJ - tpGtxsqeunyLfqklqlbawyi8HmcLHuJ4bjPychoRE1cJyc5LcCgewIy0K9BNK4FB1hkYZBdB3fcchs3T - KxIos1QSRhBmhBbx3/NI6ethbHr6aHY223jKYIS9HwJ+bkRBXhPSDt/EelkxFkVXwekcsOQMYFsESAoB - q9OADX3/PrMbTOSQRcIgwojvO2NC/gS/NIbTZwObD1jobD2nKitZOVZElkASUw37vE7Yk5wTivOJkwMQ - n+iH+LfnMD+lwILcHjCd1bn0exdiPN+WVwxukSvyGZsbESrJ6oJPJeBSSqmLAYuCIfGvfRAf74H4WDfx - DBZ5vTBJaQX71Jb7WzoTH71K/vKakBmFG35h9rvCsxxwoBZYFQy+SE0yTio+0gVx1hMe69xnmOofP8jG - 6CSRxG6oPW+rwVSYRf4px8J+Pr04XwExl5yTZ3dCnNEB8eE2eva3wyKjHcwwpoaMsYQJMfKtdr6H+tIv - lR0LWyW0A0vqvTmXnkue3gHztFZYHmqFVZocI0zTu5iyFvfv4U6tNvHOb7IRbKqTpdA8s94w9j5s8gcg - yeuG5OgTSDLbYCS7BiWThBY2SsTJtxLGxOh3Sf/vNdxNV2MqGvOYjmMs+yq6cox5TquqZfYjZii7xMab - ZjKBcjJdE0Jwb683vyJfU5krwqXSI6yH2iCjmTtM/oQtoc8HeY/WvKrWMFr8kKBDz6YM8clQamX+nr1h - /APxJaCb8WDxCQAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABPhJREFUSEu9lXls - k2Ucx1+DXBEh4QggIhiyEdDEGDkMxiPqHyoRjcGEGDVqokYDCXjiRJSJTFAJgwnpuo312Np167WNrcfa - buvWde37rve5rSs72dHJcEPk+vp739ZQ/lXxST55+vbN8/s8v+f4vQzzP7W7yHMnYBixYeyyzjUBjXMM - mo5xaByj0LRfgLptFOrWEajtI6hpGUZN8xCqbUNQWQeJAVSZB6Ay9UNp7IfCcB7KxiQUDTx9kGi7QRNe - Q8xjamyjKfyDdoPGXCP+IGaIqZvA5HUgRS+qGvt4waeCRGobFgSRaA9q7UE0OMJo7AjD4IzC6IzA3BlD - kyuOJnccVnc3rBzB9sDWxZOAzduLZk8f9UkEE8MYI6uyvpcXnCDWk2BIELg9YZSy1yD1XEdl4CYq/Dch - 91yFnJuBnJ1BBfs7KtlLAgp2Ckr2N+IiqthJqNgU/Z6EO9KPCRJU1vfwgpNpgXVQEHD+EJTuS8gX1+Lt - PXn44IsCHC6tg8pFe8KNQ83SHrGj0LIXBHTsCPTssEAtO0QMgoudFwQKvbAHGYFlQBB0+ULQukdR7x2H - MTSFY2INijWt+KVMC1NgDA3cAM6x59FANLJJog8GwsgmiF4BTyyJcRJUaOPZgu6MgNafBurbIrB4+3HO - EcGRwlLs3Z+Po0VlaOJ6Yenqg9k3CHNgBBb/EKyeBJq5KFrYMBGCL5YQBJXaWJbAlBZ4A2G000bpjO34 - 4adT0Jva4PB1o8UVRIcnBps7DK9Zj4tHtuHGvkW4krcOCfnXaPfH4eR8cLFdCPACOknymuwMjGmB1dmK - N4veh8XhQDDYA3dmUCfLweXxI24oA/bPB75ZAhxcTv0y4KsFmD7zGrqDvbA7TIjFk8IpqqiOZmWQERhc - BuSemYtVP87DbvHHiHJe9PopsM+DgD8AHN8A/JxD5N7GzLE1uO/oUtCph8yhxgRlIFNFsgT6dAYtAQve - 4zbgXfYR7GhZhwcKFuLZ/CfxzsldUFcfBEo2EVsA8eY0JVtxVbwJ9x6aBeYAA+ZzBsrOWkzQRZOqwrcL - 6BLC6mvCLmcO3nA8jJ32jXjFnouHJEvAHKbB+xlszVuEgPhxQLcd0G7HuOJpLD40B0xe+j2zlwQd9Ril - JZIpgrcLKCs0eS14tW0tXm/dgB22XLzYtA7Pm9dic91KzD5FszxGQb5jcPeBWVj9/T1gDtIzH/xL4jNi - N4OqjjpcuApIKgO3BBJdPEX/wew144Xm+/EyBX/JmoPnTA/iqYbV2Fq/Co/pV2CpeD6YAgqUT3xL8MvC - z5wPvo/4kIHCUYchyqC8wp+VgTaW4gvWOY8R20yL8Ix5JZ4wLMeWxmV4tG4xNuoWIke9AGuq52NF5WzM - OU3BjmSCf0L9HuIj4i0GcrsOg39SBrKsDMq10dQ0bQwXj0HU/itKHSKUONOIO4ohEhBB5CzGGfrNc5qe - izpFOGkXodBCvbEEJwxiuLoT6LtMGUh9WRlooqlLfLklCb0TuJIpw3zPP/MZ8j1flqczpXmK+kk6Hfyp - GaNNHCGSNPskLZFUnpVBqTSU4ouTTEOoY5DRLZTTRZFWR+i4RSGrCkOiDEOqCKGcNk9SEcRZuR/ltAxn - aablEi/Kyr04+zdSP0TF3K1yTVVvNbGbOE4UZqogXwn/Dfy3IP3BoTY3I1kv1O//jvQnM9PuxAefj3nn - 21+YLNUQAIL12AAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABehJREFUSEuVlWdQ + VFcYhs9mKVYwYESjyUYkShgHW3DcZBjGBBNFl7ZgpNgQBEVhEZASqi4KggYVkQCiRKSoiCSKiGLUIAQE + C3YCUpTRpSlEKcLy5rtXkvjDxpl55uyeuft87/nunnsFbBDju/wJWmovVFYJoGqmMURzYm9/n7K5ta2q + q6knr/bIsyxFyfM20ikJDEL78tKlFfrWy4vEzbvrPZDzdzSy27fhaHskslojsOnWCsxLnVgzRTZKQpeO + JD4YVAGHq1Mdfa4b9HHizCdypDWFIVURggOPgnnSFKFEGCzSp3eMtxzuSHItQvDGIqGMqRBcCoF12ee6 + bpfEz451RONQSzhSH4dg/6MgpDQGIvlBAJIa/Ak/JDcE4EBjEObsFdUIh7NvBnbyf40WPabRrceCO2eo + 32w0Hffi5lyNztrR7PKqbTp/JLcGIb11E5/2pdgfifUbkVDni733vRHPUeNNa37YWGyLMfOH7CSzPqHC + V+jWZ5N7jIR/9YWZAQfcgCQXIMEJiHWGe8EsJB03RQol30fyREqbUOtDwg2Iq/bC7ioZdlV5Yuc9T5pl + SKzdiPEewy6S1oLQZHzy2cJqJKwE4okd9kDUEiBiCfrDbbD55jwoFW6IzBQjkXaw974P9vBiT+y4ux4x + d9Zh2213RN1aiyia46q9YRg1vp7knsTHrFHEwvpCFgBxK0hsB8gXA6E2QJA1ev0sEVIxG2hbjKvnZyK6 + xAF7anwQe88D0STbenMN5JVuCL/uSqzm55i7MujLxzwgeRgxkT2YKryNRGpJJKUOt+XF2GgBeJsD7uaQ + ndUFHk8BarWwJXMGkhrdsbPaDVtuuSGscjWCrjojoMIJ/gQ3b769FqOd1UtJHk7oslrRmF7sWvZSHmgF + +Jij31MCrDdDn+siTJMFQxyQA+PwKoxeVw4d2QVMD4tHQNlqhFQuh8/lFfAqXQYZ4VO+EkvzF0HdSJhB + cm9iAqufptmFGEfgR0pOqZUeEvS7m+Gi83JoupQiMKUOUVevAZ2tkJ0uRhKUWF+pgIZLEawyvLGhwg5r + LtljTZEDvKiAKEC7WSBk+0huw5+HP8exUmy1R7+vBZSUvMd9ISqdf4C2xw1cPN+OwpMKeGeVY3tRKRzP + lCOmox0RLQrIWxoxxr0Y0mxXuBQvhkvJUoh+EvWqiAS/DLTHkGY1tn8U82iymQn4WaF7HaV3M8Ukx6M4 + UfAE+acUyDlWj5NH6mAXVwiTvCL41dVh86OHCGmohf/9amg4ZMOmwBjjQrWfqugKDpJ0B7GAGMWf5gm0 + jcOarOiZ07folVmifJUdxOE1OJf/GMdzGpCbXYfY+DJIt1+BfWEfpqddg37aeRhmnYXh4TPQ8r4A1bkG + ZwRqLJWEEYQZoUP89zxS+VqVTUsfwc5lGU/qj7Dzgd/PdcjPrUfaoTvYIC/EwphyOF4AlpwFbM8A0gLA + 6jRgQ9+/z+wEE9lnkTCQEPN9Z0zIn+BXxhD6bGjzAQuZZeBYbiUvwcrI85DGVsAutx12JOeEkjziZB8k + J3oh+e0FzE8pMT+nC0zPNYd+70SM5dvymsEtckU+Y3MiQqRZHfAqA5wuUupCwCJ/QPxrDyTHuyA51kk8 + h0VuN0xSmsA+teX+lsuJj14nf3VNyMThRl8s+F25vgSwpxZY5fe/TE0yTio50gFJ1lMe65znmOwb389G + 6iWRZPFAe95Vg6kzi7xTDgW9fHpJnhISLjknP9wOSUYbJIda6NnfCouMVjCj2EoyxhEmxLB32vkeTpV9 + qeZQ0CSlHVhS78259Fzy9DaYpzXB8mATrNIUGGqa3sHUdLh/D3dqdYn3fpMNZZMdLYXmmTVGcQ9hk9cH + aW4npEefQprZArH8BlRMEhrZcBEn30IYEyPeJ/2/13A3XZOpa89leg5x7KuYspHm2U0aloebmZH8Chtr + mskEasl0TTDBvb3e/op8Q2WuCJfKgLAeaIOcZu4w+RK2xFQ+yCBa87paqrT4IUGHnk0a4JOB1Gr8PXvL + +Afoc6CYoLRIEQAAAABJRU5ErkJggg== @@ -506,28 +478,28 @@ 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 Index: /trunk/BazaReklam/Classes/Helpers/WebRequestHelper.cs =================================================================== --- /trunk/BazaReklam/Classes/Helpers/WebRequestHelper.cs (revision 560) +++ /trunk/BazaReklam/Classes/Helpers/WebRequestHelper.cs (revision 560) @@ -0,0 +1,23 @@ +using System.Net; + + +namespace Baza_Reklam.Classes.Helpers +{ + public class WebRequestHelper + { + public static string GetResponse(string url) + { + WebClient webClient = new WebClient(); + string response = webClient.DownloadString(url); + webClient.Dispose(); + return response; + } + + public static void DownloadFile(string url, string fileName) + { + WebClient webClient = new WebClient(); + webClient.DownloadFile(url, fileName); + webClient.Dispose(); + } + } +} Index: /trunk/BazaReklam/Classes/Helpers/PdfHelper.cs =================================================================== --- /trunk/BazaReklam/Classes/Helpers/PdfHelper.cs (revision 560) +++ /trunk/BazaReklam/Classes/Helpers/PdfHelper.cs (revision 560) @@ -0,0 +1,85 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.IO; + +namespace Baza_Reklam.Classes.Helpers +{ + public class PdfHelper + { + private readonly string _reklama; + private string _errorMessage; + + public PdfHelper(string reklama) + { + _reklama = reklama.Trim().ToUpper(); + } + + public string ErrorMessage + { + get { return _errorMessage; } + } + + public bool DisplayPdf() + { + string url = ConfigurationHelper.GetSettingByKey("Application.Pdf.Date") ?? + "http://truck.pl/ogloszenia/_getFile.asp?pdfdate,{0},,"; + url = string.Format(url, _reklama); + + string pdfDate = WebRequestHelper.GetResponse(url); + + DateTime pdfDateTime; + + if (!DateTime.TryParse(pdfDate, null, DateTimeStyles.None, out pdfDateTime)) + { + //MessageBox.Show("Nie znaleziono pliku PDF dla wybranej reklamy"); + _errorMessage = "Nie znaleziono pliku PDF dla wybranej reklamy"; + return false; + } + + string pdfDirectory = Environment.CurrentDirectory + Path.DirectorySeparatorChar + "pdf"; + string pdfFile = Environment.CurrentDirectory + Path.DirectorySeparatorChar + "pdf" + + Path.DirectorySeparatorChar + _reklama + ".pdf"; + + if (!Directory.Exists(pdfDirectory)) + Directory.CreateDirectory(pdfDirectory); + + string pdfUrl = ConfigurationHelper.GetSettingByKey("Application.Pdf.File") ?? + "http://truck.pl/ogloszenia/_getFile.asp?pdf,{0},,"; + pdfUrl = string.Format(pdfUrl, _reklama); + + if (!File.Exists(pdfFile) || File.GetCreationTime(pdfFile) < pdfDateTime) + { + WebRequestHelper.DownloadFile(pdfUrl, pdfFile); + } + + if (!File.Exists(pdfFile)) + { + _errorMessage = "Nie znaleziono pliku PDF: " + pdfFile; + return false; + } + Process.Start(pdfFile); + return true; + } + + public static void CleanPdfFolder() + { + try + { + string pdfDirectory = Environment.CurrentDirectory + Path.DirectorySeparatorChar + "pdf"; + DirectoryInfo di = new DirectoryInfo(pdfDirectory); + FileInfo[] fileInfos = di.GetFiles("*.pdf", SearchOption.TopDirectoryOnly); + + foreach (FileInfo file in fileInfos) + { + if (file.CreationTime < DateTime.Now.AddMonths(-1)) + file.Delete(); + } + } + catch(Exception exception) + { + Logger.LogException(exception, User.getUser().Login, DateTime.Now); + } + } + } +} Index: /trunk/BazaReklam/ProductionForm.Designer.cs =================================================================== --- /trunk/BazaReklam/ProductionForm.Designer.cs (revision 65) +++ /trunk/BazaReklam/ProductionForm.Designer.cs (revision 560) @@ -35,7 +35,4 @@ System.Windows.Forms.Label pLIKLabel; System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductionForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -43,7 +40,25 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductionForm)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.produkcjaTabPage = new System.Windows.Forms.TabPage(); this.produkcjaDataGridView = new System.Windows.Forms.DataGridView(); + this.NAZWA_ZAMOWIENIA = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sTANDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tYPPROJEKTUDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.zAMAWIAMNADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.szkic = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.aGENTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PRIORYTET = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dATAAGENTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.uwagi = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pRODUKCJADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dATAPRODUKCJADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dTPDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.kOREKTADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dTPPOKORDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dATAAKCEPTACJIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pRODUKCJABindingSource = new System.Windows.Forms.BindingSource(this.components); this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet(); @@ -87,5 +102,4 @@ this.doKorekty2ToolStripButton = new System.Windows.Forms.ToolStripButton(); this.doAgentaToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.podgladJPGToolStripButton = new System.Windows.Forms.ToolStripButton(); this.podgladToolStripButton = new System.Windows.Forms.ToolStripButton(); this.akceptToolStripButton = new System.Windows.Forms.ToolStripButton(); @@ -200,19 +214,4 @@ this.klienciTableAdapter1 = new Baza_Reklam.REKLAMADataSetTableAdapters.KLIENCITableAdapter(); this.listyPodsumowanieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ListyPodsumowanieTableAdapter(); - this.NAZWA_ZAMOWIENIA = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sTANDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tYPPROJEKTUDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.zAMAWIAMNADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.szkic = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.aGENTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PRIORYTET = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dATAAGENTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.uwagi = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pRODUKCJADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dATAPRODUKCJADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dTPDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.kOREKTADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dTPPOKORDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dATAAKCEPTACJIDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); oPISLabel = new System.Windows.Forms.Label(); lokalizacjaLabel = new System.Windows.Forms.Label(); @@ -352,4 +351,126 @@ this.produkcjaDataGridView.SelectionChanged += new System.EventHandler(this.dataGridView1_SelectionChanged); // + // NAZWA_ZAMOWIENIA + // + this.NAZWA_ZAMOWIENIA.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.NAZWA_ZAMOWIENIA.DataPropertyName = "NAZWA_ZAMOWIENIA"; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.NAZWA_ZAMOWIENIA.DefaultCellStyle = dataGridViewCellStyle2; + this.NAZWA_ZAMOWIENIA.HeaderText = "Sym. zam."; + this.NAZWA_ZAMOWIENIA.Name = "NAZWA_ZAMOWIENIA"; + this.NAZWA_ZAMOWIENIA.Width = 105; + // + // sTANDataGridViewTextBoxColumn + // + this.sTANDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.sTANDataGridViewTextBoxColumn.DataPropertyName = "STAN"; + this.sTANDataGridViewTextBoxColumn.HeaderText = "Stan"; + this.sTANDataGridViewTextBoxColumn.Name = "sTANDataGridViewTextBoxColumn"; + // + // tYPPROJEKTUDataGridViewTextBoxColumn + // + this.tYPPROJEKTUDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.tYPPROJEKTUDataGridViewTextBoxColumn.DataPropertyName = "TYP_PROJEKTU"; + this.tYPPROJEKTUDataGridViewTextBoxColumn.HeaderText = "Typ"; + this.tYPPROJEKTUDataGridViewTextBoxColumn.Name = "tYPPROJEKTUDataGridViewTextBoxColumn"; + this.tYPPROJEKTUDataGridViewTextBoxColumn.Width = 60; + // + // zAMAWIAMNADataGridViewTextBoxColumn + // + this.zAMAWIAMNADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.zAMAWIAMNADataGridViewTextBoxColumn.DataPropertyName = "ZAMAWIAM_NA"; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle3.Format = "d"; + dataGridViewCellStyle3.NullValue = null; + this.zAMAWIAMNADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + this.zAMAWIAMNADataGridViewTextBoxColumn.HeaderText = "Na kiedy"; + this.zAMAWIAMNADataGridViewTextBoxColumn.Name = "zAMAWIAMNADataGridViewTextBoxColumn"; + this.zAMAWIAMNADataGridViewTextBoxColumn.Width = 75; + // + // szkic + // + this.szkic.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.szkic.DataPropertyName = "szkic"; + this.szkic.HeaderText = "Jêzyk"; + this.szkic.Name = "szkic"; + this.szkic.ReadOnly = true; + this.szkic.Width = 60; + // + // aGENTDataGridViewTextBoxColumn + // + this.aGENTDataGridViewTextBoxColumn.DataPropertyName = "AGENT"; + this.aGENTDataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.aGENTDataGridViewTextBoxColumn.HeaderText = "Agent"; + this.aGENTDataGridViewTextBoxColumn.Name = "aGENTDataGridViewTextBoxColumn"; + // + // PRIORYTET + // + this.PRIORYTET.DataPropertyName = "PRIORYTET"; + this.PRIORYTET.HeaderText = "PRIORYTET"; + this.PRIORYTET.Name = "PRIORYTET"; + this.PRIORYTET.Visible = false; + // + // dATAAGENTDataGridViewTextBoxColumn + // + this.dATAAGENTDataGridViewTextBoxColumn.DataPropertyName = "DATA_AGENT"; + dataGridViewCellStyle4.Format = "g"; + this.dATAAGENTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.dATAAGENTDataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.dATAAGENTDataGridViewTextBoxColumn.HeaderText = "Data"; + this.dATAAGENTDataGridViewTextBoxColumn.Name = "dATAAGENTDataGridViewTextBoxColumn"; + // + // uwagi + // + this.uwagi.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.uwagi.DataPropertyName = "uwagi"; + this.uwagi.HeaderText = "Uwagi"; + this.uwagi.Name = "uwagi"; + // + // pRODUKCJADataGridViewTextBoxColumn + // + this.pRODUKCJADataGridViewTextBoxColumn.DataPropertyName = "PRODUKCJA"; + this.pRODUKCJADataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.pRODUKCJADataGridViewTextBoxColumn.HeaderText = "Produkcja"; + this.pRODUKCJADataGridViewTextBoxColumn.Name = "pRODUKCJADataGridViewTextBoxColumn"; + // + // dATAPRODUKCJADataGridViewTextBoxColumn + // + this.dATAPRODUKCJADataGridViewTextBoxColumn.DataPropertyName = "DATA_PRODUKCJA"; + dataGridViewCellStyle5.Format = "g"; + this.dATAPRODUKCJADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + this.dATAPRODUKCJADataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.dATAPRODUKCJADataGridViewTextBoxColumn.HeaderText = "Data"; + this.dATAPRODUKCJADataGridViewTextBoxColumn.Name = "dATAPRODUKCJADataGridViewTextBoxColumn"; + // + // dTPDataGridViewTextBoxColumn + // + this.dTPDataGridViewTextBoxColumn.DataPropertyName = "DTP"; + this.dTPDataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.dTPDataGridViewTextBoxColumn.HeaderText = "DTP"; + this.dTPDataGridViewTextBoxColumn.Name = "dTPDataGridViewTextBoxColumn"; + // + // kOREKTADataGridViewTextBoxColumn + // + this.kOREKTADataGridViewTextBoxColumn.DataPropertyName = "KOREKTA"; + this.kOREKTADataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.kOREKTADataGridViewTextBoxColumn.HeaderText = "Korekta"; + this.kOREKTADataGridViewTextBoxColumn.Name = "kOREKTADataGridViewTextBoxColumn"; + // + // dTPPOKORDataGridViewTextBoxColumn + // + this.dTPPOKORDataGridViewTextBoxColumn.DataPropertyName = "DTP_PO_KOR"; + this.dTPPOKORDataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.dTPPOKORDataGridViewTextBoxColumn.HeaderText = "DTP 2"; + this.dTPPOKORDataGridViewTextBoxColumn.Name = "dTPPOKORDataGridViewTextBoxColumn"; + // + // dATAAKCEPTACJIDataGridViewTextBoxColumn + // + this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DataPropertyName = "DATA_DTP_PO_KOR"; + dataGridViewCellStyle6.Format = "g"; + this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + this.dATAAKCEPTACJIDataGridViewTextBoxColumn.FillWeight = 47.9073F; + this.dATAAKCEPTACJIDataGridViewTextBoxColumn.HeaderText = "Data"; + this.dATAAKCEPTACJIDataGridViewTextBoxColumn.Name = "dATAAKCEPTACJIDataGridViewTextBoxColumn"; + // // pRODUKCJABindingSource // @@ -395,5 +516,5 @@ // this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel1.Size = new System.Drawing.Size(40, 22); this.toolStripLabel1.Text = "STAN: "; // @@ -433,5 +554,5 @@ // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(53, 22); + this.toolStripLabel2.Size = new System.Drawing.Size(48, 22); this.toolStripLabel2.Text = "Symbol: "; // @@ -477,5 +598,5 @@ this.dzisiajToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.dzisiajToolStripButton.Name = "dzisiajToolStripButton"; - this.dzisiajToolStripButton.Size = new System.Drawing.Size(55, 22); + this.dzisiajToolStripButton.Size = new System.Drawing.Size(51, 22); this.dzisiajToolStripButton.Text = "Odœwie¿"; this.dzisiajToolStripButton.Click += new System.EventHandler(this.dzisiajToolStripButton_Click); @@ -591,5 +712,4 @@ this.doKorekty2ToolStripButton, this.doAgentaToolStripButton, - this.podgladJPGToolStripButton, this.podgladToolStripButton, this.akceptToolStripButton, @@ -612,5 +732,5 @@ // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(35, 28); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(36, 28); this.bindingNavigatorCountItem.Text = "of {0}"; this.bindingNavigatorCountItem.ToolTipText = "Total number of items"; @@ -683,5 +803,5 @@ this.zwrotToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.zwrotToolStripButton.Name = "zwrotToolStripButton"; - this.zwrotToolStripButton.Size = new System.Drawing.Size(52, 28); + this.zwrotToolStripButton.Size = new System.Drawing.Size(48, 28); this.zwrotToolStripButton.Text = "ZWROT"; this.zwrotToolStripButton.Click += new System.EventHandler(this.zwrotToolStripButton_Click); @@ -694,5 +814,5 @@ this.doDTPToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.doDTPToolStripButton.Name = "doDTPToolStripButton"; - this.doDTPToolStripButton.Size = new System.Drawing.Size(53, 28); + this.doDTPToolStripButton.Size = new System.Drawing.Size(48, 28); this.doDTPToolStripButton.Text = "DO DTP"; this.doDTPToolStripButton.Click += new System.EventHandler(this.doDTPToolStripButton_Click); @@ -716,5 +836,5 @@ this.doKorektyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.doKorektyToolStripButton.Name = "doKorektyToolStripButton"; - this.doKorektyToolStripButton.Size = new System.Drawing.Size(81, 28); + this.doKorektyToolStripButton.Size = new System.Drawing.Size(74, 28); this.doKorektyToolStripButton.Text = "DO KOREKTY"; this.doKorektyToolStripButton.Click += new System.EventHandler(this.doKorektyToolStripButton_Click); @@ -727,5 +847,5 @@ this.doDTP2ToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.doDTP2ToolStripButton.Name = "doDTP2ToolStripButton"; - this.doDTP2ToolStripButton.Size = new System.Drawing.Size(62, 28); + this.doDTP2ToolStripButton.Size = new System.Drawing.Size(57, 28); this.doDTP2ToolStripButton.Text = "DO DTP 2"; this.doDTP2ToolStripButton.Click += new System.EventHandler(this.doDTP2ToolStripButton_Click); @@ -738,5 +858,5 @@ this.doKorekty2ToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.doKorekty2ToolStripButton.Name = "doKorekty2ToolStripButton"; - this.doKorekty2ToolStripButton.Size = new System.Drawing.Size(90, 28); + this.doKorekty2ToolStripButton.Size = new System.Drawing.Size(83, 28); this.doKorekty2ToolStripButton.Text = "DO KOREKTY 2"; this.doKorekty2ToolStripButton.Click += new System.EventHandler(this.doKorekty2ToolStripButton_Click); @@ -749,17 +869,7 @@ this.doAgentaToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.doAgentaToolStripButton.Name = "doAgentaToolStripButton"; - this.doAgentaToolStripButton.Size = new System.Drawing.Size(77, 28); + this.doAgentaToolStripButton.Size = new System.Drawing.Size(69, 28); this.doAgentaToolStripButton.Text = "DO AGENTA"; this.doAgentaToolStripButton.Click += new System.EventHandler(this.doAgentaToolStripButton_Click); - // - // podgladJPGToolStripButton - // - this.podgladJPGToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.podgladJPGToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("podgladJPGToolStripButton.Image"))); - this.podgladJPGToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.podgladJPGToolStripButton.Name = "podgladJPGToolStripButton"; - this.podgladJPGToolStripButton.Size = new System.Drawing.Size(28, 28); - this.podgladJPGToolStripButton.Text = "Podgl¹d JPG"; - this.podgladJPGToolStripButton.Click += new System.EventHandler(this.podgladJPGToolStripButton_Click); // // podgladToolStripButton @@ -1176,5 +1286,5 @@ // this.bindingNavigatorCountItem1.Name = "bindingNavigatorCountItem1"; - this.bindingNavigatorCountItem1.Size = new System.Drawing.Size(35, 22); + this.bindingNavigatorCountItem1.Size = new System.Drawing.Size(36, 22); this.bindingNavigatorCountItem1.Text = "of {0}"; this.bindingNavigatorCountItem1.ToolTipText = "Total number of items"; @@ -1549,5 +1659,5 @@ // this.bindingNavigatorCountItem2.Name = "bindingNavigatorCountItem2"; - this.bindingNavigatorCountItem2.Size = new System.Drawing.Size(35, 28); + this.bindingNavigatorCountItem2.Size = new System.Drawing.Size(36, 28); this.bindingNavigatorCountItem2.Text = "of {0}"; this.bindingNavigatorCountItem2.ToolTipText = "Total number of items"; @@ -1616,5 +1726,5 @@ // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(36, 28); + this.toolStripLabel3.Size = new System.Drawing.Size(32, 28); this.toolStripLabel3.Text = "AMT:"; // @@ -1764,126 +1874,4 @@ // this.listyPodsumowanieTableAdapter.ClearBeforeFill = true; - // - // NAZWA_ZAMOWIENIA - // - this.NAZWA_ZAMOWIENIA.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.NAZWA_ZAMOWIENIA.DataPropertyName = "NAZWA_ZAMOWIENIA"; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.NAZWA_ZAMOWIENIA.DefaultCellStyle = dataGridViewCellStyle2; - this.NAZWA_ZAMOWIENIA.HeaderText = "Sym. zam."; - this.NAZWA_ZAMOWIENIA.Name = "NAZWA_ZAMOWIENIA"; - this.NAZWA_ZAMOWIENIA.Width = 105; - // - // sTANDataGridViewTextBoxColumn - // - this.sTANDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.sTANDataGridViewTextBoxColumn.DataPropertyName = "STAN"; - this.sTANDataGridViewTextBoxColumn.HeaderText = "Stan"; - this.sTANDataGridViewTextBoxColumn.Name = "sTANDataGridViewTextBoxColumn"; - // - // tYPPROJEKTUDataGridViewTextBoxColumn - // - this.tYPPROJEKTUDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.tYPPROJEKTUDataGridViewTextBoxColumn.DataPropertyName = "TYP_PROJEKTU"; - this.tYPPROJEKTUDataGridViewTextBoxColumn.HeaderText = "Typ"; - this.tYPPROJEKTUDataGridViewTextBoxColumn.Name = "tYPPROJEKTUDataGridViewTextBoxColumn"; - this.tYPPROJEKTUDataGridViewTextBoxColumn.Width = 60; - // - // zAMAWIAMNADataGridViewTextBoxColumn - // - this.zAMAWIAMNADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.zAMAWIAMNADataGridViewTextBoxColumn.DataPropertyName = "ZAMAWIAM_NA"; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle3.Format = "d"; - dataGridViewCellStyle3.NullValue = null; - this.zAMAWIAMNADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; - this.zAMAWIAMNADataGridViewTextBoxColumn.HeaderText = "Na kiedy"; - this.zAMAWIAMNADataGridViewTextBoxColumn.Name = "zAMAWIAMNADataGridViewTextBoxColumn"; - this.zAMAWIAMNADataGridViewTextBoxColumn.Width = 75; - // - // szkic - // - this.szkic.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.szkic.DataPropertyName = "szkic"; - this.szkic.HeaderText = "Jêzyk"; - this.szkic.Name = "szkic"; - this.szkic.ReadOnly = true; - this.szkic.Width = 60; - // - // aGENTDataGridViewTextBoxColumn - // - this.aGENTDataGridViewTextBoxColumn.DataPropertyName = "AGENT"; - this.aGENTDataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.aGENTDataGridViewTextBoxColumn.HeaderText = "Agent"; - this.aGENTDataGridViewTextBoxColumn.Name = "aGENTDataGridViewTextBoxColumn"; - // - // PRIORYTET - // - this.PRIORYTET.DataPropertyName = "PRIORYTET"; - this.PRIORYTET.HeaderText = "PRIORYTET"; - this.PRIORYTET.Name = "PRIORYTET"; - this.PRIORYTET.Visible = false; - // - // dATAAGENTDataGridViewTextBoxColumn - // - this.dATAAGENTDataGridViewTextBoxColumn.DataPropertyName = "DATA_AGENT"; - dataGridViewCellStyle4.Format = "g"; - this.dATAAGENTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; - this.dATAAGENTDataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.dATAAGENTDataGridViewTextBoxColumn.HeaderText = "Data"; - this.dATAAGENTDataGridViewTextBoxColumn.Name = "dATAAGENTDataGridViewTextBoxColumn"; - // - // uwagi - // - this.uwagi.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.uwagi.DataPropertyName = "uwagi"; - this.uwagi.HeaderText = "Uwagi"; - this.uwagi.Name = "uwagi"; - // - // pRODUKCJADataGridViewTextBoxColumn - // - this.pRODUKCJADataGridViewTextBoxColumn.DataPropertyName = "PRODUKCJA"; - this.pRODUKCJADataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.pRODUKCJADataGridViewTextBoxColumn.HeaderText = "Produkcja"; - this.pRODUKCJADataGridViewTextBoxColumn.Name = "pRODUKCJADataGridViewTextBoxColumn"; - // - // dATAPRODUKCJADataGridViewTextBoxColumn - // - this.dATAPRODUKCJADataGridViewTextBoxColumn.DataPropertyName = "DATA_PRODUKCJA"; - dataGridViewCellStyle5.Format = "g"; - this.dATAPRODUKCJADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; - this.dATAPRODUKCJADataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.dATAPRODUKCJADataGridViewTextBoxColumn.HeaderText = "Data"; - this.dATAPRODUKCJADataGridViewTextBoxColumn.Name = "dATAPRODUKCJADataGridViewTextBoxColumn"; - // - // dTPDataGridViewTextBoxColumn - // - this.dTPDataGridViewTextBoxColumn.DataPropertyName = "DTP"; - this.dTPDataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.dTPDataGridViewTextBoxColumn.HeaderText = "DTP"; - this.dTPDataGridViewTextBoxColumn.Name = "dTPDataGridViewTextBoxColumn"; - // - // kOREKTADataGridViewTextBoxColumn - // - this.kOREKTADataGridViewTextBoxColumn.DataPropertyName = "KOREKTA"; - this.kOREKTADataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.kOREKTADataGridViewTextBoxColumn.HeaderText = "Korekta"; - this.kOREKTADataGridViewTextBoxColumn.Name = "kOREKTADataGridViewTextBoxColumn"; - // - // dTPPOKORDataGridViewTextBoxColumn - // - this.dTPPOKORDataGridViewTextBoxColumn.DataPropertyName = "DTP_PO_KOR"; - this.dTPPOKORDataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.dTPPOKORDataGridViewTextBoxColumn.HeaderText = "DTP 2"; - this.dTPPOKORDataGridViewTextBoxColumn.Name = "dTPPOKORDataGridViewTextBoxColumn"; - // - // dATAAKCEPTACJIDataGridViewTextBoxColumn - // - this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DataPropertyName = "DATA_DTP_PO_KOR"; - dataGridViewCellStyle6.Format = "g"; - this.dATAAKCEPTACJIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; - this.dATAAKCEPTACJIDataGridViewTextBoxColumn.FillWeight = 47.9073F; - this.dATAAKCEPTACJIDataGridViewTextBoxColumn.HeaderText = "Data"; - this.dATAAKCEPTACJIDataGridViewTextBoxColumn.Name = "dATAAKCEPTACJIDataGridViewTextBoxColumn"; // // ProductionForm @@ -2082,5 +2070,4 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.ToolStripButton podgladJPGToolStripButton; private System.Windows.Forms.ToolStripButton ustawKolejnoscToolStripButton; private System.Windows.Forms.DataGridViewTextBoxColumn klientNazwaDataGridViewTextBoxColumn; Index: /trunk/BazaReklam/app.config =================================================================== --- /trunk/BazaReklam/app.config (revision 554) +++ /trunk/BazaReklam/app.config (revision 560) @@ -32,4 +32,7 @@ + + + Index: /trunk/BazaReklam/ProductionForm.cs =================================================================== --- /trunk/BazaReklam/ProductionForm.cs (revision 554) +++ /trunk/BazaReklam/ProductionForm.cs (revision 560) @@ -9,4 +9,5 @@ using System.Text; using Baza_Reklam.Classes; +using Baza_Reklam.Classes.Helpers; namespace Baza_Reklam @@ -68,10 +69,4 @@ dateTimePicker1.Value = DateTime.Today; - - //if (!ConnString.getConnString().Value.Contains("truck")) - //{ - // //w Sampressie w tej kolumnie jest zapisana wersja jêzykowa projektu/ w bazie CT niewykorzystywane - // szkic.Visible = false; - //} } @@ -110,5 +105,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; plikToolStripTextBox.Text = Convert.ToString(row["PLIK"]); } @@ -123,5 +118,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["PRODUKCJA"] = User.getUser().Login; row["DATA_PRODUKCJA"] = DateTime.Now; @@ -142,5 +137,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["PRODUKCJA"] = User.getUser().Login; row["DATA_PRODUKCJA"] = DateTime.Now; @@ -161,5 +156,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; REKLAMADataSet.PRODUKCJADataTable t = pRODUKCJATableAdapter.GetDataById(Convert.ToInt32(row["ID"])); @@ -194,5 +189,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["stan"] = "DO KOREKTY"; @@ -211,5 +206,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["KOREKTA"] = User.getUser().Login; @@ -232,5 +227,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["DTP_PO_KOR"] = User.getUser().Login; @@ -253,5 +248,5 @@ wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["DTP_PO_KOR"] = User.getUser().Login; @@ -280,5 +275,5 @@ { wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["DATA_AKCEPTACJI"] = DateTime.Now; row["ocena"] = ocenaToolStripComboBox.Items[ocenaToolStripComboBox.SelectedIndex]; @@ -300,5 +295,5 @@ { wylaczSortowanieGrida(); - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["DATA_AKCEPTACJI"] = DateTime.Now; @@ -416,5 +411,5 @@ spisPlikowDataGridView.Sort(IdReklamyColumn, ListSortDirection.Ascending); - + StringBuilder message = new StringBuilder(); message.AppendLine("Wczytywanie stron z pliku " + openFileDialog.FileName + " zakoñczone. "); @@ -432,5 +427,5 @@ } } - + public void wpiszStronyDoTabeli(List lista) { @@ -523,5 +518,5 @@ if (listaReklamDoWydaniaNrBindingSource.Current != null) { - DataRowView row = (DataRowView) listaReklamDoWydaniaNrBindingSource.Current; + DataRowView row = (DataRowView)listaReklamDoWydaniaNrBindingSource.Current; pobierzSciezki(row); } @@ -692,5 +687,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; uprawnienia(); @@ -890,72 +885,31 @@ private void podgladToolStripButton_Click(object sender, EventArgs e) { - if (pRODUKCJABindingSource.Current != null) - { - Cursor = Cursors.WaitCursor; - - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; - - int reklamaId = Convert.ToInt32(row["reklamaId"]); - string idReklamy = row["NAZWA_ZAMOWIENIA"].ToString(); - - string tytul; - int grzbiet; - string miasto; - byte staryNowyArchiwum; - - Produkcja.argumentyDoSciezki(reklamaId, idReklamy, out tytul, out grzbiet, out miasto, - out staryNowyArchiwum); - - string sciezka = Produkcja.GetReklamaFileName(idReklamy, tytul, grzbiet, miasto, staryNowyArchiwum, - "pdf"); - - if (File.Exists(sciezka)) - { - System.Diagnostics.Process.Start(sciezka); - } - else - { - MessageBox.Show("Nie znaleziono pliku: " + sciezka); - } - + if (pRODUKCJABindingSource.Current == null) return; + + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; + REKLAMADataSet.REKLAMADataTable dt = new REKLAMADataSet.REKLAMADataTable(); + reklamaTableAdapter.FillByReklamaId(dt, Convert.ToInt32(row["reklamaId"])); + + if (dt.Rows.Count <= 0) + { + MessageBox.Show("Upss, dla wybranej pozycji nie odnaleziono reklamy! Coœ tu jest nie tak....", "Produkcja - podgl¹d PDF", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + string symbolReklamy = dt.Rows[0]["ID Reklamy"].ToString(); + + Cursor = Cursors.WaitCursor; + try + { + PdfHelper pdfHelper = new PdfHelper(symbolReklamy); + if (!pdfHelper.DisplayPdf()) + MessageBox.Show(pdfHelper.ErrorMessage); + } + finally + { Cursor = Cursors.Default; } } - private void podgladJPGToolStripButton_Click(object sender, EventArgs e) - { - if (pRODUKCJABindingSource.Current != null) - { - Cursor = Cursors.WaitCursor; - - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; - - int reklamaId = Convert.ToInt32(row["reklamaId"]); - string idReklamy = row["NAZWA_ZAMOWIENIA"].ToString(); - - string tytul; - int grzbiet; - string miasto; - byte staryNowyArchiwum; - - Produkcja.argumentyDoSciezki(reklamaId, idReklamy, out tytul, out grzbiet, out miasto, - out staryNowyArchiwum); - - string sciezka = Produkcja.GetReklamaFileName(idReklamy, tytul, grzbiet, miasto, staryNowyArchiwum, - "jpg"); - - if (File.Exists(sciezka)) - { - System.Diagnostics.Process.Start(sciezka); - } - else - { - MessageBox.Show("Nie znaleziono pliku: " + sciezka); - } - - Cursor = Cursors.Default; - } - } - private void produkcjaDataGridView_Leave(object sender, EventArgs e) { @@ -967,5 +921,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; int idRek = Convert.ToInt32(row["ReklamaId"]); reklamaTableAdapter.FillByReklamaId(rEKLAMADataSet.REKLAMA, idRek); @@ -980,5 +934,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; int idRek = Convert.ToInt32(row["ReklamaId"]); int idPro = Convert.ToInt32(row["ID"]); @@ -999,5 +953,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["PLIK"] = projektOpenFileDialog.FileName; pRODUKCJABindingSource.EndEdit(); @@ -1114,5 +1068,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; row["PLIK"] = projektOpenFileDialog.FileName; pRODUKCJABindingSource.EndEdit(); @@ -1127,5 +1081,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; if (row["PLIK"] != DBNull.Value) { @@ -1184,5 +1138,5 @@ Cursor = Cursors.WaitCursor; - DataRowView row = (DataRowView) listyBindingSource.Current; + DataRowView row = (DataRowView)listyBindingSource.Current; int custId = Convert.ToInt32(row["custId"]); LetterViewer lv = new LetterViewer(custId, nrAMT, nrGS1, nrGS2, dateTimePicker1.Value); @@ -1250,14 +1204,14 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; int idRek = Convert.ToInt32(row["ReklamaId"]); int custId = Utils.customerId(idRek); - ClientsForm.getClientsForm((MDIBazaReklam) MdiParent).pokazKlienta(custId); + ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).pokazKlienta(custId); Hide(); - ClientsForm.getClientsForm((MDIBazaReklam) MdiParent).Show(); + ClientsForm.getClientsForm((MDIBazaReklam)MdiParent).Show(); } } @@ -1269,5 +1223,5 @@ Cursor = Cursors.WaitCursor; - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; string idReklamy = row["NAZWA_ZAMOWIENIA"].ToString(); @@ -1336,5 +1290,5 @@ if (pRODUKCJABindingSource.Current != null) { - DataRowView row = (DataRowView) pRODUKCJABindingSource.Current; + DataRowView row = (DataRowView)pRODUKCJABindingSource.Current; int id = Convert.ToInt32(row["id"]); FullInfoProjectForm fipf = new FullInfoProjectForm(id); @@ -1354,7 +1308,4 @@ } } - - - } } Index: /trunk/BazaReklam/OrdersForm.Designer.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.Designer.cs (revision 399) +++ /trunk/BazaReklam/OrdersForm.Designer.cs (revision 560) @@ -60,5 +60,4 @@ this.wplataToolStripButton = new System.Windows.Forms.ToolStripButton(); this.zamProToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.podgladJPGToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.odswiezToolStripButton = new System.Windows.Forms.ToolStripButton(); @@ -173,5 +172,4 @@ this.wplataToolStripButton, this.zamProToolStripButton, - this.podgladJPGToolStripButton, this.toolStripButton1, this.odswiezToolStripButton, @@ -348,14 +346,4 @@ this.zamProToolStripButton.Text = "Projekt"; this.zamProToolStripButton.Click += new System.EventHandler(this.zamProToolStripButton_Click); - // - // podgladJPGToolStripButton - // - this.podgladJPGToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.podgladJPGToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("podgladJPGToolStripButton.Image"))); - this.podgladJPGToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.podgladJPGToolStripButton.Name = "podgladJPGToolStripButton"; - this.podgladJPGToolStripButton.Size = new System.Drawing.Size(28, 28); - this.podgladJPGToolStripButton.Text = "Podgl¹d JPG"; - this.podgladJPGToolStripButton.Click += new System.EventHandler(this.podgladJPGToolStripButton_Click); // // toolStripButton1 @@ -1123,5 +1111,4 @@ private System.Windows.Forms.ToolStripComboBox typToolStripComboBox; private System.Windows.Forms.ToolStripButton zamProToolStripButton; - private System.Windows.Forms.ToolStripButton podgladJPGToolStripButton; private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton excelToolStripButton;