diff --git a/API_NetFramework/Controllers/UnterschriftController.cs b/API_NetFramework/Controllers/UnterschriftController.cs index 27163b7b..0b7eff11 100644 --- a/API_NetFramework/Controllers/UnterschriftController.cs +++ b/API_NetFramework/Controllers/UnterschriftController.cs @@ -15,6 +15,9 @@ using System.Drawing; using System.Threading.Tasks; using System.Threading; using API_NetFramework.Models; +using System.Web.Http.Controllers; + + namespace API_NetFramework.Controllers @@ -27,7 +30,7 @@ namespace API_NetFramework.Controllers public static class Image { - public const string Base64Image = "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"; + public const string Base64Image = "/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAFIArsDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9UKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAopGYKCTwB1NfPPxm/bs+FXwaae1uNZGv6vFkHT9HImYN6M2dq/iaAPobNcp46+LHg74Z2D3ninxLpuhwKM/6XcKrt7Kn3mPsATX5xeJv21Pjz+09q02ifCnw3c6HpjNsL6fGZZwv/TS4I2p9Bj61r+Bf+CYHjbx9qCaz8VfGrWkkp3S29uxurtu+DI/yr/49QB6/4/8A+Cp/wy8OTS2/hzTtU8USrwJkiFvCx+r84/CvHdS/4Ks+ONVkYeHvh1Z7M8edJLO35KBX1n8O/wBg/wCDPw5iiNv4Ui1i7jx/pesObhyfXB+UfgK9t0bwrovh2JY9L0my05FGAtrbpGB+QoA/OGx/4KjfEvRpEk8QfDS3+xnlmRbiA49iwIr6s/Zv/ba8CftFS/2ZaSSaH4mVdx0q+IDSDuYmHD49OvtXvupaVZaxavbX9rDe2zjDRXEYdSPoRivzF/4KBfs92P7Pnijw38Uvh2G8P+febJre1O1Le5X5kkjHYNggr0yPQ4oA/UPNLXG/Bvx0PiZ8K/CvinaEfVdOhuZFHRZCo3ge27NdlQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFNkkWNS7MFVRksxwBXy5+0N/wAFBPh/8E5LjStNnXxd4mQFTZ6fIDDC3pJIMgH1UZP0oA+n7u7hsbeSe4mjghjGWklYKqj1JNfKfx4/4KNfDn4Ux3On6BN/wmfiNMqLewb/AEaNv9ubp+Cg/hXyh9p/aO/b91LYgl8P+C1f+ENa2CgnufvTt+f4V9VfAX/gnD8O/hTJbap4hQ+M/EEY3CS+XFrE3qsXQ/Vs0AfLEviv9p79t65e30qG50DwncNtfyGNlZBO4eT70g9hnPpX0J8Gf+CXvgbwaIL7xxey+MdTX5mtxmK0U9xjO5h9SPpX2pa2sNlbpBbwxwQoAFjiUKqgdgB0qagDL8N+FdH8H6VDpmh6XaaRp8K7Y7azhWJFH0ArUxRRQAUUUUAFfCX/AAVo16Gz+EfhXRywNxfaqZVTvtjjOT9MsPzr7tr8tP2y9Vn/AGn/ANszwz8MtJcyafpMiadK8Z4V3YPcyfgoA/4BQB93/sk6PNoP7Nfw7s7hSso0iGQhuuHG8fowr1yqul6dBo+m2tjbIIra1iSCKNRgKqqAB+QFWqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoorlrX4oeFL/wAb3Xg+38Q6fL4otovOl0pZh56pjOdv059uKAOpooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoorH8WeMNF8DaHc6xr+pW+k6ZbrukubqQIo/xPsKANjIrx348/tWfD/9nuwLeItUWfVWTfDo9mRJcyeny5+Ue7Yr4/8Aj1/wUa8QfEDW38GfA/TLqaS4byF1fyC9xMTwfJj52j/abn2FWfgF/wAE2NU8VakfF/xt1Oe7vblxOdHScvNITzmeXPX/AGV/PtQB554n+O/x4/bo8QXGgeA9MutA8J79kkdo7JGqHvPccZOP4Rx7Gvo79nb/AIJreDvhqtvq/jl4/GXiIESCFlIsoG68KeXPu3HtX1r4T8HaL4F0O20fQNMtdI0y3XbHbWkYRAPw6n3PNbNAEFlZQadaxW1rDHbW8ShUiiUKqgdgBwKnoooAKKKKACiiigAooooA8++PfxUsfgx8JfEfi29cA2Ns32ePPMs7fLGg9yxH4Zr4j/4JgfC698WeKvFnxh19GmmmmktbKaQZ3zOd08gz2GQv4n0rM/4KQ/FC9+KvxY8MfBjwy7XTw3ERuoYTnfdy4CIcf3VOT6bq+/Pg38NbH4Q/DLw94S09FWHTbZY3ZRjfIeXf6liTQB2lFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQBxnxi+JWn/CH4a694s1EjyNNtmlVCceZJ0RB9WIH41+c3/BN3w7qnxa/aU8T/FDWpJLiWwjmnaZs/Pc3BK4+gQvx249K2f+Cqfx5bUtZ0j4YaVc5tbMC/1bafvTH/VRn/dXLH3I9K+nv+Cfvwbf4S/s86RJeweTrGv/APE0ugR8yq4/dKfom0/jQB9K0UUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABSZqrq2q2miafcX9/dRWVlboZJbidwiRqOpJPQV+eX7S//AAUO1LxhqjeAPgnBcXl7dyfZW1qCItLKTxtt1/8AZyPp60AfSX7TX7angz9nSxe0edNd8VyJmHR7WQFk9Glbog9jyfSvh7w/4D+N3/BQ/wAVrrHiG6k0PwRBJ8krKY7OJf7sMX/LR8fxH8T2r2H9mL/gnG/2+Pxp8ZJf7W1OZhOmiPIZBuPO64fPzn/ZHHrmvv3T9NtNJsYbOytorS0hUJHBCgREUdAAOAKAPKPgD+yz4E/Z30cW/h3TvO1SRf8ASdYvMSXMx/3v4V/2VwPrXsFFFABRRRQAUUUUAFFFFABRRRQAVwHx3+K1j8FfhXr/AIuvmXFjAfIjY/62ZuI0HqSxFd/X5i/t+/E/VPj58cPD3wU8JSG4gs7tY7lYzkS3jcHdjtGpP0y1AF7/AIJu/Ci9+KHxM8SfGrxQrXk0dzKtnLMMh7qTJkkGf7qtgf71fpZXE/Br4W6X8G/hnoPhHSUAttOt1R5OhlkPLyH3ZiTXbUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRSGuQsfi94N1Lx7ceCrXxHYXHim3jMsulxzAzIo65A7j0oA7CiiigAooooAKKKKACiiigAooooAK5H4tfEbTvhJ8Ode8W6owFppdq8+3PMj4wiD3ZiB+Nda3A64r82v+Cqnx6Wa60r4W6XP/qdt/qpU8ZI/dRn8MsfqKAPln4R6Bq37Vn7UWnjVt1zNrOptf6g3UJCp3MPYBcKPwr9yLa3js7eKCJQkUShEVRgBQMAV+e3/AASf+D4sdD8R/Ee9g/f3j/2Zp7MOViXDSsPq20f8BNfoYOgoAWiiigAooooAKKOPWo2uI1BJkRQO5IoAkoqOOZJCQjq2Ou05qSgAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigArj/il8V/DHwb8J3XiLxVqSadp0A47ySt2RF/iY9hWv4y8XaX4D8K6p4h1m6js9L023e5nmkOAFUZx9T0A7kgV+WEcPjn/gpV8dJv9Im0nwHo7cDB8qzhJ4wOjTOB/kCgB3jb4qfFz/goX46k8L+ELS40nwTDNl4dxWCOPPEly4+82OiflnrX3X+zN+x/4O/Zw0mOSygGq+JpExc61cRjzCT1WMfwL9OT3Nek/Cj4S+Gvgx4PtPDnhfTksLC3UBnwDLM2OXkbqzH/APVxXZUAJ2paKKACiiigAooooAKKKKACiiigAooqO4njtYZJZXEccalmZjgAAZJoA8c/a0+Pdv8As9/B7VNeV0OtTqbXS4G/juGGAcdwvLH6V8s/8EzfgLdalear8aPFSyXOpX8kkemPccsxckzXB9yflB92ry34ueI9X/b8/au0/wAHaJO0XgzR5WhSaPlEhVv31we25sYHttr9SfCXhnT/AAX4Z0zQdJt1tdN063S2t4l7IoAH4+vvQBrUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFACGvzR+Nf7EPxn8JfHLWPHvwnvvta6jcS3MdxDeJBd2xl++h8wgEc8EHp2r9L6KAPy3j+Ef7cFxwdY1hP97W7df/AGanf8KP/bbkzu1/VR/3H4f6PX6jUUAflz/woH9tZsf8VLqYz6+IY/8A4qj/AIZz/bRkOG8Vakvv/wAJGP6NX6jUUAflx/wzL+2XIvPi/UV9v+Emb/Gg/ss/tjSYz401AH/saJP6Gv1HooA/Lj/hkr9sFzz46vvx8Uz/AONH/DHf7XUq4bx3cAejeKLiv1HooA/Lj/hi/wDazkxu8evj/a8TXPH6Uv8AwxF+1bIcN4/X6t4luj/7LX6jUUAfkx8QP2U/2jvht4N1XxR4h+JMFrpOmQmad/8AhI7tmIHQKNnLE4AHckV8gR/2x488TW8TzXWr61qU6Qo80hklmkYhVBJOSTwPwr9Bf+Cqvx0MraT8LdLuM4K6hqqxnnP/ACyjOP8AvrH+7Xi//BNb4R/8LE+P0GuXUPmab4Yi+3EkZXzzlYh+eW/4DQB2+jf8E5/2iNFsYrTT/Gml6baLyLe31q6jVM8n5VjxV4f8E8/2i3zv+IVjj/sNXZ/9kr9QxS0Afl3/AMO6P2gpAQ/xCscf9ha6P/slL/w7c+PEg+f4h2Gf+wldH/2Wv1DooA/Lz/h2j8bpOX+Ien5/6/rk/wDstIf+CYvxjkxv+IOmkd83Vyf6V+olFAH5ef8ADrf4rycyfELTQfXzrg/0qRf+CV/xNbG/4i6cPXm4P9a/T+igD44/ZD/Yl8W/s8/EG78Ra543TWLaS1a3FhaiQK5JB3NuPbHH1r7HoooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA/Pz/AIKsfFG7t9I8LfDnTpWQ6tL9su40OPMVWCxqfUbjn8BX1N+yv8GLH4GfBjQfD9vAqX8kK3WoTAANLcOAWJPfHCj2FfDP/BQcBP20Ph49/wD8gzytPJ3fd2/am3/pX6grjAx+lADqKKKACiiigAooooAKKKKACiiigAooooAK+Kf+Cj37Tcnw68Hj4eeHbgjxN4gi23Lwn57e1Y4OMdGf7v0zX0x8cvjBpHwM+GureLdZkURWibYIScNPMR8ka+5P6Z9K/Pn9jP4R6x+1d8ctV+MvxARr3SbO786COUfu57hceXGAf4IwAcdOAPWgD6d/YD/ZmX4F/C8atq8AHi3xAFuLosvNtDj93CP/AEI+59hX1OOKQLt6dKWgAooooAKKKKACiiigAooqBL2CSd4UmjeZPvRq4LL9RQBPRSCloAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigArk/ip8RdN+FHw/1zxXqrAWemWzTFc4MjY+VB7k4H411lfmz/wAFJvjHqPxE8eaD8FPCTtdP58b6hFCcmW5c4iiPsoO4/X2oA+NvFmuan44XxX8TPEEhnv8AWL97a1LnIMjfNIV/2Y48KB2LL6V+pH/BOX4Pr8Mf2e7DUrmDy9X8SyHUpywwwjPyxL/3yN31Y18I+JPhjb+Nv2hPAvwO8NEXOmeHmjsr64j5ElxxJfTH6EMufRBX7E6Tpdvomm2mn2kYitbWFIYkUYCqowB+QoAuUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAHwL/wVY+Ftxe+F/DPxE0+NjLo0/wBkunQHKI5yjH2DjH/AhX05+yn8X7b42fBDw54gjmWS9WAWl8gOWSeMBWBHbOAfxrv/AB14L0z4ieD9Y8N6zbrc6bqls9rPGwzwwxke4PIPYgV+X/wi8ca7/wAE8/2itU8H+LfPk8Faq6l5gCUeIsRHdJ6kdGx6EdqAP1foqno+sWWv6Xa6lp1zFeWN1Es0FxCwZJEYZDA9xVygAooooAKKKKACiiigAooooAKiurmKzt5Z55VhgjUu8kjBVRRySSegAqQ1+fn/AAUR/aknuJF+DfgSSW91vUHWHVZLPJYbiAtsuOSzZG70BAoA8m+OXj7XP2+f2kNM8A+EpZP+EO0y4dY5kB8vYpxLdv7YGFz7etfpr8M/h3o3wp8EaR4V0G2FtpumwiGNR1c/xOx7sxySfU143+xT+y/bfs6/DWM38Mb+L9WVZ9SuAMmPjKwA+i5OfU5r6MoAKKKKACiiigAooooAKKKKAPL/ANpb4sSfBP4I+KPF1vF517Y24W1jIyDM7BEJ9gW3H6V+VX7GfjXx14p/a28N6ja6pe3t9qN80mrOzsyyQHJkLjpjB49OK/Ynxp4N0fx/4Z1Dw/r9jHqWkX0flXFrL911znqOQQQCCOmK4n4N/sz/AA8+A7XUvg/QY7G7uuJbuV2lmK/3QzEkL7CgD1EfrS0UUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFYnh/wAbaB4qur+20bWrHVLixk8q6jtJ1kaBv7rAHg9etAG3RRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRSMwVSSdoHc9KAPNP2ivjPYfAX4T634tvCrz28Rjs7djgz3DcIn58n2Br85v2UtGuLXS/iL+0x42b7TNpSznTDOOLi/kH3wD2UsFHufar/7V/xG1n9sn9pLR/hX4NkMmg6bdG2WRTlHlB/fXDf7KgED6H1rov8AgoRqVh8J/hr8PPgN4RB8pVS6ukj+/Lg7ItwHVncs34D1oA1P+CV/w3n8QeJvGPxU1VWmnkdrK2mkGd0kjeZM+fXoM+5r9IK8t/Zl+E8HwV+CfhbwuiqLqG1Wa8cD79xJ88h/AkgeyivUqACiiigAooooAKKK4L42/GPQvgT8PdR8WeIHc2lsAsdvD/rJ5D92Nfc/pjNAHe0V8DfBr/gqF/wsb4q6Z4Z1Xwcml6Zqtytra3VvdGSSJ2OFMgIAI6dMYz3r75oAKKKKACiiigAooooAKKKKACiub8efEXw18MtDfV/FOt2eiaepx515KEDH0UfxH2Aq94V8VaT428P2OuaHfw6npV7H5tvd27bkkXOMg/UEfhQBrUUUe3egAooooAKKKKACiiigAooooAK8V/ak/Zl0T9pbwI2l32yy1u0DSaZqezLQSEfdPqjYGR7e1e1UhoA/LP8AZs/aW8Xfsd/EGX4V/Fa3mj8NJMUjmkyxsiTxJGf44T1x26juK/T/AEXWLDXtJtdR027hvrC6jEsFxA4ZHU8ggivIv2nP2W/DH7SnhE2WpxrZa7bAnT9YjQeZC2Put/eQ9xXwb8Kfjh8Rv+Cf/wAQH8BeP9PuNR8HSTbkVWLKqE8zWzHgjuU9fTrQB+rtFc54D+IGgfEzwvZ+IPDeow6ppd0m6OaFs4/2WHUMO4PNdHQAUUUUAFFFFABRRXlv7RXx+0H9nf4c3fiTV5Fkuj+6sLANiS6mI4UD0HUnsKAPO/22P2sLL9nfwLJZaZLHceNtVjaPT7bOfIU8Gdx6DsO5xXin/BPT9lW9N0/xi8fwvca3qDmbSobsZkUNktcvn+Js/L6DnvXmv7LXwN8Q/tn/ABcv/i58Smln8OwXQdIW4ju5EOVgT0iQYyB16dzX6jwW8dtCkMMaxRIoRUUYCgDAAHYUASUUUUAFFFFABRRRQAUUU2SRYlLOwRRyWY4AoAdRmvG/il+158KPhDHIuueLbOS9T/lw09vtM+fQqmdv/AiK+Pvid/wVmurjz7fwB4PEarnbf6yxYgf3vLTj82oA+pvjV+2h4I+CfxH0XwVqcV7qOr6g0YlWwVXFosjbULjOcn0HNe+o24A9jyK/Lv8AYI+F+oftIfHDXvjD45P9pDTrrz0Mi/u5r1h8vHTbGuCAOh21+otAC0UUUAFFJury748ftFeEf2f/AAfc614gvo3uQNttpsLg3FzJ2VV6gepPAoA9B17xFpfhfSbjVNX1C30zT7dd8tzdSCNEHuTXy/df8FMfg1b+MI9Dju9TuLdphCdWjtB9lUk43ZLbivvtr5DeT4z/APBR7x0VjDaF4HtJfu5ZbK1XPf8A56y4/wAivoab/glD4DePw6IPEeqQyWZzqUhAY33IPy9o/TIzx7igD7jt547qCOaJxJFIoZWU5BBGQRUlQWNnFptjb2kC7III1iRfRVGAPyFT0AFFFFABRRRQAUUUUAeS/tU/FhPgz8CfFXiQSiO+S1a2sgTybiQbUx7gnd+FfMX/AASm+GN1YeEPFXxCvzIZtcuRZwbyfnSMku/4u5GfY1zP/BVL4i3Gv+IfBfwu0otNcySLfXEMZyWkc+XChH/fR/EV9x/A/wCHdv8ACX4TeF/CkCgf2bYxxylR96UjLt9SxNAHdUVyXxE+LHhL4T6O+qeLNds9EtFHym4kG+T2RB8zH2Ar5R8Sf8FXPhlpeoPb6Xoeu6zCpx9qWNIUb6Bmz+YoA+26K+bPg3/wUA+E3xgvYdNj1OXw3q8xAjtNaURByeyyAlM+2a+kUcSKGU7lIyGB60AOoopM0AFeB/tRftgeE/2adG2XRGseJ7hM2mjQOAx9HkP8CZ/E9hWp+1V+0lpP7N/w3udXuGjuddugYNM08t800pH3iOoRepPtjuK+KP2P/wBlnVf2nfFl38X/AIrvcahpc9y0ttbXBI+3yBup9IV6ADg4xQBn6X8W/wBr79pKSTWfCEF9pGisSYfsMcdrbkegkl5f65Ndx+zb+2J8T/A/xqtfhX8aYZZ7i9lW2iuruNUuLeVv9WSV4dG6Z9+tfofZafbaXZw2lpBHbWsKBIoYUCoigYAAHQfSvgT4jfs7/EP4sft+WPiHUNHaz8HaVJb3EOrLjynghAIUEHl2bIx2oA/QQUUgIo/CgBa+Qf8AgoR+1MPg74FPhHw7dgeM9dQxZjOXtLZuGf2Zui/UmvUP2nv2pvDP7N/g+W6vp4r3xFcIRp+jo+ZJW/vMB91B3J+gr40/Y7/Z81/9pz4oXfxq+J6yXelfavtFpBcg7byZT8uAf+WUeBgdCQBQB7b/AME9f2Y0+EHgGTx74nh8rxVrkJlAnHzWdr1AOejN94/gK+dPhlG37Xn7fl/4klBufDWjXDXgZuUFvAdsI/4E2D+Jr7P/AG7fiuPhJ+zn4hktZfs+p6sn9lWe3gqZAQxGPRN1fJv7Ott/wzl+wv47+Jcq+Rrvig/ZLB24YIcxx4/EyN+AoA9G+HP7W3jr4wftxS+FvCt1HN8PLJp7ea2MalGhiUh7jfjIJfG3nuBX3mK+C/8AglP8KP7J8Da/8QLyL/S9auDaW0jjnyYz8xH1c/8AjtfetABRRRQAUUUUAFfFX/BVXw/qerfAnSb6zR5bHT9UWS8VeiqylVY+wJx+NfZWqapaaLp9xfX9zHZ2duhlmnmYKiKBkkk9q/Lv9pr9pHxP+2R8Qrb4T/C+2mm8NtchHmTK/bmB5lkP8ES4J59M+goA8s/YN8EH4pftN+GppoooLPQ4hfShcKD5SgIMdyWIJ/Gv2h3DpX5l+Lf+CXfjTwPpuna38OvGX2nxFaxK08DObVzMBz5MqnpnoGx9aqeCP28vjD+z1r0Hhr4yeG7rVLWM7GnuovJvAoONyyD5JR/P1oA/UCkZgoJJwB3rkvhf8VPDnxi8H2fibwvfpqGmXI7cPE46o69VYehr4h/4KE/tr3Xhu4u/hj4GvPKvWTZrGqwt80QP/LCMjoSPvHtnFAHe/tT/APBRLQvhXPceGfASQeKPFgYxSTqd1raN0wcf6xwf4Rx6mvnL9m39tb4x3n7RXh3w94q1SbWLHW9RisrrTJ4EX7OJSBvTAyu3IbHoDmvmT4d6vdWdxBZ+D9El1vxvfny471ofOe33cEQR4ID/APTQ8jnGOtfpD+xX+wvN8JdRg+IHjyf7d40kVnt7PdvWy3DlmY/ekOTnsMmgD7WpM1g+MPHvh34f6TJqfiPWrLRrGMZM15MEB9hnkn2FfEfxq/4KmaPp80ukfC/RpPEN+xMaaleoywbumUjHzOfrigD7k8TeLdG8F6TNqmu6na6Tp8KlpLi8lEaKPqa+HPj1/wAFPNNsLiTw/wDCbTX8RatIxiGq3EZ8kN0HlR/ekP1wPrXk3hv9mX4/ftmatD4h+JGs3fh/w+7b411AFMJ/0xthjHHQtivuD4C/sb/Dj4AQJPpGlrqeuYAfWNSUST/8A7IP90UAfkj8d5Piv4g8U6XcfE2XUX1nVoxPZ2d8+GSNmwuIh9wE9BgV+y37OPw7T4S/A/wb4W5EljYqZs95ZCZJD/307V+evxMaH4xf8FMIdO1CZV0nSNQjSVpnCxpDawebISTwB8rV6d+1B/wUUka/n8C/BqN9T1aZvsra3DEZAHPG22XB3N/tYx6ZoA97/am/bT8Jfs6aXNYxTR634xkT/R9JhfPlk9GmI+6vt1P6186/sfftF/H74pfHnTF8TWd3c+C9Vgmnm32Hk2tvEEYo8b7R/GFXqc5NXv2XP+Cd899qEPjz4zSS6nq9w4uo9DuHMnzE533LE/Mf9jp6+lfoDa2UFnDFDbxJBDEoSOONQqqoGAoA6AUATDpS0nTiq2o6rZ6PaPdX13DZ20Yy008gRF+pPFAFqiqGi69pviTT4b/Sb+21Kxmz5dzaSrJG2ODhgcHmr9ABRRRQAUUUUAFFFFABXBfGT4I+E/jp4TuNB8VabHeQMp8m5HE1s+MB427EdfQ9wa72igD8m9e8H/F3/gnD48/trRZ5Nf8AAV3MFduTbTr2SZR/q5MdGH/1q+/v2df2qfBn7SGhfaNCultNZhQNd6NcOPPhPcgfxL/tD9K9W17w/pnirSLnS9XsbfUtOuUMc1tcxh0dT1BBr85/2iP2C/E3we1//hYvwNu7uIWjmd9JgkP2m2HUmI/xp/snn60AfpPz+FLXw5+yp/wUU03xpJB4R+KJj8PeKUfyE1F18u3uXzjDg/6t8+vBPp0r7ghmS4jWSNldGGVZTkEeoNAD6KKKAEPTjrX5V2vw5+If7ev7S2pXfiqxvtA8G6FctDNHOjItrErELAmesr7Tkj3PYV+qtMSFIyxVFUsckqMZPrQBl+E/C+leC/DthoeiWUenaXYxLDBbwrhVUD+fqe+a16KKACiiigAorz34k/H/AOH3wjt2k8VeKtO0twMi3aUPM30jXLH8q+Pvil/wVa0yKV9P+G3ha51q6Y7Y73VAY4yfVYlyzfjigD9Ai23Oa8f+KX7W3wr+D/mR+IPFtl9uQc2Fk/2i4+mxc4/HFfBf9j/tc/tY4N1JfeHfD9x2lP8AZtrtP+yPncfga9e+Fv8AwSl8M6a0d54/8S3niC8J3PaaePIhz3y5yzfhigDn/iJ/wVaudSuH0v4aeCpbq6kOyG61TLsx7FYU5J+p/CuIj+FX7W37U0gn8Raje+G9DuOfKvZTYQhT6Qp8zD6iv0Q+HPwH8AfCe3SLwr4U03SXUYNxHCGmb6ucsfzrvvagD4S+Fv8AwSm8H6HJHeeOtfvfE9yDlrW1/wBGgJ9zy7fmKwv+CinhnwR8CfgHpHhXwd4c03Qpte1BVkkt4AJWghG9gXPzHLGPqfWv0K6V+a//AAVqMreLvhmk+4aZ5Vxubnbu8xN3/juKAPrH9iL4ap8Mf2a/B9iYhHe31sNTu+MEyTfPg/RSq/8AAa93rk/B/iTQYfAWiXUGq2S6YunwmOfz0CbBGuDnOK8Y+L37f/wl+FMM8UetjxRqqghbHRSJfm9GkztX8/woA+kia8e+NX7WXw2+A8UkfiPX4X1RVymk2RE10x7AqPu/8CxXwprn7U37RP7W99No3w20C58P6HIxUyaaCGCn/npdMABx/dxXpnwX/wCCXFmsya38Wdem1zUpG82TTLGVvL3dxJKfmf8ADFAHjXx0/wCCmPj/AOIFvdW3gaybwboKt5bXyL5l02c4BkxtjJx0HPvXP/sm/sjeJ/2qfEn/AAl3jG9vf+ERjmzcX11Izz37jqkZbJx6t0HbmvuT9p79jTSviT8D4PCHgGy07wzd6bcrd2cEcflxTMFKlXYc5IP3jnmvkvw/+y9+17p2i23hiw1a50TQ7RfKhjh1mOKFVz/0zO7v3FAH6X6JpPhT4T+GLXSbBdP8N6LZpsihLrCigdySeT7muF8U/tefBzwa0ial8QdG81PvRW0/nuP+Apk18WaP/wAEu/iR4ulE/jf4j28TMcyLE014/wCblRXqnhf/AIJP/DfTdja14h1zW5B1CFLdD+ABP60AdN4i/wCCoHwZ0fetlNq+suOn2WyKqfxcj+VcTc/8FcPAkbYh8Ga9IvZmkhXP4bq9o8O/sA/A3w6qbfBcWoMvR7+4kmP15bFdpD+yv8IbeERp8OvD+3GPmskJ/MjNAHhngn/gqT8JvE14ltq1vq3hlnOBNeQrLEvuxQkgfhX1l4X8VaR400W21fQtRt9V0y5XfFdWsgdHH1FeBfEj/gn78GvH2mTxQeGo/Dd8yny73SGMZRvUpnaR7EV8YfDHxF4y/YA/aXg8E67qEl54K1SdFfk+TNA7bUuEU/ddT1A9CPSgD9YaKxvE3jHRPBmiy6trurWmladGu5rm6lWNMfUnn8K+JPjh/wAFRNF0iZ9H+F2kyeJ9UY+WNRukZbcN22IPmkP5CgD7m1nXNP8ADumz6hql7Bp1jApaS5upBHGgHcseBXyH8Zv+Cnfw58BNcWPhSGbxpqiZUSW58u0VveQ8t/wEfjXzvov7OP7Rn7YupQ6t8QtYuvD/AIclbeF1DMahT/zytVx+bY+pruP2if2XfhZ+yN+zjq+pW9ifEHi/Ugum2epaoQ7LJJ9944/urhQx7kHHNAHm37I6at+1p+2dcfEHxLBG0WmD+1ZoYwTFGVASCNc9gcH/AICa+tf2uP27NB+ANvceH9A8nXPHDrgWwbMNlkcNKR3/ANnr61+eHwL/AGiNf+Evw91Pwn8OdMmfxt4mugs+qRx+ZLHEBtSKFR1Y5Y7j0z7V9kfsjf8ABP8AbSL6H4gfFtTqviWd/tMGk3LeYsLHnzJyfvvk9OgoA8p+Ef7GfxL/AGstYi8e/F3Xr7TdJuj5sccw/wBKnj6gRxniJPTj8O9fcHg/9jL4NeCtLSztPAml3mF2tcalF9plf3LPn9MV7TGoVFUDCgYC46U6gD42/aE/4Jt+BfiFps1/4Fgi8G+JIwWjjhJ+yTnqFZP4Pqv5V84/DX9qr4tfsU+If+EI+J+jXes6DGcQLcufMROm63mPDp7H9K/VesHxh4E8O+PtNbT/ABHotjrdm3/LG9gWQD3GRx+FAHy5a/8ABUr4NS2ayzLr1tPjm3NiGIPpkNivMviN/wAFW4NQhfTfhr4Pu7zVJ/3cN1qfIDHgbYkJLH2JH419F3H7A/wLuLwznwJaxknPlxzyqn5bq9F8B/AX4efDJlfwz4P0nSZhwLiG3Uy/99nLfrQB+Neg61efH74+WMnxg8WjTLXzy2o3eqyeSsMaHLQop4UnG0KB3r9F/En/AAUQ+B/wr0K30nw1cz6/HZQrBb2ej25WJFUYA3thccds1c+LX/BOL4Z/Fjxte+J5LrVdDvL+UzXcOnunlSSHq4DKdpPf+VX/AAN/wTl+C3guaOebQ7jxFcJ0bWLkyL1z9xcKfyoA+YPEX/BQb41fHLUJNH+FHg19NR22rNaW7XlyB6lyNi/lVa1/ZK/ax+J+b3xH4vudKaT5vLv9ZZWGf9iLIFfpn4d8K6N4T0+Ox0XS7PSrOMYWCzhWJQPoorVoA/K64+Bv7X3wDn+36BrOpa9bR8sunX321SPeGTk/gKsz/tg/tXeJLX/hHrHwZcWurEeW11b6FIJvTI3ZUH3xX6kYooA/Nv4Gf8E9vGXxH8Xx+NvjrqVxKWcTNpU0/m3Nyeu2Vs4Rf9kc/Sv0Z0vSrPRdOtrCwto7OytkWOK3hUKqIAAAB2HFW6yfFXiG08I+GdV1u+kWGz0+1kupXY4AVFLH+VAH5tf8FEPFl78av2jPB3wg0NzL9jkihlVTx9quCM5/3Y8Z+prV/wCCnUkPw5+Ffwq+GmkZi02EPIyqMbhBGsa5HuXY/UVifsBeHbv46ftTeL/irqyNLDYSS3McjDjz5iQgH+6m79K+kP2//wBlnWf2ivCOiX3hbypPEmhPKY7WV9guIZAu5Qx4DAopGfegD2n9nLwfD4B+BXgbQ4UCfZtJtzIFGMyOgdz+LMarfGD9pb4d/A6ykl8U+Ira3uwMpp0DCW6f0AjXn8TgV8AQ/D/9tTxXp9r4dkuNY0zTreNbdS13DaoEUBRl1O4jHpmvQ/hP/wAEsPtN5HrHxW8Uy6rdu2+TT9NdiGPo8zfMfwA+tAHP+NP+CknxH+K2vN4f+DfgySN3JWOZ7dru7cf3ti/Kg+ua5rUP2jv2s/2fZrTxH4+sbu80CWULJFqdnF5Jz/BviAMbY6ZP4V+kfw3+EvhD4TaOum+E9As9GtQMMbeMb5PdnPzMfqa1/FnhTSvHHh2/0LW7KK/0u+iaGe3mXKspH6H0PagDif2ffj94e/aG8A2viPQpFjm/1d5p7MPNtZccow9O4PcVt/FD4weEfg34fk1jxbrdtpNqATGkjjzJiP4UTqx9hX59eL/+Cf8A8ZPhD421C/8Agz4jcaNeMdgi1A2lxGp/gkB+V8eufwq/4D/4JqeP/iNr6az8ZPGkjoCC1vBdNd3Mg7qZG+VB9M0Acd8Vfjn8S/2/vHX/AAgvw702607wfE+6Vd20MgP+uuXHAHon06mvun9l39lXwz+zX4RW2skXUPEV0oOoavIvzyt/cT+6g7Dv1Nd/8LfhD4T+DfhuPQ/CWj2+lWK8uYxmSVv7zueWP1rsqACuH+Lnwc8L/GrwfeeHvE2nRXlvMhEUxUCW3fHDo3UEf/rruKz/ABBrVr4b0PUNVvZVhtLKB7iV2OAqqpYn8hQB+XX7E+s+I/gz8eviZ8MrCd7p/sV+lvAx+Vrq3U+W+OxI498+1fLvw78NaD8QPH16PiN41PhCJpGlvL26tZJ55ZCx3qAoOGzn73FfXn/BPjT7j4rftXeO/iO8bfZIRcSiTHG+d8Kv12g19c/FD9hX4Q/FjXp9a1Xw/JZapO2+a402doPNYnlmUfKT74oA+cvh/wDtOfsu/st6L5HgWx1DxHq7Jtl1JLQ+fOcc5lk27QfQDFcj4q/4KNfFn4yX76F8JvBj6fLKdiTQQte3fPQ9Ni/ka+q/Cv8AwT0+B3haZJh4UbVJVOQdSupJl/75zivefDPg3QfBdgtloOj2Oj2i8CGygWJf/HQKAPzX8J/8E+PjF8ctUj1v4ueLZtLjc7mjuZzdXWD2C52J/nivtf4Lfsg/DL4GwwvoegR3eqquG1XUgJ7hj6gnhf8AgIFe1VHcTx2sLzSyLFFGCzO5CqoHUk9qAH7QBjFedfGz4/eDPgH4cOreLdUjtTID9msUIa4uWHaNOp+vQdzXzT+1B/wUe0HwB9p8N/DfyvE/ickxNfAb7S2bpxj/AFjA9hx714x8Gf2KfiL+094oHj340apf2OmXBEi29wSLu5XOQqrjESdO2fbvQB8jfFb4gRfFD4z+JPFVp52gWmu6hJKd7lmhjfAbcV5IwckD1xzX6Sfsi+C/2d/gn4btdatPHXh3XvE86Bp9YvbuNHiJH3I42OYwOnr617P4v/Yx+EvjDwDZeEZvCtvY6fY/8es9j+6uImxy3mdWJ77sg1896h/wSO8GTXTPZ+ONZtbcnIiktY5CB6bsr/KgD6N179sj4K+G1Y3XxF0R2Ucx2s/nv/3ymTXkXjL/AIKkfCPw+rro8WreI5x0+z2/kof+BORx+FZOg/8ABKH4Y6eVbU9e1/VCDyqyRwqfwCk/rXrPhH9g74I+DmjeDwVb6hNH0k1KV7g/kxx+lAHyP4h/4KUfFf4rXj6T8L/Aq2ckh2LJHC9/cDPQ8AKv4isux/Y7/aT/AGjLxL34jeJJ9GsnO4pq10WZQf7tvHwPxxX6daD4X0bwvZra6PpVnpdsowIrOBYlH4KBWpQB5d+zj8DLP9nj4Y2XhCz1KfVhFI88t1OAu+Rzk7VH3R6CvUaKKACiiigAooooAKKKKACiiigAoNFFAHyp+1X+wX4X+Pa3Ou6H5XhrxptyLuJMQ3TDoJVHftvHP1r5Y+EP7V/xL/Yy8VL8Pvixpl7qPh2BtsZlO6aCPP34JOkkf+yT9MdK/VKvPfjR8CfCPx48LS6J4r01blMHyLuPCz2zno8b9j7dD3FAG98PviJ4e+KHhe01/wAM6pBqumXKhlmhbJU/3WHVWHcHmukzX5K+JfAnxd/4JzePl1/Q7qbWvA1xNsaUAm1uFzkRzoOEkx0b24Pav0F/Zw/ai8I/tI+GvtuiT/ZNWt1H27SLhh51ufUf3kz0YfjQB7LRSbhXivxk/bE+F3wR82DW/EcN1qyZxpem4uLjPoQDhf8AgRFAHtdY/ijxhofgvTX1DXtXs9HskBLT3s6xLx9TzX5yeNP+CjnxM+MeqP4e+Dng6a0kmOxLlYTeXeOmcD5E/HOKpeGf+CfPxo+OWpJrPxX8YS6Wkp3NHdXBurnHcBAdiH8ePTtQB7f8YP8AgqD8O/BMk1l4RtbnxnqKnaJY/wBzaA/75GW/AfjXz7N8cP2qP2tJHtPCGmXfh7QZztMmmxm0hCn+9cP8x/A19k/CH9gv4S/CSOCaPQl8Q6tHg/2hrWJ2z6qmNi/gK+hbe1hs4UhgiSGFBhY41CqB7AUAfnd8N/8AglNcajcLqXxN8ZzXlzId8tpphLsxPUNM/JP0H419g/Cv9l/4Z/BuKP8A4RnwpY292ox9vuE864Pv5jZI/DFeq0UAIOBjGKWiigAooooAK8f/AGmP2a/D/wC0x4Jj0PWJZLG8tJTPY6jAoL27kYIwfvKRjI9hXsFFAH5nQ/8ABJvxa1yLaX4kWg0pW+Xbbylsf7m7AP417j8Kf+CY/wALvAdxDea+154zvYyGC3xEduD/ANc1+99GJFfYFHtQBQ0XQdO8N6dDp+lWFvp1jCu2O3tYljjUegAFX6KOlABRRSMwUEk4HvQAtFZV94s0PTc/a9Z0+1I/57XUafzNcxqnx6+G+i5+3eOvD9tjrv1GL/4qgDvKK8Y1H9sv4J6XkS/EjQZCOoguRKf/AB3NeBfHT/gqL4N8J28tl8PLY+LdUZflvZg0VpET0PIDOfYYHvQB9o+IvE2k+EtJm1PWtStdL0+EbpLi7lWNF/EmvyY/4KHftGeC/jr4w8OR+C2nvpdCEsUmp+Xsjm3FSBHnkgEdT614v4s+Nmv/ALQHjBbr4neNb610vfuKW9uZY4Rn7sUIIXPuTWf4o1D4bab8TNBfwtHqs/g+xNu15PfKourpg+6VgoO1c9AvtzQB9M+B/wBkn46ftbXNjrfxI1y80Lw9GiLB/aWfMMYAA8q3GAuR3bFfc/wL/Y3+G3wFjSfR9HXUdaxh9X1ICWcnuVyMJ/wEfjXgM3/BWjwBaxiO08G69IqDaoZ4kAA7feNY93/wV20Rc/Zfh9fyenm3yL/JTQB+hHbjivE/2ov2YNJ/af8ADGk6Rqmq3ejHTbv7VFPaqrZypVlKnjoetfJF1/wV6mwfs3w4RfTztTJ/lGKz5P8AgrN4uuv+PH4cWDA9N08z/wAgKAPsj4D/ALIvw7/Z8j8/w9pZutZZdsmsX5ElwfZTjCD2UCva6/MV/wDgqF8W7zi1+GWm47EW92//ALNULf8ABRb4/wB9xa/Di3XPTbpN039aAP1Aor8vf+G4v2o73m18BKmem3QZj/M0f8NaftgXv+p8ETAf7HhuT+poA/UKivy9/wCGhP2073/VeDtUXP8Azz8OH+opP+FxftvTdPC+uR/9y+o/mtAH6h0V+Xv/AAsr9uKbpoWtp/3Boh/NaZ/wm37c0jYGm64v/cLtx/7LQB+otFfl3/wmP7c//Phrn/gttv8A4igeMP25/wDoH65/4Lbb/wCJoA/USivy9Xx5+3LH/wAwrW3x/wBQqA/+y0v/AAs79uGHroGsv/3Boj/JaAP1Bor8vf8AhdX7bdr9/wAJ61IB6+Hgf5LTv+GmP2zNP/13gq8YD/nr4bf+lAH6gV8df8FPfiw3gf4Ex+GrOby9Q8T3Itm2nkW6YeT/AL6+VfxNeBH9tL9q6wybrwHux13eHpl/ka+bfjd8efHv7Rnj7TLrxNpaz6no6m3XSbG2dQNrkuGQZYHjB+lAH6g/8E//AITr8K/2cdDM8Hl6prhOq3ZI+b5wBGp9ggX8SfWvpOvzA0z/AIKdfE3w5Y29ndfC/Tobe3jWJFWG5iwqjAHJ9K1bX/grpq0DBb74b25PcRXzp/NTQB+lVFfnpp//AAV40aQj7d8Pb2H18i/R/wCaiuo07/grL8N7kr9r8M+ILQ9yBFIP0agD7jor5J0f/gp98E9SwLi71jTm7/aLAkD/AL5JrvtB/bn+B3iEqIfiBp1qzfw3we3I/wC+1FAHvFFcv4c+KXg7xfGr6J4o0jVVb7v2W9jcn8Ac104YNyDkUALRR70UAFfFX/BTv43SeBvhRa+B9Ln2at4ofZPsPzJaKQWH1dsL9N1fahYKMk4HXmvys01X/ba/b8mmbM/hDQZy/wA3KfZLZgq/9/ZMH6P7UAfZP7B/wRT4K/APSY7mHy9d1vGp6gzD5gXH7uP6KmPxLetfRdNjjWGNURQqKMBR0AFOoAKKKKAPLPjp+0l4H/Z70M3vijVFS8kUtbaXAQ9zcY/up2GeMnivz08XfHH42/t7eIJPC3gjS59C8IeZiaO3kKRBM8G5n7/7i/ka+zPjh+wx4N+PfxYsPGviHUdRUQ26W9xpkDgRXAQkr833l64IHWvdvB3gnQfh/olvo/h3SbXR9NgUKlvaRhF+p9T7nmgD5z/Zm/YD8GfAr7LrOrhfFPi5AG+2XMY8i3b/AKZIe/8AtHn6V9TilooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKxPFfjXQvAuky6p4h1a00bT4hlri8lEa8emep9hzXxF8bP+Cpei6XcS6P8ADHRZPEd+T5a6leIyW+7sUjHzP+OKAPtrxtb+Hr7wvqNv4qFi2gyxFbpdQKiEp33FuK/Gz43an4S+APx0i1z4E+NZriKJzLst9xS2bPMQc8SofTn0Oa9b0f8AZ7/aO/bO1CLVvHerXXh7w258xBqRaKMKef3VsvU+7AfWvrT4Lf8ABPP4WfCbyLu+07/hL9ZQAm61dQ0Qb/Zi+6PxzQB8R2P7Qn7QX7aHidPCGha5a6OHi3SWtjKLKMoOGZnyXb1IGevSvpL4Pf8ABLHwpobRaj8RNZufFWpH5ns7YmK2z6M333/SvOv2yv2QdT+CWvL8YPhK0+mwWk/2q8srPhrF8582PH/LPruU9Poa+pv2M/2sLD9pLwOUvGitPGGmIqahZqceYOgmQf3SevoaAPaPBPw58M/DnS10/wAM6HZaLaKMeXZwhM/U9SfrXR0gpaACiiigAooooAKKKKAA8Vj6x4w0Lw9EZdU1nT9OjHVrq6SMf+PGretWLanpF7ZpPJavcQvEs8Zw0ZYEbh7jOa/Opv8AglD4j1zWrq5134nJcQySswk+zSTTOpJI3F3AB/OgD6/8R/tg/BvwsWW++IOjtIvWO2m85v8AxzNeaa//AMFNPglo24W+o6pq7Dp9isGwfxcrXFeG/wDgk58OtPVW1jxJrurMOqxmOBf0Br07w/8A8E7vgboO1m8KPqUg6tf3ksgP1G7H6UAeM+IP+CuHhS3LLovgfVr4/wAL3VxHED+ADGuG1H/gqz481iQxeH/hrZxsfuebLNcE+nCqtfdnh/8AZv8AhZ4WVRpngDw/b7ehawjkP5sDXc6f4f0vSYxHY6baWUf923gSMfkBQB+ZR/bM/au8Yc6L4HktFf7rW3h+Vh+BkzR/wkX7cXjD/V2msaard1tre2HP1HFfqIoCjAGBR+tAH5d/8M9/tmeLOdQ8UX9ju6+drgjH5Rk09f8Agnd+0D4kYHXPiFax7uu/VLmc/wAhX6gk14l8fv2uvAH7Pmny/wBt6kt/re39zotiwkuHP+0P4B7tigD49t/+CTviW4QvrfxNtNg5YpayPge5ZhXz78cvgl8IPgtHPp9n8SL7xv4nTK/Y9Ks40t4m/wCmk28/kATXqXiD44fHz9urWpfD/gvTp9B8KO+yaOydo4FTuZ5+N3+6PwBr6X/Z8/4Jr+CPhlJbav4xkXxpr6YcRzpizhfrxGfv/VvyoA+AvgL+xj8R/j5cQT6dpbaP4fZvn1jUVKRbe+wdXP0496+/fB//AAS1+Euj6RbRa7Lq2v6iq/vrn7UbdHbvtReg/E19h21rDZ26QW8SQwRjakcahVUDsAOg9qLm6is7eWeeRYoIlLvIxwFUDJJ9BigD4O/ac/Zj+AH7N/we1bxF/wAIr9o1Z0NrpkF1fSv5lywIU43cheWPsK4D/gnR+yDoPxA8Nar478e6HDqum3TfZdKs7tTtwpzJLjPTOFH0Ncr8ZvFus/t//tRaZ4L8NPJH4O0mVoo7hclFhDfvrpvrjC/h61+ofgnwhpvgHwppXh3SLdbbTdNtktoI1HRVGMn3PUmgDhbP9lT4Q2GPJ+Hegcf89LNX/nmty1+BPw4scfZ/Avh+HH9zTYR/7LXdUUAc5a/DfwpY4+z+GtJgx02WUY/pWlF4b0mH/V6XZJ/u26D+laNFAFePT7SL7ltCv+7GBU6qFGFGKWigAooooAO1FFFACYpaKKACiiigAooooAKKKKAOM+MXj63+F/wv8S+KbllVdMspJk3fxSYwi/ixAr4L/wCCWXw/uPFHjLxt8T9VVp5yWs4J5BnMsreZM2fXGB+Ndv8A8FWPis2g/Dvw/wCA7OXF1rtz9quVU8+REeAfq5H/AHwa+h/2PfhOvwd/Z98K6JJF5eoTW4v73jB86X5yD9AQv4UAevyaXZzj95aQSf78an+lULrwZoF8pFxomnTD/ppaRn+lbNFAHC6j8Cfh1q+ftvgfQLknqZNOiJ/9BrltS/Y7+DGrBhcfDvRfm/55Q+X/AOgkV7HRQB806v8A8E6vgXq27HhWWyJ6fZL6VMf+PVwevf8ABKf4UairHTtV8QaU/wDDtuElUfgy5P519pUUAfnD4i/4JJXdizTeFfiOUlHKLfWRjP03I/8ASuWP7Kn7Wfwe+fwr4qn1S2jOVTT9WZhx/wBM5cDNfqPRgUAfltb/ALbn7SnwNuEh+IXhFtSs0OGbU9PaBj9Jo/l/MGvpb4I/8FIPhp8U5rbTdaaXwZrcxCCPUGBtnY8YWUcDn+8BX1XfafbanbPb3dvFdW8g2vFMgdWHoQetfHv7Vn7APgLxp4T1vxJ4VsIvCviWztpLtVs1221yUUsVePoCcY3D15oA+gP2hvGo8F/Anxn4gtZ13QaVM0EqNkbmXapBHuRXyX/wSX8FRweDfGXi6WPN1fXq2SyEc7EXcfzLfpXlHwL+JmvfEr9hP4yeEtQuZr4+GoLd7SWQlmW3kZm8vPopibHsa+if+CVupW1z+zteWkTAz22rzCZe/wAwUr+lAH2ZRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFMkkSOMu7KqKMlmOAB65r5A/aS/4KMeD/AITm60XweI/F/ihcx5hkzZ27/wC04++Qf4V/OgD6r8UeLNH8E6Pcatr2p2ukabAN0l1eSiNFH1P8q+Fvjh/wVEsoLiXQfhNo769qMjeVHqt3G3lbumY4vvOfrj6V5J4X+APx6/bi1yHxB4+1W60Dwuzbo3vEMaBD/wA8LfjPH8R/M193/Az9kH4cfAW3hk0TRkvNZVQH1jUAJbhj3IJ4Qey0AfDvhP8AY3+Ov7VmrxeJPitr15oWmzEOF1HJn2HnEduMLGMdMgfSvuD4I/sd/DT4FW0baLoUd9q6j59X1ICa4J9VJGE/4CBXtopaAEGMdOKWiigCK6tYby1lt7iJJ7eRSkkcihlZSMEEHqMV+Uf7Q3w31n9hP9ozR/iF4OSSLwrqNw0kMcZPlqCczWrexByue30r9Ya8i/as+Edt8avgb4k8PSwrJdrAbuxYjmO4jBZCPryPoxoA7j4b+PNL+J/gbRfFOizCfTdUtluImB5XI5U+6nII7EGulr4C/wCCUnxNnuvC/in4e30p83SZ/tlrE/VEc7ZAP+BjP419+0AFFFFABRRRQAUUUUAFFFFABRRRQAUUVBeXlvp9rLc3U0dvbxLveaZwqIo6kk8AUAT1yPxM+K3hX4Q+Hpda8Wa1baPYoPlMzjfIf7qJ1ZvYV8l/tIf8FKNB8Gmfw98NIU8VeIi3lf2hgtaQt0+XHMrfTj3rxf4b/sb/ABc/ay8Qw+Mvi/rV9pGkSkOsd0P9JkTrtih4ES47kfhQBp/F79v74gfHnWj4J+COiX9mtyfL+2wx776Zc4yo6RL75z7iup+An/BMua81GHxP8Y9Vk1O+kbzm0aGcvuY8/vpTyxz2X86+zfhD8BvBPwN0Uad4R0SHTwwAlumG+eY+ryHk/wAq9BoAyvDPhXR/BujwaVoWmWuk6dAu2O1tIhGij6DvWrRRQAV+f3/BQ79q64WRvg54Ene41vUHW31aa15dQ3AtlI/iY43Y7cd69E/bk/bQtPgjoc3hLwpcpdePL5NuY8MNPjbje3+2f4R+Ppnhf2Av2P7jSWX4sfEO2kuPEt8xn021vsl4A3JnkB58xs8Z6Z9aAPZf2I/2Wrf9nT4dibUo0l8YawqzajNjPkjqsCn0Xv6mvpKiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiuE+OvxEi+FPwh8WeKpGAbTbCSWFWON0pG2NfxYrQB+cvxMkb9qb/AIKI2OhRH7To2j3iWrY5UQ2x3yn6Fsj8a/VOONYo1RRhVAAHoPSvzm/4JS/DuXV9U8bfE3VFaa6lk/s+2mkHLO58yd/ryo/E1+jdABRRRQAUUUUAFFFFABRRXO+N/iF4b+G+iy6r4m1qz0WwjHMt3KEyfRR1J9hQB0Jr5B/b+/au0n4U/D/VfBGj3iXHjLW7VrZo4WybKBxtaR8H5WIJAHXv2ryT48f8FJtV8X6h/wAIh8EtKubq8um8hdYeAvM5PGIIsf8Ajzfl3rT/AGWP+Cfup3niKP4ifGd21LV5ZRdQ6NcSGVjJnIe4Y9T/ALHTjmgDsf8Agn/+zbL4f/Zz8R/8JNatbz+OlzJA4w6WvlskeR2Pzu3/AAIVwX7CPw8+Jv7P/wC0X4q8Car4fvW8J3UUjS6oYyLYGPmGZHxg7x8uOvP+ya/RGONYo1RFCoowFUYAHpTqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigArkfib8VPC/wAIfC9zr/ivVItL06Efek5eRv7iL1Zj6CuQ/aO/aW8Lfs3+EH1TXJvtGpTqy2GlwkebcuP/AEFB3Y9K/PLwP8M/in/wUW+Ic3ibxPfXGk+CbWbYsuCIIVznybdDwzY6t+Z6CgDT+Jv7UHxX/ba8Uy+Bfhjpd5pPhmZ9sqxHa8kecb7iUcIvfaD7c19N/sz/APBO7wd8Hvset+KvJ8X+LI8SBpo82ts/+wh+8R/eP5Cvob4T/Bvwp8FfCtvoHhTS49PtI1AklwDNO2OXkfqzGu1AxQAixiNQqgKo6KOgp1FFABRRRQAUUUUAFIyhlIIyDwQaWsXxp4ps/BHhLV9f1CQRWenW0lzIzHHCqTigD81/2JYf+Ed/b+8faPZnbZf8TSMqp4IWcFf51+oVfmV/wTI0e88dfHj4g/EO4QmHy5R5hHWWeXcQD/ug1+mtABRRRQAUUUUAFFFFABRRRQAUVn67r+neGNJudT1a+t9O0+2QyTXV1II441HUljwK/Pn9oP8A4KPaj4q1GTwV8EbK4vr+6k+zrrSwl5XOcf6PHg/99N+AoA+sP2gv2r/An7O+ku+u6gLvWmXNvo1mQ9xKcHBI6Kvu2Pxr4D1bxx8df+Ch3iFtH0S1bw/4ISX96sbNHZxrnrNJ1lYDsPyHWvS/2ff+CcOq+KtWj8ZfG+/ub29ncTtorXBkklPUfaJM5H+6p9s1+gvh7w1pXhPSbfS9G0+30zTrdQsVraxiONB7AUAfPX7N/wCwh4D+Aot9UuIV8TeLEAJ1S9jBWJu/lJyF+vJ96+ll4FLRQAUUUm6gBa+Sv21P23NO+AulP4c8MSw6l46ukICghk09SPvyerei/nxXL/tlft92fw7F74G+Hcqar4wk/wBHn1CH95FYseCq4+9L7dAffiuP/Y2/YRv7zV4fiZ8XoXvtSncXdppF8xkYueRLcZ6nuFP4+lAFD9ij9jPU/GmvRfF/4rCS8ubqb7bYadfDLzuTnz5c9v7q/T2Ffo2F2gAcU2ONY41RFCKowFUYAHsKfQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAV8Nf8FWviV/YPwn0Lwfbyf6Vrl5500a9fJiwfyLEflX3LX5VftP3y/tCf8FA9A8F+eG0rTbu20oqzAL8p824x7nlf+AigD7n/AGMfhqfhb+zn4Q0qWLyry4thf3Qxg+ZL85B+gIH4V7dUcESQxJHGoSNFCqqjAAHAAqSgAoorO1rxFpfhuza61XUbXTbZRky3cyxqPxJoA0aM182/EL/goT8FfAHmxL4m/wCEiu0yPI0WMzjPp5nCfrXzR46/4Kta9r1w+nfDvwOqXEvyxT6gWnlPoREmB+poA/SeSRIo2d2CIoyWY4Arxj4rfthfCn4PxSjWvFVrcXyA40/TT9onJ9MLwPxIr4MX4Yftc/tSOs2u3mqaJos5yF1CX+z7cKfSFQGb8V/GvZ/hT/wSl8MaRcRX3j/xDdeIpgdzWNkPIgJ9Gc5dh9CKAOG8ff8ABTbxr8RNSfQ/hJ4MlhmlOyK5uIjdXTZ6ERqCq/jmszwZ+wX8Y/2i9Yj8S/GHxRdaRbyHIhu5PPuyp5wsYOyIf5xX6JeAfhH4M+F+npZ+FfDen6HCox/osADt/vOfmY+5NdfQB5N8EP2X/h/8AbER+F9GjGoMu2bVLrEt1Lxzlz0B9BgV6yOKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAry/9oj4+aF+zx8O7zxJrMqSXBzFYWIbEl1MRwoHp3J7CvTZpkt4ZJZXWOONSzOxwFAGST7V+Tuuzat/wUO/a6Ol2080fgjR2k2yLnZDZI4BkH+3K2MfX2oAsfAj4H+Mv29fildfEb4i3dxH4Rhn5CgqswU8W0A6Kg4BYfzNfqT4Z8M6Z4P0Oz0fRrKHT9Ms4xFBbwrtVFHpUfhHwppfgXw3pugaLZx2Gl6fCsFvbxLtVVUY/M9Se5JrYoAKKKKACiiigAooooAKKKCcAk9KACvzp/4KL/tMT+Kr23+CvgZmv7y7uETVpLU7mZ8jZbLj35b6Aetdl+2n+3lb+A1ufAfw4uf7T8W3AMFzqFr86WOeNif3pfp0+vFN/YR/Ysn8CyQ/E34gRNceL7xTPZWdz8zWm/kyyZ/5atnv93J7mgD3j9j/AOAcX7PfwZ0zQpgr65df6Zqky952A+QeyDC/gT3r26kFLQAUUUUAFFFFABRRSOwRGZiFUDJJ7UALXjP7Qv7VXgr9nPRHn129W71iSMtaaNasDPMexI/hXP8AEf1rwT9rD/goXZ+B7q48FfDBV8QeK5D5EmoxDzIbVycbUA/1kmfwHvXnf7PP/BP3xD8VtXT4h/HC+vJpb2T7SNInlLXFx6Gds/Ip/uDnHp0oA898z45/8FF/FGMtoPgWCfrtZLGBc/nNIB9fwr76/Z5/ZJ8C/s7aXH/Y1it/rrIBca1eKGnkOOdv9xfYV67oOgad4X0i20vSbKHTtOtUEcNtbxhERRwAAK0KAExS0UUAFFFee/Gb47eD/gR4Ym1nxXqsdooU+RZqQ09yw6JGnUk+vQdzQB22raxZaDp1xf6jdQ2NlboZJbi4cIkajkkk8Yr85P2m/wBuvX/i54gPwz+CNvc3S3bm3m1W1Ume6zwVhGPkT1fr9K4XxR8SPi//AMFFvGX/AAjfhmzfQfA0EoMqbiLeJc/fuHH329FH4DvX3h+zT+yX4P8A2bdDC6ZAupeIZkC3etXCDzZOOVT+4vsPxzQB5F+x9+wHpfwnS18XePY4ta8asfOit3+eGwP4/fk/2u3b1r7NxS0UAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRSMwVSScAdSaAForlfEXxU8G+EY2bWvFOk6YFGT9pvY1P5ZzXjvjD/goJ8D/AAjuDeMF1aVc/u9LtpJyT6ZC7f1oA+jKK+A/F3/BXDwpZ+ZH4a8FarqTjhZtQnjt0PuFXeSPyrzi8/4KGfHv4kSGHwT4FjtVfhWs9Plu3HodzcfpQB+oE24RPsxvwcZ6Zr8ufhZ+zbqOi/tPav49+MGsaf4T0rS9Wk1SGS6v40a/l8wtH5fzZKDgnjsB60g+HX7aPxu41PUtW0Gxk5P2i+SwQD12xkN+lb/hn/gk74i1q4F342+IkPnSHdKmnwyXDk+vmSEZP4UAfS/jT/goZ8EvB3mKviZtbmXP7vSrdpc/8COF/Wvn3x1/wVqErvbeBvAct1IxxHcatPj6Hy4wSfpuFeueCv8AgmL8HvDOxtTh1LxHMvU3tyUQ/wDAUxX0D4H+BvgD4bqo8N+D9H0l16TQ2ieb/wB9kFv1oA/OY/G79sH48MV0HSNS0awm6Np+nCzjAP8A01kGSPfdV/R/+CcPxn+KV4l78RfHEdkrnLrcXMl9MB9Mhc/jX6hgBenFFAHx38P/APgl38JvCvlS65Lqniy7XBb7VN5MJPsiYOPYsa+kvBHwb8EfDeBIvDXhbS9HCjAe3tlDn6tjJ/OuyooAKTAHTilooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA8f/a88RXXhf9m3x/fWbMlx/ZckSOvUb/kP6E186f8ABJrwrZ2Pwl8T+IFRWvtQ1IW7yY+YRxoCFz6Zcmvrf4z+Al+KHwq8U+FSyo+qafLbxs3AEhX5Cfbdivgb/gmX8XF+G/jTxR8IfFOdL1C4uWls0uPkxcodksPPRiACPXafbIB+ltFJmloAKKKKACiikzQAtFZ+ueINM8M6dNqGr6ha6ZYwjdJcXcyxRqPdmIFfHfx5/wCCm/gjwLDcad4Fg/4TLWxlFn5jsoz0yW6v/wAB/OgD668XeMdF8B6Bd634g1K30rSrVd0t1cuFVfb3PsOa/OP9oT9u/wAV/HfWj8OfglY34t79zbtqNvEftd2D1EY/5Zp/tHnHcVy/h74K/H39uzXrfXPG19caD4TZxIkl1GYYVQ/88IP4uOjH8zX6CfAX9mLwN+zzoq2nhnTt1/IoFzqt1h7mc98t2Gf4RgUAeHfse/sDWHwfkh8X+OfJ1zxnIA8UDYkhsSeSQT9+T/a6Dt619lDjil/nRQAUUUUAFFFFABRRVXVNUtNF0+4v764jtbO3jMs08rBVRQMkk+lAD76+t9Ns57q7njtraBGklmlYKqKBksSegAr81v2mv2yPE/7Qnir/AIVT8FIbye0upTb3Go2mVlvexCN/BF6scZ9hWR+0b+0x4w/bC+IifCr4TR3J8MySeVPPDlTeYPzSSN/DCPQ9ep6gV9o/stfsm+Gf2avC6R2kaaj4nuox/aGryL8zt/cj/uoPTv1NAHC/sj/sI+H/AIE2sHiDxLHDr/jiRQxuHG6GyJHKxA9W9WPPpivrCiigAoopM0ALTWZVUlmCgckk9PevP/jF8efBXwL0F9T8W6zDY5UmG0UhricjsidT9elfnT8Qv2pPjF+2l4ln8G/DDSLrRvDbHbItqxEjRk433E/RFP8AdH60AfR/7T//AAUS8M/Ck3nh3wT5XirxauYmkj+a0tX6fMw++w/urx6mvBPg7+xv8Sv2rvEkPxB+Muq39lo9ywljt7j5bm5jzkKidIoyOnHToO9fRP7L/wDwT18KfByO017xWIvFPjHiTfMu61tW64jQ/eYH+JvwAr66VdowBgdqAOe8DfD/AMP/AA18O22h+GdKt9H0y3XakFugH4serH3PNdFRRQAUUUUAFFFFABRRRQAUUyaZYI2kc4VAWJ9h1r4Z8bf8FXvBfh/VL2w0fwlq2rtbytELiSVIUcqcZA5OOKAPumivzO1L/gq5431qQweGfhnaCQ/c86aa5Y/8BRV/nWd/w1t+114+bGheCp9Ojfp9l8Puox7NNn880AfqDuHrTJriK3jLyyLEi9Wc4A/OvzA/4Q/9tv4h/wDH1f6rpcT9Q93DahfwXmpLf/gnl8fvHMgfxV8Qre338t5+oz3J/EACgD9CfEnxu+H/AIPVm1rxroOmADJ+0ahEv/s1eU+Jv+Cg3wL8M7lPjJdUlX+DTbaWbP0baFP518/eHf8AgkXpm5ZfEXxDvLl8/PHYWKpn/gbsf5V6p4d/4JffBbRdpvINa1tx3vL8qD9RGFFAHK+JP+CsPw60/eujeHNb1Zh91pVSBT+ZJrzPWP8Agq54v1yR4PCfw4tt54U3Ektyw/BAK+yvDX7Hfwb8JhDY+AdJZ16PdRee31+cmvTdH8G6D4eRU0zRbDT1X7otrZEx+QoA/NE/HT9s/wCLeDoHh7UtGtpPuvZaOlumD28ycH9CKP8AhkP9rH4ntv8AFPjG4sopPvJf64zbf+ARZWv1GooA/N7w9/wSX1K/kE3iv4h7mJy62NuXJ/4E5/pXsng7/gl78HfDpjfVE1bxJKuMi8uzFGf+AxgH9a+vaKAPL/Cf7L/wn8D7Do3w/wBDtZE6TSWomk/77fc3616PZ6baafGI7S1htYx0WGMIB+AFWaKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAQjr2r4c/bc/Yj1Dx5qz/Ev4bN9l8YWxWa6sITsa7K9JY27SjA47+uev3JSbRQB+bXwZ/4KXa18P5o/C3xl8PX0l3akQvqtvFsuUxxmWJsbsd2X8jX1n4Z/bc+Cfiq2SW28fadbMwB8m+3wOPqGAruPiN8C/AHxatzF4t8KabrRIwJpotsy/7si4Yfga+cPE//AASw+EetTvJpl3rmhbif3cNysqL9N6k/maAPf2/aW+FSx7z8QfD+3Gf+P5P8a5rXv22vgl4dVjc/EDTZmX/lna75mP02qa+fV/4JH+BRJk+NvEDJ/d8qD+e2uj0P/glV8JdPdW1DUfEGqbTyGukjB+u1KAGeNP8Agqt8K9C3poWl654mmH3WjhW2iJ92c7h/3ya8T1v/AIKPfGH4qXLaf8N/Aq2LS5CPBBJezDnrnAUH8K+yvCH7EPwR8GMj2fgHTrudf+W2pF7tvriRio/ACvY9H8OaV4et1g0vTbTToVGBHawrGo/ACgD8x9H/AGK/2hf2ltQi1b4p+KJtFsC24RapOZpVX/pnbodq/iRX1r8D/wBgX4XfBmSG/Om/8JNrkeGF/qyrIEYd0j+6P1NfSlFACKoUADgDpS0UUAFFFFABRRRQAUUUUAFfmp+3j+0nrfxc8dRfA74db7qJ7lbbUZLU5a7nz/qcjoi/xepHoK+ov24/2gm+AfwYvLjT5vK8R6xusNNI+9GxX5pR/ujn64rxf/gmv+zL/wAI/ob/ABY8TQm413WUY6Z9o+ZoYGPzS8/xP69cfU5APd/2Sf2V9H/Zq8Cpb4jv/FN8gbU9S28luvlJ6Iv69a96oooAKKpavrFjoOnzX2o3kFhZwrukuLmRY0QDuSTgV8bfHb/gp14J8D/aNM8CQf8ACZ6wuUW6XK2SN0+91f8A4DwfWgD7E17xHpfhXS59S1jULbTLCEbpLi6kEaKPcmvg39oL/gpxBHeTeGfhDpz6zqTt5I1qaItHu6fuYurn3PHsa8h0X4N/tDft0avHrfi+/utC8KM26Fr5WgtkX0gtxgvx/Eev96vur9n39jT4efs/2cU2m6Ymr+IcYl1rUEDzZ7iMdIx7AZ9TQB8cfB/9gv4h/tDa+vjr41a1fWFvdOH+yXDlr64XqBg8RJ7dfYV+inw3+Fnhf4SeHIND8KaRb6Rp8fJWFBukb+87dWb3NdXgUUAFFFFABRRRQAUUUUAFFFFABRRRQA1lDdenpXn9n+z18MrHUZ7+LwF4f+2TyGWSaTTonYsTkn5gcHPpXoVFAFHTdD03R4RDYafa2MI6R28KxqPwAq99OKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA/NP/AIK8WOptrXw8uykjaMtvdR7lHyrOWQnPuVAx9DX2H8Lv2mPhFrXgPRn0rxloemWkVpFGtjd3iQSW4VANhViDxjH4V3vxO+Fvhn4weFZ/DvirTI9T0yY52vw0bDo6MOVYeor4w8Sf8EkfCt7qMkujeNdS020Y5FvPbpMVHoGyP1oA+gvGn7cXwX8ExObnxrZ6hKo/1OmA3DfT5Rj9a+YPid/wVYutSmOl/C7wdLc3ch2R3mqqZGYngbII+Sfq34V33g//AIJTfDTRZI5Nc1nWPEDKcmMusCN7YUZx+NfTPw0+APw++EMIXwn4V07SZcYa6SENO31kOWP50AfnXp37Of7Sv7XmoRX/AI91W60DQpTvxqhMSKp/uWy4/XH1r6/+Bv7Afww+DC295LYt4q16PDHUdWVWCt6pEPlUfmfevpUUtADY41jjCIoVVGAoGABTqKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA//9k="; } public class UnterschriftController : ApiController @@ -45,7 +48,7 @@ namespace API_NetFramework.Controllers try { string path = System.Configuration.ConfigurationManager.AppSettings["UnterschriftPath"]; - string filename = path + TGNummer + ".jpg"; + string filename = path + TGNummer + ".pdf"; if (!File.Exists(filename)) { return Content(HttpStatusCode.NotFound, "Image " + filename + " not found"); @@ -69,8 +72,9 @@ namespace API_NetFramework.Controllers } + - [HttpGet] + [HttpGet] [Route("API/GetUnterschrift")] public IHttpActionResult GetUnterschrift(string TGNummer) { @@ -88,8 +92,9 @@ namespace API_NetFramework.Controllers } try { - var dataBytes = File.ReadAllBytes(@"x:\docdemo\unterschriften\kube.jpg"); - var dataStream = new MemoryStream(dataBytes); + + byte[] b = File.ReadAllBytes(filename); + var dataStream = new MemoryStream(b); string imageName = TGNummer + ".jpg"; return new unterschriftResult(dataStream, Request, imageName); } @@ -129,7 +134,7 @@ namespace API_NetFramework.Controllers }; - var contentType = "image/png"; + var contentType = "image/jpeq"; //this.contentType ?? MimeMapping.GetMimeMapping(Path.GetExtension(filePath)); response.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); @@ -170,12 +175,14 @@ namespace API_NetFramework.Controllers public System.Threading.Tasks.Task ExecuteAsync(System.Threading.CancellationToken cancellationToken) { httpResponseMessage = httpRequestMessage.CreateResponse(HttpStatusCode.OK); - httpResponseMessage.Content = new StreamContent(Unterschrift); - httpResponseMessage.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment"); + //httpResponseMessage.Content = new StreamContent(Unterschrift); + httpResponseMessage.Content = new ByteArrayContent(Unterschrift.ToArray()); + httpResponseMessage.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment"); httpResponseMessage.Content.Headers.ContentDisposition.FileName = Signfilename; httpResponseMessage.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"); + //httpResponseMessage.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("image/jpeq"); - return System.Threading.Tasks.Task.FromResult(httpResponseMessage); + return System.Threading.Tasks.Task.FromResult(httpResponseMessage); } } } diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index b349f754..fa6952b4 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index bc238d5c..6cebaf31 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 6d4e35d0..ff38854e 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index b349f754..fa6952b4 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index bc238d5c..6cebaf31 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index dadc10e5..ab604da4 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Client.csproj b/Client/Client.csproj index a59617b4..142df9b9 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -771,6 +771,16 @@ + + + + + + + + + + diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs index 6bdf49cf..a7c659ff 100644 --- a/Client/DocMgmt/Serienbrief.Designer.cs +++ b/Client/DocMgmt/Serienbrief.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv(); Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv(); @@ -61,6 +62,9 @@ this.txtbezeichnung = new System.Windows.Forms.TextBox(); this.GrpEmpfaenger = new System.Windows.Forms.GroupBox(); this.sfDataGridEmpfaenger = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.ctxmenuEmpfaenger = new System.Windows.Forms.ContextMenuStrip(this.components); + this.partnerHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.ribbon1 = new System.Windows.Forms.Ribbon(); @@ -77,14 +81,18 @@ this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonsave = new System.Windows.Forms.RibbonButton(); this.ribbonPanel6 = new System.Windows.Forms.RibbonPanel(); + this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel7 = new System.Windows.Forms.RibbonPanel(); + this.ribbonbuttonaddpartner = new System.Windows.Forms.RibbonButton(); + this.ribbonButton2 = new System.Windows.Forms.RibbonButton(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.pnlLoad = new System.Windows.Forms.Panel(); this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.btnsbloadcancel = new System.Windows.Forms.Button(); + this.btnsbloadok = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); - this.btnsbloadok = new System.Windows.Forms.Button(); - this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel8 = new System.Windows.Forms.RibbonPanel(); this.GrpDokumentInhalt.SuspendLayout(); this.groupBox8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).BeginInit(); @@ -98,6 +106,7 @@ ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit(); this.GrpEmpfaenger.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit(); + this.ctxmenuEmpfaenger.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).BeginInit(); this.pnlLoad.SuspendLayout(); @@ -394,13 +403,37 @@ // sfDataGridEmpfaenger // this.sfDataGridEmpfaenger.AccessibleName = "Table"; + this.sfDataGridEmpfaenger.ContextMenuStrip = this.ctxmenuEmpfaenger; this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill; this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16); this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger"; + this.sfDataGridEmpfaenger.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended; this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(1019, 579); this.sfDataGridEmpfaenger.TabIndex = 4; this.sfDataGridEmpfaenger.Text = "sfDataGrid1"; // + // ctxmenuEmpfaenger + // + this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.partnerHinzufügenToolStripMenuItem, + this.partnerLöschenToolStripMenuItem}); + this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger"; + this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(176, 48); + // + // partnerHinzufügenToolStripMenuItem + // + this.partnerHinzufügenToolStripMenuItem.Name = "partnerHinzufügenToolStripMenuItem"; + this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.partnerHinzufügenToolStripMenuItem.Text = "Partner hinzufügen"; + this.partnerHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.partnerHinzufügenToolStripMenuItem_Click); + // + // partnerLöschenToolStripMenuItem + // + this.partnerLöschenToolStripMenuItem.Name = "partnerLöschenToolStripMenuItem"; + this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.partnerLöschenToolStripMenuItem.Text = "Partner löschen"; + this.partnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.partnerLöschenToolStripMenuItem_Click); + // // treeViewAdv1 // treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; @@ -534,6 +567,8 @@ this.ribbonTab1.Panels.Add(this.ribbonPanel4); this.ribbonTab1.Panels.Add(this.ribbonPanel5); this.ribbonTab1.Panels.Add(this.ribbonPanel6); + this.ribbonTab1.Panels.Add(this.ribbonPanel7); + this.ribbonTab1.Panels.Add(this.ribbonPanel8); this.ribbonTab1.Text = "Funktionen"; // // ribbonPanel1 @@ -541,6 +576,7 @@ this.ribbonPanel1.Items.Add(this.RibbonButtonExit); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Text = ""; + this.ribbonPanel1.Visible = false; // // RibbonButtonExit // @@ -633,6 +669,40 @@ this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Text = ""; // + // ribbonButton1 + // + this.ribbonButton1.Image = global::OnDoc.Properties.Resources.EditDoc_32x32_32; + this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.EditDoc_32x32_32; + this.ribbonButton1.Name = "ribbonButton1"; + this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.EditDoc_24x24_32; + this.ribbonButton1.Text = "Vorlage bearbeiten"; + this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.Items.Add(this.ribbonbuttonaddpartner); + this.ribbonPanel7.Items.Add(this.ribbonButton2); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Text = "ribbonPanel7"; + // + // ribbonbuttonaddpartner + // + this.ribbonbuttonaddpartner.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonaddpartner.Image"))); + this.ribbonbuttonaddpartner.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonaddpartner.LargeImage"))); + this.ribbonbuttonaddpartner.Name = "ribbonbuttonaddpartner"; + this.ribbonbuttonaddpartner.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonaddpartner.SmallImage"))); + this.ribbonbuttonaddpartner.Text = "Partner hinzufügen"; + this.ribbonbuttonaddpartner.Click += new System.EventHandler(this.ribbonbuttonaddpartner_Click); + // + // ribbonButton2 + // + this.ribbonButton2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.Image"))); + this.ribbonButton2.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.LargeImage"))); + this.ribbonButton2.Name = "ribbonButton2"; + this.ribbonButton2.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.SmallImage"))); + this.ribbonButton2.Text = "Partnerlise prüfen"; + this.ribbonButton2.Click += new System.EventHandler(this.ribbonButton2_Click); + // // openFileDialog1 // this.openFileDialog1.FileName = "openFileDialog1"; @@ -643,9 +713,9 @@ this.pnlLoad.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.pnlLoad.Controls.Add(this.sfdatagridsbload); this.pnlLoad.Controls.Add(this.btnsbloadcancel); - this.pnlLoad.Controls.Add(this.panel1); this.pnlLoad.Controls.Add(this.btnsbloadok); - this.pnlLoad.Location = new System.Drawing.Point(148, 85); + this.pnlLoad.Controls.Add(this.panel1); + this.pnlLoad.Location = new System.Drawing.Point(241, 101); this.pnlLoad.Name = "pnlLoad"; this.pnlLoad.Size = new System.Drawing.Size(965, 637); this.pnlLoad.TabIndex = 4; @@ -654,6 +724,7 @@ // sfdatagridsbload // this.sfdatagridsbload.AccessibleName = "Table"; + this.sfdatagridsbload.AllowEditing = false; this.sfdatagridsbload.Dock = System.Windows.Forms.DockStyle.Top; this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47); this.sfdatagridsbload.Name = "sfdatagridsbload"; @@ -661,7 +732,9 @@ this.sfdatagridsbload.TabIndex = 3; this.sfdatagridsbload.Text = "sfDataGrid1"; this.sfdatagridsbload.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellClick); + this.sfdatagridsbload.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellDoubleClick); this.sfdatagridsbload.Click += new System.EventHandler(this.Serienbrief_Load); + this.sfdatagridsbload.DoubleClick += new System.EventHandler(this.sfdatagridsbload_DoubleClick); // // btnsbloadcancel // @@ -669,10 +742,20 @@ this.btnsbloadcancel.Name = "btnsbloadcancel"; this.btnsbloadcancel.Size = new System.Drawing.Size(75, 23); this.btnsbloadcancel.TabIndex = 2; - this.btnsbloadcancel.Text = "abbruch"; + this.btnsbloadcancel.Text = "Abbrechen"; this.btnsbloadcancel.UseVisualStyleBackColor = true; this.btnsbloadcancel.Click += new System.EventHandler(this.btnsbloadcancel_Click); // + // btnsbloadok + // + this.btnsbloadok.Location = new System.Drawing.Point(870, 600); + this.btnsbloadok.Name = "btnsbloadok"; + this.btnsbloadok.Size = new System.Drawing.Size(75, 23); + this.btnsbloadok.TabIndex = 0; + this.btnsbloadok.Text = "Öffnen"; + this.btnsbloadok.UseVisualStyleBackColor = true; + this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click); + // // panel1 // this.panel1.Controls.Add(this.label1); @@ -692,24 +775,10 @@ this.label1.TabIndex = 0; this.label1.Text = "Serienbrief öffnen"; // - // btnsbloadok - // - this.btnsbloadok.Location = new System.Drawing.Point(870, 600); - this.btnsbloadok.Name = "btnsbloadok"; - this.btnsbloadok.Size = new System.Drawing.Size(75, 23); - this.btnsbloadok.TabIndex = 0; - this.btnsbloadok.Text = "öffnen"; - this.btnsbloadok.UseVisualStyleBackColor = true; - this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click); - // - // ribbonButton1 + // ribbonPanel8 // - this.ribbonButton1.Image = global::OnDoc.Properties.Resources.EditDoc_32x32_32; - this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.EditDoc_32x32_32; - this.ribbonButton1.Name = "ribbonButton1"; - this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.EditDoc_24x24_32; - this.ribbonButton1.Text = "Vorlage bearbeiten"; - this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Text = "ribbonPanel8"; // // Serienbrief // @@ -743,6 +812,7 @@ ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit(); this.GrpEmpfaenger.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).EndInit(); + this.ctxmenuEmpfaenger.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.GridEmpfänger)).EndInit(); this.pnlLoad.ResumeLayout(false); @@ -805,5 +875,12 @@ private System.Windows.Forms.Label label1; private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridsbload; private System.Windows.Forms.RibbonButton ribbonButton1; + private System.Windows.Forms.RibbonPanel ribbonPanel7; + private System.Windows.Forms.RibbonButton ribbonbuttonaddpartner; + private System.Windows.Forms.ContextMenuStrip ctxmenuEmpfaenger; + private System.Windows.Forms.ToolStripMenuItem partnerHinzufügenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem partnerLöschenToolStripMenuItem; + private System.Windows.Forms.RibbonButton ribbonButton2; + private System.Windows.Forms.RibbonPanel ribbonPanel8; } } \ No newline at end of file diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs index 8e193c6b..24563cc1 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/DocMgmt/Serienbrief.cs @@ -13,12 +13,14 @@ using System.Xml.Linq; using Database; using DOCGEN.Klassen; using Helper; +using Microsoft.Office.Interop.Word; using Model; using NLog; using OnDoc.DocMgmt; using OnDoc.Klassen; using OnDoc.UIControls.Administrator; using Syncfusion.Windows.Forms.Tools; +using Syncfusion.Windows.Forms.Tools.Renderers; using Syncfusion.WinForms.Controls; using Syncfusion.WinForms.DataGrid; using Syncfusion.WinForms.DataGrid.Interactivity; @@ -33,8 +35,8 @@ namespace OnDoc.UIControls private int profilnr = 0; private serienbrief sb = new serienbrief(); private int serienbriefnr = 0; - - //private DataSet dsempfaenger = new DataSet(); + + //private DataSet dsempfaenger = new DataSet(); private int selectedsbnr = 0; public Serienbrief() { @@ -95,6 +97,7 @@ namespace OnDoc.UIControls cbboxteam.DataSource = dbteam.dsdaten.Tables[0]; cbboxteam.ValueMember = "teamnr"; cbboxteam.DisplayMember = "bezeichnung"; + this.cbboxteam.SelectedIndex = 0; } private void RibbonButtonExit_Click(object sender, EventArgs e) { @@ -103,7 +106,7 @@ namespace OnDoc.UIControls private void RibbonButtonExcelImport_Click(object sender, EventArgs e) { - DataTable importdata = new DataTable(); + System.Data.DataTable importdata = new System.Data.DataTable(); openFileDialog1.Filter = "Excel-Dateien files (*.xlsx)|*.xlsx|CSV-Dateien (*.csv)|*.csv|Alle Dateien (*.*)|*.*"; openFileDialog1.FilterIndex = 0; if (openFileDialog1.ShowDialog() == DialogResult.OK) @@ -152,10 +155,10 @@ namespace OnDoc.UIControls catch { r1[col.ColumnName] = ""; } } - r1["Status"] = 0; - r1["Error"] = 0; + r1["STATUS"] = 0; + r1["FEHLERCODE"] = 0; dB.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + r1[0].ToString(), false, true); - if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Error"] = 1; else r1["Error"] = 0; + if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0; r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString(); sb.dsempfaenger.Tables[0].Rows.Add(r1); } @@ -165,7 +168,7 @@ namespace OnDoc.UIControls } } - private void refresh_empfaenger(DataTable dt) + private void refresh_empfaenger(System.Data.DataTable dt) { sfDataGridEmpfaenger.DataSource = null; sfDataGridEmpfaenger.DataSource = dt; @@ -178,10 +181,8 @@ namespace OnDoc.UIControls //sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false; //sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false; //sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false; - //sfDataGridEmpfaenger.Columns["Status"].Visible = false; - //sfDataGridEmpfaenger.Columns["Error"].Visible = false; update_zahlen(); - } + } private void init_empfaenger(int serienbriefnr) { Database.DB db = new DB(AppParams.connectionstring); @@ -198,11 +199,7 @@ namespace OnDoc.UIControls sb.dsempfaenger = new DataSet(); sb.dsempfaenger.Tables.Clear(); sb.dsempfaenger.ReadXml(filename); - sb.dsempfaenger.Tables[0].Columns.Add("Status"); - sb.dsempfaenger.Tables[0].Rows[0]["Status"] = "0"; - - sb.dsempfaenger.Tables[0].Columns.Add("Error"); - sb.dsempfaenger.Tables[0].Rows[0]["Error"] = "0"; + sb.dsempfaenger.AcceptChanges(); refresh_empfaenger(sb.dsempfaenger.Tables[0]); System.IO.File.Delete(filename); @@ -210,7 +207,7 @@ namespace OnDoc.UIControls private void RibbonButtonNew_Click(object sender, EventArgs e) { - + OnDoc.DocMgmt.DokTypSelect DokTypSelect = new OnDoc.DocMgmt.DokTypSelect(); DokTypSelect.vorlagentype = 1; DokTypSelect.ShowDialog(this); @@ -219,15 +216,21 @@ namespace OnDoc.UIControls this.sb = null; this.sb = new serienbrief(); sb.dokumenttypnr = DokTypSelect.dokumenttypnr; - + update_serienbrief_details(true, sb.dokumenttypnr, 0); init_empfaenger(0); vorlagenfelder(sb.dokumenttypnr); refresh_empfaenger(sb.dsempfaenger.Tables[0]); update_screen(); update_serienbriefdaten(true); - + vorlage_auslesen_und_speichern(); + SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb); + sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy()); + sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder"; + update_serienbriefdaten(false); + + } else { @@ -242,9 +245,9 @@ namespace OnDoc.UIControls dB.Get_ApplicationType_from_Vorlage(sb.officevorlagenr); string Apptype = ""; Apptype = dB.dsdaten.Tables[0].Rows[0][1].ToString(); - string filename = dB.get_vorlage_to_file(sb.officevorlagenr.ToString(),AppParams.tempdir,sb.serienbriefnr.ToString()+"."+Apptype); - sb.filename = dB.save_sb_vorlage_to_db(filename,Apptype,sb.serienbriefnr); - } + string filename = dB.get_vorlage_to_file(sb.officevorlagenr.ToString(), AppParams.tempdir, sb.serienbriefnr.ToString() + "." + Apptype); + sb.filename = dB.save_sb_vorlage_to_db(filename, Apptype, sb.serienbriefnr); + } private void vorlagenfelder(int dokumenttypnr) { DB db = new DB(AppParams.connectionstring); @@ -267,7 +270,7 @@ namespace OnDoc.UIControls sb.dsempfaenger.Tables[1].Columns.Add(db.dsdaten.Tables[0].Rows[i][0].ToString()); try { - if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[i][1])==true) + if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[i][1]) == true) { sb.dsempfaenger.Tables[1].Rows[0][db.dsdaten.Tables[0].Rows[i][0].ToString()] = 1; } @@ -283,10 +286,10 @@ namespace OnDoc.UIControls s = s + "- " + db.dsdaten.Tables[0].Rows[i][0].ToString() + System.Environment.NewLine; } - + } sb.dsempfaenger.AcceptChanges(); - if (s !="") { MessageBox.Show("Folgende Spalten wurden aufgrund der gewählten Vorlage zur Liste hinzugefügt"+System.Environment.NewLine+ s,"Serienbrief",MessageBoxButtons.OK,MessageBoxIcon.Information); } + if (s != "") { MessageBox.Show("Folgende Spalten wurden aufgrund der gewählten Vorlage zur Liste hinzugefügt" + System.Environment.NewLine + s, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Information); } //foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows) //{ @@ -310,27 +313,27 @@ namespace OnDoc.UIControls if (newsb) { db.Get_Tabledata("Select bezeichnung,office_vorlagenr from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); - sb.bezeichnung= db.dsdaten.Tables[0].Rows[0][0].ToString(); + sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]); - + } } private void update_serienbriefdaten(bool newsb) { - sb.bezeichnung=this.txtbezeichnung.Text; - sb.verantwortlich=Convert.ToInt32(this.cbboxverantwortlich.SelectedValue.ToString()); + sb.bezeichnung = this.txtbezeichnung.Text; + sb.verantwortlich = Convert.ToInt32(this.cbboxverantwortlich.SelectedValue.ToString()); if (newsb) { sb.erstellt_am = DateTime.Now; } sb.aktiv = true; sb.mutiert_am = DateTime.Now; sb.mutierer = AppParams.CurrentMitarbieter; - sb.verantwortlich=AppParams.CurrentMitarbieter; - try {sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString());} catch { sb.postzustellung = 0; } + sb.verantwortlich = AppParams.CurrentMitarbieter; + try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; } try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; } - try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0;} + try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; } try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; } DB db = new DB(AppParams.connectionstring); - sb.serienbriefnr=db.Save_Serienbrief(sb,AppParams.tempdir); + sb.serienbriefnr = db.Save_Serienbrief(sb, AppParams.tempdir); db.save_sb_vorlage_to_db(sb.filename, "", sb.serienbriefnr); } @@ -338,22 +341,25 @@ namespace OnDoc.UIControls private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e) { - + } private void update_zahlen() { try { + sb.dsempfaenger.AcceptChanges(); DataView dv = new DataView(sb.dsempfaenger.Tables[0]); - dv.RowFilter = "Status = 0"; + dv.RowFilter = "Status = 0"; treeViewAdv1.Nodes[0].Text = "In Bearbeitung (" + dv.Count.ToString() + ")"; - dv.RowFilter = "Error <> 0"; + dv.RowFilter = "Status =-1"; treeViewAdv1.Nodes[1].Text = "Fehlerhaft (" + dv.Count.ToString() + ")"; - dv.RowFilter = "Status = 1"; + if (dv.Count > 0) treeViewAdv1.Nodes[1].TextColor = Color.Red; else treeViewAdv1.Nodes[1].TextColor= Color.Black; + dv.RowFilter = "Status = 1"; treeViewAdv1.Nodes[2].Text = "Generiert (" + dv.Count.ToString() + ")"; - dv.RowFilter = "Status = 2"; + dv.RowFilter = "Status = 2"; treeViewAdv1.Nodes[3].Text = "Abgeschlossen (" + dv.Count.ToString() + ")"; + treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; } catch { } @@ -369,22 +375,22 @@ namespace OnDoc.UIControls switch (nodetext.Substring(0, 5)) { case "In Be": - dv.RowFilter = "Status = 0"; + dv.RowFilter = "Status = 0"; sfDataGridEmpfaenger.DataSource = null; sfDataGridEmpfaenger.DataSource = dv; break; case "Fehle": - dv.RowFilter = "Error <> 0"; + dv.RowFilter = "Status=-1"; sfDataGridEmpfaenger.DataSource = null; sfDataGridEmpfaenger.DataSource = dv; break; case "Gener": - dv.RowFilter = "Status = 1"; + dv.RowFilter = "Status = 1"; sfDataGridEmpfaenger.DataSource = null; sfDataGridEmpfaenger.DataSource = dv; break; case "Abges": - dv.RowFilter = "Status = 2"; + dv.RowFilter = "Status = 2"; sfDataGridEmpfaenger.DataSource = null; sfDataGridEmpfaenger.DataSource = dv; break; @@ -399,16 +405,20 @@ namespace OnDoc.UIControls private void RibbonButtonOpen_Click(object sender, EventArgs e) { + GrpEmpfaenger.Visible = false; + GrpDokumentInhalt.Visible = false; pnlLoad.Visible = true; + pnlLoad.Dock = DockStyle.Top; DB db = new DB(AppParams.connectionstring); db.clear_parameter(); - db.add_parameter("@mitarbeiternr",AppParams.CurrentMitarbieter.ToString()); + db.add_parameter("@mitarbeiternr", AppParams.CurrentMitarbieter.ToString()); db.Get_Tabledata("dbo.sp_edex_sb_get_serienbriefe", true, false); sfdatagridsbload.DataSource = null; sfdatagridsbload.DataSource = db.dsdaten.Tables[0]; - this.pnlLoad.Left = this.Left; - this.pnlLoad.Width = this.Width; - Application.DoEvents(); + btnsbloadok.Left = pnlLoad.Width - btnsbloadok.Width - 20; + if (sfdatagridsbload.RowCount == 0) this.btnsbloadok.Enabled = false; + // vorlage_auslesen_und_speichern(); + System.Windows.Forms.Application.DoEvents(); } private void bntsbloadok_Click(object sender, EventArgs e) @@ -417,18 +427,22 @@ namespace OnDoc.UIControls sb = new serienbrief(); sb.dsempfaenger = new DataSet(); sb.serienbriefnr = selectedsbnr; - sb = db.Load_Serienbrief(sb,AppParams.tempdir); - sb.filename= db.get_sb_vorlage(sb.serienbriefnr,AppParams.tempdir); + sb = db.Load_Serienbrief(sb, AppParams.tempdir); + sb.filename = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir); pnlLoad.Visible = false; update_screen(); refresh_empfaenger(sb.dsempfaenger.Tables[0]); + GrpEmpfaenger.Visible = true; + GrpDokumentInhalt.Visible = true; + db = null; } - private void update_screen() { + private void update_screen() + { txtbezeichnung.Text = sb.bezeichnung; cbboxpostzustellung.SelectedValue = sb.postzustellung; cbboxunterschriftlinks.SelectedValue = sb.unterschriftlinks; - cbboxunterschriftrechts.SelectedValue=sb.unterschriftrechts; + cbboxunterschriftrechts.SelectedValue = sb.unterschriftrechts; cbboxverantwortlich.SelectedValue = sb.verantwortlich; update_zahlen(); GrpDokumentInhalt.Enabled = true; @@ -438,21 +452,166 @@ namespace OnDoc.UIControls private void btnsbloadcancel_Click(object sender, EventArgs e) { pnlLoad.Visible = false; + GrpEmpfaenger.Visible = true; + GrpDokumentInhalt.Visible = true; + } private void sfdatagridsbload_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) { var selectedItem = e.DataRow; var dataRow = (e.DataRow.RowData as DataRowView).Row; - selectedsbnr = Convert.ToInt32( dataRow["serienbriefnr"].ToString()); - + selectedsbnr = Convert.ToInt32(dataRow["serienbriefnr"].ToString()); + } private void ribbonButton1_Click(object sender, EventArgs e) { + SerienbriefBearbeitung sbedit = new SerienbriefBearbeitung(this.sb); sbedit.Show(); } + + private void ribbonbuttonaddpartner_Click(object sender, EventArgs e) + { + + Partnersuche ps = new Partnersuche(); + ps.ShowDialog(); + if (ps.DialogResult == DialogResult.OK) + { + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ps.partnernr.ToString(), false, true); + if (db.dsdaten.Tables[0].Rows.Count > 0) + { + System.Data.DataRow dr = sb.dsempfaenger.Tables[0].NewRow(); + for (int i = 1; i < sb.dsempfaenger.Tables[0].Columns.Count; i++) + { + dr[i] = ""; + } + dr["partnernr"] = Convert.ToInt32(ps.partnernr.ToString()); + dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString(); + dr["STATUS"] = 0; + dr["FEHLERCODE"] = 0; + + sb.dsempfaenger.Tables[0].Rows.Add(dr); + refresh_empfaenger(sb.dsempfaenger.Tables[0]); + } + db = null; + } + + } + + private void partnerHinzufügenToolStripMenuItem_Click(object sender, EventArgs e) + { + ribbonbuttonaddpartner_Click(sender, e); + } + + private void partnerLöschenToolStripMenuItem_Click(object sender, EventArgs e) + { + sfDataGridEmpfaenger.AllowDeleting = true; + sfDataGridEmpfaenger.DeleteSelectedRecords(); + sfDataGridEmpfaenger.AllowDeleting = false; + refresh_empfaenger(sb.dsempfaenger.Tables[0]); + return; + + } + + private void sfdatagridsbload_DoubleClick(object sender, EventArgs e) + { + if (sfdatagridsbload.RowCount == 0) return; + bntsbloadok_Click(sender, e); + } + + private void sfdatagridsbload_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) + { + bntsbloadok_Click(sender, e); + } + + private void Partnerliste_Pruefen() + { + DB db = new DB(AppParams.connectionstring); + db.create_sb_check_table(AppParams.CurrentMitarbieter); + db.save_sb_checkdata(AppParams.CurrentMitarbieter, sb); + System.Data.DataTable dt = new System.Data.DataTable(); + dt = db.Check_sb_Data(AppParams.CurrentMitarbieter, sb); + string msg = ""; + bool bldossier = false; + System.Data.DataRow[] dr; + for (int i = 0, loopTo = dt.Rows.Count - 1; i <= loopTo; i++) + { + dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "'"); + if (dr.Length == 0) + { + dr = sb.dsempfaenger.Tables[0].Select("Partnernr=''"); + } + + foreach (var dr1 in dr) + { + dr1["Status"] = dt.Rows[i]["status"]; + try + { + if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) > 0) + { + dr1["Fehlercode"] = dt.Rows[i]["Fehlercode"]; + } + if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) >= 10) + { + if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) == 11) + { + // MyMsg.show_standardmessage(920000, MsgBoxStyle.Exclamation) + msg = "Die Serienbriefvorlage ist für Personen-Dokumente. Es sind jedoch BP's in der Partnerliste. Der Serienbrief kann nicht generiert werden."; + } + else + { + msg = "Die Serienbriefvorlage ist für BP-Dokumente. Es sind jedoch Personen-Nummern in der Partnerliste. Der Serienbrief kann nicht generiert weden."; + } + } + } + catch + { + + } + } + + + if (Convert.ToInt32(dt.Rows[i][4]) == 1) { bldossier = true; }; + } + if (sb.dsempfaenger.Tables[0].Columns.Count > 20) { check_zwingende_felder(); } + refresh_empfaenger(sb.dsempfaenger.Tables[0]); + if (msg !="") { MessageBox.Show(msg,"Serienbrief",MessageBoxButtons.OK, MessageBoxIcon.Error); } + } + + private void check_zwingende_felder() + { + + for (int i = 20; i < sb.dsempfaenger.Tables[0].Columns.Count; i++) + { + if (Convert.ToInt32(sb.dsempfaenger.Tables[1].Rows[0][sb.dsempfaenger.Tables[0].Columns[i].ColumnName]) == 1) + { + System.Data.DataRow[] dr = sb.dsempfaenger.Tables[0].Select("[" + sb.dsempfaenger.Tables[0].Columns[i].ColumnName + "] <>''"); + foreach (System.Data.DataRow dr2 in dr) + { + if (Convert.ToInt32(dr2["Status"]) == 0) { dr2["Status"] = 1; } + } + + dr = sb.dsempfaenger.Tables[0].Select("[" + sb.dsempfaenger.Tables[0].Columns[i].ColumnName + "] =''"); + foreach (System.Data.DataRow dr2 in dr) + { + if (Convert.ToInt32(dr2["Status"]) == 0) + { + dr2["Status"] = -1; + dr2["Fehlercode"] = 2; + } + } + } + } + } + + private void ribbonButton2_Click(object sender, EventArgs e) + { + Partnerliste_Pruefen(); + treeViewAdv1_AfterSelect(sender, e); + } } } diff --git a/Client/DocMgmt/Serienbrief.resx b/Client/DocMgmt/Serienbrief.resx index 1a035660..4b8a2a43 100644 --- a/Client/DocMgmt/Serienbrief.resx +++ b/Client/DocMgmt/Serienbrief.resx @@ -117,10 +117,49 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + + 17, 17 - AAABAAUAAAAAAAEAIABVIgAAVgAAADAwAAABACAAqCUAAKsiAAAgIAAAAQAgAKgQAABTSAAAGBgAAAEA diff --git a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs index 21e9a371..ae51124a 100644 --- a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs +++ b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs @@ -28,16 +28,30 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SerienbriefBearbeitung)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.sfdatagridstandard = new Syncfusion.WinForms.DataGrid.SfDataGrid(); - this.sfdatagridDokspezifisch = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.sfdatagridUsed = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.sfdatagridDokspezifisch = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.sfdatagridstandard = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.contextMenuStandard = new System.Windows.Forms.ContextMenuStrip(this.components); + this.platzhalterImDokumentEinfügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenuIDV = new System.Windows.Forms.ContextMenuStrip(this.components); + this.platzhalterImDokumentEinfügenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenuUsed = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cursorImDokumentPositionierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.platzhalterLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).BeginInit(); + this.contextMenuStandard.SuspendLayout(); + this.contextMenuIDV.SuspendLayout(); + this.contextMenuUsed.SuspendLayout(); this.SuspendLayout(); // // toolStrip1 @@ -50,6 +64,9 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.sfdatagridUsed); this.groupBox1.Controls.Add(this.sfdatagridDokspezifisch); this.groupBox1.Controls.Add(this.sfdatagridstandard); @@ -58,34 +75,112 @@ this.groupBox1.Size = new System.Drawing.Size(379, 435); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; - this.groupBox1.Text = "groupBox1"; // - // sfdatagridstandard + // sfdatagridUsed // - this.sfdatagridstandard.AccessibleName = "Table"; - this.sfdatagridstandard.Location = new System.Drawing.Point(6, 19); - this.sfdatagridstandard.Name = "sfdatagridstandard"; - this.sfdatagridstandard.Size = new System.Drawing.Size(367, 101); - this.sfdatagridstandard.TabIndex = 0; - this.sfdatagridstandard.Text = "sfDataGrid1"; + this.sfdatagridUsed.AccessibleName = "Table"; + this.sfdatagridUsed.ContextMenuStrip = this.contextMenuUsed; + this.sfdatagridUsed.Location = new System.Drawing.Point(6, 263); + this.sfdatagridUsed.Name = "sfdatagridUsed"; + this.sfdatagridUsed.Size = new System.Drawing.Size(367, 166); + this.sfdatagridUsed.TabIndex = 2; + this.sfdatagridUsed.Text = "sfDataGrid1"; // // sfdatagridDokspezifisch // this.sfdatagridDokspezifisch.AccessibleName = "Table"; + this.sfdatagridDokspezifisch.ContextMenuStrip = this.contextMenuIDV; this.sfdatagridDokspezifisch.Location = new System.Drawing.Point(6, 135); this.sfdatagridDokspezifisch.Name = "sfdatagridDokspezifisch"; this.sfdatagridDokspezifisch.Size = new System.Drawing.Size(367, 101); this.sfdatagridDokspezifisch.TabIndex = 1; this.sfdatagridDokspezifisch.Text = "sfDataGrid1"; // - // sfdatagridUsed + // sfdatagridstandard // - this.sfdatagridUsed.AccessibleName = "Table"; - this.sfdatagridUsed.Location = new System.Drawing.Point(6, 255); - this.sfdatagridUsed.Name = "sfdatagridUsed"; - this.sfdatagridUsed.Size = new System.Drawing.Size(367, 101); - this.sfdatagridUsed.TabIndex = 2; - this.sfdatagridUsed.Text = "sfDataGrid1"; + this.sfdatagridstandard.AccessibleName = "Table"; + this.sfdatagridstandard.ContextMenuStrip = this.contextMenuStandard; + this.sfdatagridstandard.Location = new System.Drawing.Point(6, 32); + this.sfdatagridstandard.Name = "sfdatagridstandard"; + this.sfdatagridstandard.Size = new System.Drawing.Size(367, 84); + this.sfdatagridstandard.TabIndex = 0; + this.sfdatagridstandard.Text = "sfDataGrid1"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(7, 16); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(137, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Verfügbare Standard-Werte"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(7, 119); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(190, 13); + this.label2.TabIndex = 4; + this.label2.Text = "Verfügbare dokument-spzifische Werte"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(7, 244); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(96, 13); + this.label3.TabIndex = 5; + this.label3.Text = "Verwendete Werte"; + // + // contextMenuStandard + // + this.contextMenuStandard.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.platzhalterImDokumentEinfügenToolStripMenuItem}); + this.contextMenuStandard.Name = "contextMenuStandard"; + this.contextMenuStandard.Size = new System.Drawing.Size(256, 48); + // + // platzhalterImDokumentEinfügenToolStripMenuItem + // + this.platzhalterImDokumentEinfügenToolStripMenuItem.Name = "platzhalterImDokumentEinfügenToolStripMenuItem"; + this.platzhalterImDokumentEinfügenToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.platzhalterImDokumentEinfügenToolStripMenuItem.Text = "Platzhalter im Dokument einfügen"; + this.platzhalterImDokumentEinfügenToolStripMenuItem.Click += new System.EventHandler(this.platzhalterImDokumentEinfügenToolStripMenuItem_Click); + // + // contextMenuIDV + // + this.contextMenuIDV.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.platzhalterImDokumentEinfügenToolStripMenuItem1}); + this.contextMenuIDV.Name = "contextMenuIDV"; + this.contextMenuIDV.Size = new System.Drawing.Size(256, 26); + // + // platzhalterImDokumentEinfügenToolStripMenuItem1 + // + this.platzhalterImDokumentEinfügenToolStripMenuItem1.Name = "platzhalterImDokumentEinfügenToolStripMenuItem1"; + this.platzhalterImDokumentEinfügenToolStripMenuItem1.Size = new System.Drawing.Size(255, 22); + this.platzhalterImDokumentEinfügenToolStripMenuItem1.Text = "Platzhalter im Dokument einfügen"; + this.platzhalterImDokumentEinfügenToolStripMenuItem1.Click += new System.EventHandler(this.platzhalterImDokumentEinfügenToolStripMenuItem1_Click); + // + // contextMenuUsed + // + this.contextMenuUsed.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cursorImDokumentPositionierenToolStripMenuItem, + this.platzhalterLöschenToolStripMenuItem}); + this.contextMenuUsed.Name = "contextMenuUsed"; + this.contextMenuUsed.Size = new System.Drawing.Size(258, 48); + // + // cursorImDokumentPositionierenToolStripMenuItem + // + this.cursorImDokumentPositionierenToolStripMenuItem.Name = "cursorImDokumentPositionierenToolStripMenuItem"; + this.cursorImDokumentPositionierenToolStripMenuItem.Size = new System.Drawing.Size(257, 22); + this.cursorImDokumentPositionierenToolStripMenuItem.Text = "Cursor im Dokument positionieren"; + this.cursorImDokumentPositionierenToolStripMenuItem.Click += new System.EventHandler(this.cursorImDokumentPositionierenToolStripMenuItem_Click); + // + // platzhalterLöschenToolStripMenuItem + // + this.platzhalterLöschenToolStripMenuItem.Name = "platzhalterLöschenToolStripMenuItem"; + this.platzhalterLöschenToolStripMenuItem.Size = new System.Drawing.Size(257, 22); + this.platzhalterLöschenToolStripMenuItem.Text = "Platzhalter löschen"; // // SerienbriefBearbeitung // @@ -101,9 +196,13 @@ this.Text = "SerienbriefBearbeitung"; this.Load += new System.EventHandler(this.SerienbriefBearbeitung_Load); this.groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).EndInit(); + this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).EndInit(); + this.contextMenuStandard.ResumeLayout(false); + this.contextMenuIDV.ResumeLayout(false); + this.contextMenuUsed.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -116,5 +215,15 @@ private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridUsed; private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridDokspezifisch; private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridstandard; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ContextMenuStrip contextMenuStandard; + private System.Windows.Forms.ToolStripMenuItem platzhalterImDokumentEinfügenToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip contextMenuIDV; + private System.Windows.Forms.ToolStripMenuItem platzhalterImDokumentEinfügenToolStripMenuItem1; + private System.Windows.Forms.ContextMenuStrip contextMenuUsed; + private System.Windows.Forms.ToolStripMenuItem cursorImDokumentPositionierenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem platzhalterLöschenToolStripMenuItem; } } \ No newline at end of file diff --git a/Client/DocMgmt/SerienbriefBearbeitung.cs b/Client/DocMgmt/SerienbriefBearbeitung.cs index a0c3a964..a90aa29d 100644 --- a/Client/DocMgmt/SerienbriefBearbeitung.cs +++ b/Client/DocMgmt/SerienbriefBearbeitung.cs @@ -4,6 +4,8 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Runtime.DesignerServices; +using System.Security.RightsManagement; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -14,7 +16,9 @@ using Syncfusion.Windows.Forms.Tools; using Syncfusion.WinForms.Controls; using Syncfusion.WinForms.DataGrid; using Syncfusion.WinForms.DataGrid.Interactivity; +using Windows.Devices.HumanInterfaceDevice; using Windows.Media.Ocr; +using Windows.UI.Xaml.Controls; namespace OnDoc.DocMgmt { @@ -25,6 +29,9 @@ namespace OnDoc.DocMgmt DataTable UsedFelder = new DataTable(); int dokumenttypnr = 0; serienbrief sb = new serienbrief(); + private Microsoft.Office.Interop.Word.Application word; + private Microsoft.Office.Interop.Word.Document doc; + public SerienbriefBearbeitung() { InitializeComponent(); @@ -40,10 +47,60 @@ namespace OnDoc.DocMgmt this.sb = sb; } + private DataTable get_idvwerte() + { + int i; + var dt = new DataTable(); + dt.Columns.Add("Feldname"); + dt.Columns.Add("Wert"); + var loopTo = sb.dsempfaenger.Tables[0].Columns.Count - 1; + for (i = 0; i <= loopTo; i++) + { + switch (sb.dsempfaenger.Tables[0].Columns[i].Caption.ToUpper()) + { + case "PARTNERNR": + case "KURZBEZEICHNUNG": + case "ANREDE": + case "NAME": + case "VORNAME": + case "STRASSE": + case "PLZ": + case "ORT": + case "ZUSTELLADRESSE": + case "BRIEFANREDE1": + case "BRIEFANREDE2": + case "STATUS": + case "FEHLERCD": + case "BLKUNDE": + case "DOKUMENT_GEDRUCKT": + case "AKTIV": + case "DOKUMENTID": + case "DOKUMENTIDBDR": + case "ERSTELLER": + case "FEHLERCODE": + case "DRUCKJOBID": + { + break; + } + + default: + { + System.Data.DataRow myRow; + myRow = dt.NewRow(); + myRow[0] = sb.dsempfaenger.Tables[0].Columns[i].Caption.ToString(); + myRow[1] = ""; + dt.Rows.Add(myRow); + break; + } + } + } + return dt; + } private void SerienbriefBearbeitung_Load(object sender, EventArgs e) { StdFelder = get_vorlagenfelder(sb.dokumenttypnr, 0); - + this.TopMost = true; + foreach (System.Data.DataRow dr in StdFelder.Rows) { dr[1] = dr[1].ToString().Replace(System.Environment.NewLine, " "); @@ -51,37 +108,50 @@ namespace OnDoc.DocMgmt StdFelder.AcceptChanges(); sfdatagridstandard.RowHeight = 17; sfdatagridstandard.DataSource = StdFelder; - - IDVFelder = get_vorlagenfelder(sb.dokumenttypnr, 1); - foreach (System.Data.DataRow dr in IDVFelder.Rows) + + IDVFelder = get_idvwerte(); + //foreach (System.Data.DataRow dr in IDVFelder.Rows) + //{ + // dr[1] = dr[1].ToString().Replace(System.Environment.NewLine, " "); + //} + //IDVFelder.AcceptChanges(); + sfdatagridDokspezifisch.DataSource = IDVFelder; + sfdatagridDokspezifisch.RowHeight = 17; + + init_used_felder(true); + foreach (System.Data.DataRow dr in UsedFelder.Rows) { dr[1] = dr[1].ToString().Replace(System.Environment.NewLine, " "); } - IDVFelder.AcceptChanges(); - sfdatagridDokspezifisch.DataSource = IDVFelder; - sfdatagridDokspezifisch.RowHeight= 17; - init_used_felder(); + sfdatagridUsed.RowHeight = 17; + sfdatagridUsed.DataSource = UsedFelder; } - private DataTable get_vorlagenfelder(int dokumenttypnr, int type) { + private DataTable get_vorlagenfelder(int dokumenttypnr, int type) + { Database.DB db = new Database.DB(AppParams.connectionstring); db.clear_parameter(); db.add_parameter("@dokumenttypnr", sb.dokumenttypnr.ToString()); db.add_parameter("@type", type.ToString()); - db.Get_Tabledata("sp_edex_sb_get_standardvorlagenfelder",true,false); + db.Get_Tabledata("sp_edex_sb_get_standardvorlagenfelder", true, false); return db.dsdaten.Tables[0]; } - private Microsoft.Office.Interop.Word.Application word; - private Microsoft.Office.Interop.Word.Document doc; - public void load_document() + public void unload_document() + { + doc.Close(SaveChanges: false); + doc = null; + word.Quit(SaveChanges: false); + } + + public void load_document(Boolean word_visible ) { word = new Microsoft.Office.Interop.Word.Application(); doc = new Microsoft.Office.Interop.Word.Document(); word.Documents.Open(sb.filename); doc = word.ActiveDocument; - word.Visible= true; + word.Visible = word_visible; word.WindowState = Microsoft.Office.Interop.Word.WdWindowState.wdWindowStateMaximize; } @@ -143,17 +213,84 @@ namespace OnDoc.DocMgmt row.Delete(); } list.AcceptChanges(); - sfdatagridUsed.DataSource= list; } - public DataTable init_used_felder() - - { - load_document(); + public DataTable init_used_felder(Boolean word_visible) + + { + load_document(word_visible); get_usedfelder(ref UsedFelder); - return null; + if (word_visible==false) { unload_document(); } + return UsedFelder; } + public bool grid_empty(ref SfDataGrid grid) + { + if (grid.RowCount > 0) { return false; } else return true; + } + private bool Row_Selected(ref SfDataGrid grid) + { + if (grid_empty(ref grid) == true) { return false; } + var records = grid.View.GetSelectedRecords(); + if (records.Count < 1) { return false; } + return true; + } + + public void cursor_positionieren(ref SfDataGrid grid) + { + if (!Row_Selected(ref grid)) { return; } + var records = grid.View.GetSelectedRecords(); + foreach (var record in records) + { + var data = record as DataRowView; + + if (data["Feldname"].ToString() != "") + { + word.Selection.GoTo(What: Microsoft.Office.Interop.Word.WdGoToItem.wdGoToField, Name: data["Feldname"].ToString()); + } + if (data["beginntextmarke"].ToString() != "") + { + word.Selection.GoTo(What: Microsoft.Office.Interop.Word.WdGoToItem.wdGoToBookmark, Name: data["beginntextmarke"].ToString()); + } + if (data["endetextmarke"].ToString() != "") + { + + } + } + } + + public void insert_tm(ref SfDataGrid grid) + { + if (!Row_Selected(ref grid)) { return; } + var records = grid.View.GetSelectedRecords(); + foreach (var record in records) + { + var data = record as DataRowView; + if (data["Feldname"].ToString() != "") + { + word.Selection.FormFields.Add(Range: word.Selection.Range, Type: Microsoft.Office.Interop.Word.WdFieldType.wdFieldFormTextInput); + word.Selection.PreviousField().Select(); + word.Selection.FormFields[1].Name = data["Feldname"].ToString(); + } + if (data["beginntextmarke"].ToString() != "") + { + word.Selection.Bookmarks.Add(data["beginntextmarke"].ToString()); + } + } + } + public void cursorImDokumentPositionierenToolStripMenuItem_Click(object sender, EventArgs e) + { + cursor_positionieren(ref sfdatagridUsed); + } + private void platzhalterImDokumentEinfügenToolStripMenuItem1_Click(object sender, EventArgs e) + { + insert_tm(ref sfdatagridDokspezifisch); + } + + private void platzhalterImDokumentEinfügenToolStripMenuItem_Click(object sender, EventArgs e) + { + insert_tm(ref sfdatagridstandard); + } } } diff --git a/Client/DocMgmt/SerienbriefBearbeitung.resx b/Client/DocMgmt/SerienbriefBearbeitung.resx index bd8e405f..fae60f75 100644 --- a/Client/DocMgmt/SerienbriefBearbeitung.resx +++ b/Client/DocMgmt/SerienbriefBearbeitung.resx @@ -120,6 +120,15 @@ 17, 17 + + 437, 17 + + + 294, 17 + + + 122, 17 + diff --git a/Client/Properties/Resources.Designer.cs b/Client/Properties/Resources.Designer.cs index b35ef8a7..aeeb2f66 100644 --- a/Client/Properties/Resources.Designer.cs +++ b/Client/Properties/Resources.Designer.cs @@ -1460,6 +1460,106 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_16x16_32 { + get { + object obj = ResourceManager.GetObject("Partner_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_24x24_32 { + get { + object obj = ResourceManager.GetObject("Partner_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_256x256_32 { + get { + object obj = ResourceManager.GetObject("Partner_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_32x32_32 { + get { + object obj = ResourceManager.GetObject("Partner_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_48x48_32 { + get { + object obj = ResourceManager.GetObject("Partner_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_Saldiert_16x16_32 { + get { + object obj = ResourceManager.GetObject("Partner_Saldiert_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_Saldiert_24x24_32 { + get { + object obj = ResourceManager.GetObject("Partner_Saldiert_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_Saldiert_256x256_32 { + get { + object obj = ResourceManager.GetObject("Partner_Saldiert_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_Saldiert_32x32_32 { + get { + object obj = ResourceManager.GetObject("Partner_Saldiert_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Partner_Saldiert_48x48_32 { + get { + object obj = ResourceManager.GetObject("Partner_Saldiert_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Client/Properties/Resources.resx b/Client/Properties/Resources.resx index 439d0ba5..05ac69aa 100644 --- a/Client/Properties/Resources.resx +++ b/Client/Properties/Resources.resx @@ -538,6 +538,36 @@ ..\Resources\OnBase_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Partner_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_Saldiert_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_Saldiert_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_Saldiert_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_Saldiert_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Partner_Saldiert_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PDF_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Client/Resources/Partner_16x16-32.png b/Client/Resources/Partner_16x16-32.png new file mode 100644 index 00000000..38cbb137 Binary files /dev/null and b/Client/Resources/Partner_16x16-32.png differ diff --git a/Client/Resources/Partner_24x24-32.png b/Client/Resources/Partner_24x24-32.png new file mode 100644 index 00000000..30922a88 Binary files /dev/null and b/Client/Resources/Partner_24x24-32.png differ diff --git a/Client/Resources/Partner_256x256-32.png b/Client/Resources/Partner_256x256-32.png new file mode 100644 index 00000000..cac27c83 Binary files /dev/null and b/Client/Resources/Partner_256x256-32.png differ diff --git a/Client/Resources/Partner_32x32-32.png b/Client/Resources/Partner_32x32-32.png new file mode 100644 index 00000000..b0d726c6 Binary files /dev/null and b/Client/Resources/Partner_32x32-32.png differ diff --git a/Client/Resources/Partner_48x48-32.png b/Client/Resources/Partner_48x48-32.png new file mode 100644 index 00000000..1ef54d41 Binary files /dev/null and b/Client/Resources/Partner_48x48-32.png differ diff --git a/Client/Resources/Partner_Saldiert_16x16-32.png b/Client/Resources/Partner_Saldiert_16x16-32.png new file mode 100644 index 00000000..80424de2 Binary files /dev/null and b/Client/Resources/Partner_Saldiert_16x16-32.png differ diff --git a/Client/Resources/Partner_Saldiert_24x24-32.png b/Client/Resources/Partner_Saldiert_24x24-32.png new file mode 100644 index 00000000..58791bad Binary files /dev/null and b/Client/Resources/Partner_Saldiert_24x24-32.png differ diff --git a/Client/Resources/Partner_Saldiert_256x256-32.png b/Client/Resources/Partner_Saldiert_256x256-32.png new file mode 100644 index 00000000..2622814e Binary files /dev/null and b/Client/Resources/Partner_Saldiert_256x256-32.png differ diff --git a/Client/Resources/Partner_Saldiert_32x32-32.png b/Client/Resources/Partner_Saldiert_32x32-32.png new file mode 100644 index 00000000..b02a1f62 Binary files /dev/null and b/Client/Resources/Partner_Saldiert_32x32-32.png differ diff --git a/Client/Resources/Partner_Saldiert_48x48-32.png b/Client/Resources/Partner_Saldiert_48x48-32.png new file mode 100644 index 00000000..20de319c Binary files /dev/null and b/Client/Resources/Partner_Saldiert_48x48-32.png differ diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 1cae9d9b..f4bd13dc 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -35,9 +35,6 @@ namespace OnDoc.UICintrols this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.ctxMenuDokList = new System.Windows.Forms.ContextMenuStrip(this.components); this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.vertragPDFDEMOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.zellenwertInZwischenablageKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -48,9 +45,6 @@ namespace OnDoc.UICintrols this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox(); - this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel2 = new System.Windows.Forms.Panel(); this.lblTitel = new System.Windows.Forms.Label(); @@ -58,62 +52,69 @@ namespace OnDoc.UICintrols this.ribbon2 = new System.Windows.Forms.Ribbon(); this.RibbonTabUserFunctions = new System.Windows.Forms.RibbonTab(); this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); - this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel(); + this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); + this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); + this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); + this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); + this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); + this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); + this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); + this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); + this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); + this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); + this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); + this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); + this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); + this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); + this.lblToApprove = new System.Windows.Forms.Label(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); + this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); this.RibbonButtonNewDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditEditDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditDelete = new System.Windows.Forms.RibbonButton(); this.RibbonButtonZuweisen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonToApproval = new System.Windows.Forms.RibbonButton(); - this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonApproval = new System.Windows.Forms.RibbonButton(); this.ribbonButtonRefresh_Bewilligungen = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonArchivToOnBase = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonCreateNewPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonCreateNewSerienbrief = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditSerienbrief = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonRefresh = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); - this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonGetMA = new System.Windows.Forms.RibbonButton(); this.ribbonDokumntID = new System.Windows.Forms.RibbonButton(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); - this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); + this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); - this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); - this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativ = new System.Windows.Forms.RibbonButton(); - this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); - this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonDokumenttyp = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorlagen = new System.Windows.Forms.RibbonButton(); - this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton2 = new System.Windows.Forms.RibbonButton(); this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton(); - this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton(); - this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); - this.lblToApprove = new System.Windows.Forms.Label(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); - this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); - this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton(); + this.RibbonPartnerSaldiert = new System.Windows.Forms.RibbonButton(); this.docPreview1 = new OnDoc.UIControls.DocPreview(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); this.ctxMenuDokList.SuspendLayout(); @@ -170,29 +171,6 @@ namespace OnDoc.UICintrols this.dokumentAnzeigenToolStripMenuItem.Visible = false; this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click); // - // dokumentBearbeitenToolStripMenuItem - // - this.dokumentBearbeitenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("dokumentBearbeitenToolStripMenuItem.Image"))); - this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; - this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; - this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); - // - // dokumentLöschenToolStripMenuItem - // - this.dokumentLöschenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("dokumentLöschenToolStripMenuItem.Image"))); - this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; - this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; - this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); - // - // archivierenToolStripMenuItem - // - this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); - this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; - this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.archivierenToolStripMenuItem.Text = "Archivieren"; - // // barcodeDemoToolStripMenuItem // this.barcodeDemoToolStripMenuItem.Name = "barcodeDemoToolStripMenuItem"; @@ -283,33 +261,6 @@ namespace OnDoc.UICintrols this.tsrbvorschau.SelectedIndexChanged += new System.EventHandler(this.tsrbvorschau_SelectedIndexChanged); this.tsrbvorschau.TextChanged += new System.EventHandler(this.tsrbvorschau_TextChanged); // - // tsbtnpreviewno - // - this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); - this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewno.Name = "tsbtnpreviewno"; - this.tsbtnpreviewno.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewno.Text = "Keine Vorschau"; - // - // tsbtnpreviewbottom - // - this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); - this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; - this.tsbtnpreviewbottom.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewbottom.Text = "Vorschau unten"; - // - // tsbtnpreviewright - // - this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); - this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewright.Name = "tsbtnpreviewright"; - this.tsbtnpreviewright.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewright.Text = "Vorschau rechts"; - // // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -411,16 +362,6 @@ namespace OnDoc.UICintrols this.RibbonPanelExit.Text = "Beenden"; this.RibbonPanelExit.Visible = false; // - // RibbonButtonExit - // - this.RibbonButtonExit.Image = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; - this.RibbonButtonExit.LargeImage = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; - this.RibbonButtonExit.Name = "RibbonButtonExit"; - this.RibbonButtonExit.SmallImage = global::OnDoc.Properties.Resources.CloseApplication_16x16_32; - this.RibbonButtonExit.Text = "Beenden"; - this.RibbonButtonExit.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center; - this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click); - // // RibbonPanelBearbeiten // this.RibbonPanelBearbeiten.ButtonMoreVisible = false; @@ -433,60 +374,6 @@ namespace OnDoc.UICintrols this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; this.RibbonPanelBearbeiten.Text = "Dokument"; // - // RibbonButtonNewDoc - // - this.RibbonButtonNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.Name = "RibbonButtonNewDoc"; - this.RibbonButtonNewDoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.Text = "Neu"; - this.RibbonButtonNewDoc.Click += new System.EventHandler(this.RibbonButtonNewDoc_Click); - // - // RibbonButtonFavoriten - // - this.RibbonButtonFavoriten.Image = global::OnDoc.Properties.Resources.Favoriten_32x32_32; - this.RibbonButtonFavoriten.LargeImage = global::OnDoc.Properties.Resources.Favoriten_32x32_32; - this.RibbonButtonFavoriten.Name = "RibbonButtonFavoriten"; - this.RibbonButtonFavoriten.SmallImage = global::OnDoc.Properties.Resources.Favoriten_24x24_32; - this.RibbonButtonFavoriten.Text = "Neu Favorit"; - this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click); - // - // RibbonButtonEditEditDoc - // - this.RibbonButtonEditEditDoc.Image = global::OnDoc.Properties.Resources.EditDoc_32x32_32; - this.RibbonButtonEditEditDoc.LargeImage = global::OnDoc.Properties.Resources.EditDoc_32x32_32; - this.RibbonButtonEditEditDoc.Name = "RibbonButtonEditEditDoc"; - this.RibbonButtonEditEditDoc.SmallImage = global::OnDoc.Properties.Resources.EditDoc_16x16_32; - this.RibbonButtonEditEditDoc.Text = "Bearbeiten"; - this.RibbonButtonEditEditDoc.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); - // - // RibbonButtonEditDelete - // - this.RibbonButtonEditDelete.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; - this.RibbonButtonEditDelete.LargeImage = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; - this.RibbonButtonEditDelete.Name = "RibbonButtonEditDelete"; - this.RibbonButtonEditDelete.SmallImage = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; - this.RibbonButtonEditDelete.Text = "Löschen"; - this.RibbonButtonEditDelete.Click += new System.EventHandler(this.RibbonButtonEditDelete_Click); - // - // RibbonButtonZuweisen - // - this.RibbonButtonZuweisen.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; - this.RibbonButtonZuweisen.LargeImage = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; - this.RibbonButtonZuweisen.Name = "RibbonButtonZuweisen"; - this.RibbonButtonZuweisen.SmallImage = global::OnDoc.Properties.Resources.Zuweisen_16x16_32; - this.RibbonButtonZuweisen.Text = "Zuweisen"; - this.RibbonButtonZuweisen.Click += new System.EventHandler(this.RibbonButtonZuweisen_Click); - // - // ribbonButtonToApproval - // - this.ribbonButtonToApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; - this.ribbonButtonToApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32; - this.ribbonButtonToApproval.Name = "ribbonButtonToApproval"; - this.ribbonButtonToApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32; - this.ribbonButtonToApproval.Text = "zur Unterschriften-Prüfung"; - this.ribbonButtonToApproval.Click += new System.EventHandler(this.ribbonButtonToApproval_Click); - // // RibbonPannelAproval // this.RibbonPannelAproval.ButtonMoreVisible = false; @@ -495,23 +382,6 @@ namespace OnDoc.UICintrols this.RibbonPannelAproval.Name = "RibbonPannelAproval"; this.RibbonPannelAproval.Text = ""; // - // ribbonButtonApproval - // - this.ribbonButtonApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; - this.ribbonButtonApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32; - this.ribbonButtonApproval.Name = "ribbonButtonApproval"; - this.ribbonButtonApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32; - this.ribbonButtonApproval.Text = "Prüfen"; - this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click); - // - // ribbonButtonRefresh_Bewilligungen - // - this.ribbonButtonRefresh_Bewilligungen.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; - this.ribbonButtonRefresh_Bewilligungen.LargeImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; - this.ribbonButtonRefresh_Bewilligungen.Name = "ribbonButtonRefresh_Bewilligungen"; - this.ribbonButtonRefresh_Bewilligungen.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; - this.ribbonButtonRefresh_Bewilligungen.Click += new System.EventHandler(this.ribbonButtonRefresh_Bewilligungen_Click); - // // RibbonPanelArchiv // this.RibbonPanelArchiv.ButtonMoreVisible = false; @@ -520,24 +390,6 @@ namespace OnDoc.UICintrols this.RibbonPanelArchiv.Name = "RibbonPanelArchiv"; this.RibbonPanelArchiv.Text = "Archiv"; // - // RibbonButtonArchivToOnBase - // - this.RibbonButtonArchivToOnBase.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.Image"))); - this.RibbonButtonArchivToOnBase.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.LargeImage"))); - this.RibbonButtonArchivToOnBase.Name = "RibbonButtonArchivToOnBase"; - this.RibbonButtonArchivToOnBase.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.SmallImage"))); - this.RibbonButtonArchivToOnBase.Text = "Archivieren"; - this.RibbonButtonArchivToOnBase.Click += new System.EventHandler(this.RibbonButtonArchivToOnBase_Click); - // - // ribbonButtonVersandstrasse - // - this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; - this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; - this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; - this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32; - this.ribbonButtonVersandstrasse.Text = "Versandstrasse"; - this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click); - // // RibbonPanelCreate // this.RibbonPanelCreate.ButtonMoreVisible = false; @@ -548,42 +400,6 @@ namespace OnDoc.UICintrols this.RibbonPanelCreate.Name = "RibbonPanelCreate"; this.RibbonPanelCreate.Text = "Serienbriefe / Dokumentpakete"; // - // RibbonButtonCreateNewPaket - // - this.RibbonButtonCreateNewPaket.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; - this.RibbonButtonCreateNewPaket.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; - this.RibbonButtonCreateNewPaket.Name = "RibbonButtonCreateNewPaket"; - this.RibbonButtonCreateNewPaket.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_16x16_32; - this.RibbonButtonCreateNewPaket.Text = "Dokumentpaket"; - this.RibbonButtonCreateNewPaket.Click += new System.EventHandler(this.RibbonButtonCreateNewPaket_Click); - // - // RibbonButtonEditPaket - // - this.RibbonButtonEditPaket.Image = global::OnDoc.Properties.Resources.EditDokumentPaket_32x32_32; - this.RibbonButtonEditPaket.LargeImage = global::OnDoc.Properties.Resources.EditDokumentPaket_32x32_32; - this.RibbonButtonEditPaket.Name = "RibbonButtonEditPaket"; - this.RibbonButtonEditPaket.SmallImage = global::OnDoc.Properties.Resources.EditDokumentPaket_16x16_32; - this.RibbonButtonEditPaket.Text = "Dokumentpaket bearbeiten"; - this.RibbonButtonEditPaket.Visible = false; - // - // RibbonButtonCreateNewSerienbrief - // - this.RibbonButtonCreateNewSerienbrief.Image = global::OnDoc.Properties.Resources.NewSerienbrief_32x32_32; - this.RibbonButtonCreateNewSerienbrief.LargeImage = global::OnDoc.Properties.Resources.NewSerienbrief_32x32_32; - this.RibbonButtonCreateNewSerienbrief.Name = "RibbonButtonCreateNewSerienbrief"; - this.RibbonButtonCreateNewSerienbrief.SmallImage = global::OnDoc.Properties.Resources.NewSerienbrief_16x16_32; - this.RibbonButtonCreateNewSerienbrief.Text = "Serienbrief"; - this.RibbonButtonCreateNewSerienbrief.Click += new System.EventHandler(this.RibbonButtonCreateNewSerienbrief_Click); - // - // RibbonButtonEditSerienbrief - // - this.RibbonButtonEditSerienbrief.Image = global::OnDoc.Properties.Resources.EditSerienbrief_32x32_32; - this.RibbonButtonEditSerienbrief.LargeImage = global::OnDoc.Properties.Resources.EditSerienbrief_32x32_32; - this.RibbonButtonEditSerienbrief.Name = "RibbonButtonEditSerienbrief"; - this.RibbonButtonEditSerienbrief.SmallImage = global::OnDoc.Properties.Resources.EditSerienbrief_16x16_32; - this.RibbonButtonEditSerienbrief.Text = "Serienbrief bearbeiten"; - this.RibbonButtonEditSerienbrief.Visible = false; - // // RibbonPanelDoklist // this.RibbonPanelDoklist.ButtonMoreVisible = false; @@ -591,15 +407,6 @@ namespace OnDoc.UICintrols this.RibbonPanelDoklist.Name = "RibbonPanelDoklist"; this.RibbonPanelDoklist.Text = "Dokumentliste"; // - // RibbonButtonRefresh - // - this.RibbonButtonRefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; - this.RibbonButtonRefresh.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32; - this.RibbonButtonRefresh.Name = "RibbonButtonRefresh"; - this.RibbonButtonRefresh.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; - this.RibbonButtonRefresh.Text = "Aktualisieren"; - this.RibbonButtonRefresh.Click += new System.EventHandler(this.RibbonButtonRefresh_Click); - // // RibbonPanelDemo // this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1); @@ -607,16 +414,7 @@ namespace OnDoc.UICintrols this.RibbonPanelDemo.Text = "Test-Funktionen"; this.RibbonPanelDemo.Visible = false; // - // RibbonButtonTest1 - // - this.RibbonButtonTest1.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.Image"))); - this.RibbonButtonTest1.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.LargeImage"))); - this.RibbonButtonTest1.Name = "RibbonButtonTest1"; - this.RibbonButtonTest1.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.SmallImage"))); - this.RibbonButtonTest1.Text = "Test 1"; - this.RibbonButtonTest1.Click += new System.EventHandler(this.RibbonButtonTest1_Click); - // - // RibbonPanelSuche + // RibbonPanelSuche // this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); @@ -631,6 +429,315 @@ namespace OnDoc.UICintrols this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; this.ribbonGroupMitarbeiter.Text = ""; // + // RibbonGroupFilter + // + this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); + this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); + this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); + this.RibbonGroupFilter.Name = "RibbonGroupFilter"; + this.RibbonGroupFilter.Text = ""; + // + // RibbonFilterLabel + // + this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonFilterLabel.Name = "RibbonFilterLabel"; + this.RibbonFilterLabel.Text = ""; + this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; + // + // ribbonPanelVorschau + // + this.ribbonPanelVorschau.ButtonMoreVisible = false; + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); + this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); + this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; + this.ribbonPanelVorschau.Text = "Vorschau"; + // + // RibbonPanelProfil + // + this.RibbonPanelProfil.ButtonMoreVisible = false; + this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); + this.RibbonPanelProfil.Items.Add(this.ribbonButton1); + this.RibbonPanelProfil.Name = "RibbonPanelProfil"; + this.RibbonPanelProfil.Text = "Profil"; + // + // ribbonItemGroup1 + // + this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); + this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); + this.ribbonItemGroup1.Name = "ribbonItemGroup1"; + // + // ribbonLabel1 + // + this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabel1.Name = "ribbonLabel1"; + this.ribbonLabel1.Text = "Profil"; + // + // RibbonCBProfil + // + this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonCBProfil.Name = "RibbonCBProfil"; + this.RibbonCBProfil.SelectedIndex = -1; + this.RibbonCBProfil.TextBoxText = ""; + // + // ribbonPannelDiverseVorlagen + // + this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); + this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; + this.ribbonPannelDiverseVorlagen.Text = "Nativ"; + this.ribbonPannelDiverseVorlagen.Visible = false; + // + // RibbonTabAdmin + // + this.RibbonTabAdmin.Name = "RibbonTabAdmin"; + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1); + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); + this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); + this.RibbonTabAdmin.Text = "Administration"; + // + // ribbonPanel1 + // + this.ribbonPanel1.ButtonMoreVisible = false; + this.ribbonPanel1.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Right; + this.ribbonPanel1.Items.Add(this.RibbonButtonDokumenttyp); + this.ribbonPanel1.Items.Add(this.RibbonButtonVorlagen); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Text = "ribbonPanel1"; + // + // ribbonPanel3 + // + this.ribbonPanel3.ButtonMoreVisible = false; + this.ribbonPanel3.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; + this.ribbonPanel3.Items.Add(this.ribbonButton2); + this.ribbonPanel3.Items.Add(this.RibbonButtonBerechtigungsgruppe); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Text = "Berechtigungen"; + // + // RibbonPanelDiverses + // + this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); + this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; + this.RibbonPanelDiverses.Text = "Diverse Funktionen"; + // + // lblToApprove + // + this.lblToApprove.AutoSize = true; + this.lblToApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblToApprove.ForeColor = System.Drawing.Color.Red; + this.lblToApprove.Location = new System.Drawing.Point(407, 88); + this.lblToApprove.Name = "lblToApprove"; + this.lblToApprove.Size = new System.Drawing.Size(0, 18); + this.lblToApprove.TabIndex = 6; + // + // timer1 + // + this.timer1.Interval = 60000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // dokumentBearbeitenToolStripMenuItem + // + this.dokumentBearbeitenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("dokumentBearbeitenToolStripMenuItem.Image"))); + this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; + this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; + this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); + // + // dokumentLöschenToolStripMenuItem + // + this.dokumentLöschenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("dokumentLöschenToolStripMenuItem.Image"))); + this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; + this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; + this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); + // + // archivierenToolStripMenuItem + // + this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); + this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; + this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.archivierenToolStripMenuItem.Text = "Archivieren"; + // + // tsbtnpreviewno + // + this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); + this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewno.Name = "tsbtnpreviewno"; + this.tsbtnpreviewno.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewno.Text = "Keine Vorschau"; + // + // tsbtnpreviewbottom + // + this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); + this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; + this.tsbtnpreviewbottom.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewbottom.Text = "Vorschau unten"; + // + // tsbtnpreviewright + // + this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); + this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewright.Name = "tsbtnpreviewright"; + this.tsbtnpreviewright.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewright.Text = "Vorschau rechts"; + // + // RibbonButtonExit + // + this.RibbonButtonExit.Image = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; + this.RibbonButtonExit.LargeImage = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; + this.RibbonButtonExit.Name = "RibbonButtonExit"; + this.RibbonButtonExit.SmallImage = global::OnDoc.Properties.Resources.CloseApplication_16x16_32; + this.RibbonButtonExit.Text = "Beenden"; + this.RibbonButtonExit.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center; + this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click); + // + // RibbonButtonNewDoc + // + this.RibbonButtonNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.Name = "RibbonButtonNewDoc"; + this.RibbonButtonNewDoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.Text = "Neu"; + this.RibbonButtonNewDoc.Click += new System.EventHandler(this.RibbonButtonNewDoc_Click); + // + // RibbonButtonFavoriten + // + this.RibbonButtonFavoriten.Image = global::OnDoc.Properties.Resources.Favoriten_32x32_32; + this.RibbonButtonFavoriten.LargeImage = global::OnDoc.Properties.Resources.Favoriten_32x32_32; + this.RibbonButtonFavoriten.Name = "RibbonButtonFavoriten"; + this.RibbonButtonFavoriten.SmallImage = global::OnDoc.Properties.Resources.Favoriten_24x24_32; + this.RibbonButtonFavoriten.Text = "Neu Favorit"; + this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click); + // + // RibbonButtonEditEditDoc + // + this.RibbonButtonEditEditDoc.Image = global::OnDoc.Properties.Resources.EditDoc_32x32_32; + this.RibbonButtonEditEditDoc.LargeImage = global::OnDoc.Properties.Resources.EditDoc_32x32_32; + this.RibbonButtonEditEditDoc.Name = "RibbonButtonEditEditDoc"; + this.RibbonButtonEditEditDoc.SmallImage = global::OnDoc.Properties.Resources.EditDoc_16x16_32; + this.RibbonButtonEditEditDoc.Text = "Bearbeiten"; + this.RibbonButtonEditEditDoc.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); + // + // RibbonButtonEditDelete + // + this.RibbonButtonEditDelete.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; + this.RibbonButtonEditDelete.LargeImage = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; + this.RibbonButtonEditDelete.Name = "RibbonButtonEditDelete"; + this.RibbonButtonEditDelete.SmallImage = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; + this.RibbonButtonEditDelete.Text = "Löschen"; + this.RibbonButtonEditDelete.Click += new System.EventHandler(this.RibbonButtonEditDelete_Click); + // + // RibbonButtonZuweisen + // + this.RibbonButtonZuweisen.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; + this.RibbonButtonZuweisen.LargeImage = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; + this.RibbonButtonZuweisen.Name = "RibbonButtonZuweisen"; + this.RibbonButtonZuweisen.SmallImage = global::OnDoc.Properties.Resources.Zuweisen_16x16_32; + this.RibbonButtonZuweisen.Text = "Zuweisen"; + this.RibbonButtonZuweisen.Click += new System.EventHandler(this.RibbonButtonZuweisen_Click); + // + // ribbonButtonToApproval + // + this.ribbonButtonToApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonToApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonToApproval.Name = "ribbonButtonToApproval"; + this.ribbonButtonToApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32; + this.ribbonButtonToApproval.Text = "zur Unterschriften-Prüfung"; + this.ribbonButtonToApproval.Click += new System.EventHandler(this.ribbonButtonToApproval_Click); + // + // ribbonButtonApproval + // + this.ribbonButtonApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonApproval.Name = "ribbonButtonApproval"; + this.ribbonButtonApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32; + this.ribbonButtonApproval.Text = "Prüfen"; + this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click); + // + // ribbonButtonRefresh_Bewilligungen + // + this.ribbonButtonRefresh_Bewilligungen.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; + this.ribbonButtonRefresh_Bewilligungen.LargeImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; + this.ribbonButtonRefresh_Bewilligungen.Name = "ribbonButtonRefresh_Bewilligungen"; + this.ribbonButtonRefresh_Bewilligungen.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; + this.ribbonButtonRefresh_Bewilligungen.Click += new System.EventHandler(this.ribbonButtonRefresh_Bewilligungen_Click); + // + // RibbonButtonArchivToOnBase + // + this.RibbonButtonArchivToOnBase.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.Image"))); + this.RibbonButtonArchivToOnBase.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.LargeImage"))); + this.RibbonButtonArchivToOnBase.Name = "RibbonButtonArchivToOnBase"; + this.RibbonButtonArchivToOnBase.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.SmallImage"))); + this.RibbonButtonArchivToOnBase.Text = "Archivieren"; + this.RibbonButtonArchivToOnBase.Click += new System.EventHandler(this.RibbonButtonArchivToOnBase_Click); + // + // ribbonButtonVersandstrasse + // + this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; + this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; + this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; + this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32; + this.ribbonButtonVersandstrasse.Text = "Versandstrasse"; + this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click); + // + // RibbonButtonCreateNewPaket + // + this.RibbonButtonCreateNewPaket.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; + this.RibbonButtonCreateNewPaket.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; + this.RibbonButtonCreateNewPaket.Name = "RibbonButtonCreateNewPaket"; + this.RibbonButtonCreateNewPaket.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_16x16_32; + this.RibbonButtonCreateNewPaket.Text = "Dokumentpaket"; + this.RibbonButtonCreateNewPaket.Click += new System.EventHandler(this.RibbonButtonCreateNewPaket_Click); + // + // RibbonButtonEditPaket + // + this.RibbonButtonEditPaket.Image = global::OnDoc.Properties.Resources.EditDokumentPaket_32x32_32; + this.RibbonButtonEditPaket.LargeImage = global::OnDoc.Properties.Resources.EditDokumentPaket_32x32_32; + this.RibbonButtonEditPaket.Name = "RibbonButtonEditPaket"; + this.RibbonButtonEditPaket.SmallImage = global::OnDoc.Properties.Resources.EditDokumentPaket_16x16_32; + this.RibbonButtonEditPaket.Text = "Dokumentpaket bearbeiten"; + this.RibbonButtonEditPaket.Visible = false; + // + // RibbonButtonCreateNewSerienbrief + // + this.RibbonButtonCreateNewSerienbrief.Image = global::OnDoc.Properties.Resources.NewSerienbrief_32x32_32; + this.RibbonButtonCreateNewSerienbrief.LargeImage = global::OnDoc.Properties.Resources.NewSerienbrief_32x32_32; + this.RibbonButtonCreateNewSerienbrief.Name = "RibbonButtonCreateNewSerienbrief"; + this.RibbonButtonCreateNewSerienbrief.SmallImage = global::OnDoc.Properties.Resources.NewSerienbrief_16x16_32; + this.RibbonButtonCreateNewSerienbrief.Text = "Serienbrief"; + this.RibbonButtonCreateNewSerienbrief.Click += new System.EventHandler(this.RibbonButtonCreateNewSerienbrief_Click); + // + // RibbonButtonEditSerienbrief + // + this.RibbonButtonEditSerienbrief.Image = global::OnDoc.Properties.Resources.EditSerienbrief_32x32_32; + this.RibbonButtonEditSerienbrief.LargeImage = global::OnDoc.Properties.Resources.EditSerienbrief_32x32_32; + this.RibbonButtonEditSerienbrief.Name = "RibbonButtonEditSerienbrief"; + this.RibbonButtonEditSerienbrief.SmallImage = global::OnDoc.Properties.Resources.EditSerienbrief_16x16_32; + this.RibbonButtonEditSerienbrief.Text = "Serienbrief bearbeiten"; + this.RibbonButtonEditSerienbrief.Visible = false; + // + // RibbonButtonRefresh + // + this.RibbonButtonRefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; + this.RibbonButtonRefresh.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32; + this.RibbonButtonRefresh.Name = "RibbonButtonRefresh"; + this.RibbonButtonRefresh.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; + this.RibbonButtonRefresh.Text = "Aktualisieren"; + this.RibbonButtonRefresh.Click += new System.EventHandler(this.RibbonButtonRefresh_Click); + // + // RibbonButtonTest1 + // + this.RibbonButtonTest1.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.Image"))); + this.RibbonButtonTest1.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.LargeImage"))); + this.RibbonButtonTest1.Name = "RibbonButtonTest1"; + this.RibbonButtonTest1.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.SmallImage"))); + this.RibbonButtonTest1.Text = "Test 1"; + this.RibbonButtonTest1.Click += new System.EventHandler(this.RibbonButtonTest1_Click); + // // ribbonButtonGetMA // this.ribbonButtonGetMA.Image = global::OnDoc.Properties.Resources.Pprofil_24x24_32; @@ -655,24 +762,26 @@ namespace OnDoc.UICintrols // // ribbonButton3 // - this.ribbonButton3.Image = global::OnDoc.Properties.Resources.Connect_24x24_32; - this.ribbonButton3.LargeImage = global::OnDoc.Properties.Resources.Connect_24x24_32; + this.ribbonButton3.Image = global::OnDoc.Properties.Resources.Partner_24x24_32; + this.ribbonButton3.LargeImage = global::OnDoc.Properties.Resources.Partner_24x24_32; this.ribbonButton3.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; this.ribbonButton3.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; this.ribbonButton3.Name = "ribbonButton3"; - this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Connect_16x16_32; + this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Partner_16x16_32; this.ribbonButton3.Text = "Partner"; this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1); // - // ribbonPanelVorschau + // RibbonFilterDelete // - this.ribbonPanelVorschau.ButtonMoreVisible = false; - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); - this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); - this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; - this.ribbonPanelVorschau.Text = "Vorschau"; + this.RibbonFilterDelete.Image = global::OnDoc.Properties.Resources.Remove_24x24_32; + this.RibbonFilterDelete.LargeImage = global::OnDoc.Properties.Resources.Remove_24x24_32; + this.RibbonFilterDelete.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonFilterDelete.Name = "RibbonFilterDelete"; + this.RibbonFilterDelete.SmallImage = global::OnDoc.Properties.Resources.Remove_16x16_32; + this.RibbonFilterDelete.Text = "Filter löschen"; + this.RibbonFilterDelete.ToolTip = "Filter löschen"; + this.RibbonFilterDelete.Visible = false; + this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click); // // RibbonBtnVorschauNo // @@ -712,33 +821,6 @@ namespace OnDoc.UICintrols this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster"; this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click); // - // RibbonPanelProfil - // - this.RibbonPanelProfil.ButtonMoreVisible = false; - this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); - this.RibbonPanelProfil.Items.Add(this.ribbonButton1); - this.RibbonPanelProfil.Name = "RibbonPanelProfil"; - this.RibbonPanelProfil.Text = "Profil"; - // - // ribbonItemGroup1 - // - this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); - this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); - this.ribbonItemGroup1.Name = "ribbonItemGroup1"; - // - // ribbonLabel1 - // - this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabel1.Name = "ribbonLabel1"; - this.ribbonLabel1.Text = "Profil"; - // - // RibbonCBProfil - // - this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonCBProfil.Name = "RibbonCBProfil"; - this.RibbonCBProfil.SelectedIndex = -1; - this.RibbonCBProfil.TextBoxText = ""; - // // ribbonButton1 // this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_32x32_32; @@ -747,13 +829,6 @@ namespace OnDoc.UICintrols this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32; this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); // - // ribbonPannelDiverseVorlagen - // - this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); - this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; - this.ribbonPannelDiverseVorlagen.Text = "Nativ"; - this.ribbonPannelDiverseVorlagen.Visible = false; - // // ribbonButtonNativ // this.ribbonButtonNativ.Image = global::OnDoc.Properties.Resources.Native_32x32_32; @@ -762,23 +837,6 @@ namespace OnDoc.UICintrols this.ribbonButtonNativ.SmallImage = global::OnDoc.Properties.Resources.Native_24x24_32; this.ribbonButtonNativ.Click += new System.EventHandler(this.ribbonButtonNativ_Click); // - // RibbonTabAdmin - // - this.RibbonTabAdmin.Name = "RibbonTabAdmin"; - this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1); - this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); - this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); - this.RibbonTabAdmin.Text = "Administration"; - // - // ribbonPanel1 - // - this.ribbonPanel1.ButtonMoreVisible = false; - this.ribbonPanel1.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Right; - this.ribbonPanel1.Items.Add(this.RibbonButtonDokumenttyp); - this.ribbonPanel1.Items.Add(this.RibbonButtonVorlagen); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Text = "ribbonPanel1"; - // // RibbonButtonDokumenttyp // this.RibbonButtonDokumenttyp.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.Image"))); @@ -797,15 +855,6 @@ namespace OnDoc.UICintrols this.RibbonButtonVorlagen.Text = "Vorlagen"; this.RibbonButtonVorlagen.Click += new System.EventHandler(this.RibbonButtonVorlagen_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ButtonMoreVisible = false; - this.ribbonPanel3.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; - this.ribbonPanel3.Items.Add(this.ribbonButton2); - this.ribbonPanel3.Items.Add(this.RibbonButtonBerechtigungsgruppe); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Text = "Berechtigungen"; - // // ribbonButton2 // this.ribbonButton2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.Image"))); @@ -824,12 +873,6 @@ namespace OnDoc.UICintrols this.RibbonButtonBerechtigungsgruppe.Text = "Berechtigungsgruppe"; this.RibbonButtonBerechtigungsgruppe.Click += new System.EventHandler(this.RibbonButtonBerechtigungsgruppe_Click); // - // RibbonPanelDiverses - // - this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); - this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; - this.RibbonPanelDiverses.Text = "Diverse Funktionen"; - // // ribbonButtonBCK // this.ribbonButtonBCK.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonBCK.Image"))); @@ -848,46 +891,15 @@ namespace OnDoc.UICintrols this.RibbonButtonCreateNewDoc.Text = "Dokument"; this.RibbonButtonCreateNewDoc.Click += new System.EventHandler(this.RibbonButtonCreateNewDoc_Click); // - // lblToApprove - // - this.lblToApprove.AutoSize = true; - this.lblToApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblToApprove.ForeColor = System.Drawing.Color.Red; - this.lblToApprove.Location = new System.Drawing.Point(407, 88); - this.lblToApprove.Name = "lblToApprove"; - this.lblToApprove.Size = new System.Drawing.Size(0, 18); - this.lblToApprove.TabIndex = 6; - // - // timer1 - // - this.timer1.Interval = 60000; - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // - // RibbonGroupFilter - // - this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); - this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); - this.RibbonGroupFilter.Name = "RibbonGroupFilter"; - this.RibbonGroupFilter.Text = ""; - // - // RibbonFilterLabel + // RibbonPartnerSaldiert // - this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; - this.RibbonFilterLabel.Name = "RibbonFilterLabel"; - this.RibbonFilterLabel.Text = ""; - this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; - // - // RibbonFilterDelete - // - this.RibbonFilterDelete.Image = global::OnDoc.Properties.Resources.Remove_24x24_32; - this.RibbonFilterDelete.LargeImage = global::OnDoc.Properties.Resources.Remove_24x24_32; - this.RibbonFilterDelete.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonFilterDelete.Name = "RibbonFilterDelete"; - this.RibbonFilterDelete.SmallImage = global::OnDoc.Properties.Resources.Remove_16x16_32; - this.RibbonFilterDelete.Text = "Filter löschen"; - this.RibbonFilterDelete.ToolTip = "Filter löschen"; - this.RibbonFilterDelete.Visible = false; - this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click); + this.RibbonPartnerSaldiert.Image = global::OnDoc.Properties.Resources.Partner_Saldiert_24x24_32; + this.RibbonPartnerSaldiert.LargeImage = global::OnDoc.Properties.Resources.Partner_Saldiert_24x24_32; + this.RibbonPartnerSaldiert.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonPartnerSaldiert.Name = "RibbonPartnerSaldiert"; + this.RibbonPartnerSaldiert.SmallImage = global::OnDoc.Properties.Resources.Partner_Saldiert_16x16_32; + this.RibbonPartnerSaldiert.ToolTip = "Partner ist saldiert"; + this.RibbonPartnerSaldiert.Visible = false; // // docPreview1 // @@ -1010,5 +1022,6 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonItemGroup RibbonGroupFilter; private System.Windows.Forms.RibbonLabel RibbonFilterLabel; private System.Windows.Forms.RibbonButton RibbonFilterDelete; + private System.Windows.Forms.RibbonButton RibbonPartnerSaldiert; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index a74544ba..aefce674 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1005,6 +1005,7 @@ namespace OnDoc.UICintrols RibbonFilterLabel.Text = ps.partnernr + " " + ps.partnerkurzname; RibbonFilterLabel.Visible = true; RibbonFilterDelete.Visible = true; + if (ps.partnersaldiert) { RibbonPartnerSaldiert.Visible = true; } else { RibbonPartnerSaldiert.Visible = false; } refresh_dokumente(); } } @@ -1038,6 +1039,7 @@ namespace OnDoc.UICintrols this.Search_Docid = ""; this.RibbonFilterLabel.Visible = false; this.RibbonFilterLabel.Text = ""; + this.RibbonPartnerSaldiert.Visible = false; RibbonFilterDelete.Visible = false; } diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index a09854ac..9cf596ef 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -23,6 +23,8 @@ namespace OnDoc.UIControls public int partnernr = 0; public string partnerkurzname = ""; + public bool partnersaldiert = false; + public bool person = false; public Partnersuche() { InitializeComponent(); @@ -37,6 +39,8 @@ namespace OnDoc.UIControls try { TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata); + if (trefferlistedata.RowCount > 0) {sfButton1.Enabled = true;} + trefferlistedata.SelectedIndex = 0; } catch { } } @@ -49,14 +53,22 @@ namespace OnDoc.UIControls if (DivFnkt.IsNumeric(s)) { trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0); - + if (clsPartner.partnerliste.Rows.Count == 1) + { + trefferlistedata.SelectedIndex = 0; + trefferlistedata_DoubleClick(sender, e); + } } } if (txtKurzname.Text.Trim() != "") { string s = txtKurzname.Text.Trim(); trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1); - + if (clsPartner.partnerliste.Rows.Count == 1) + { + trefferlistedata.SelectedIndex = 0; + trefferlistedata_DoubleClick(sender, e); + } } try { @@ -92,6 +104,7 @@ namespace OnDoc.UIControls { partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); } catch { } } @@ -102,6 +115,7 @@ namespace OnDoc.UIControls { partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); this.DialogResult = DialogResult.OK; this.Close(); } @@ -112,6 +126,7 @@ namespace OnDoc.UIControls { partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); this.DialogResult = DialogResult.OK; this.Close(); } @@ -130,6 +145,7 @@ namespace OnDoc.UIControls { partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); this.DialogResult = DialogResult.OK; this.Close(); } diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index c94d61a3..e697f0a0 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index d2ec9955..a95aa805 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index b2ff9ee4..338157f9 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 95eb0ea6..b6b84674 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 07cdc8a6..ebd4c4bf 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 9ad62fd3..2853d65a 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 94289614..abb2bb02 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.Properties.Resources.resources b/Client/obj/Debug/OnDoc.Properties.Resources.resources index d6e1f0c9..1857e50b 100644 Binary files a/Client/obj/Debug/OnDoc.Properties.Resources.resources and b/Client/obj/Debug/OnDoc.Properties.Resources.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources index cc34211a..85485290 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index c94d61a3..e697f0a0 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index d2ec9955..a95aa805 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 100b39ca..8b02102f 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index b2ff9ee4..338157f9 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index e3aac9a7..a66f87ff 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 709c6111..9c76b0fa 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -37,7 +37,7 @@ namespace Database } - + public void add_parameter(string name, string value) { @@ -436,7 +436,7 @@ namespace Database //DokumentInfoWert foreach (DataRow dr in DocData.dokumentwerte.Rows) { - if (dr["cold_indexfeld"].ToString()=="") { dr["cold_indexfeld"] = 0; } + if (dr["cold_indexfeld"].ToString() == "") { dr["cold_indexfeld"] = 0; } if (dr["cold_indexfeld"].ToString() == "0") { db.clear_parameter(); @@ -453,7 +453,7 @@ namespace Database db.clear_parameter(); db.add_parameter("@dokumentid", dokumentid); db.add_parameter("@indextyp", "1"); - db.Get_Tabledata("SP_Dokument_Cold_Index",true, false); + db.Get_Tabledata("SP_Dokument_Cold_Index", true, false); } db.clear_parameter(); db.add_parameter("@dokumentid", dokumentid); @@ -468,7 +468,7 @@ namespace Database int approved = 0; int approved1 = 0; int approved2 = 0; - if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"])==true) + if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"]) == true) { toapprove = 1; if (dok.iUnterschriftlinks == dok.iErsteller) { approved1 = 1; } @@ -477,9 +477,9 @@ namespace Database int unterschriftlinks = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_links"]); int unterschriftrechts = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_rechts"]); - if (unterschriftlinks==1 && unterschriftrechts==0 && approved1==1) { approved = 1; } + if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; } - db.Exec_SQL("Update dokument set toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + dokumentid+"'"); + db.Exec_SQL("Update dokument set toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + dokumentid + "'"); return dokumentid; } @@ -491,18 +491,18 @@ namespace Database int approval2 = 0; if (init) { - + } Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid + "'", false, true); if (Convert.ToBoolean(dsdaten.Tables[0].Rows[0]["toapprove"]) == true) { - if ( dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString()== dsdaten.Tables[0].Rows[0]["ersteller"].ToString()) approval1 = 1; + if (dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString() == dsdaten.Tables[0].Rows[0]["ersteller"].ToString()) approval1 = 1; if (dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString() == dsdaten.Tables[0].Rows[0]["ersteller"].ToString()) approval2 = 1; if (approval1 != approval2) approved = 0; Exec_SQL("Update dokument set approved=" + approved.ToString() + ", approval1=" + approval1.ToString() + ", approval2=" + approval2.ToString() + " where dokumentid = '" + dokumentid + "'"); } - + } public DataTable COLD_Index_Sichern(int indextyp, string dokumentid) { @@ -794,7 +794,7 @@ namespace Database SqlDataAdapter DA = new SqlDataAdapter("select * from doks where dokumentid='" + DokumentID + "'", Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); DataSet ds = new DataSet(); - byte [] mydata = null; + byte[] mydata = null; if (base64document == "") { FileStream fs = new FileStream(Dokumentname, FileMode.Open, FileAccess.Read); @@ -864,17 +864,18 @@ namespace Database Exec_SQL("Delete from dokinbearbeitung where dokumentid='" + dokumentid + "'"); return true; case 3: - Get_Tabledata("Select count(*) from dokinbearbeitung where dokumentid='" + dokumentid + "'",false,true); + Get_Tabledata("Select count(*) from dokinbearbeitung where dokumentid='" + dokumentid + "'", false, true); if (Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]) > 0) return false; else return true; default: return true; } if (typ == 2) { - } else + } + else { string sql = "Insert DokInBearbeitung (dokumentid, mitarbeiternr,datum,erstellung,dokumentname,stationsname) "; - sql = sql + " values('" + dokumentid + "'," + mitarbeiter.ToString()+",getdate(),'','','')"; + sql = sql + " values('" + dokumentid + "'," + mitarbeiter.ToString() + ",getdate(),'','','')"; Exec_SQL(sql); return true; } @@ -1075,7 +1076,7 @@ namespace Database // Creates a SqlParameter and adds it to the command - + public void InsertParameter(SqlCommand command, string parameterName, string sourceColumn, @@ -1157,7 +1158,7 @@ namespace Database var iErrorcode = default(int); - + scmCmdToExecute.Connection.Open(); scmCmdToExecute.CommandType = CommandType.StoredProcedure; scmCmdToExecute.CommandText = "dbo.[sp_vorlagenfeld_insert]"; @@ -1180,7 +1181,7 @@ namespace Database { scmCmdToExecute.Connection.Close(); scmCmdToExecute.Dispose(); - + } scmCmdToExecute.Dispose(); } @@ -1191,7 +1192,7 @@ namespace Database clsConnectionProvider edoka_conn = new clsConnectionProvider(); edoka_conn.sConnectionString = this.connectionstring; dbsb.cpMainConnectionProvider = edoka_conn; - dbsb.iSerienbriefnr=sb.serienbriefnr; + dbsb.iSerienbriefnr = sb.serienbriefnr; dbsb.SelectOne(); sb.bezeichnung = dbsb.sBezeichnung.ToString(); @@ -1210,7 +1211,7 @@ namespace Database sb.mutiert_am = Convert.ToDateTime(dbsb.daMutiert_am.Value); sb.team = Convert.ToInt32(dbsb.iMutierer.Value); sb.aktiv = Convert.ToBoolean(dbsb.bAktiv.Value); - sb.status = Convert.ToInt32( dbsb.iStatus.Value); + sb.status = Convert.ToInt32(dbsb.iStatus.Value); sb.dokumenttypnr = Convert.ToInt32(dbsb.iDokumenttypnr.Value); sb.windowwidth = Convert.ToInt32(dbsb.iWindowwidth.Value); sb.windowheight = Convert.ToInt32(dbsb.iWindowwidth.Value); @@ -1221,9 +1222,10 @@ namespace Database sb.gedruckt = Convert.ToInt32(dbsb.iGedruckt.Value); sb.bestaetigt = Convert.ToInt32(dbsb.iBestaetigt.Value); sb.ausgeloest = Convert.ToInt32(dbsb.iAusgeloest.Value); - try {sb.bldossier = Convert.ToInt32(dbsb.iBldossier.Value); } catch { }; + try { sb.bldossier = Convert.ToInt32(dbsb.iBldossier.Value); } catch { }; string fn = read_empfaengerdata(sb.serienbriefnr, temppath); - if (fn != "") { + if (fn != "") + { sb.dsempfaenger.Tables.Clear(); sb.dsempfaenger.ReadXml(fn); System.IO.File.Delete(fn); @@ -1242,7 +1244,7 @@ namespace Database dbsb.iSerienbriefnr = sb.serienbriefnr; dbsb.SelectOne(); } - + dbsb.sBezeichnung = sb.bezeichnung; dbsb.iSerienbriefnr = sb.serienbriefnr; dbsb.iVerantwortlich = sb.verantwortlich; @@ -1252,7 +1254,7 @@ namespace Database dbsb.iUnterschriftlinks = sb.unterschriftlinks; dbsb.iUnterschriftrechts = sb.unterschriftrechts; dbsb.iTeam = sb.team; - dbsb.daArchivdatum=sb.archivdatum; + dbsb.daArchivdatum = sb.archivdatum; dbsb.daTermin = sb.termin; dbsb.sBemerkung = sb.bemerkung; dbsb.daErstellt_am = sb.erstellt_am; @@ -1282,7 +1284,7 @@ namespace Database dbsb.Update(); } - save_empfaengerdata(sb.serienbriefnr,temppath,sb.dsempfaenger); + save_empfaengerdata(sb.serienbriefnr, temppath, sb.dsempfaenger); edoka_conn.CloseConnection(true); @@ -1292,19 +1294,19 @@ namespace Database public string read_empfaengerdata(int serienbriefnr, string temppath) { string filename = temppath + serienbriefnr.ToString() + ".xml"; - + Get_Tabledata("Select dbo.BinaryToBase64(xmldata) from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString(), false, true); try { - File.WriteAllBytes(filename, Convert.FromBase64String(dsdaten.Tables[0].Rows[0][0].ToString())); + File.WriteAllBytes(filename, Convert.FromBase64String(dsdaten.Tables[0].Rows[0][0].ToString())); } catch { filename = ""; } return filename; - + } public Boolean save_empfaengerdata(int serienbriefnr, string temppath, DataSet empf) { @@ -1312,7 +1314,7 @@ namespace Database { string filename = temppath + serienbriefnr.ToString() + ".xml"; empf.WriteXml(filename); - + SqlConnection Connection = new SqlConnection(); SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString() + "", Connection); @@ -1370,7 +1372,7 @@ namespace Database try { SqlConnection Connection = new SqlConnection(); - SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_vorlage where serienbriefnr=" + serienbriefnr.ToString() , Connection); + SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_vorlage where serienbriefnr=" + serienbriefnr.ToString(), Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); DataSet ds = new DataSet(); FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read); @@ -1422,24 +1424,109 @@ namespace Database } public string get_sb_vorlage(int serienbriefnr, string temppath) { - - string filename = temppath + serienbriefnr.ToString() + ".xml"; + + string filename = temppath + serienbriefnr.ToString() + ".xml"; - Get_Tabledata("Select dbo.BinaryToBase64(vorlage), doctype from edex_sb_vorlage where serienbriefnr=" + serienbriefnr.ToString(), false, true); + Get_Tabledata("Select dbo.BinaryToBase64(vorlage), doctype from edex_sb_vorlage where serienbriefnr=" + serienbriefnr.ToString(), false, true); + try + { + filename = temppath + serienbriefnr.ToString() + "." + dsdaten.Tables[0].Rows[0][1].ToString(); + File.WriteAllBytes(filename, Convert.FromBase64String(dsdaten.Tables[0].Rows[0][0].ToString())); + } + catch + { + filename = ""; + } + return filename; + + } + public void create_sb_check_table(int mitarbeiternr) + { + clear_parameter(); + add_parameter("@manr", mitarbeiternr.ToString()); + Get_Tabledata("dbo.sp_edex_sb_check_partner_create_table", true, false); + } + public void save_sb_checkdata(int mitarbeiternr, serienbrief sb) + { + var tdt = new DataTable("TMPSB_" + mitarbeiternr.ToString()); + DataRow tdr; + + int i; + tdt.Columns.Add("Partnernr"); + tdt.Columns.Add("Status"); + tdt.Columns.Add("Rowid"); + tdt.Columns.Add("Fehlercode"); + // Rel 4.1 - BLKunde + tdt.Columns.Add("BLKunde"); + + DataRow[] dv; + + dv = sb.dsempfaenger.Tables[0].Select(); + i = 0; + + foreach (var DR in dv) + { + int ii; try { - filename = temppath + serienbriefnr.ToString() + "." + dsdaten.Tables[0].Rows[0][1].ToString(); - File.WriteAllBytes(filename, Convert.FromBase64String(dsdaten.Tables[0].Rows[0][0].ToString())); + ii = Convert.ToInt32(DR["Status"]); } catch { - filename = ""; + ii = 0; } - return filename; - + if (ii < 2) + { + DR["Status"] = -1; + tdr = tdt.NewRow(); + if (DR["Partnernr"].ToString() == "") + { + tdr[0] = 0; + tdr[1] = -1; + tdr[2] = i; + tdr[3] = 0; + // Rel. 4.1 BLKunde initialisieren + tdr[4] = 0; + } + else + { + tdr[0] = DR["Partnernr"]; + tdr[1] = 0; + tdr[2] = i; + tdr[3] = 3; + // Rel. 4.1 BLKunde initialisieren + tdr[4] = 0; + } + tdt.Rows.Add(tdr); + } + i = i + 1; } + + var connection = new SqlConnection(); + var da = new SqlDataAdapter("Select * from TMPSB_" + mitarbeiternr.ToString(), connection); + var cb = new SqlCommandBuilder(da); + connection.ConnectionString = connectionstring; + connection.Open(); + da.Update(tdt); + connection.Close(); + return; } + + public DataTable Check_sb_Data(int mitarbeiternr,serienbrief sb) + { + clear_parameter(); + add_parameter("@manr", mitarbeiternr.ToString()); + add_parameter("@vertrag", "0"); + add_parameter("@doktypnr", sb.dokumenttypnr.ToString()); + Get_Tabledata("dbo.sp_edex_sb_check_partner", true, false); + return dsdaten.Tables[0]; + } + } + + +} + diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 0c3ee5c2..ff62c79a 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index d8290cd1..3708ad72 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_16x16-32.png b/Images/Icons/Icons/Blue/Images/Partner_16x16-32.png new file mode 100644 index 00000000..38cbb137 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_24x24-32.png b/Images/Icons/Icons/Blue/Images/Partner_24x24-32.png new file mode 100644 index 00000000..30922a88 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_256x256-32.png b/Images/Icons/Icons/Blue/Images/Partner_256x256-32.png new file mode 100644 index 00000000..cac27c83 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_32x32-32.png b/Images/Icons/Icons/Blue/Images/Partner_32x32-32.png new file mode 100644 index 00000000..b0d726c6 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_48x48-32.png b/Images/Icons/Icons/Blue/Images/Partner_48x48-32.png new file mode 100644 index 00000000..1ef54d41 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_Saldiert_16x16-32.png b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_16x16-32.png new file mode 100644 index 00000000..80424de2 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_Saldiert_24x24-32.png b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_24x24-32.png new file mode 100644 index 00000000..58791bad Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_Saldiert_256x256-32.png b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_256x256-32.png new file mode 100644 index 00000000..2622814e Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_Saldiert_32x32-32.png b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_32x32-32.png new file mode 100644 index 00000000..b02a1f62 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Partner_Saldiert_48x48-32.png b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_48x48-32.png new file mode 100644 index 00000000..20de319c Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Partner_Saldiert_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Partner.ico b/Images/Icons/Icons/Blue/Partner.ico new file mode 100644 index 00000000..7e5a5bef Binary files /dev/null and b/Images/Icons/Icons/Blue/Partner.ico differ diff --git a/Images/Icons/Icons/Blue/Partner_Saldiert.ico b/Images/Icons/Icons/Blue/Partner_Saldiert.ico new file mode 100644 index 00000000..5d886579 Binary files /dev/null and b/Images/Icons/Icons/Blue/Partner_Saldiert.ico differ