Compare commits
	
		
			983 Commits
		
	
	
		
			d2c0884b44
			...
			v0.10.8
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7a15050575 | |||
| 8d9172f91e | |||
| 7437187630 | |||
| a38cdaa8af | |||
| a5638135a3 | |||
| a04c7d538e | |||
| 26235f8c0a | |||
| f43d9c020c | |||
| 22514715c1 | |||
| 5eda25ed14 | |||
| 543185d48e | |||
| 141086673f | |||
| 6627ab6d12 | |||
| 7ef3faa39e | |||
| 8c8c0a8c2b | |||
| 78a72c641f | |||
| e18bc58b6c | |||
| 21f68caf4c | |||
| 2ef10b4bb2 | |||
| 5321be46c7 | |||
| 0f24f9da08 | |||
| 8ce8492c74 | |||
| ee1315929c | |||
| 9930e6173c | |||
| b5c1bfb08f | |||
| cd2b482b5a | |||
| bec1b165bf | |||
| 2ae2564647 | |||
| adbe418b7c | |||
| 94db0723c5 | |||
| f54677d429 | |||
| 49e4b65c27 | |||
| ada5085cae | |||
| 85931e62e8 | |||
| 39956cbcbd | |||
| 84d8d0cecb | |||
| fe7f9d675b | |||
| 9d1ee8638c | |||
| cd40075702 | |||
| 204dfe8745 | |||
| f97dfc3c72 | |||
| d3839c288a | |||
| 2764a0ca21 | |||
| 48970de652 | |||
| 367c3ac357 | |||
| 4d89a17e80 | |||
| f52c11b91e | |||
| f48c6a02cb | |||
| 025ff08d84 | |||
| b091bd0ec3 | |||
| 804a17911c | |||
| 170cfda37e | |||
| 2d737e2780 | |||
| 2333077aa5 | |||
| 9127cd3f03 | |||
| 036a0dc978 | |||
| 7749f6ab45 | |||
| cf05a0c658 | |||
| 5567d9f25a | |||
| 4403754ada | |||
| 8db6007264 | |||
| 944270744a | |||
| 10ee1d6548 | |||
| db4de5b5fe | |||
| f69d2809f3 | |||
| 1c2e0baa68 | |||
| 39f93da0ba | |||
| 91717f8efb | |||
| 7786fb421a | |||
| 12d2aeecaf | |||
| 1bc0d67d26 | |||
| 38315cd928 | |||
| 53d3affefe | |||
| 4c3f0c40fa | |||
| 662862090e | |||
| a5164e286f | |||
| ae1e985656 | |||
| 36c1bd35a7 | |||
| 4aa3362029 | |||
| cc97004b30 | |||
| 935b31f6e3 | |||
| f09753ccc2 | |||
| 53c7cb2ec0 | |||
| 80c3ec1b9c | |||
| b49c9c65b1 | |||
| b6afb94246 | |||
| 8e9f2f4e90 | |||
| d741ba92dc | |||
| 84f772a32f | |||
| fd0ed97305 | |||
| 1141331608 | |||
| f235d5b380 | |||
| 30116f7848 | |||
| abe7699a5b | |||
| bb77a4e79a | |||
| 46ea0f29ff | |||
| 4229fbbef6 | |||
| 8dde1cb3f4 | |||
| c314321039 | |||
| cf1e975d8e | |||
| 60359935a4 | |||
| 49e988f71a | |||
| 2a8de18772 | |||
| af80e827b7 | |||
| 9a2fa3ee3d | |||
| ba9e1d7201 | |||
| 49f03c0a3c | |||
| 37adf92e80 | |||
| 4c75dbe4aa | |||
| 5c31ad8851 | |||
| 3ac9536e76 | |||
| 7246852181 | |||
| dd48a24c58 | |||
| ffef1fd6e4 | |||
| 01d658f51d | |||
| 5a36e84b1f | |||
| 5b2f617a68 | |||
| dd5049faae | |||
| ffe0ff5508 | |||
| 34178105a7 | |||
| 6b48a1090c | |||
| ddd821e478 | |||
| 658a1f4dc1 | |||
| daf83c4bbc | |||
| 26d75ea3cd | |||
| 86937485e4 | |||
| e9de54415a | |||
| 62f63ef63d | |||
| 44656e0022 | |||
| 80df16999f | |||
| d317ccc1e0 | |||
| 6195363335 | |||
| 6a92eb76a0 | |||
| f9d6da7bc8 | |||
| 9478f2a1ab | |||
| 157d0b75a2 | |||
| 255bcbe3ad | |||
| bce2eea3ac | |||
| 91c60018f1 | |||
| 5037818997 | |||
| 5c76b8ec52 | |||
| 9d9bb099e1 | |||
| f4172235be | |||
| 299c65ab1a | |||
| ba8034ad75 | |||
| 7c63373a02 | |||
| 750ae53428 | |||
| 1121c18dc5 | |||
| 96a3168d49 | |||
| e627f13264 | |||
| 7ce8c3cabf | |||
| 763f0197ca | |||
| 43dddf2c07 | |||
| 70129695ae | |||
| 51b9799b56 | |||
| c1903b1f36 | |||
| 66eb177fbf | |||
| 87467bbe75 | |||
| abf465f821 | |||
| 792c18365e | |||
| 5c46a00752 | |||
| 9d9f929843 | |||
| b76c5ea874 | |||
| 86e69e9ff8 | |||
| 050e4f5b6f | |||
| 01f055ee17 | |||
| da9df5cbeb | |||
| cc0aa6046f | |||
| 5cb7d2cbb0 | |||
| 6c1e50ad02 | |||
| 46551fb142 | |||
| b404839ad1 | |||
| ab926421b0 | |||
| bbd8b67afd | |||
| 70f8276808 | |||
| 4483eb6a69 | |||
| 6fc38b9db0 | |||
| 5a4ff26f31 | |||
| 012352c562 | |||
| 81f286f504 | |||
| 324a63cf9a | |||
| ca0497e396 | |||
| 08f551a394 | |||
| 3460b9378c | |||
| a06921d4ec | |||
| f2c2d3270b | |||
| 6927d44b82 | |||
| cc0843f183 | |||
| 5039c1252a | |||
| 6e4f3b799d | |||
| 4c9a151f77 | |||
| 03cacf604b | |||
| c12d111c57 | |||
| 302870fb58 | |||
| f756220d75 | |||
| 293c8967be | |||
| 601ac548fe | |||
| 4e477c38e0 | |||
| 46fc0db6ba | |||
| a531e948c1 | |||
| cc4ec6c5db | |||
| ff375e3caf | |||
| 5b952c4eb1 | |||
| 48c441b787 | |||
| be246d6f06 | |||
| 2b10e52ab0 | |||
| e3fd705f52 | |||
| 81e18ac553 | |||
| f95f0f0ef3 | |||
| 8eba40a8c1 | |||
| 69aa75a50a | |||
| 13340c0979 | |||
| 4bd378e048 | |||
| 602c237fa0 | |||
| 5e6d0ebf17 | |||
| b064643010 | |||
| 3526234432 | |||
| b03f81d4f2 | |||
| f123bb44c5 | |||
| 30536819e7 | |||
| 384f7c9ec0 | |||
| d102a1cb7a | |||
| 6906584ef0 | |||
| c0c0b4a26a | |||
| 0ce8e488f9 | |||
| eb4562dceb | |||
| 35e5a1dfff | |||
| 179c8bd4f7 | |||
| fd17d294b9 | |||
| 2a4e8d69d0 | |||
| 8bf8362480 | |||
| c4d68d11bc | |||
| 21fe5bc094 | |||
| e7bfc69842 | |||
| f53371ab19 | |||
| 5f8688f0cd | |||
| fa00eaaefc | |||
| 443e111594 | |||
| c6905bbb42 | |||
| c360e6b6a7 | |||
| 9062d55b20 | |||
| a9f38a3ccb | |||
| cbc0d0ebff | |||
| 27b5d653e6 | |||
| 869f652afc | |||
| 80e91ad776 | |||
| bce709efe4 | |||
| 12eb53cb44 | |||
| 657910ff48 | |||
| 5c3cf41d3d | |||
| b8851fb241 | |||
| 66898714bb | |||
| 1047bc6e8f | |||
| 1419c834ac | |||
| eddea88e77 | |||
| 7274d793c4 | |||
| 79d9e5d242 | |||
| b2f52072f8 | |||
| 9aa6cba1ff | |||
| d501cfaf72 | |||
| c2b6486ede | |||
| 82ea5920f2 | |||
| d011c69812 | |||
| 26a9902a13 | |||
| 57662534f3 | |||
| d87f3ce6a6 | |||
| 7f21b7b231 | |||
| cac0959fe7 | |||
| a04f887b4d | |||
| 5c42ef8104 | |||
| cf2ec3bdc4 | |||
| b31b5f6164 | |||
| 85f48f1d2a | |||
| e3cb20366c | |||
| 56ac79b4dd | |||
| 175d006d5b | |||
| f4ef75ac40 | |||
| 5795c5e8ba | |||
| 04351a906f | |||
| 3f9c4cb1f6 | |||
| c6e83ffff4 | |||
| dd408ca40e | |||
| 555ce228d4 | |||
| 9d80c5913f | |||
| e435e5da8d | |||
| 7b48385992 | |||
| 48f0ddd232 | |||
| c9bb075910 | |||
| ee1f4081f4 | |||
| b6e37c0c67 | |||
| 87da56b7a9 | |||
| afc143e1e4 | |||
| 545033daf5 | |||
| 1b822a88f3 | |||
| a9bad4dd3f | |||
| 1806b02039 | |||
| 98688168b8 | |||
| 2f3524db9d | |||
| 51e345f1fd | |||
| 729d2fd76c | |||
| 5715c41a2e | |||
| 9353581a56 | |||
| a72803f749 | |||
| 9d1ce4138c | |||
| 4afd2d8242 | |||
| b7d33e6d89 | |||
| 711bab5d33 | |||
| d9f9ab2391 | |||
| ebb196b094 | |||
| 298e423de8 | |||
| e2e46bc52a | |||
| a8e3eb6c1c | |||
| 4e2c087260 | |||
| 0c63e315bb | |||
| f3cdac8a61 | |||
| acc159ed9c | |||
| 1eba3d9d20 | |||
| 239b8a9091 | |||
| 2a3a69d96f | |||
| 3f09717922 | |||
| f242b077bd | |||
| 61c8d1ee97 | |||
| a5df03aa2c | |||
| c0f4a484ab | |||
| 6a5507060a | |||
| c70772b47d | |||
| d0fe264af4 | |||
| dc83e64db6 | |||
| 34ebc8fa34 | |||
| 0629f4eb1b | |||
| 746d0f10de | |||
| 58c7eec6f8 | |||
| e1201bc6b8 | |||
| ccd4a58007 | |||
| b5d060aca6 | |||
| 271e085fdf | |||
| e7375c7f9f | |||
| ea6621ee57 | |||
| d6f1ce01fb | |||
| 5a488369be | |||
| d944aabc06 | |||
| 74da1ba46f | |||
| 0812c6a8f9 | |||
| d3c232d550 | |||
| 95850c1d81 | |||
| 234710887e | |||
| b6269f8131 | |||
| a5a6915db1 | |||
| 77cf47e154 | |||
| e9d0eec3bd | |||
| 7e1843a1b3 | |||
| ac4026571e | |||
| fb28ce5006 | |||
| 46c97089e7 | |||
| 376af72700 | |||
| 9139557cc4 | |||
| 37e10136f4 | |||
| a275385b5c | |||
| 060acc56c3 | |||
| 55c447621b | |||
| 247367d1bf | |||
| e693f83152 | |||
| f922388db9 | |||
| 53a25b3be4 | |||
| cc72a8365e | |||
| cc5396711d | |||
| ccb83911b1 | |||
| 20772d09ae | |||
| 624c9a6b34 | |||
| 09a739d135 | |||
| e5c462b43f | |||
| 92c3ed991b | |||
| 614e0010fd | |||
| 3b94875a7f | |||
| d897e44f3b | |||
| 546a9f23c1 | |||
| 3a0f2e9556 | |||
| e9f6f22bc8 | |||
| c5b1867de8 | |||
| 4673877d36 | |||
| 665e16d78f | |||
| 7181d744fc | |||
| 0a42d4776a | |||
| efe91192bc | |||
| 06a095a199 | |||
| 8031654e86 | |||
| 424bd87c94 | |||
| 190ef82872 | |||
| 7b1a3b4f8b | |||
| e6cab7993f | |||
| 25a0722f96 | |||
| 3324a9a238 | |||
| 5a6317fcdb | |||
| 9fec79ef8c | |||
| 56fdf62c5c | |||
| f8ee478a9e | |||
| c82e8de724 | |||
| 049927f90c | |||
| abbb5a12a6 | |||
| 092c5788a4 | |||
| 96c9890b90 | |||
| 958fbaae50 | |||
| 04199376d2 | |||
| 6e26bd8922 | |||
| ae7fdef2ea | |||
| c0ff852f5e | |||
| 10b78dfb72 | |||
| d289a5d4bf | |||
| 9172222307 | |||
| 05a75a52cc | |||
| 8732141e6b | |||
| 99ca12b276 | |||
| 7ff069d068 | |||
| 583d5b4e3e | |||
| 3f2b5b684c | |||
| 5db14c09ad | |||
| 791eaddf58 | |||
| 5cb29aa75f | |||
| 3c0fea30f5 | |||
| f2df121435 | |||
| 7f4cfdc1b5 | |||
| f4eb6456be | |||
| f13fb3aaf0 | |||
| 9a39879804 | |||
| 11be424c38 | |||
| 1b9064a97c | |||
| 805f782c83 | |||
| 912206f52d | |||
| 825bd6f304 | |||
| 9ecad6aa79 | |||
| 68f1a2c091 | |||
| 59cd69ddaf | |||
| 7c23f9bdae | |||
| 6d53e35399 | |||
| 42eb68d431 | |||
| 0591d91f49 | |||
| befe6a753b | |||
| 4daa6deb26 | |||
| c07a6b450c | |||
| 6fdd72e28b | |||
| 6af33c591f | |||
| f850fd08ff | |||
| b063b201e3 | |||
| 60b624b009 | |||
| 71a234ca60 | |||
| 38abfb0edd | |||
| 05a037db70 | |||
| b9287f8260 | |||
| 50ac757067 | |||
| c6cd9d7c73 | |||
| 1b28752f4c | |||
| e0bdbee2ae | |||
| ff3bd5cea5 | |||
| 116d88d3d6 | |||
| 6bcb2fb406 | |||
| 8665c93702 | |||
| 62496a0770 | |||
| 8678a02318 | |||
| 9de7fad139 | |||
| 85c8783f7e | |||
| 75e02751f0 | |||
| ef1c3b25cf | |||
| 255953a658 | |||
| 9470b26aec | |||
| 3a2bf81bd9 | |||
| d3aca196dd | |||
| 519e903d1c | |||
| dd568b81e8 | |||
| 31b0ae245d | |||
| 46498ce337 | |||
| 0fff698a5d | |||
| a71c6685f0 | |||
| ab41702f6c | |||
| 2bbf4dd1fd | |||
| 8909b4a3a8 | |||
| f8d776c028 | |||
| 2154e253ad | |||
| df83430c35 | |||
| d59a713a8c | |||
| 5e48d8e8d1 | |||
| 4f95d3fe16 | |||
| ce3185842a | |||
| e1d19fd9e5 | |||
| 3931a4084c | |||
| 1a492e4eff | |||
| 58a13eb3cc | |||
| d5124829de | |||
| 37658869e4 | |||
| 24a43ff37d | |||
| 16cf055834 | |||
| ef0b913063 | |||
| 05909919e2 | |||
| 3642c5ac07 | |||
| 6cee604448 | |||
| 89d20f4c42 | |||
| 182b367811 | |||
| a2bb09cfbd | |||
| b981b5f895 | |||
| 9dc2e8a59a | |||
| 1dc05e47cf | |||
| 21cc20ee63 | |||
| 491c41b239 | |||
| 47658a72ae | |||
| 8b0a4d7979 | |||
| 9ee7f6baf1 | |||
| ecbc9c2d82 | |||
| bf90543ad8 | |||
| 6a5676f916 | |||
| 75e9d756d2 | |||
| ee161b149b | |||
| 0cb7b4bfc8 | |||
| 4a49a17b6a | |||
| 741ccaacae | |||
| 19f4300440 | |||
| 954c7a8bdb | |||
| 626724fe87 | |||
| 42bf01656e | |||
| 51293baaae | |||
| 1d1398a9cd | |||
| 7d199282d0 | |||
| b56a5ed5c6 | |||
| 201b63c2f1 | |||
| b2bd0c9a21 | |||
| 8502afdc9a | |||
| cb541cb6e6 | |||
| 403e7723d2 | |||
| 8fbce03031 | |||
| b32a935150 | |||
| 337bfa89d9 | |||
| f886888ccc | |||
| 4dd036babd | |||
| b6fd62f8ca | |||
| b52c09a176 | |||
| 668eb9a2d0 | |||
| 9eb013ce11 | |||
| 38ad433b4e | |||
| 0a60f01979 | |||
| a1ddef4666 | |||
| 788d0efa4a | |||
| 0f06d98d39 | |||
| 228d17f8cb | |||
| 1664024e64 | |||
| 8fbfd33e8f | |||
| 95853099bb | |||
| 8072febd5b | |||
| 62d9641b28 | |||
| 3aabfbc603 | |||
| 09e55264bb | |||
| f894c3b212 | |||
| 09a7889044 | |||
| d77aac43ec | |||
| 062c7bed5e | |||
| b723161fa5 | |||
| debee3b4bf | |||
| f15733f827 | |||
| 05b6e8ddd6 | |||
| 5ae326074f | |||
| 60b99bf95b | |||
| 3562d304de | |||
| 9f73d13dbf | |||
| 5e665ffb50 | |||
| 1e751c473a | |||
| d67e434fed | |||
| 3a89e16db3 | |||
| 2556033a07 | |||
| 3f6a94e773 | |||
| e75e2ddbda | |||
| 121ca10261 | |||
| f28a1a2db9 | |||
| ab61edc402 | |||
| ba55692cbe | |||
| eb46955b3b | |||
| 37bf8d0855 | |||
| be87f31211 | |||
| 4738cde9e4 | |||
| 6cf5e0d45e | |||
| 8e71e82efc | |||
| 4f07d9b129 | |||
| 8555748202 | |||
| a0914f4d54 | |||
| 2301251420 | |||
| 83f9b58d4d | |||
| f8aef20b0d | |||
| 0dcffc8677 | |||
| bc578b212e | |||
| 8368caf58a | |||
| c836b45920 | |||
| b9a2893d80 | |||
| 82f93746ab | |||
| b79fcfb1ed | |||
| ba241c98a9 | |||
| f7cdd7a4c1 | |||
| 1bdb7183ed | |||
| 4d5ad13e0c | |||
| 69e6b6a713 | |||
| 781077e5e3 | |||
| 16d429e9e4 | |||
| 18600a44da | |||
| 9c46974bd7 | |||
| 480f99234c | |||
| 8811ca25ce | |||
| 161bf31a62 | |||
| ae00fd2c31 | |||
| 2c48c89cfa | |||
| de5e62de50 | |||
| 0eed426559 | |||
| 03a9a3793a | |||
| 7528764ff3 | |||
| 3576a066fe | |||
| 7efd34bc4d | |||
| 59553be571 | |||
| 8b9d62ea50 | |||
| 17d00a8524 | |||
| 47950afb67 | |||
| 08108f0c18 | |||
| 8a6086ba6d | |||
| b1c7b45523 | |||
| 2bca2aed97 | |||
| c25bfc9f1b | |||
| fb4dc613ae | |||
| 0413bc5afc | |||
| f4ec95cdca | |||
| 077e03ab2f | |||
| 9488c4c853 | |||
| e962d1e44b | |||
| df5007826d | |||
| 6db2e0a4ec | |||
| 363005ad49 | |||
| 22318e1b9a | |||
| 6e0da28ea3 | |||
| e8169af6c8 | |||
| ed78c8facb | |||
| b096163ed3 | |||
| 486655d071 | |||
| d485f0fda1 | |||
| 8509f04d4d | |||
| 3ee7a6e75e | |||
| 8b96b65c8c | |||
| db8a449785 | |||
| 2cdde60644 | |||
| 32f229b0a5 | |||
| 2f98df87a0 | |||
| f6ff2869c1 | |||
| 65ae2090ac | |||
| 73b3ddbcff | |||
| 78d83691df | |||
| c1b5631e24 | |||
| f9a3d31a49 | |||
| 3c8501cbe2 | |||
| 00eec47e13 | |||
| ff053e56cf | |||
| 493cfa3156 | |||
| 4fff89029d | |||
| 7e6aaf514b | |||
| 053fbdbf30 | |||
| a1ae44e135 | |||
| 7fe2ea76c3 | |||
| 6435a649b4 | |||
| 12226c3d0f | |||
| 1413f480cd | |||
| f7a044ba79 | |||
| d9dbfe68c1 | |||
| 6b6373238a | |||
| eebddf0527 | |||
| 9f67448b72 | |||
| 193b4688d3 | |||
| 9cc365e779 | |||
| ad9f4d3a9a | |||
| b1dad261d1 | |||
| 18c020e8a6 | |||
| 3b0b84dcea | |||
| 11ea958059 | |||
| 105854c389 | |||
| ba5d888e37 | |||
| 8792404e0d | |||
| d5102c9cd7 | |||
| 25d681a1d8 | |||
| fa9f18da29 | |||
| e8bd81ccc7 | |||
| f26d55af68 | |||
| e46ddb9cdc | |||
| 3cf3ca71d6 | |||
| 1d4ab7b264 | |||
| 841f8bfb84 | |||
| a075189bdd | |||
| e52475a4bf | |||
| 8ce4911317 | |||
| c190ce1474 | |||
| f19de3ae6e | |||
| e56e209506 | |||
| 28fb4f6fa2 | |||
| a832879b73 | |||
| a2f49e1b8b | |||
| 99c3474fb6 | |||
| 9924795888 | |||
| 733ab0d208 | |||
| 6e2ba56a7c | |||
| 2507a2695f | |||
| ddd83bf63d | |||
| 685793f0fb | |||
| f6712704ee | |||
| de500854c4 | |||
| d992b6a206 | |||
| d2b96736bb | |||
| 50b9f4e207 | |||
| 45fc0893b1 | |||
| c4dd56075d | |||
| f1084c716a | |||
| 2f8e4ca812 | |||
| 450f5d8109 | |||
| 62d6707d10 | |||
| 2bcf26cc8d | |||
| daddd069a3 | |||
| 3b3489b492 | |||
| 505ee0ad24 | |||
| 0b79fa192e | |||
| ff2968c989 | |||
| 8c49cc8ef2 | |||
| f0751499ea | |||
| d4dd84394b | |||
| 3b4340b5e8 | |||
| 4db147e582 | |||
| c997acc95d | |||
| f8126c392e | |||
| b6d74d3c07 | |||
| 62bf425313 | |||
| 5657a8f90a | |||
| 56578a0a9d | |||
| e71d9516ec | |||
| 658c10c2a4 | |||
| ff3defe52d | |||
| a489f13d99 | |||
| 20d4bbf7ac | |||
| 604094a603 | |||
| 522fed818f | |||
| 3930534273 | |||
| 4d950b2597 | |||
| badf4ce955 | |||
| 7d8c670ed2 | |||
| 91a3786cd9 | |||
| 73af12a64d | |||
| 0e9bae4ec9 | |||
| 9df8056616 | |||
| 9e9195b9c0 | |||
| 1625f15f92 | |||
| 6a8bd9c932 | |||
| 05da8eefac | |||
| 04badb658b | |||
| 8f2f5b28cf | |||
| d5e4e0a29d | |||
| 96570dffd4 | |||
| e79f4baa2f | |||
| b79ba14f9e | |||
| de298ffef1 | |||
| eaf7b6bd41 | |||
| 2bb8205da0 | |||
| f623aa1fee | |||
| 00e7eeb774 | |||
| 47d51ded51 | |||
| 532bb826e1 | |||
| 8193bf483c | |||
| 34dcaf26d9 | |||
| 7411f570ee | |||
| 52702f3fa2 | |||
| 7f3573cede | |||
| 72359dc8be | |||
| 0e17aa5408 | |||
| 2bf850bc55 | |||
| aadf536d13 | |||
| 3be6371be1 | |||
| ca1b68aa4f | |||
| d4e5ac6753 | |||
| c9f49927a8 | |||
| 1794b5b8ca | |||
| 7347439034 | |||
| 51ad8f99fd | |||
| 39279a5dda | |||
| 5271f357f5 | |||
| 13ba3f90f6 | |||
| 43be8bf391 | |||
| 826a76c56c | |||
| efaae5f490 | |||
| 3a73265a75 | |||
| a6fef7fd9b | |||
| a08df4c3ed | |||
| 9701af9e36 | |||
| b4f1eeee84 | |||
| 2922fe0138 | |||
| 704facbc6b | |||
| 404e8a0c27 | |||
| ef621fab2d | |||
| 0938e33fe1 | |||
| 6b5c283e10 | |||
| b6400c41c4 | |||
| 24b7078a05 | |||
| dc215d3350 | |||
| b80cbc037c | |||
| 4891501f62 | |||
| 6d3adc48f6 | |||
| f5eea1e906 | |||
| ba691f4d17 | |||
| 470f092482 | |||
| e9e4c75edd | |||
| ff1a4e7182 | |||
| 1e9cad6de7 | |||
| 62fe087598 | |||
| 7f01b85878 | |||
| a659d07db2 | |||
| b2a78907cf | |||
| 7bcf532b26 | |||
| 595f9a049c | |||
| 80ed90941d | |||
| 77cee53f2d | |||
| 1a673f4b3a | |||
| 5ad8c88319 | |||
| 30aaa64f59 | |||
| 352bf840c3 | |||
| 898cece0d3 | |||
| 0b05cc4e10 | |||
| 74fa08e95d | |||
| bc6148624c | |||
| f5f00a7739 | |||
| 2de4739e9d | |||
| 47e8ab7e62 | |||
| 8a678509c5 | |||
| de53bfdd2b | |||
| f9d95a48f2 | |||
| be734b880f | |||
| 1c45e95ef3 | |||
| 7086a72fab | |||
| 540236f878 | |||
| aab95ee444 | |||
| 2b7d19199a | |||
| 28b424fe65 | |||
| 324c5db94e | |||
| faaeefe6ce | |||
| b76d43a5ff | |||
| 8b48882c86 | |||
| 286279b89f | |||
| c933fa3423 | |||
| 0958728418 | |||
| cb8d405dcf | |||
| 6f4e3474b8 | |||
| 545622a2ab | |||
| 3a0736a73f | |||
| 048a7e0f13 | |||
| cad475fc20 | |||
| 8b0f1e35c8 | |||
| 67dbf62eb7 | |||
| 9b59208373 | |||
| 146560c796 | |||
| 286e3515d4 | |||
| c1d3a9042d | |||
| e656bde54d | |||
| 33d763d968 | |||
| 56a0eb794e | |||
| effc9f9230 | |||
| 4817a2aedc | |||
| b67628c566 | |||
| 5aa8e45652 | |||
| 1f377483a5 | |||
| 9b84452b86 | |||
| 75e6c1bd5d | |||
| a96a05d3de | |||
| 3f09e62c74 | |||
| a98bc3ae4a | |||
| 93d4365d36 | |||
| 33e10d00bf | |||
| 7c2bf711c7 | |||
| ff7fe34d5b | |||
| 973f49fabc | |||
| 8899e8bd32 | |||
| 6dda9e09cf | |||
| c0a6f16374 | |||
| ba71618463 | |||
| 6261217e7c | |||
| 5dd56d9666 | |||
| 83a82c17c6 | |||
| 03cf88a058 | |||
| 4bb0acb4a2 | |||
| 04db3fe0c5 | |||
| 28bb8f2d3f | |||
| 5074f945cf | |||
| 3a12837706 | |||
| cfa1f1eeea | |||
| 85e4ccd215 | |||
| 0e13e269d0 | |||
| 4aa8fe2e2d | |||
| a94bf651de | |||
| 00078a1f4e | |||
| ded7dbec06 | |||
| 8534ff6bba | |||
| f735da0059 | |||
| 5093706a4a | |||
| 8f7d699b4e | |||
| b87710cc67 | |||
| 0d609c1013 | |||
| 58235e3b02 | |||
| 3ab2b8a8dc | |||
| 258b2b3c5b | |||
| 9e1ea293aa | |||
| 12a81bd924 | |||
| 84edec2b54 | |||
| c871dea873 | |||
| 99a6f53307 | |||
| f8af155c60 | |||
| 244de52b19 | |||
| 0ea77656e3 | |||
| 65bcc7bbb1 | |||
| cbb57f7039 | |||
| 644362f492 | |||
| b11dcd273d | |||
| 041e674af9 | |||
| c65ffaf161 | |||
| e7cb698026 | |||
| 2800b8b3e6 | |||
| 94a0adc55a | |||
| a24edfffa3 | |||
| dfda5e36c8 | |||
| 29b8f046f4 | |||
| 8290b57cd4 | |||
| e1630e9919 | |||
| 91a20662da | |||
| 7af27ab5de | |||
| f4c24d9578 | |||
| 1226e85c4a | |||
| d05eb145b6 | |||
| a984c4f16c | |||
| 921871cab1 | |||
| baf694621c | |||
| 75dfdb155b | |||
| 704337aa1d | |||
| a62fb9ab16 | |||
| d06ea4f045 | |||
| 69d89ecd56 | |||
| 4571b06279 | |||
| c68c798b49 | |||
| bfedf436d8 | |||
| fd7a15bc5a | |||
| 5cee928978 | |||
| 75322da405 | |||
| 9ba45e58f6 | |||
| d43633cb65 | |||
| cf1b1f7865 | |||
| df4e254305 | |||
| 05f9e94260 | |||
| 75b87719b3 | |||
| 2eef0496ba | |||
| 9584f12fc5 | |||
| 8c0df674ec | |||
| 592df9e56d | |||
| c0e584143e | |||
| cb2534d678 | |||
| db5f6dbef0 | |||
| 5c2f7ae69a | |||
| 7c2a0ca1a6 | |||
| f90319fc9f | |||
| fd26ee4f52 | |||
| e8919cc629 | |||
| 8d9e713c81 | |||
| ad538ba767 | |||
| 79a92be9d2 | |||
| 8b55490b76 | |||
| c1b8b68513 | |||
| 70ad8188c4 | |||
| ee7aaf81d9 | |||
| a6699320ef | |||
| 1abe8de810 | |||
| 4c402d81ab | |||
| df7f2174e5 | |||
| 577a3a0a63 | |||
| ad47aa2a79 | |||
| fb077bc557 | |||
| 9229f27cf7 | |||
| 7468af3970 | |||
| 27abf559e8 | |||
| 5b9aedd1a4 | |||
| 3315b758ad | |||
| 4cd1114def | |||
| 2281ec80ae | |||
| dc236bab62 | |||
| 3bf7d65dea | |||
| 2ee7e90bcc | 
							
								
								
									
										56
									
								
								.gitea/workflows/deploy.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								.gitea/workflows/deploy.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,56 @@ | |||||||
|  | name: Deploy | ||||||
|  | on: | ||||||
|  |   push: | ||||||
|  |     tags: ["v[0-9]+.[0-9]+.[0-9]+"] | ||||||
|  | jobs: | ||||||
|  |   deploy: | ||||||
|  |     name: Build and Deploy | ||||||
|  |     runs-on: windows-latest | ||||||
|  |     permissions: | ||||||
|  |       contents: write | ||||||
|  |     steps: | ||||||
|  |       - name: Set APP_VERSION variable from tag | ||||||
|  |         shell: powershell | ||||||
|  |         run: | | ||||||
|  |           $APP_VERSION = $env:GITHUB_REF -replace '^refs/tags/v', '' | ||||||
|  |           Add-Content -Path $env:GITHUB_ENV -Value "APP_VERSION=$APP_VERSION" | ||||||
|  |       - name: Checkout repository | ||||||
|  |         uses: actions/checkout@v4 | ||||||
|  |       - name: Check version in project | ||||||
|  |         shell: powershell | ||||||
|  |         run: | | ||||||
|  |           Select-String Elwig/Elwig.csproj -Pattern "<Version>" | ||||||
|  |           $res = Select-String Elwig/Elwig.csproj -Pattern "<Version>${{ env.APP_VERSION }}</Version>" | ||||||
|  |           if ($res -eq $null) { | ||||||
|  |             exit 1 | ||||||
|  |           } | ||||||
|  |       - name: Setup MSBuild | ||||||
|  |         uses: microsoft/setup-msbuild@v1.1 | ||||||
|  |       - name: Setup NuGet | ||||||
|  |         uses: nuget/setup-nuget@v1 | ||||||
|  |       - name: Restore NuGet packages | ||||||
|  |         shell: powershell | ||||||
|  |         run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a | ||||||
|  |       - name: Build Setup | ||||||
|  |         shell: powershell | ||||||
|  |         run: $(& msbuild -verbosity:quiet Setup/Setup.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a | ||||||
|  |       - name: Rename artifact | ||||||
|  |         shell: powershell | ||||||
|  |         run: Move-Item Setup/bin/x64/Release/Elwig.exe Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe | ||||||
|  |       - name: Create release | ||||||
|  |         uses: akkuman/gitea-release-action@v1 | ||||||
|  |         with: | ||||||
|  |           name: Elwig ${{ env.APP_VERSION }} | ||||||
|  |           body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**" | ||||||
|  |           files: |- | ||||||
|  |             Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe | ||||||
|  |       - name: Upload to website | ||||||
|  |         shell: powershell | ||||||
|  |         run: | | ||||||
|  |           $content = [System.IO.File]::ReadAllBytes("Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe") | ||||||
|  |           Invoke-WebRequest ` | ||||||
|  |             -Uri "https://elwig.at/files/Elwig-${{ env.APP_VERSION }}.exe" ` | ||||||
|  |             -Method PUT ` | ||||||
|  |             -Body $content ` | ||||||
|  |             -Headers @{ Authorization = "${{ secrets.API_AUTHORIZATION }}" } ` | ||||||
|  |             -ContentType "application/octet-stream" | ||||||
							
								
								
									
										43
									
								
								.gitea/workflows/test.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								.gitea/workflows/test.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,43 @@ | |||||||
|  | name: Test | ||||||
|  | on: | ||||||
|  |   push: | ||||||
|  |     branches: ["**"] | ||||||
|  |     paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"] | ||||||
|  | jobs: | ||||||
|  |   test: | ||||||
|  |     name: Run tests | ||||||
|  |     runs-on: windows-latest | ||||||
|  |     steps: | ||||||
|  |       - name: Checkout repository | ||||||
|  |         uses: actions/checkout@v4 | ||||||
|  |       - name: Check for Byte order marks | ||||||
|  |         shell: powershell | ||||||
|  |         run: | | ||||||
|  |           $pattern = [char]::ConvertFromUtf32(0xFEFF) | ||||||
|  |           $files = git grep -IEl "^$pattern" | ||||||
|  |           if ( $lastexitcode -ne 1 ) { | ||||||
|  |             echo "Files with BOM found:" | ||||||
|  |             echo $files | ||||||
|  |             exit 1 | ||||||
|  |           } else { | ||||||
|  |             echo "No files with BOM found" | ||||||
|  |             exit 0 | ||||||
|  |           } | ||||||
|  |       - name: Setup MSBuild | ||||||
|  |         uses: microsoft/setup-msbuild@v1.1 | ||||||
|  |       - name: Setup NuGet | ||||||
|  |         uses: nuget/setup-nuget@v1 | ||||||
|  |       - name: Restore NuGet packages | ||||||
|  |         shell: powershell | ||||||
|  |         run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a | ||||||
|  |       - name: Build Elwig | ||||||
|  |         shell: powershell | ||||||
|  |         run: $(& msbuild -verbosity:quiet Elwig/Elwig.csproj -property:Configuration=Debug; $a=$lastexitcode) | findstr x*; exit $a | ||||||
|  |       - name: Build Tests | ||||||
|  |         shell: powershell | ||||||
|  |         run: $(& dotnet build Tests; $a=$lastexitcode) | findstr x*; exit $a | ||||||
|  |       - name: Run Tests | ||||||
|  |         shell: powershell | ||||||
|  |         run: | | ||||||
|  |           $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH | ||||||
|  |           $(& dotnet test Tests --filter "FullyQualifiedName!~E2ETests"; $a=$lastexitcode) | findstr x*; exit $a | ||||||
							
								
								
									
										4
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -3,3 +3,7 @@ bin/ | |||||||
| *.user | *.user | ||||||
| .vs | .vs | ||||||
| .idea | .idea | ||||||
|  | Tests/Resources/Sql/Create.sql | ||||||
|  | *.exe | ||||||
|  | !WinziPrint.exe | ||||||
|  | *.sqlite3 | ||||||
|   | |||||||
							
								
								
									
										668
									
								
								CHANGELOG.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										668
									
								
								CHANGELOG.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,668 @@ | |||||||
|  |  | ||||||
|  | Changelog | ||||||
|  | ========= | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.8][v0.10.8] (2024-09-05) {#v0.10.8} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.10.8-features} | ||||||
|  |  | ||||||
|  | * Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) gibt es eine neue Spalte `Datum` und es können alle Lesepläne nach z.B. einem Mitglied durchsucht werden. (a5638135a3, 7437187630) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.8-bugfixes} | ||||||
|  |  | ||||||
|  | * Versuch 3: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8d9172f91e) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.8-misc} | ||||||
|  |  | ||||||
|  | * Im Lieferjournal (`DeliveryJournal`) ist die Sortierung der Filter für das Gewicht korrigiert. (22514715c1) | ||||||
|  | * In der Anmeldeliste (`DeliveryAncmtList`) wurde die Spalte `Anmldg.` zentriert. (f43d9c020c) | ||||||
|  | * In Geschäftsdokumenten (`BusinessDocument`) wurden im Informationsblock `:` hinzugefügt. (26235f8c0a) | ||||||
|  | * Im Mitgliedsstammdatenblat (`MemberDataSheet`) wird der USt.-Steuersatz zusätzlich zu _Buchführend: ja/nein_ angezeigt. (a04c7d538e) | ||||||
|  |  | ||||||
|  | [v0.10.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.8 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.7][v0.10.7] (2024-09-02) {#v0.10.7} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.10.7-features} | ||||||
|  |  | ||||||
|  | * Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Anmeldezeitpunkt angezeigt; in der Anmeldeliste als `ok` oder `verspät.`. (141086673f) | ||||||
|  | * Im Lieferungen-Fenster (`DeliveryAdminWindow`) kann nach dem Gesamtgewicht einer Lieferung gefiltert werden (z.B. `<500kg`, `>8000kg`). (543185d48e) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.7-bugfixes} | ||||||
|  |  | ||||||
|  | * Versuch 2: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12) | ||||||
|  |  | ||||||
|  | [v0.10.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.7 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.6][v0.10.6] (2024-08-30) {#v0.10.6} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.6-bugfixes} | ||||||
|  |  | ||||||
|  | * Der Titel des Flächenbindungs-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c) | ||||||
|  | * Im Auszahlungsvariante-Fenster (`ChartWindow`) einen Skalierungs-Fehler behoben. ([#33][i33]) | ||||||
|  | * Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8c8c0a8c2b) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.6-misc} | ||||||
|  |  | ||||||
|  | * SQL-Queries für Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`) und Über-/Unterlieferungen effizienter umgeschrieben. (9930e6173c) | ||||||
|  | * Im Haupt-Fenster (`MainWindow`) den Menüpunkt _Waagen_ zu _Waage_ geändert. (8ce8492c74) | ||||||
|  | * Im Übernahme-Fenster (`DeliveryAdminWindow`) wird in der Teil-Lieferungen-Liste immer die letzte Teil-Lieferung angezeigt. (2ef10b4bb2) | ||||||
|  | * Breite des Traubenanmeldungen-Fensters (`DeliveryAncmtAdminWindow`) leicht erhöht und Fehler beim Enter-Drücken im _Gewicht_ Eingabefeld. (21f68caf4c, e18bc58b6c) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) wird das ändern der Kontaktart E-Mail wieder farblich hervorgehoben. (78a72c641f) | ||||||
|  |  | ||||||
|  | [v0.10.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.6 | ||||||
|  | [i33]: https://git.necronda.net/winzer/elwig/issues/33 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.5][v0.10.5] (2024-08-24) {#v0.10.5} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.10.5-features} | ||||||
|  |  | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) kann der Benutzer beim Übertragen von Flächenbindungen entscheiden, ob der Beginn der Laufzeit übernommen werden soll, oder nicht. (bec1b165bf) | ||||||
|  | * Im Haupt-Fenster (`MainWindow`) ist es nun möglich für Waagen vom Typ `SysTec-IT` Datum und Uhrzeit festzulegen. (cd2b482b5a) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.5-misc} | ||||||
|  |  | ||||||
|  | * Abstände in der Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (adbe418b7c) | ||||||
|  | * Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) scheinen keine Warnungen mehr auf, wenn ein nicht-optionales Feld nicht ausgefüllt wurde. (2ae2564647) | ||||||
|  |  | ||||||
|  | [v0.10.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.5 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.4][v0.10.4] (2024-08-22) {#v0.10.4} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.4-misc} | ||||||
|  |  | ||||||
|  | * Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Wochentag auch beim Bearbeiten angezeigt. (85931e62e8) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) werden Anzahl der Mitglieder und Geschäftsanteile nicht mehr von allen aktiven angezeigt, sonder von den momentan gefilterten. (49e4b65c27) | ||||||
|  | * Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (f54677d429) | ||||||
|  |  | ||||||
|  | [v0.10.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.4 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.3-bugfixes} | ||||||
|  |  | ||||||
|  | * Datum für _Anmeldungen bis_ im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) ab jetzt änderbar. (84d8d0cecb) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.3-misc} | ||||||
|  |  | ||||||
|  | * Wochentag bei Leseplan-Liste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) anzeigen. (fe7f9d675b) | ||||||
|  |  | ||||||
|  | [v0.10.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.3 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.2-bugfixes} | ||||||
|  |  | ||||||
|  | * Beim Hochladen der Mitgliederdaten sind Flächenbindungen nicht mitexportiert worden. (204dfe8745) | ||||||
|  | * Beim Importieren von älteren Exportdaten kam es zu einem Fehler. (cd40075702) | ||||||
|  |  | ||||||
|  | [v0.10.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.2 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.1][v0.10.1] (2024-08-14) {#v0.10.1} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.10.1-features} | ||||||
|  |  | ||||||
|  | * In der Mitglieder-Liste (PDF und Excel) werden ggf. gefilterte Flächenbindungen angegeben. (d3839c288a) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.1-bugfixes} | ||||||
|  |  | ||||||
|  | * Fehler beim Berechnen... | ||||||
|  |   * falls in Saison keine Lieferungen vorhanden sind. (48970de652) | ||||||
|  |   * falls der Vorname eines Mitgliedes nicht gesetzt ist. (2764a0ca21) | ||||||
|  |  | ||||||
|  | [v0.10.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.1 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.10.0][v0.10.0] (2024-08-13) {#v0.10.0} | ||||||
|  | ------------------------------------------ | ||||||
|  |  | ||||||
|  | > [!NOTE] | ||||||
|  | > Mitglieder können ab dieser Version als juristische Person markiert werden. | ||||||
|  | > Es ist empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus). | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.10.0-features} | ||||||
|  |  | ||||||
|  | * Traubenanmeldungen und Leseplanung sind ab jetzt verfügbar. ([#14][i14]) | ||||||
|  | * Mitglieder können nun auch als juristische Person markiert werden. ([#54][i54]) | ||||||
|  | * Im Auszahlungsvarianten-Fenster kann unter _Anpassen_ (`PaymentAdjustmentWindow`) nun auch ein Absoluter oder Relativer Zu-/Abschlag pro Mitglied festgelegt werden, der **vor der MwSt.** angewendet wird. (4d89a17e80) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.10.0-bugfixes} | ||||||
|  |  | ||||||
|  | * Beim Erstellen eines neuen Mitgliedes war es nicht möglich die Flächenbindungen des Vorgängers zu übernehmen. (9127cd3f03) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.10.0-misc} | ||||||
|  |  | ||||||
|  | * Für den Treuebonus der WG Matzen werden nun auch Lieferungen der Vorgänger miteinbezogen. (2333077aa5) | ||||||
|  | * In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) werden Zu-/Abschläge pro Mitglied explizit angegeben, somit ist die Zwischensumme korrekt. (f52c11b91e) | ||||||
|  |  | ||||||
|  | [v0.10.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.0 | ||||||
|  | [i14]: https://git.necronda.net/winzer/elwig/issues/14 | ||||||
|  | [i54]: https://git.necronda.net/winzer/elwig/issues/54 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.9.3][v0.9.3] (2024-08-02) {#v0.9.3} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.9.3-misc} | ||||||
|  |  | ||||||
|  | * Das Lieferjournal als Excel-Liste beinhaltet nun auch Liefer-Zweigstelle und Stamm-Zweigstelle des Liefernaten. (cf05a0c658) | ||||||
|  |  | ||||||
|  | [v0.9.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.3 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.9.2][v0.9.2] (2024-08-01) {#v0.9.2} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.9.2-bugfixes} | ||||||
|  |  | ||||||
|  | * Verhalten beim Schließen des Haupt-Fensters (`MainWindow`) nicht immer richtig. (8db6007264) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) führt beim Erstellen eines Mitglied das Eingeben einer Tel.-Nr. zu einem Fehler. (4403754ada) | ||||||
|  |  | ||||||
|  | [v0.9.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.2 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.9.1][v0.9.1] (2024-08-01) {#v0.9.1} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.9.1-features} | ||||||
|  |  | ||||||
|  | * Im Rundschreiben-Fenster (`MailWindow`) können E-Mails ohne Anhänge verschickt werden. (f69d2809f3) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) und Lieferungen-Fenster (`DeliveryAdminWindow`) kann das/die momentan ausgewählte Mitglied/Lieferung alleine exportiert werden. (db4de5b5fe) | ||||||
|  | * Exporte für Mitglieder enthalten nun auch deren Flächenbindungen. (10ee1d6548) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.9.1-bugfixes} | ||||||
|  |  | ||||||
|  | * Sortierung der Wiegen-Knöpfe im Übernahme-Fenster (`DeliveryAdminWindow`). (7786fb421a) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.9.1-misc} | ||||||
|  |  | ||||||
|  | * Deutsche Fehlermeldung beim Hochladen/Herunterladen im Haupt-Fenster (`MainWindow`). (91717f8efb) | ||||||
|  | * Waagen-Fehler _Brutto negativ_ implementiert. (39f93da0ba) | ||||||
|  |  | ||||||
|  | [v0.9.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.1 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.9.0][v0.9.0] (2024-07-28) {#v0.9.0} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.9.0-features} | ||||||
|  |  | ||||||
|  | * Flächenbindungen werden als Tabelle in der Status-Leiste im Mitglieder-Fenster (`MemberAdminWindow`) angezeigt. ([#26][i26]) | ||||||
|  | * Filter für E-Mail-Adressen, Tel.-Nr. und Kontaktarten im Mitglieder-Fenster (`MemberAdminWindow`). (1141331608) | ||||||
|  | * Auf Lieferscheinen (`DeliveryNote`) werden nun _Brutto, Tara, Netto_ werte abgedruckt. (fd0ed97305, 4aa3362029, 53d3affefe) | ||||||
|  | * Beim Exportieren der Mitgliederliste werden auch Tel.-Nr. und E-Mail-Adressen exportiert. (b6afb94246) | ||||||
|  | * Benutzerfreundliches Synchronisieren zwischen Standorten. ([#3][i3]) | ||||||
|  | * Übernehmer _müssen_ explizit entscheiden, ob _gerebelt gewogen_ oder nicht. (935b31f6e3) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.9.0-bugfixes} | ||||||
|  |  | ||||||
|  | * Zu-/Abschläge im Lieferungen-Fenster (`DeliveryAdminWindow`). (f235d5b380) | ||||||
|  | * Falls keine Saison existierte führte das zu einem Absturz im Rundschreiben-Fenster (`MailWindow`). (84f772a32f) | ||||||
|  | * Beim Drucken _sollte_ kein Kommandozeilen-Fenster mehr sichtbar sein. (d741ba92dc) | ||||||
|  | * Wenn bei einem Mitglied keine Stamm-KG hinterlegt war, kam es zu inkonsistentem Verhalten im Übernahme-Fenster (`DeliveryAdminWinodw`). (4c3f0c40fa) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.9.0-misc} | ||||||
|  |  | ||||||
|  | * Model-View-ViewModel (MVVM) implementiert! ([#10][i10]) | ||||||
|  | * Die nächste Saison "beginnt" bereits im Juli (statt erst im August) (`CurrentLastSeason`). (c314321039) | ||||||
|  | * Automatisierte Tests für Waagen (Sitzendorf, Haugsdorf). (8e9f2f4e90) | ||||||
|  | * Überprüfung auf Byte-Order-Marks in allen Quellcode-Dateien. (53c7cb2ec0, f09753ccc2) | ||||||
|  |  | ||||||
|  | [v0.9.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.0 | ||||||
|  | [i3]: https://git.necronda.net/winzer/elwig/issues/3 | ||||||
|  | [i10]: https://git.necronda.net/winzer/elwig/issues/10 | ||||||
|  | [i26]: https://git.necronda.net/winzer/elwig/issues/26 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.9][v0.8.9] (2024-07-23) {#v0.8.9} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.9-bugfixes} | ||||||
|  |  | ||||||
|  | * Absturz im Rundschreiben-Fenster (`MailWindow`). Fehler bei `CheckComboBox`. (49f03c0a3c) | ||||||
|  | * Excel-Exporte können nun auch Sonderzeichen (wie `&`) enthalten. (ba9e1d7201) | ||||||
|  |  | ||||||
|  | [v0.8.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.9 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.8][v0.8.8] (2024-07-22) {#v0.8.8} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.8-bugfixes} | ||||||
|  |  | ||||||
|  | * Schnittstelle für Gassner-Waagen nicht funktionsfähig. (4c75dbe4aa) | ||||||
|  |  | ||||||
|  | [v0.8.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.8 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.7][v0.8.7] (2024-07-22) {#v0.8.7} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.7-features} | ||||||
|  |  | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) muss eine E-Mail-Adresse angegeben werden, wenn E-Mail als Kontaktart angegeben wird. (5a36e84b1f) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.7-misc} | ||||||
|  |  | ||||||
|  | * Automatisierte Ende-zu-Ende-Tests (`E2ETests`) hinzugefügt. (ddd821e478, 6b48a1090c, dd5049faae, 5b2f617a68, 7246852181) | ||||||
|  | * Automatisierte Tests überarbeitet. (44656e0022, 86937485e4, 34178105a7, ffe0ff5508, 01d658f51d) | ||||||
|  | * Update-Dialog (`UpdateDialog`) überarbeitet. (62f63ef63d, e9de54415a) | ||||||
|  | * Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) etwas verbessert. (26d75ea3cd, daf83c4bbc) | ||||||
|  | * Im Übernahme-Fenster (`DeliveryAdminWindow`) werden nur noch aktive Mitglieder angezeigt. (658a1f4dc1) | ||||||
|  | * Abhängigkeiten aktualisiert. (ffef1fd6e4, dd48a24c58) | ||||||
|  | * Auto-Update-Funktion überarbeitet. (3ac9536e76) | ||||||
|  |  | ||||||
|  | [v0.8.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.7 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.6][v0.8.6] (2024-07-01) {#v0.8.6} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.6-features} | ||||||
|  |  | ||||||
|  | * Es ist nun möglich benutzerdefinierte Zu-/Abschläge pro Mitglied anzugeben. ([#48][i48], 255bcbe3ad, 6a92eb76a0) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) Menü-Eintrag zum Ansehen von Traubengutschriften (`CreditNote`) hinzugefügt. (bce2eea3ac) | ||||||
|  |   | ||||||
|  | ### Sonstiges {#v0.8.6-misc} | ||||||
|  |  | ||||||
|  | * Im Rundschreiben-Fenster (`MailWindow`) kann das Datum geändert werden. (7ce8c3cabf) | ||||||
|  | * Im Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`): | ||||||
|  |   * kann nur noch die aktuellste Saison angepasst werden. (43dddf2c07) | ||||||
|  |   * gibt es jetzt eine Statusleiste. (5c76b8ec52) | ||||||
|  | * Auf Traubengutschriften (`CreditNote`) wird die Berechnungszeit nicht mehr angeführt, dafür jedoch das Datum der Auszahlungsvariante. (763f0197ca) | ||||||
|  | * Im Stammdaten-Fenster (`BaseDataWindow`) sind Strafen bei Unterlieferung lt. GA besser gruppiert. ([#52][i52]) | ||||||
|  | * Statistiken zu Zu-/Abschlägen im Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#49][i49]) | ||||||
|  | * Knöpfe (und Pfeile) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) anders angeordnet. (6195363335) | ||||||
|  | * Im Auszahlungsvariante-Fenster (`ChartWindow`) sind 73 °Oe standardmäßig ausgewählt. ([#51][i51]) | ||||||
|  |  | ||||||
|  | [v0.8.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.6 | ||||||
|  | [i48]: https://git.necronda.net/winzer/elwig/issues/48 | ||||||
|  | [i49]: https://git.necronda.net/winzer/elwig/issues/49 | ||||||
|  | [i51]: https://git.necronda.net/winzer/elwig/issues/51 | ||||||
|  | [i52]: https://git.necronda.net/winzer/elwig/issues/52 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.5][v0.8.5] (2024-06-17) {#v0.8.5} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.5-features} | ||||||
|  |  | ||||||
|  | * Fenster zum Anpassen der Auszahlung einer Saison (`PaymentAdjustmentWindow`) hinzugefügt. ([#46][i46]) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.5-bugfixes} | ||||||
|  |  | ||||||
|  | * Inaktive Mitglieder, die in der letzten Saison geliefert haben, bisher in _Über-/Unterlieferungen_ nicht aufgeschienen. (abf465f821) | ||||||
|  | * Inaktive Mitglieder, die in der letzten Saison geliefert haben, haben keine entsprechenden Rundschreiben bekommen. (792c18365e) | ||||||
|  | * Falls unter `Stammdaten > Mandant` kein IBAN gesetzt war führte das zu einem Fehler beim Exportieren der Überweisungsdaten. (da9df5cbeb) | ||||||
|  | * Falls sich Daten in der Datenbank im Hintergrund geändert haben wurden Daten für Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) falsch neu geladen. (050e4f5b6f) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.5-misc} | ||||||
|  |  | ||||||
|  | * Kleine Änderungen im EBICS-/XML-Export. (5cb7d2cbb0, cc0aa6046f, 87467bbe75) | ||||||
|  |  | ||||||
|  | [v0.8.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.5 | ||||||
|  | [i46]: https://git.necronda.net/winzer/elwig/issues/46 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.4][v0.8.4] (2024-06-13) {#v0.8.4} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.4-features} | ||||||
|  |  | ||||||
|  | * EBICS-Überweisung-Version für EBICS-/XML-Exporte der Überweisungsdaten nun unter `Stammdaten > Parameter > Daten-Export` konfigurierbar. (ab926421b0) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.4-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls beim Schließen des Hauptmenüs ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.4-misc} | ||||||
|  |  | ||||||
|  | * Eingabetyp _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) überarbeitet. ([#37][i37], 4483eb6a69) | ||||||
|  | * Abhängigkeit `Extended.Wpf.Toolkit` endgültig entfernt. ([#37][i37], 4483eb6a69) | ||||||
|  | * Automatisierte Tests für österreich-spezifischen EBICS-Standard hinzugefügt. (46551fb142) | ||||||
|  |  | ||||||
|  | [v0.8.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.4 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.3][v0.8.3] (2024-06-11) {#v0.8.3} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.3-features} | ||||||
|  |  | ||||||
|  | * Strafe für Unterlieferung lt. GA kann abhängig von GAs angegeben werden. ([#47][i47]) | ||||||
|  | * Es ist nun möglich Mitglieder zu löschen. (c12d111c57, 5a4ff26f31) | ||||||
|  | * Beim Übertragen der Flächenbindungen an einen Nachfolger (bzw. beim Inaktiv-Setzen) kann nun die gewünschte Saison angegeben werden. ([#45][i45]) | ||||||
|  | * Es ist nun möglich Saisons anzulegen und zu löschen. ([#44][i44]) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.3-bugfixes} | ||||||
|  |  | ||||||
|  | * Beim Auswählen einer Saison mit einer anderen Währung unter `Stammdaten > Saisons` kam es zu einem Absturz. (f756220d75) | ||||||
|  | * Abstürze im Rundschreiben-Fenster (`MailWindow`) beim Auswählen von einzelnen Mitgliedern oder nach Flächenbindung. (6e4f3b799d, 5039c1252a) | ||||||
|  | * Es nun wieder möglich Zu-/Abschläge bei Lieferungen hinzuzufügen oder zu entfernen. (324a63cf9a, 012352c562) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.3-misc} | ||||||
|  |  | ||||||
|  | * Eingabetyp _Ganzzahl_ (`IntegerUpDown`) überarbeitet. ([#37](i37), cc4ec6c5db, a531e948c1) | ||||||
|  | * Beim Erstellen der Installationsdatei wird der Rückgabewert überprüft (`curl --fail`). (ff375e3caf) | ||||||
|  | * URL in vordefinierter `config.ini`-Datei auf `https://elwig.at/` ausgebessert. (293c8967be) | ||||||
|  | * Abhängigkeiten aktualisiert. (4e477c38e0, 601ac548fe) | ||||||
|  | * Absender bei Anlieferungsbestätigung (`DeliveryConfirmation`) wird nicht mehr immer abgedruckt. (4c9a151f77) | ||||||
|  | * In der Zusammenfassung der Auszahlungsvariantendaten (`PaymentVariantSummary`) werden Rebel Zu-/Abschläge angeführt. (08f551a394) | ||||||
|  |  | ||||||
|  | [v0.8.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.3 | ||||||
|  | [i37]: https://git.necronda.net/winzer/elwig/issues/37 | ||||||
|  | [i44]: https://git.necronda.net/winzer/elwig/issues/44 | ||||||
|  | [i45]: https://git.necronda.net/winzer/elwig/issues/45 | ||||||
|  | [i47]: https://git.necronda.net/winzer/elwig/issues/47 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.2][v0.8.2] (2024-05-14) {#v0.8.2} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.2-features} | ||||||
|  |  | ||||||
|  | * In der Konfigurationsdatei (`config.ini`) gibt es die Möglichkeit bei Waagen `required = false` hinzuzufügen. | ||||||
|  |   So werden Fehlermeldungen der Waagen beim Starten dem Benutzer nicht angezeigt (außer `debug = true` ist in `[general]` gesetzt). (81e18ac553, e3fd705f52) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.2-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls die Saison für das aktuelle Jahr nicht angelegt war führte das zu einem Absturz im Stammdaten-Fenster (`BaseDataWindow`). (f95f0f0ef3) | ||||||
|  | * Das Drucken von Dokumenten ist wieder möglich. (2b10e52ab0) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.2-misc} | ||||||
|  |  | ||||||
|  | * Umstieg von `https://www.necronda.net/elwig/` auf `https://elwig.at/`. (be246d6f06, 5b952c4eb1) | ||||||
|  |  | ||||||
|  | [v0.8.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.2 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.1][v0.8.1] (2024-05-12) {#v0.8.1} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | > [!WARNING] | ||||||
|  | > Aufgrund eines Fehlers beim Erstellen der Installationsdatei ist in dieser Version das Drucken von Dokumenten nicht möglich! | ||||||
|  | > | ||||||
|  | > Es wird empfohlen die nächste Version zu verwenden. | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.1-features} | ||||||
|  |  | ||||||
|  | * Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#32][i32], 69aa75a50a) | ||||||
|  |  | ||||||
|  | ### Behobene Fehle {#v0.8.1-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls in einer neuen Version die Datenbank aktualisiert werden musste, konnte es vorkommen, dass es beim Start zu einem Absturz kam. (6906584ef0) | ||||||
|  | * Beim Exportieren der Überweisungsdaten kam es zu einem Absturz. (f123bb44c5) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.1-misc} | ||||||
|  |  | ||||||
|  | * Das Installationsprogramm ist nun auf deutsch verfügbar. (d102a1cb7a) | ||||||
|  | * Menüleiste und Statusleiste im Fenster für Auszahlungsvarianten (`PaymentVaiantWindow`) hinzugefügt. (b03f81d4f2) | ||||||
|  |  | ||||||
|  | [v0.8.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.1 | ||||||
|  | [i32]: https://git.necronda.net/winzer/elwig/issues/32 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.8.0][v0.8.0] (2024-05-01) {#v0.8.0} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.8.0-features} | ||||||
|  |  | ||||||
|  | * Die Qualitätsstatistik (`WineQualityStatistic`) kann in °KMW angezeigt werden. (869f652afc, 27b5d653e6) | ||||||
|  | * Waagen-Schnittstelle vom Typ `Gassner` implementiert. (443e111594) | ||||||
|  | * Teile zum Synchronisierung der Datenbank zwischen Zweigstellen implementiert. ([#3][i3]) | ||||||
|  | * Sorten-/Qualitätsaufschlüsselung im Hauptfenster. (2a4e8d69d0) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.8.0-bugfixes} | ||||||
|  |  | ||||||
|  | * Beim Anzeigen von Zu-/Abschlägen einer Saison im Stammdaten-Fenster (`BaseDataWindow`) kam es zu einem Absturz. (1419c834ac) | ||||||
|  | * Das Laden von einigen Daten im Stammdaten-Fenster (`BaseDataWindow`) war nicht immer konsistent. (1047bc6e8f) | ||||||
|  | * Die Einstellungen in `Stammdaten -> Parameter` haben nicht konsistent funktioniert. (9062d55b20) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.8.0-misc} | ||||||
|  |  | ||||||
|  | * Rahmenstärke in Dokumenten wider auf 0.5pt gesetzt. (eddea88e77) | ||||||
|  | * Mehr automatisierte Tests für Dokumente hinzugefügt. (66898714bb, b8851fb241, 5c3cf41d3d, 657910ff48, 12eb53cb44, 80e91ad776) | ||||||
|  | * `SeasonFinishWindow` und `TestWindow` entfernt. (a9f38a3ccb) | ||||||
|  | * Abhängigkeiten aktualisiert. (c6905bbb42, 21fe5bc094, fd17d294b9, 35e5a1dfff) | ||||||
|  | * Beim Überprüfen auf Updates bekommt der Nutzer nun auch eine Rückmeldung, wenn es keine Updates gibt. (c360e6b6a7) | ||||||
|  |  | ||||||
|  | [v0.8.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.0 | ||||||
|  | [i3]: https://git.necronda.net/winzer/elwig/issues/3 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.7.2][v0.7.2] (2024-03-28) {#v0.7.2} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.7.2-features} | ||||||
|  |  | ||||||
|  | * Flächenbindungen können vom Vorgänger übernommen bzw. beim Inaktiv-Setzen storniert werden. ([#41][i41]) | ||||||
|  | * Für diverse Funktionen wurden Tastenkürzel hinzugefügt (in den Menüleisten oder beim Drüberfahren mit der Maus genauer ersichtlich; z.B. Speichern/Neu/Löschen/Zurücksetzen/Abbrechen/Bearbeiten). ([#31][i31]) | ||||||
|  | * Die Mitgliederliste ist nun auch als PDF/Ausdruck und Excel-Liste verfügbar. ([#36][i36]) | ||||||
|  | * Im Lieferungen-Fenster (`DeliveryAdminWindow`): | ||||||
|  |   * kann nach mehr Dingen gefiltert werden (Handwiegung, Handlese, gebunden/ungebunden, brutto/netto). ([#12][i12], cf2ec3bdc4) | ||||||
|  |   * werden verwendete Zu-/Abschläge zusätzlich in der Tabelle angezeigt. (b31b5f6164) | ||||||
|  |   * können gefilterte Lieferungen nun auch als Excel-Liste exportiert werden. ([#13][i13]) | ||||||
|  |   * gibt es ab jetzt ein Übersichtsdokument/Qualitätsstatistik für gefilterte Lieferungen (`WineQualityStatistic`). ([#30][i30], d011c69812, d501cfaf72) | ||||||
|  | * Einige Optionen zum PDF-Speichern/-Ausdrucken überarbeitet. (b2f52072f8) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.7.2-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls beim Starten des Programms die Datenbank-Version "zu neu" war, wurde nur ein Fehler angezeigt und kein Auto-Update versucht. (87da56b7a9) | ||||||
|  | * Falls ein Element einer Liste ausgewählt wurde, das nicht in der Liste existierte führte dies zu einem Absturz. (afc143e1e4) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.7.2-misc} | ||||||
|  |  | ||||||
|  | * Das Gesamte Programm ist nun schneller und wird nach längerer Benutzung nicht mehr langsamer (`AppDbContext` Lifecycle). ([#43][i43]) | ||||||
|  | * Excel-Exports überarbeitet (Datumswerte, Wahr-/Falsch-Werte). (9d80c5913f, c6e83ffff4, 5795c5e8ba) | ||||||
|  | * Rahmenstärke in Dokumenten wider auf 0.05pt gesetzt. (9aa6cba1ff) | ||||||
|  |  | ||||||
|  | [v0.7.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.2 | ||||||
|  | [i12]: https://git.necronda.net/winzer/elwig/issues/12 | ||||||
|  | [i13]: https://git.necronda.net/winzer/elwig/issues/13 | ||||||
|  | [i30]: https://git.necronda.net/winzer/elwig/issues/30 | ||||||
|  | [i31]: https://git.necronda.net/winzer/elwig/issues/31 | ||||||
|  | [i36]: https://git.necronda.net/winzer/elwig/issues/36 | ||||||
|  | [i41]: https://git.necronda.net/winzer/elwig/issues/41 | ||||||
|  | [i43]: https://git.necronda.net/winzer/elwig/issues/43 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.7.1][v0.7.1] (2024-03-11) {#v0.7.1} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.7.1-features} | ||||||
|  |  | ||||||
|  | * Für Auszahlungsvarianten kann ein Rebel-Zu-/Abschlag festgelegt werden. ([#40][i40]) | ||||||
|  | * Im Rundschreiben-Fenster (`MailWindow`) gibt es ab jetzt die Möglichkeit den Ort anzupassen. (34ebc8fa34, a5df03aa2c) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.7.1-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls im Rundschreiben-Fenster (`MailWindow`) der Ausdruck nach PLZ und Ort sortiert werden sollte, wurden Rechnungsadressen nicht beachtet. (746d0f10de) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.7.1-misc} | ||||||
|  |  | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) wurde die Möglichkeit zum Verfassen von Rundschreiben entfernt. (61c8d1ee97) | ||||||
|  | * Das Erzeugen von PDF-Dokumenten wurde verbessert. (c70772b47d, 6a5507060a, c0f4a484ab) | ||||||
|  |  | ||||||
|  | [v0.7.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.1 | ||||||
|  | [i40]: https://git.necronda.net/winzer/elwig/issues/40 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.7.0][v0.7.0] (2024-03-06) {#v0.7.0} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | > [!NOTE] | ||||||
|  | > Das Attribut "Bio" wird ab dieser Version automatisch entfernt und als Bewirtschaftungsart "Bio" verwendet. | ||||||
|  | > Sämtliche Lieferungen und Auszahlungsvarianten werden automatisch aktualisiert. | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.7.0-features} | ||||||
|  |  | ||||||
|  | * Das Attribut "Bio" wird nun als Bewirtschaftungsart "Bio" verwendet. ([#34][i34], 25a0722f96, 8031654e86, 7181d744fc, cc72a8365e) | ||||||
|  | * Im Übernahme-Fenster (`DeliveryAdminWindow`) wurde eine Abklingzeit von 1 Sekunde zum Wiegen-Knopf hinzugefügt. (efe91192bc) | ||||||
|  | * Im Übernahme-/Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wurde ein Knopf hinzugefügt, | ||||||
|  |   mit dem man zum entsprechenden Mitglied (bzw. Vorgänger) springen kann. (665e16d78f) | ||||||
|  | * Ein Rundschreiben-Fenster (`MailWindow`) wurde hinzugefügt. ([#15][i15], cc5396711d, 060acc56c3, a275385b5c, 37e10136f4, 376af72700) | ||||||
|  | * Eine automatische Update Funktion wurde hinzugefügt. Diese überprüft regelmäßig, ob eine neuere Version von Elwig verfügbar ist. ([#8][i8], a5a6915db1, 271e085fdf) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.7.0-bugfixes} | ||||||
|  |  | ||||||
|  | * Falls in einer Auszahlungsvariante ein unbekanntes Attribut verwendet wurde, kam es zu einem Absturz. ([#39][i39]) | ||||||
|  | * Falls für ein Mitglied kein IBAN hinterlegt war, kam es beim Exportieren der Traubengutschriften zu einem Absturz. (958fbaae50) | ||||||
|  | * Waagen-Schnittstelle für Badner Waage war Fehlerhaft. (092c5788a4) | ||||||
|  | * Falls Flächenbindungen von Mitgliedern keine Bewirtschaftungsart gesetzt haben sollten, kam es beim Erstellen des Stammdatenblattes (`MemberDataSheet`) zum Absturz. (3324a9a238) | ||||||
|  | * Telefonnummern und E-Mail-Adressen können wieder beliebig hinzugefügt und gelöscht werden. (e9f6f22bc8, 3a0f2e9556) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.7.0-misc} | ||||||
|  |  | ||||||
|  | * Beim Schließen des Hauptfensters wird der Nutzer gefragt, ob er alle anderen Fenster auch schließen möchte. (96c9890b90) | ||||||
|  | * Im Lieferungen-Fenster (`DeliveryAdminWindow`) und auf Lieferscheinen (`DeliveryNote`) wird neben _(nicht) gerebelt_ nun auch _brutto/netto_ angegeben. (049927f90c) | ||||||
|  | * Falls man die Lieferungen eines einzelnen Mitglieds ansieht, werden nun standardmäßig nur die Lieferungen der aktuellen Saison angezeigt. (5a6317fcdb) | ||||||
|  | * Im Stammdaten-Fenster (`BaseDataWindow`) unter Attributen findet sich nun ein kurzer Erklärtext. (e6cab7993f) | ||||||
|  | * Die Installationsdatei erkennt nun die Elwig-Version wieder richtig. ([#35][i35]) | ||||||
|  | * Am Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden die Flächenbindungen ab jetzt immer frühestens auf der zweiten Seite abgedruckt. (4673877d36) | ||||||
|  | * Beim automatischen Aktualisieren der Datenbank werden Fremdschlüssel validiert. (d897e44f3b, 3b94875a7f, 614e0010fd, 92c3ed991b) | ||||||
|  | * Nachnamen von Mitgliedern in Großschreibung werden ab jetzt mit `ẞ` statt mit `ß` geschrieben. (ccb83911b1) | ||||||
|  | * Dokumente können nun parallel erstellt werden. ([#19][i19], 9139557cc4, ac4026571e, e9d0eec3bd, 77cf47e154, 5a488369be) | ||||||
|  | * Die Popup-Fenster sind modernisiert worden. ([#16][i16]) | ||||||
|  | * Grunstücksnummern bei Flächenbindungen werden bei der Eingabe nicht mehr validiert. (ea6621ee57) | ||||||
|  | * Abhängigkeiten aktualisiert. (d944aabc06) | ||||||
|  |  | ||||||
|  | [v0.7.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.0 | ||||||
|  | [i8]: https://git.necronda.net/winzer/elwig/issues/8 | ||||||
|  | [i15]: https://git.necronda.net/winzer/elwig/issues/15 | ||||||
|  | [i16]: https://git.necronda.net/winzer/elwig/issues/16 | ||||||
|  | [i19]: https://git.necronda.net/winzer/elwig/issues/19 | ||||||
|  | [i34]: https://git.necronda.net/winzer/elwig/issues/34 | ||||||
|  | [i35]: https://git.necronda.net/winzer/elwig/issues/35 | ||||||
|  | [i39]: https://git.necronda.net/winzer/elwig/issues/39 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.6.8][v0.6.8] (2024-02-22) {#v0.6.8} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.6.8-features} | ||||||
|  |  | ||||||
|  | * Waagen-Schnittstelle vom Typ `Schember-Async` implementiert. (10b78dfb72, c0ff852f5e, ae7fdef2ea) | ||||||
|  |  | ||||||
|  | [v0.6.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.8 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.6.7][v0.6.7] (2024-02-21) {#v0.6.7} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.6.7-misc} | ||||||
|  |  | ||||||
|  | * WG Weinland und WG Baden nun registierte Mandanten. (583d5b4e3e) | ||||||
|  | * Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden Flächenbindungen nun immer für das momentane Jahr angezeigt (nicht die neueste angelegte Saison). (8732141e6b) | ||||||
|  | * Umstrukturierung der internen Waagen-Schnittstellen-Implementation. (3f2b5b684c, 7ff069d068, 99ca12b276) | ||||||
|  |  | ||||||
|  | [v0.6.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.7 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.6.6][v0.6.6] (2024-02-18) {#v0.6.6} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.6.6-misc} | ||||||
|  |  | ||||||
|  | * Automatisierte Tests für Waagen-Schnittstellen hinzugefügt. (f13fb3aaf0, f4eb6456be, 7f4cfdc1b5) | ||||||
|  | * Im Übernahme-Fenster (`DeliveryAdminWindow`) wird die Saison ab jetzt ausschließlich über die Jahreszahl bestimmt. (3c0fea30f5) | ||||||
|  |  | ||||||
|  | [v0.6.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.6 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | [v0.6.5][v0.6.5] (2024-02-15) {#v0.6.5} | ||||||
|  | --------------------------------------- | ||||||
|  |  | ||||||
|  | ### Neue Funktionen {#v0.6.5-features} | ||||||
|  |  | ||||||
|  | * Die Installationsdatei kann ab jetzt automatisch erstellt werden. ([#6][i6], 6d53e35399) | ||||||
|  |  | ||||||
|  | ### Behobene Fehler {#v0.6.5-bugfixes} | ||||||
|  |  | ||||||
|  | * Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) fehlte bei Rechnungsadressen der Abstand zwischen PLZ und Ort. (68f1a2c091) | ||||||
|  |  | ||||||
|  | ### Sonstiges {#v0.6.5-misc} | ||||||
|  |  | ||||||
|  | * Berechnung der Aufteilung für Bio-Attribute aktualisiert. (0591d91f49, 42eb68d431) | ||||||
|  | * Kleine Änderungen im EBICS-/XML-Export. (befe6a753b, 825bd6f304) | ||||||
|  | * Automatisierte Tests für EBICS-/XML-Export hinzugefügt. (6fdd72e28b, c07a6b450c, 4daa6deb26) | ||||||
|  | * Automatisierte Tests für Dokumente hinzugefügt. (912206f52d, 805f782c83, 1b9064a97c) | ||||||
|  | * Anpassungen für PLZ und KG-Nr. in der Datenbank. (11be424c38) | ||||||
|  | * Im Mitglieder-Fenster (`MemberAdminWindow`) dürfen Freitextsuchen nun 2 (statt 3) Zeichen lang sein. (59cd69ddaf) | ||||||
|  |  | ||||||
|  | [v0.6.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.5 | ||||||
|  | [i6]: https://git.necronda.net/winzer/elwig/issues/6 | ||||||
|  |  | ||||||
							
								
								
									
										68
									
								
								Elwig.sln
									
									
									
									
									
								
							
							
						
						
									
										68
									
								
								Elwig.sln
									
									
									
									
									
								
							| @@ -4,22 +4,88 @@ VisualStudioVersion = 17.3.32929.385 | |||||||
| MinimumVisualStudioVersion = 10.0.40219.1 | MinimumVisualStudioVersion = 10.0.40219.1 | ||||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elwig", "Elwig\Elwig.csproj", "{00868460-16F6-4B48-AA9B-998F6263693B}" | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elwig", "Elwig\Elwig.csproj", "{00868460-16F6-4B48-AA9B-998F6263693B}" | ||||||
| EndProject | EndProject | ||||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}" | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}" | ||||||
|  | EndProject | ||||||
|  | Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Installer", "Installer\Installer.wixproj", "{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}" | ||||||
|  | EndProject | ||||||
|  | Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Setup", "Setup\Setup.wixproj", "{952E309C-2090-4978-8996-65900D8E8FA4}" | ||||||
| EndProject | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		Debug|Any CPU = Debug|Any CPU | 		Debug|Any CPU = Debug|Any CPU | ||||||
|  | 		Debug|ARM64 = Debug|ARM64 | ||||||
|  | 		Debug|x64 = Debug|x64 | ||||||
|  | 		Debug|x86 = Debug|x86 | ||||||
| 		Release|Any CPU = Release|Any CPU | 		Release|Any CPU = Release|Any CPU | ||||||
|  | 		Release|ARM64 = Release|ARM64 | ||||||
|  | 		Release|x64 = Release|x64 | ||||||
|  | 		Release|x86 = Release|x86 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||||||
| 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
| 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|Any CPU.Build.0 = Debug|Any CPU | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|ARM64.Build.0 = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|x64.Build.0 = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Debug|x86.Build.0 = Debug|Any CPU | ||||||
| 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|Any CPU.ActiveCfg = Release|Any CPU | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|Any CPU.Build.0 = Release|Any CPU | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|ARM64.ActiveCfg = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|ARM64.Build.0 = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|x64.ActiveCfg = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|x64.Build.0 = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|x86.ActiveCfg = Release|Any CPU | ||||||
|  | 		{00868460-16F6-4B48-AA9B-998F6263693B}.Release|x86.Build.0 = Release|Any CPU | ||||||
| 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
| 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|Any CPU.Build.0 = Debug|Any CPU | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|ARM64.Build.0 = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|x64.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|x64.Build.0 = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|x86.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Debug|x86.Build.0 = Debug|Any CPU | ||||||
| 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|Any CPU.ActiveCfg = Release|Any CPU | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|Any CPU.Build.0 = Release|Any CPU | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|ARM64.ActiveCfg = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|ARM64.Build.0 = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|x64.ActiveCfg = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|x64.Build.0 = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|x86.ActiveCfg = Release|Any CPU | ||||||
|  | 		{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}.Release|x86.Build.0 = Release|Any CPU | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|Any CPU.Build.0 = Debug|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|ARM64.Build.0 = Debug|ARM64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|x64.ActiveCfg = Debug|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|x64.Build.0 = Debug|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|x86.ActiveCfg = Debug|x86 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Debug|x86.Build.0 = Debug|x86 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|Any CPU.ActiveCfg = Release|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|Any CPU.Build.0 = Release|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|ARM64.ActiveCfg = Release|ARM64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|ARM64.Build.0 = Release|ARM64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x64.ActiveCfg = Release|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x64.Build.0 = Release|x64 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x86.ActiveCfg = Release|x86 | ||||||
|  | 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x86.Build.0 = Release|x86 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|Any CPU.Build.0 = Debug|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|ARM64.Build.0 = Debug|ARM64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x64.ActiveCfg = Debug|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x64.Build.0 = Debug|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x86.ActiveCfg = Debug|x86 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x86.Build.0 = Debug|x86 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|Any CPU.ActiveCfg = Release|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|Any CPU.Build.0 = Release|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|ARM64.ActiveCfg = Release|ARM64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|ARM64.Build.0 = Release|ARM64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x64.ActiveCfg = Release|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x64.Build.0 = Release|x64 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x86.ActiveCfg = Release|x86 | ||||||
|  | 		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x86.Build.0 = Release|x86 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|   | |||||||
							
								
								
									
										127
									
								
								Elwig/App.xaml
									
									
									
									
									
								
							
							
						
						
									
										127
									
								
								Elwig/App.xaml
									
									
									
									
									
								
							| @@ -1,40 +1,113 @@ | |||||||
| <Application x:Class="Elwig.App" | <Application | ||||||
|  |         x:Class="Elwig.App" | ||||||
|         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|              xmlns:local="clr-namespace:Elwig" |         xmlns:ctrl="clr-namespace:Elwig.Controls" | ||||||
|              StartupUri="Windows\MainWindow.xaml" |         Exit="Application_Exit"> | ||||||
|              xmlns:ui="http://schemas.modernwpf.com/2019"> |  | ||||||
|     <Application.Resources> |     <Application.Resources> | ||||||
|         <!--<ResourceDictionary> |         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/> | ||||||
|             <ResourceDictionary.MergedDictionaries> |         <ctrl:WidthToMarginConverter x:Key="WidthToMarginConverter"/> | ||||||
|                 <ui:ThemeResources /> |  | ||||||
|                 <ui:XamlControlsResources /> |         <DataTemplate x:Key="PostalDestTemplate"> | ||||||
|             </ResourceDictionary.MergedDictionaries> |  | ||||||
|         </ResourceDictionary>--> |  | ||||||
|         <DataTemplate x:Key="PostalDestComboBoxTemplate"> |  | ||||||
|             <StackPanel Orientation="Horizontal"> |             <StackPanel Orientation="Horizontal"> | ||||||
|                 <TextBlock Text="{Binding Dest}"/> |                 <TextBlock Text="{Binding Dest}"/> | ||||||
|                 <TextBlock Text=" ("/> |                 <TextBlock Text="{Binding Ort.Name, StringFormat='{} ({0})'}"/> | ||||||
|                 <TextBlock Text="{Binding Ort.Name}"/> |  | ||||||
|                 <TextBlock Text=")"/> |  | ||||||
|             </StackPanel> |  | ||||||
|         </DataTemplate> |  | ||||||
|         <DataTemplate x:Key="BranchTemplate"> |  | ||||||
|             <StackPanel Orientation="Horizontal"> |  | ||||||
|                 <TextBlock Text="{Binding Name}"/> |  | ||||||
|             </StackPanel> |  | ||||||
|         </DataTemplate> |  | ||||||
|         <DataTemplate x:Key="KgTemplate"> |  | ||||||
|             <StackPanel Orientation="Horizontal"> |  | ||||||
|                 <TextBlock Text="{Binding Name}"/> |  | ||||||
|             </StackPanel> |             </StackPanel> | ||||||
|         </DataTemplate> |         </DataTemplate> | ||||||
|         <DataTemplate x:Key="KgNrTemplate"> |         <DataTemplate x:Key="KgNrTemplate"> | ||||||
|             <StackPanel Orientation="Horizontal"> |             <StackPanel Orientation="Horizontal"> | ||||||
|                 <TextBlock Text="{Binding Name}"/> |                 <TextBlock Text="{Binding Name}"/> | ||||||
|                 <TextBlock Text=" ("/> |                 <TextBlock Text="{Binding KgNr, StringFormat='{} ({0:00000})'}"/> | ||||||
|                 <TextBlock Text="{Binding KgNr}"/> |             </StackPanel> | ||||||
|                 <TextBlock Text=")"/> |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="MemberAdminNameTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding MgNr}" MinWidth="48" Margin="0,0,10,0" TextAlignment="Right"/> | ||||||
|  |                 <TextBlock Text="{Binding AdministrativeName1}" MinWidth="100" Margin="0,0,5,0"/> | ||||||
|  |                 <TextBlock Text="{Binding AdministrativeName2}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="WineVarietyTemplateCollapsed"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="WineVarietyTemplateExpanded"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |                 <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="ModifierTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/> | ||||||
|  |                 <TextBlock Text="{Binding ValueStr}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="WineAttributeTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}" MinWidth="150" Margin="0,0,10,0"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="WineQualityLevelTemplateCollapsed"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="WineQualityLevelTemplateExpanded"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding IsPredicate, Converter={StaticResource BoolToStarConverter}}" MinWidth="6"/> | ||||||
|  |                 <TextBlock Text="{Binding Name}" MinWidth="100" Margin="0,0,10,0"/> | ||||||
|  |                 <TextBlock Text="{Binding MinKmwStr}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="WineOriginTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="WineOriginTemplateCollapsed"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="WineOriginTemplateExpanded"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="GemTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Text="{Binding Name}"/> | ||||||
|  |                 <TextBlock Text="{Binding Gkz, StringFormat='{} ({0:00000})'}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |  | ||||||
|  |         <DataTemplate x:Key="WbKgTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> | ||||||
|  |                 <TextBlock Width="250"> | ||||||
|  |                     <TextBlock Text="{Binding Name}"/> | ||||||
|  |                     <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/> | ||||||
|  |                 </TextBlock> | ||||||
|  |                 <TextBlock Text="{Binding Gem.WbGem.Origin.Name}"/> | ||||||
|  |             </StackPanel> | ||||||
|  |         </DataTemplate> | ||||||
|  |         <DataTemplate x:Key="WbKgGlTemplate"> | ||||||
|  |             <StackPanel Orientation="Horizontal"> | ||||||
|  |                 <TextBlock Width="220"> | ||||||
|  |                     <TextBlock Text="{Binding Name}"/> | ||||||
|  |                     <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/> | ||||||
|  |                 </TextBlock> | ||||||
|  |                 <TextBlock Text="{Binding WbKg.Gl.Name}"/> | ||||||
|             </StackPanel> |             </StackPanel> | ||||||
|         </DataTemplate> |         </DataTemplate> | ||||||
|     </Application.Resources> |     </Application.Resources> | ||||||
|   | |||||||
| @@ -2,84 +2,327 @@ using System; | |||||||
| using System.Data; | using System.Data; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using System.Windows; | using System.Windows; | ||||||
| using System.Windows.Controls; |  | ||||||
| using System.IO; | using System.IO; | ||||||
| using Elwig.Helpers; | using Elwig.Helpers; | ||||||
| using Elwig.Helpers.Weighing; | using Elwig.Helpers.Weighing; | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using System.Windows.Threading; | using System.Windows.Threading; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Threading; | ||||||
|  | using System.Windows.Markup; | ||||||
|  | using System.Reflection; | ||||||
|  | using Elwig.Helpers.Printing; | ||||||
|  | using Elwig.Windows; | ||||||
|  | using Elwig.Dialogs; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using Elwig.Helpers.Billing; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| namespace Elwig { | namespace Elwig { | ||||||
|     public partial class App : Application { |     public partial class App : Application { | ||||||
|  |  | ||||||
|         public static readonly string DataPath = @"C:\ProgramData\Elwig\"; |         protected static App CurrentApp; | ||||||
|         public static readonly string ExePath = @"C:\Program Files\Elwig\"; |         public static int NumWindows => CurrentApp.Windows.Count; | ||||||
|         public static readonly Config Config = new(DataPath + "config.ini"); |         public static bool ForceShutdown { get; private set; } = false; | ||||||
|         public static IEnumerable<IScale> Scales { get; private set; } |  | ||||||
|         public static ClientParameters Client { get; private set;  } |         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) }; | ||||||
|  |  | ||||||
|  |         public static readonly string DataPath = @"C:\ProgramData\Elwig\"; | ||||||
|  |         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini"); | ||||||
|  |         public static readonly string ExePath = @"C:\Program Files\Elwig\"; | ||||||
|  |         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig"); | ||||||
|  |  | ||||||
|  |         public static Config Config { get; private set; } = new(ConfigPath); | ||||||
|  |         public static Version Version { get; private set; } = new(); | ||||||
|  |  | ||||||
|  |         public static int BranchNum { get; private set; } | ||||||
|  |         public static string ZwstId { get; private set; } | ||||||
|  |         public static string BranchName { get; private set; } | ||||||
|  |         public static int? BranchPlz { get; private set; } | ||||||
|  |         public static string? BranchLocation { get; private set; } | ||||||
|  |         public static string? BranchAddress { get; private set; } | ||||||
|  |         public static string? BranchPhoneNr { get; private set; } | ||||||
|  |         public static string? BranchFaxNr { get; private set; } | ||||||
|  |         public static string? BranchMobileNr { get; private set; } | ||||||
|  |         public static IList<IScale> Scales { get; private set; } | ||||||
|  |         public static IList<ICommandScale> CommandScales => Scales.Where(s => s is ICommandScale).Cast<ICommandScale>().ToList(); | ||||||
|  |         public static IList<IEventScale> EventScales => Scales.Where(s => s is IEventScale).Cast<IEventScale>().ToList(); | ||||||
|  |         public static ClientParameters Client { get; set; } | ||||||
|  |  | ||||||
|         public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady; |  | ||||||
|         public static Dispatcher MainDispatcher { get; private set; } |         public static Dispatcher MainDispatcher { get; private set; } | ||||||
|  |         private DateTime LastChanged; | ||||||
|  |         private static DateTime CurrentLastWrite => File.GetLastWriteTime(Config.DatabaseFile); | ||||||
|  |         private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(2) }; | ||||||
|  |  | ||||||
|         public App() : base() { |         public App() : base() { | ||||||
|             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); |             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); | ||||||
|             Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "Elwig")); |             Directory.CreateDirectory(TempPath); | ||||||
|             Directory.CreateDirectory(DataPath); |             Directory.CreateDirectory(DataPath); | ||||||
|             MainDispatcher = Dispatcher; |             MainDispatcher = Dispatcher; | ||||||
|             Scales = Array.Empty<IScale>(); |             Scales = []; | ||||||
|  |             CurrentApp = this; | ||||||
|  |             OverrideCulture(); | ||||||
|  |  | ||||||
|  |             var args = Environment.GetCommandLineArgs(); | ||||||
|  |             if (args.Length >= 2) { | ||||||
|  |                 Config = new(Path.GetFullPath(args[1])); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|         protected override void OnStartup(StartupEventArgs evt) { |             ContextTimer.Tick += (object? sender, EventArgs evt) => { | ||||||
|             using (var ctx = new AppDbContext()) { |                 var ch = CurrentLastWrite; | ||||||
|                 if (!ctx.Database.CanConnect()) { |                 if (ch > LastChanged) { | ||||||
|                     MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error); |                     LastChanged = ch; | ||||||
|  |                     OnContextChanged(); | ||||||
|  |                 } | ||||||
|  |             }; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static void OnContextChanged() { | ||||||
|  |             MainDispatcher.BeginInvoke(async () => await HintContextChange()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static void OverrideCulture() { | ||||||
|  |             var locale = new CultureInfo("de-AT", false); | ||||||
|  |             locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator; | ||||||
|  |             locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator; | ||||||
|  |             locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator; | ||||||
|  |             CultureInfo.CurrentCulture = locale; | ||||||
|  |             CultureInfo.CurrentUICulture = locale; | ||||||
|  |             Thread.CurrentThread.CurrentCulture = locale; | ||||||
|  |             Thread.CurrentThread.CurrentUICulture = locale; | ||||||
|  |             CultureInfo.DefaultThreadCurrentCulture = locale; | ||||||
|  |             CultureInfo.DefaultThreadCurrentUICulture = locale; | ||||||
|  |             FrameworkElement.LanguageProperty.OverrideMetadata( | ||||||
|  |                 typeof(FrameworkElement), | ||||||
|  |                 new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name)) | ||||||
|  |             ); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected override async void OnStartup(StartupEventArgs evt) { | ||||||
|  |             Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0"); | ||||||
|  |  | ||||||
|  |             try { | ||||||
|  |                 await AppDbUpdater.CheckDb(); | ||||||
|  |             } catch (Exception e) { | ||||||
|  |                 if (Config.UpdateUrl != null && Utils.HasInternetConnectivity()) { | ||||||
|  |                     await CheckForUpdates(); | ||||||
|  |                 } | ||||||
|  |                 MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|                 Shutdown(); |                 Shutdown(); | ||||||
|  |                 return; | ||||||
|             } |             } | ||||||
|  |  | ||||||
|  |             LastChanged = CurrentLastWrite; | ||||||
|  |             ContextTimer.Start(); | ||||||
|  |  | ||||||
|  |             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = []; | ||||||
|  |             using (var ctx = new AppDbContext()) { | ||||||
|  |                 branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr)); | ||||||
|  |                 try { | ||||||
|  |                     Client = new(ctx); | ||||||
|  |                 } catch (Exception e) { | ||||||
|  |                     MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |                     Shutdown(); | ||||||
|  |                     return; | ||||||
|  |                 } | ||||||
|  |                 BranchNum = branches.Count; | ||||||
|             } |             } | ||||||
|             Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged)); |  | ||||||
|             Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged)); |  | ||||||
|  |  | ||||||
|             Client = new(); |             Utils.RunBackground("Temp File Cleanup", () => { | ||||||
|  |                 Utils.CleanupTempFiles(); | ||||||
|  |                 return Task.CompletedTask; | ||||||
|  |             }); | ||||||
|  |  | ||||||
|             var list = new LinkedList<IScale>(); |             Utils.RunBackground("HTML Initialization", () => Html.Init()); | ||||||
|  |             Utils.RunBackground("PDF Initialization", () => Pdf.Init()); | ||||||
|  |             Utils.RunBackground("JSON Schema Initialization", BillingData.Init); | ||||||
|  |  | ||||||
|  |             if (Config.UpdateAuto && Config.UpdateUrl != null) { | ||||||
|  |                 if (Utils.HasInternetConnectivity()) { | ||||||
|  |                     Utils.RunBackground("Auto Updater", async () => { | ||||||
|  |                         await Task.Delay(500); | ||||||
|  |                         await CheckForUpdates(); | ||||||
|  |                     }); | ||||||
|  |                 } | ||||||
|  |                 _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer); | ||||||
|  |                 _autoUpdateTimer.Start(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var list = new List<IScale>(); | ||||||
|             foreach (var s in Config.Scales) { |             foreach (var s in Config.Scales) { | ||||||
|                 try { |                 try { | ||||||
|                     var scaleNr = int.Parse(s[0]); |                     list.Add(Scale.FromConfig(s)); | ||||||
|                     var type = s[1].ToLower(); |  | ||||||
|                     var model = s[2]; |  | ||||||
|                     var cnx = s[3]; |  | ||||||
|                     var empty = s[4]; |  | ||||||
|                     var filling = s[5]; |  | ||||||
|                     int? limit = s[6] == null ? null : int.Parse(s[6]); |  | ||||||
|                     if (type == "systec") { |  | ||||||
|                         list.AddLast(new SystecScale(scaleNr, model, cnx, empty, filling, limit)); |  | ||||||
|                     } else { |  | ||||||
|                         throw new ArgumentException($"Invalid scale type: \"{type}\""); |  | ||||||
|                     } |  | ||||||
|                 } catch (Exception e) { |                 } catch (Exception e) { | ||||||
|                     MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error); |                     list.Add(new InvalidScale(s.Id)); | ||||||
|  |                     if (s.Required) | ||||||
|  |                         MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error", | ||||||
|  |                             MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             Scales = list; |             Scales = list; | ||||||
|  |  | ||||||
|  |             if (Config.Branch != null) { | ||||||
|  |                 if (!branches.ContainsKey(Config.Branch.ToLower())) { | ||||||
|  |                     MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |                     Shutdown(); | ||||||
|  |                 } else { | ||||||
|  |                     SetBranch(branches[Config.Branch.ToLower()]); | ||||||
|  |                 } | ||||||
|  |             } else if (branches.Count == 1) { | ||||||
|  |                 SetBranch(branches.First().Value); | ||||||
|  |             } else { | ||||||
|  |                 MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |                 Shutdown(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|             base.OnStartup(evt); |             base.OnStartup(evt); | ||||||
|  |  | ||||||
|  |             var window = new MainWindow(); | ||||||
|  |             window.Show(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         protected override void OnExit(ExitEventArgs evt) { |         private async void Application_Exit(object sender, ExitEventArgs evt) { | ||||||
|             Utils.RunBackground("PDF Close", () => Documents.Pdf.Close()); |             await Pdf.Cleanup(); | ||||||
|             base.OnExit(evt); |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         private void PrintingReadyChanged() { |         public static void SetBranch(Branch b) { | ||||||
|             Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs()); |             SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr)); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         protected void OnPrintingReadyChanged(EventArgs evt) { |         private static void SetBranch((string, string, int?, string?, string?, string?, string?, string?) entry) { | ||||||
|             foreach (Window w in Windows) { |             ZwstId = entry.Item1; | ||||||
|                 foreach (var b in Utils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) { |             BranchName = entry.Item2; | ||||||
|                     b.IsEnabled = IsPrintingReady; |             BranchPlz = entry.Item3; | ||||||
|  |             BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME | ||||||
|  |             BranchAddress = entry.Item5; | ||||||
|  |             BranchPhoneNr = entry.Item6; | ||||||
|  |             BranchFaxNr = entry.Item7; | ||||||
|  |             BranchMobileNr = entry.Item8; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task HintContextChange() { | ||||||
|  |             var ch = CurrentLastWrite; | ||||||
|  |             if (ch > CurrentApp.LastChanged) | ||||||
|  |                 CurrentApp.LastChanged = ch; | ||||||
|  |             foreach (Window w in CurrentApp.Windows) { | ||||||
|  |                 if (w is not ContextWindow c) continue; | ||||||
|  |                 await c.HintContextChange(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         private void OnAutoUpdateTimer(object? sender, EventArgs? evt) { | ||||||
|  |             foreach (Window w in CurrentApp.Windows) { | ||||||
|  |                 if (w is UpdateDialog) return; | ||||||
|  |             } | ||||||
|  |             if (Utils.HasInternetConnectivity()) { | ||||||
|  |                 Utils.RunBackground("Auto Updater", async () => await CheckForUpdates()); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task CheckForUpdates(bool showAlert = false) { | ||||||
|  |             if (Config.UpdateUrl == null) return; | ||||||
|  |             var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl); | ||||||
|  |             if (latest != null && new Version(latest.Value.Version) > Version) { | ||||||
|  |                 await MainDispatcher.BeginInvoke(() => { | ||||||
|  |                     var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size); | ||||||
|  |                     if (d.ShowDialog() == true) { | ||||||
|  |                         ForceShutdown = true; | ||||||
|  |                         Current.Shutdown(); | ||||||
|  |                     } | ||||||
|  |                 }); | ||||||
|  |             } else if (showAlert) { | ||||||
|  |                 if (latest == null) { | ||||||
|  |                     MessageBox.Show("Informationen konnten nicht abgerufen werden!", "Nach Updates suchen", | ||||||
|  |                         MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |                 } else { | ||||||
|  |                     MessageBox.Show($"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})", "Nach Updates suchen", | ||||||
|  |                         MessageBoxButton.OK, MessageBoxImage.Information); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window { | ||||||
|  |             foreach (Window w in CurrentApp.Windows) { | ||||||
|  |                 if (w is T t && (selector == null || selector(t))) { | ||||||
|  |                     if (t.WindowState == WindowState.Minimized) | ||||||
|  |                         t.WindowState = WindowState.Normal; | ||||||
|  |                     t.Activate(); | ||||||
|  |                     return t; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             var n = constructor(); | ||||||
|  |             n.Show(); | ||||||
|  |             return n; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static DeliveryAdminWindow FocusReceipt() { | ||||||
|  |             return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) { | ||||||
|  |             return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) { | ||||||
|  |             return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static BaseDataWindow FocusBaseData() { | ||||||
|  |             return FocusWindow<BaseDataWindow>(() => new()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static BaseDataWindow FocusBaseDataAreaComType() { | ||||||
|  |             var w = FocusBaseData(); | ||||||
|  |             w.AreaCommitmentTypes.Focus(); | ||||||
|  |             return w; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static BaseDataWindow FocusBaseDataSeason(int year) { | ||||||
|  |             var w = FocusBaseData(); | ||||||
|  |             w.Seasons.Focus(); | ||||||
|  |             ControlUtils.SelectItemWithPk(w.SeasonList, year); | ||||||
|  |             return w; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static OriginHierarchyWindow FocusOriginHierarchy() { | ||||||
|  |             return FocusWindow<OriginHierarchyWindow>(() => new()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static OriginHierarchyWindow FocusOriginHierarchyKg(int kgnr) { | ||||||
|  |             var w = FocusOriginHierarchy(); | ||||||
|  |             w.FocusKgNr(kgnr); | ||||||
|  |             return w; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static DeliveryAncmtAdminWindow FocusDeliveryAncmt() { | ||||||
|  |             return FocusWindow<DeliveryAncmtAdminWindow>(() => new()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static DeliveryScheduleAdminWindow FocusDeliverySchedule() { | ||||||
|  |             return FocusWindow<DeliveryScheduleAdminWindow>(() => new()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static PaymentVariantsWindow FocusPaymentVariants(int year) { | ||||||
|  |             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static PaymentAdjustmentWindow FocusPaymentAdjustment(int year) { | ||||||
|  |             return FocusWindow<PaymentAdjustmentWindow>(() => new(year), w => w.Year == year); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static ChartWindow FocusChartWindow(int year, int avnr) { | ||||||
|  |             return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static MemberAdminWindow FocusMember(int mgnr) { | ||||||
|  |             var w = FocusWindow<MemberAdminWindow>(() => new()); | ||||||
|  |             w.FocusMember(mgnr); | ||||||
|  |             return w; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static MailWindow FocusMailWindow(int? year = null) { | ||||||
|  |             return FocusWindow<MailWindow>(() => new(year), w => year == null || w.Year == year); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										20
									
								
								Elwig/Controls/BoolToValueConverter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								Elwig/Controls/BoolToValueConverter.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | |||||||
|  | using System; | ||||||
|  | using System.Windows.Data; | ||||||
|  | using System.Globalization; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class BoolToValueConverter<T> : IValueConverter { | ||||||
|  |         public T FalseValue { get; set; } | ||||||
|  |         public T TrueValue { get; set; } | ||||||
|  |  | ||||||
|  |         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return (bool)value ? TrueValue : FalseValue; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return value?.Equals(TrueValue) ?? false; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     public class BoolToStringConverter : BoolToValueConverter<string> { } | ||||||
|  | } | ||||||
							
								
								
									
										167
									
								
								Elwig/Controls/CheckComboBox.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										167
									
								
								Elwig/Controls/CheckComboBox.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,167 @@ | |||||||
|  | using System.Collections; | ||||||
|  | using System.Collections.ObjectModel; | ||||||
|  | using System.Collections.Specialized; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class CheckComboBox : ListBox { | ||||||
|  |  | ||||||
|  |         public new static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register(nameof(SelectedItems), typeof(IList), typeof(CheckComboBox), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedItemsChangedCallback)); | ||||||
|  |         public new IList SelectedItems { | ||||||
|  |             get => (IList)GetValue(SelectedItemsProperty); | ||||||
|  |             set => SetValue(SelectedItemsProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register(nameof(Delimiter), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", ")); | ||||||
|  |         public string Delimiter { | ||||||
|  |             get => (string)GetValue(DelimiterProperty); | ||||||
|  |             set => SetValue(DelimiterProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty ListDisplayMemberPathProperty = DependencyProperty.Register(nameof(ListDisplayMemberPath), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(null)); | ||||||
|  |         public string ListDisplayMemberPath { | ||||||
|  |             get => (string)GetValue(ListDisplayMemberPathProperty); | ||||||
|  |             set => SetValue(ListDisplayMemberPathProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register(nameof(AllItemsSelectedContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All")); | ||||||
|  |         public string AllItemsSelectedContent { | ||||||
|  |             get => (string)GetValue(AllItemsSelectedContentProperty); | ||||||
|  |             set => SetValue(AllItemsSelectedContentProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register(nameof(IsSelectAllActive), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false)); | ||||||
|  |         public bool IsSelectAllActive { | ||||||
|  |             get => (bool)GetValue(IsSelectAllActiveProperty); | ||||||
|  |             set => SetValue(IsSelectAllActiveProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register(nameof(SelectAllContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All")); | ||||||
|  |         public string SelectAllContent { | ||||||
|  |             get => (string)GetValue(SelectAllContentProperty); | ||||||
|  |             set => SetValue(SelectAllContentProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty AllItemsSelectedProperty = DependencyProperty.Register(nameof(AllItemsSelected), typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false)); | ||||||
|  |         public bool? AllItemsSelected { | ||||||
|  |             get => (bool?)GetValue(AllItemsSelectedProperty); | ||||||
|  |             set => SetValue(AllItemsSelectedProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(nameof(IsDropDownOpen), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false)); | ||||||
|  |         public bool IsDropDownOpen { | ||||||
|  |             get => (bool)GetValue(IsDropDownOpenProperty); | ||||||
|  |             set => SetValue(IsDropDownOpenProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(nameof(MaxDropDownHeight), typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue)); | ||||||
|  |         public double MaxDropDownHeight { | ||||||
|  |             get => (double)GetValue(MaxDropDownHeightProperty); | ||||||
|  |             set => SetValue(MaxDropDownHeightProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public new static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(nameof(SelectionChanged), RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckComboBox)); | ||||||
|  |         public new event SelectionChangedEventHandler SelectionChanged { | ||||||
|  |             add => AddHandler(SelectionChangedEvent, value); | ||||||
|  |             remove => RemoveHandler(SelectionChangedEvent, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         static CheckComboBox() { | ||||||
|  |             DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckComboBox), new FrameworkPropertyMetadata(typeof(CheckComboBox))); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private bool _viewHandled; | ||||||
|  |         private bool _modelHandled; | ||||||
|  |         private TextBlock _textBox; | ||||||
|  |  | ||||||
|  |         public CheckComboBox() { | ||||||
|  |             SelectionMode = SelectionMode.Multiple; | ||||||
|  |             SelectedItems = new ObservableCollection<object>(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public override void OnApplyTemplate() { | ||||||
|  |             _textBox = (GetTemplateChild("TextBox") as TextBlock)!; | ||||||
|  |             var button = GetTemplateChild("Button") as Button; | ||||||
|  |             button!.Click += Button_MouseDown; | ||||||
|  |             var item = GetTemplateChild("SelectAllItem") as ListBoxItem; | ||||||
|  |             item!.PreviewMouseDown += SelectAllItem_MouseDown; | ||||||
|  |             if (SelectedItems is INotifyCollectionChanged collection) { | ||||||
|  |                 collection.CollectionChanged += (s, e) => { SelectItems(); }; | ||||||
|  |             } | ||||||
|  |             IsEnabledChanged += OnIsEnabledChanged; | ||||||
|  |             base.SelectionChanged += OnSelectionChanged; | ||||||
|  |             base.OnApplyTemplate(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static void OnSelectedItemsChangedCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e) { | ||||||
|  |             if (sender is CheckComboBox ccb) | ||||||
|  |                 ccb.OnSelectedItemsChanged(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void OnSelectedItemsChanged() { | ||||||
|  |             if (SelectedItems is INotifyCollectionChanged collection) { | ||||||
|  |                 collection.CollectionChanged += (s, e) => { SelectItems(); }; | ||||||
|  |             } | ||||||
|  |             SelectItems(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void Button_MouseDown(object sender, RoutedEventArgs evt) { | ||||||
|  |             IsDropDownOpen = !IsDropDownOpen; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SelectAllItem_MouseDown(object sender, RoutedEventArgs evt) { | ||||||
|  |             if (AllItemsSelected == false) { | ||||||
|  |                 SelectAll(); | ||||||
|  |             } else { | ||||||
|  |                 UnselectAll(); | ||||||
|  |             } | ||||||
|  |             evt.Handled = true; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) { | ||||||
|  |             SelectItemsReverse(); | ||||||
|  |             var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null; | ||||||
|  |             if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) { | ||||||
|  |                 _textBox.Text = AllItemsSelectedContent; | ||||||
|  |                 AllItemsSelected = true; | ||||||
|  |             } else if (SelectedItems.Count == 0) { | ||||||
|  |                 _textBox.Text = ""; | ||||||
|  |                 AllItemsSelected = false; | ||||||
|  |             } else { | ||||||
|  |                 _textBox.Text = string.Join(Delimiter, | ||||||
|  |                     dmp == null ? SelectedItems.Cast<object>() : | ||||||
|  |                     SelectedItems.Cast<object>() | ||||||
|  |                         .Select(i => i.GetType().GetProperty(dmp)?.GetValue(i)) | ||||||
|  |                 ); | ||||||
|  |                 AllItemsSelected = null; | ||||||
|  |             } | ||||||
|  |             RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, evt.RemovedItems, evt.AddedItems)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs evt) { | ||||||
|  |             if (!IsEnabled) IsDropDownOpen = false; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SelectItems() { | ||||||
|  |             if (_viewHandled || _modelHandled) | ||||||
|  |                 return; | ||||||
|  |             _viewHandled = true; | ||||||
|  |             base.SelectedItems.Clear(); | ||||||
|  |             foreach (var item in SelectedItems) | ||||||
|  |                 base.SelectedItems.Add(item); | ||||||
|  |             _viewHandled = false; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SelectItemsReverse() { | ||||||
|  |             if (_modelHandled || _viewHandled) | ||||||
|  |                 return; | ||||||
|  |             _modelHandled = true; | ||||||
|  |             SelectedItems.Clear(); | ||||||
|  |             foreach (var item in base.SelectedItems) | ||||||
|  |                 SelectedItems.Add(item); | ||||||
|  |             _modelHandled = false; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										118
									
								
								Elwig/Controls/CheckComboBox.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								Elwig/Controls/CheckComboBox.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,118 @@ | |||||||
|  | <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |                     xmlns:ctrl="clr-namespace:Elwig.Controls"> | ||||||
|  |     <ctrl:VisibilityConverter x:Key="VisibilityConverter"/> | ||||||
|  |     <Style TargetType="ctrl:CheckComboBox" BasedOn="{StaticResource {x:Type ListBox}}"> | ||||||
|  |         <Setter Property="Template"> | ||||||
|  |             <Setter.Value> | ||||||
|  |                 <ControlTemplate TargetType="ctrl:CheckComboBox"> | ||||||
|  |                     <Grid Style="{x:Null}"> | ||||||
|  |                         <Button x:Name="Button" ClickMode="Press" BorderThickness="1" | ||||||
|  |                                 BorderBrush="{TemplateBinding BorderBrush}" | ||||||
|  |                                 IsEnabled="{Binding IsEnabled, RelativeSource={RelativeSource TemplatedParent}}"> | ||||||
|  |                             <Button.Style> | ||||||
|  |                                 <Style TargetType="{x:Type Button}"> | ||||||
|  |                                     <Setter Property="Background" Value="White"/> | ||||||
|  |                                     <Setter Property="Template"> | ||||||
|  |                                         <Setter.Value> | ||||||
|  |                                             <ControlTemplate TargetType="{x:Type Button}"> | ||||||
|  |                                                 <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True" | ||||||
|  |                                                         BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1"> | ||||||
|  |                                                     <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/> | ||||||
|  |                                                 </Border> | ||||||
|  |                                             </ControlTemplate> | ||||||
|  |                                         </Setter.Value> | ||||||
|  |                                     </Setter> | ||||||
|  |                                 </Style> | ||||||
|  |                             </Button.Style> | ||||||
|  |                             <Path x:Name="IconDropdown" Data="M 0,0 L 3,3 L 6,0" Stroke="#FF606060" StrokeThickness="1" Margin="0,0,5,0" | ||||||
|  |                                   HorizontalAlignment="Right" VerticalAlignment="Center"/> | ||||||
|  |                         </Button> | ||||||
|  |                         <TextBlock x:Name="TextBox" Style="{x:Null}" Margin="6,0,18,0" IsHitTestVisible="False" | ||||||
|  |                                    HorizontalAlignment="Stretch" VerticalAlignment="Center"/> | ||||||
|  |                         <Popup x:Name="Popup" Placement="Bottom" Focusable="True" | ||||||
|  |                                IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" | ||||||
|  |                                PopupAnimation="Slide" AllowsTransparency="True"> | ||||||
|  |                             <Popup.Style> | ||||||
|  |                                 <Style TargetType="{x:Type Popup}"> | ||||||
|  |                                     <Setter Property="StaysOpen" Value="False"/> | ||||||
|  |                                     <Style.Triggers> | ||||||
|  |                                         <DataTrigger Binding="{Binding IsMouseOver, ElementName=Button}" Value="True"> | ||||||
|  |                                             <Setter Property="StaysOpen" Value="True"/> | ||||||
|  |                                         </DataTrigger> | ||||||
|  |                                         <DataTrigger Binding="{Binding IsMouseOver, ElementName=Border}" Value="True"> | ||||||
|  |                                             <Setter Property="StaysOpen" Value="True"/> | ||||||
|  |                                         </DataTrigger> | ||||||
|  |                                     </Style.Triggers> | ||||||
|  |                                 </Style> | ||||||
|  |                             </Popup.Style> | ||||||
|  |                             <Border x:Name="Border" Style="{x:Null}" BorderThickness="1" BorderBrush="Gray" Background="White" SnapsToDevicePixels="True" | ||||||
|  |                                     MinWidth="{TemplateBinding ActualWidth}" | ||||||
|  |                                     MaxHeight="{TemplateBinding MaxDropDownHeight}"> | ||||||
|  |                                 <DockPanel> | ||||||
|  |                                     <ListBoxItem x:Name="SelectAllItem" Padding="2,1,2,1" DockPanel.Dock="Top" | ||||||
|  |                                                  Visibility="{TemplateBinding IsSelectAllActive, Converter={StaticResource VisibilityConverter}}"> | ||||||
|  |                                         <StackPanel Orientation="Horizontal"> | ||||||
|  |                                             <CheckBox VerticalAlignment="Center" Margin="0,0,5,0" IsThreeState="True" | ||||||
|  |                                                       IsChecked="{Binding AllItemsSelected, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/> | ||||||
|  |                                             <TextBlock Text="{TemplateBinding SelectAllContent}" VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/> | ||||||
|  |                                         </StackPanel> | ||||||
|  |                                     </ListBoxItem> | ||||||
|  |                                     <ScrollViewer Style="{x:Null}"> | ||||||
|  |                                         <StackPanel Style="{x:Null}" IsItemsHost="True" SnapsToDevicePixels="True" | ||||||
|  |                                                     KeyboardNavigation.DirectionalNavigation="Contained"/> | ||||||
|  |                                     </ScrollViewer> | ||||||
|  |                                 </DockPanel> | ||||||
|  |                             </Border> | ||||||
|  |                         </Popup> | ||||||
|  |                     </Grid> | ||||||
|  |                     <ControlTemplate.Triggers> | ||||||
|  |                         <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                             <Setter TargetName="IconDropdown" Property="Stroke" Value="#FFA0A0A0"/> | ||||||
|  |                         </Trigger> | ||||||
|  |                         <Trigger Property="IsMouseOver" Value="True"> | ||||||
|  |                             <Setter TargetName="IconDropdown" Property="Stroke" Value="Black"/> | ||||||
|  |                         </Trigger> | ||||||
|  |                     </ControlTemplate.Triggers> | ||||||
|  |                 </ControlTemplate> | ||||||
|  |             </Setter.Value> | ||||||
|  |         </Setter> | ||||||
|  |         <Setter Property="ItemContainerStyle"> | ||||||
|  |             <Setter.Value> | ||||||
|  |                 <Style TargetType="ListBoxItem"> | ||||||
|  |                     <Setter Property="Template"> | ||||||
|  |                         <Setter.Value> | ||||||
|  |                             <ControlTemplate TargetType="ListBoxItem"> | ||||||
|  |                                 <Border BorderBrush="{TemplateBinding BorderBrush}"  | ||||||
|  |                                         BorderThickness="{TemplateBinding BorderThickness}"  | ||||||
|  |                                         Background="{TemplateBinding Background}" | ||||||
|  |                                         Padding="2,1,2,1"> | ||||||
|  |                                     <StackPanel Orientation="Horizontal"> | ||||||
|  |                                         <CheckBox VerticalAlignment="Center" Margin="0,0,5,0" | ||||||
|  |                                                   IsChecked="{Binding IsSelected, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=ListBoxItem}}"/> | ||||||
|  |                                         <ContentPresenter VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/> | ||||||
|  |                                     </StackPanel> | ||||||
|  |                                 </Border> | ||||||
|  |                             </ControlTemplate> | ||||||
|  |                         </Setter.Value> | ||||||
|  |                     </Setter> | ||||||
|  |                     <Setter Property="BorderThickness" Value="1"/> | ||||||
|  |                     <Style.Triggers> | ||||||
|  |                         <Trigger Property="IsMouseOver" Value="True"> | ||||||
|  |                             <Setter Property="BorderBrush" Value="#FF70C0E7"/> | ||||||
|  |                             <Setter Property="Background" Value="#FFE5F3FB"/> | ||||||
|  |                         </Trigger> | ||||||
|  |                     </Style.Triggers> | ||||||
|  |                 </Style> | ||||||
|  |             </Setter.Value> | ||||||
|  |         </Setter> | ||||||
|  |         <Style.Triggers> | ||||||
|  |             <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                 <Setter Property="Foreground" Value="Gray"/> | ||||||
|  |             </Trigger> | ||||||
|  |             <Trigger Property="IsMouseOver" Value="True"> | ||||||
|  |                 <Setter Property="BorderBrush" Value="#FF7EB4EA"/> | ||||||
|  |             </Trigger> | ||||||
|  |         </Style.Triggers> | ||||||
|  |     </Style> | ||||||
|  | </ResourceDictionary> | ||||||
							
								
								
									
										106
									
								
								Elwig/Controls/IntegerUpDown.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										106
									
								
								Elwig/Controls/IntegerUpDown.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,106 @@ | |||||||
|  | using System; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  | using System.Windows.Controls.Primitives; | ||||||
|  | using System.Windows.Input; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class IntegerUpDown : TextBox { | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(nameof(Minimum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null)); | ||||||
|  |         public int? Minimum { | ||||||
|  |             get => (int?)GetValue(MinimumProperty); | ||||||
|  |             set => SetValue(MinimumProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(nameof(Maximum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null)); | ||||||
|  |         public int? Maximum { | ||||||
|  |             get => (int?)GetValue(MaximumProperty); | ||||||
|  |             set => SetValue(MaximumProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public int? Value { | ||||||
|  |             get => int.TryParse(Text, out var res) ? res : null; | ||||||
|  |             set => Text = $"{value}"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         static IntegerUpDown() { | ||||||
|  |             DefaultStyleKeyProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(typeof(IntegerUpDown))); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public IntegerUpDown() { | ||||||
|  |             TextChanged += IntegerUpDown_TextChanged; | ||||||
|  |             LostFocus += IntegerUpDown_LostFocus; | ||||||
|  |             KeyUp += IntegerUpDown_KeyUp; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public override void OnApplyTemplate() { | ||||||
|  |             var incButton = GetTemplateChild("IncrementButton") as RepeatButton; | ||||||
|  |             var decButton = GetTemplateChild("DecrementButton") as RepeatButton; | ||||||
|  |             incButton!.Click += IncrementButton_Click; | ||||||
|  |             decButton!.Click += DecrementButton_Click; | ||||||
|  |             base.OnApplyTemplate(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void IntegerUpDown_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             var idx = CaretIndex; | ||||||
|  |             Text = new string(Text.Where(char.IsAsciiDigit).Take(4).ToArray()); | ||||||
|  |             CaretIndex = idx; | ||||||
|  |             evt.Handled = !(Value >= Minimum && Value <= Maximum); | ||||||
|  |             if (idx >= 4) { | ||||||
|  |                 if (Value < Minimum) { | ||||||
|  |                     Value = Minimum; | ||||||
|  |                 } else if (Value > Maximum) { | ||||||
|  |                     Value = Maximum; | ||||||
|  |                 } | ||||||
|  |                 CaretIndex = 4; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void IntegerUpDown_LostFocus(object sender, RoutedEventArgs evt) { | ||||||
|  |             if (Value < Minimum) { | ||||||
|  |                 Value = Minimum; | ||||||
|  |             } else if (Value > Maximum) { | ||||||
|  |                 Value = Maximum; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void IncrementButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void DecrementButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void IntegerUpDown_KeyUp(object sender, KeyEventArgs evt) { | ||||||
|  |             switch (evt.Key) { | ||||||
|  |                 case Key.Up: | ||||||
|  |                 case Key.Add: | ||||||
|  |                 case Key.OemPlus: | ||||||
|  |                     Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue); | ||||||
|  |                     evt.Handled = true; | ||||||
|  |                     CaretIndex = 4; | ||||||
|  |                     break; | ||||||
|  |                 case Key.Down: | ||||||
|  |                 case Key.Subtract: | ||||||
|  |                 case Key.OemMinus: | ||||||
|  |                     Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue); | ||||||
|  |                     evt.Handled = true; | ||||||
|  |                     CaretIndex = 4; | ||||||
|  |                     break; | ||||||
|  |                 case Key.PageUp: | ||||||
|  |                     Value = Math.Min((Value ?? 0) + 10, Maximum ?? int.MaxValue); | ||||||
|  |                     evt.Handled = true; | ||||||
|  |                     CaretIndex = 4; | ||||||
|  |                     break; | ||||||
|  |                 case Key.PageDown: | ||||||
|  |                     Value = Math.Max((Value ?? 0) - 10, Minimum ?? int.MinValue); | ||||||
|  |                     evt.Handled = true; | ||||||
|  |                     CaretIndex = 4; | ||||||
|  |                     break; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										52
									
								
								Elwig/Controls/IntegerUpDown.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								Elwig/Controls/IntegerUpDown.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | |||||||
|  | <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |                     xmlns:ctrl="clr-namespace:Elwig.Controls"> | ||||||
|  |     <Style TargetType="ctrl:IntegerUpDown" BasedOn="{StaticResource {x:Type TextBox}}"> | ||||||
|  |         <Setter Property="Template"> | ||||||
|  |             <Setter.Value> | ||||||
|  |                 <ControlTemplate TargetType="ctrl:IntegerUpDown"> | ||||||
|  |                     <Grid> | ||||||
|  |                         <Grid.RowDefinitions> | ||||||
|  |                             <RowDefinition Height="*"/> | ||||||
|  |                             <RowDefinition Height="*"/> | ||||||
|  |                         </Grid.RowDefinitions> | ||||||
|  |                         <Grid.ColumnDefinitions> | ||||||
|  |                             <ColumnDefinition Width="*"/> | ||||||
|  |                             <ColumnDefinition Width="18"/> | ||||||
|  |                         </Grid.ColumnDefinitions> | ||||||
|  |  | ||||||
|  |                         <Border x:Name="Border" BorderThickness="1,1,0,1" | ||||||
|  |                                 BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||||
|  |                                 SnapsToDevicePixels="True" Grid.RowSpan="2"> | ||||||
|  |                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center"/> | ||||||
|  |                         </Border> | ||||||
|  |  | ||||||
|  |                         <RepeatButton x:Name="IncrementButton" Padding="0" Height="Auto" Width="Auto" BorderThickness="1,1,1,1" | ||||||
|  |                                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="0" Grid.Column="1"> | ||||||
|  |                             <Path x:Name="IconIncrement" Data="M 0,4 L 4,0 L 8,4 Z" Fill="#FF444444" | ||||||
|  |                                   HorizontalAlignment="Center" VerticalAlignment="Center"/> | ||||||
|  |                         </RepeatButton> | ||||||
|  |                         <RepeatButton x:Name="DecrementButton" Padding="0" Height="Auto" Width="Auto"  BorderThickness="1,0,1,1" | ||||||
|  |                                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" Grid.Column="1"> | ||||||
|  |                             <Path x:Name="IconDecrement" Data="M 0,0 L 4,4 L 8,0 Z" Fill="#FF444444" | ||||||
|  |                                   HorizontalAlignment="Center" VerticalAlignment="Center"/> | ||||||
|  |                         </RepeatButton> | ||||||
|  |                     </Grid> | ||||||
|  |                     <ControlTemplate.Triggers> | ||||||
|  |                         <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                             <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/> | ||||||
|  |                             <Setter TargetName="IconIncrement" Property="Fill" Value="#FF888888"/> | ||||||
|  |                             <Setter TargetName="IconDecrement" Property="Fill" Value="#FF888888"/> | ||||||
|  |                         </Trigger> | ||||||
|  |                     </ControlTemplate.Triggers> | ||||||
|  |                 </ControlTemplate> | ||||||
|  |             </Setter.Value> | ||||||
|  |         </Setter> | ||||||
|  |         <Setter Property="TextAlignment" Value="Right"/> | ||||||
|  |         <Style.Triggers> | ||||||
|  |             <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                 <Setter Property="Foreground" Value="Gray"/> | ||||||
|  |             </Trigger> | ||||||
|  |         </Style.Triggers> | ||||||
|  |     </Style> | ||||||
|  | </ResourceDictionary> | ||||||
							
								
								
									
										41
									
								
								Elwig/Controls/UnitConverter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								Elwig/Controls/UnitConverter.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | |||||||
|  | using System; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Data; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class UnitConverter : DependencyObject, IValueConverter { | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null)); | ||||||
|  |         public string Unit { | ||||||
|  |             get => (string)GetValue(UnitProperty); | ||||||
|  |             set => SetValue(UnitProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register(nameof(Precision), typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0)); | ||||||
|  |         public byte Precision { | ||||||
|  |             get => (byte)GetValue(PrecisionProperty); | ||||||
|  |             set => SetValue(PrecisionProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object? Convert(object? value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             if (value == null) { | ||||||
|  |                 return null; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var fmt = $"{{0:N{Precision}}}"; | ||||||
|  |             var unit = $"{(Unit != null ? " " : "")}{Unit}"; | ||||||
|  |             if (value is int i) { | ||||||
|  |                 return $"{string.Format(fmt, i)}{unit}"; | ||||||
|  |             } else if (value is decimal d) { | ||||||
|  |                 return $"{string.Format(fmt, d)}{unit}"; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return Binding.DoNothing; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object? ConvertBack(object? value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             throw new NotImplementedException(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										17
									
								
								Elwig/Controls/UnitTextBox.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								Elwig/Controls/UnitTextBox.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class UnitTextBox : TextBox { | ||||||
|  |  | ||||||
|  |         public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata("")); | ||||||
|  |         public string Unit { | ||||||
|  |             get => (string)GetValue(UnitProperty); | ||||||
|  |             set => SetValue(UnitProperty, value); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         static UnitTextBox() { | ||||||
|  |             DefaultStyleKeyProperty.OverrideMetadata(typeof(UnitTextBox), new FrameworkPropertyMetadata(typeof(UnitTextBox))); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										41
									
								
								Elwig/Controls/UnitTextBox.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								Elwig/Controls/UnitTextBox.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | |||||||
|  | <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |                     xmlns:ctrl="clr-namespace:Elwig.Controls"> | ||||||
|  |     <Style TargetType="ctrl:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}"> | ||||||
|  |         <Setter Property="Template"> | ||||||
|  |             <Setter.Value> | ||||||
|  |                 <ControlTemplate TargetType="ctrl:UnitTextBox"> | ||||||
|  |                     <Border x:Name="Border" | ||||||
|  |                             BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||||
|  |                             BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||||
|  |                             SnapsToDevicePixels="True"> | ||||||
|  |                         <Grid> | ||||||
|  |                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Bottom"> | ||||||
|  |                                 <ScrollViewer.Margin> | ||||||
|  |                                     <Binding ElementName="UnitBlock" Path="ActualWidth"> | ||||||
|  |                                         <Binding.Converter> | ||||||
|  |                                             <ctrl:WidthToMarginConverter/> | ||||||
|  |                                         </Binding.Converter> | ||||||
|  |                                     </Binding> | ||||||
|  |                                 </ScrollViewer.Margin> | ||||||
|  |                             </ScrollViewer> | ||||||
|  |                             <TextBlock x:Name="UnitBlock" Text="{Binding Path=Unit, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||||
|  |                                        FontSize="10" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3"/> | ||||||
|  |                         </Grid> | ||||||
|  |                     </Border> | ||||||
|  |                     <ControlTemplate.Triggers> | ||||||
|  |                         <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                             <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/> | ||||||
|  |                         </Trigger> | ||||||
|  |                     </ControlTemplate.Triggers> | ||||||
|  |                 </ControlTemplate> | ||||||
|  |             </Setter.Value> | ||||||
|  |         </Setter> | ||||||
|  |         <Setter Property="TextAlignment" Value="Right"/> | ||||||
|  |         <Style.Triggers> | ||||||
|  |             <Trigger Property="IsEnabled" Value="False"> | ||||||
|  |                 <Setter Property="Foreground" Value="Gray"/> | ||||||
|  |             </Trigger> | ||||||
|  |         </Style.Triggers> | ||||||
|  |     </Style> | ||||||
|  | </ResourceDictionary> | ||||||
							
								
								
									
										16
									
								
								Elwig/Controls/VisibilityConverter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								Elwig/Controls/VisibilityConverter.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | |||||||
|  | using System; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Data; | ||||||
|  | using System.Globalization; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class VisibilityConverter : IValueConverter { | ||||||
|  |         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return (bool)value ? Visibility.Visible : Visibility.Collapsed; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return (Visibility)value == Visibility.Visible; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										16
									
								
								Elwig/Controls/WidthToMarginConverter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								Elwig/Controls/WidthToMarginConverter.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | |||||||
|  | using System; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Data; | ||||||
|  | using System.Globalization; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class WidthToMarginConverter : IValueConverter { | ||||||
|  |         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return new Thickness(0, 0, 2 + (double)value, 0); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { | ||||||
|  |             return ((Thickness)value).Right - 2; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								Elwig/Controls/WineOriginTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Elwig/Controls/WineOriginTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | using System.Windows.Controls; | ||||||
|  | using System.Windows; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class WineOriginTemplateSelector : DataTemplateSelector { | ||||||
|  |         public override DataTemplate SelectTemplate(object item, DependencyObject container) { | ||||||
|  |             ContentPresenter presenter = (ContentPresenter)container; | ||||||
|  |             if (presenter.TemplatedParent is ComboBox) { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineOriginTemplateCollapsed"); | ||||||
|  |             } else { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineOriginTemplateExpanded"); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								Elwig/Controls/WineQualityLevelTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Elwig/Controls/WineQualityLevelTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | using System.Windows.Controls; | ||||||
|  | using System.Windows; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class WineQualityLevelTemplateSelector : DataTemplateSelector { | ||||||
|  |         public override DataTemplate SelectTemplate(object item, DependencyObject container) { | ||||||
|  |             ContentPresenter presenter = (ContentPresenter)container; | ||||||
|  |             if (presenter.TemplatedParent is ComboBox) { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineQualityLevelTemplateCollapsed"); | ||||||
|  |             } else { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineQualityLevelTemplateExpanded"); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								Elwig/Controls/WineVarietyTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Elwig/Controls/WineVarietyTemplateSelector.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | using System.Windows.Controls; | ||||||
|  | using System.Windows; | ||||||
|  |  | ||||||
|  | namespace Elwig.Controls { | ||||||
|  |     public class WineVarietyTemplateSelector : DataTemplateSelector { | ||||||
|  |         public override DataTemplate SelectTemplate(object item, DependencyObject container) { | ||||||
|  |             ContentPresenter presenter = (ContentPresenter)container; | ||||||
|  |             if (presenter.TemplatedParent is ComboBox) { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineVarietyTemplateCollapsed"); | ||||||
|  |             } else { | ||||||
|  |                 return (DataTemplate)presenter.FindResource("WineVarietyTemplateExpanded"); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										56
									
								
								Elwig/Dialogs/AbwertenDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								Elwig/Dialogs/AbwertenDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,56 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.AbwertenDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         FocusManager.FocusedElement="{Binding ElementName=WeightInput}" | ||||||
|  |         Title="Teillieferung abwerten" Height="190" Width="400"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <Grid.ColumnDefinitions> | ||||||
|  |             <ColumnDefinition Width="70"/> | ||||||
|  |             <ColumnDefinition/> | ||||||
|  |         </Grid.ColumnDefinitions> | ||||||
|  |  | ||||||
|  |         <TextBlock Margin="10,10,10,10" Grid.ColumnSpan="2" TextWrapping="Wrap" TextAlignment="Center"> | ||||||
|  |             Welche Menge der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/> | ||||||
|  |             von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/><LineBreak/> | ||||||
|  |             mit <Run x:Name="TextWeight" FontWeight="Bold" Text="1 000 kg"/> soll abgewertet werden? | ||||||
|  |         </TextBlock> | ||||||
|  |  | ||||||
|  |         <Label Content="Gewicht:" Margin="10,70,10,10"/> | ||||||
|  |         <Grid Grid.Column="1" Width="70" Height="25" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"> | ||||||
|  |             <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" | ||||||
|  |                      TextChanged="WeightInput_TextChanged"/> | ||||||
|  |             <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/> | ||||||
|  |         </Grid> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" IsDefault="True" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										33
									
								
								Elwig/Dialogs/AbwertenDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								Elwig/Dialogs/AbwertenDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,33 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class AbwertenDialog : Window { | ||||||
|  |  | ||||||
|  |         public int Weight; | ||||||
|  |  | ||||||
|  |         public AbwertenDialog(string lsnr, string name, int weight) { | ||||||
|  |             Weight = weight; | ||||||
|  |             InitializeComponent(); | ||||||
|  |             TextLsNr.Text = lsnr; | ||||||
|  |             TextMember.Text = name; | ||||||
|  |             TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Weight = int.Parse(WeightInput.Text); | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void UpdateButtons() { | ||||||
|  |             ConfirmButton.IsEnabled = int.TryParse(WeightInput.Text, out var w) && w > 0 && w <= Weight; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             Validator.CheckInteger(WeightInput, true, 5); | ||||||
|  |             UpdateButtons(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										78
									
								
								Elwig/Dialogs/AreaComDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										78
									
								
								Elwig/Dialogs/AreaComDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,78 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.AreaComDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         xmlns:ctrl="clr-namespace:Elwig.Controls" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         DataContext="{Binding RelativeSource={RelativeSource Self}}" | ||||||
|  |         Title="Flächenbindungen übertragen" Height="260" Width="450"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Top"> | ||||||
|  |             Sollen die aktiven Flächenbindungen des angegebenen Vorgängers<LineBreak/> | ||||||
|  |             übernommen werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²) | ||||||
|  |         </TextBlock> | ||||||
|  |         <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Top"> | ||||||
|  |             Sollen die aktiven Flächenbindungen gekündigt werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²) | ||||||
|  |         </TextBlock> | ||||||
|  |  | ||||||
|  |         <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0" | ||||||
|  |                HorizontalAlignment="Center" VerticalAlignment="Top"/> | ||||||
|  |         <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14" | ||||||
|  |                             Minimum="1900" Maximum="9999" | ||||||
|  |                             HorizontalAlignment="Center" VerticalAlignment="Top" | ||||||
|  |                             TextChanged="SeasonInput_TextChanged"/> | ||||||
|  |         <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0" | ||||||
|  |                   HorizontalAlignment="Center" VerticalAlignment="Top" | ||||||
|  |                   Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed" | ||||||
|  |                   IsChecked="{Binding MaintainYearTo}"/> | ||||||
|  |  | ||||||
|  |         <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Top"> | ||||||
|  |             Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/> | ||||||
|  |             und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen. | ||||||
|  |         </TextBlock> | ||||||
|  |         <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Top"> | ||||||
|  |             Die Flächenbindungen sind bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig. | ||||||
|  |         </TextBlock> | ||||||
|  |  | ||||||
|  |         <TextBlock x:Name="InfoBlock" Margin="0,0,0,75" TextAlignment="Center" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Bottom"> | ||||||
|  |             Falls die Flächenbindungen später an ein neues Mitglied<LineBreak/> | ||||||
|  |             übertragen werden sollen bitte <Italic>Nein</Italic> auswählen! | ||||||
|  |         </TextBlock> | ||||||
|  |         <TextBlock Text="Die Änderungen werden erst beim Speichern übernommen!" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,50"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Ja" Margin="10,10,115,10" Grid.Column="1" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Nein" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										60
									
								
								Elwig/Dialogs/AreaComDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								Elwig/Dialogs/AreaComDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class AreaComDialog : Window { | ||||||
|  |  | ||||||
|  |         public int CancelSeason { get; set; } | ||||||
|  |         public int SuccessorSeason => CancelSeason + 1; | ||||||
|  |         public bool MaintainYearTo { get; set; } | ||||||
|  |  | ||||||
|  |         public string AreaComNum { get; set; } | ||||||
|  |         public string Area { get; set; } | ||||||
|  |  | ||||||
|  |         public AreaComDialog(string name, int areaComNum, int area) { | ||||||
|  |             CancelSeason = Utils.FollowingSeason - 1; | ||||||
|  |             AreaComNum = $"{areaComNum:N0}"; | ||||||
|  |             Area = $"{area:N0}"; | ||||||
|  |             InitializeComponent(); | ||||||
|  |             SeasonInput.Text = $"{CancelSeason}"; | ||||||
|  |             Title = $"Aktive Flächenbindungen kündigen - {name}"; | ||||||
|  |             QuestionBlock1.Visibility = Visibility.Hidden; | ||||||
|  |             QuestionBlock2.Visibility = Visibility.Visible; | ||||||
|  |             DescBlock1.Visibility = Visibility.Hidden; | ||||||
|  |             DescBlock2.Visibility = Visibility.Visible; | ||||||
|  |             CopyYearToInput.Visibility = Visibility.Hidden; | ||||||
|  |             Height = 240; | ||||||
|  |             SeasonInput.Margin = new(0, 40, 0, 0); | ||||||
|  |             SeasonLabel.Margin = new(0, 40, 100, 0); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public AreaComDialog(string name, string successorName, int areaComNum, int area) { | ||||||
|  |             CancelSeason = Utils.FollowingSeason - 1; | ||||||
|  |             AreaComNum = $"{areaComNum:N0}"; | ||||||
|  |             Area = $"{area:N0}"; | ||||||
|  |             InitializeComponent(); | ||||||
|  |             SeasonInput.Text = $"{CancelSeason}"; | ||||||
|  |             Title = $"Aktive Flächenbindungen übertragen - {name} - {successorName}"; | ||||||
|  |             InfoBlock.Visibility = Visibility.Hidden; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             CancelSeason = (int)SeasonInput.Value!; | ||||||
|  |             CancelSeason1.Text = $"{CancelSeason}"; | ||||||
|  |             CancelSeason2.Text = $"{CancelSeason}"; | ||||||
|  |             TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; | ||||||
|  |             DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) { | ||||||
|  |             TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; | ||||||
|  |             DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										64
									
								
								Elwig/Dialogs/DeleteMemberDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								Elwig/Dialogs/DeleteMemberDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,64 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.DeleteMemberDialog" | ||||||
|  |         AutomationProperties.AutomationId="DeleteMemberDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         DataContext="{Binding RelativeSource={RelativeSource Self}}" | ||||||
|  |         Title="Mitglied löschen" Height="280" Width="400"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="CheckBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <TextBlock TextAlignment="Center" Margin="10,10,10,10" VerticalAlignment="Top"> | ||||||
|  |             Bei Bestätigung wird das Mitglied samt zugehöriger Daten<LineBreak/> | ||||||
|  |             <Bold>unwiderruflich gelöscht!</Bold> Wenn möglich sollte stattdessen<LineBreak/> | ||||||
|  |             der Status des Mitglieds auf <Italic>Inaktiv</Italic> gesetzt werden! | ||||||
|  |         </TextBlock> | ||||||
|  |  | ||||||
|  |         <Label Content="Name u. MgNr. wiederholen:" Margin="10,60,10,10" HorizontalAlignment="Center"/> | ||||||
|  |         <TextBox x:Name="NameInput" Margin="10,85,10,10" | ||||||
|  |                  TextChanged="NameInput_TextChanged"/> | ||||||
|  |  | ||||||
|  |         <Label Content="Beim Löschen müssen folgende Daten auch gelöscht werden:" Margin="10,120,10,10"/> | ||||||
|  |         <CheckBox x:Name="AreaComInput" Content="Flächenbindungen" Margin="40,145,0,0" | ||||||
|  |                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed" | ||||||
|  |                   IsChecked="{Binding DeleteAreaComs}"/> | ||||||
|  |         <CheckBox x:Name="DeliveryInput" Content="Lieferungen" Margin="40,165,0,0" | ||||||
|  |                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed" | ||||||
|  |                   IsChecked="{Binding DeleteDeliveries}"/> | ||||||
|  |         <CheckBox x:Name="PaymentInput" Content="Auszahlungsdaten" Margin="40,185,0,0" | ||||||
|  |                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed" | ||||||
|  |                   IsChecked="{Binding DeletePaymentData}"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										66
									
								
								Elwig/Dialogs/DeleteMemberDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								Elwig/Dialogs/DeleteMemberDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class DeleteMemberDialog : Window { | ||||||
|  |  | ||||||
|  |         protected string[] NameParts; | ||||||
|  |  | ||||||
|  |         public bool DeleteAreaComs { get; set; } | ||||||
|  |         public bool DeleteDeliveries { get; set; } | ||||||
|  |         public bool DeletePaymentData { get; set; } | ||||||
|  |  | ||||||
|  |         public DeleteMemberDialog(int mgnr, string name, int numAreaComs, int numDeliveries, int numCredits) { | ||||||
|  |             NameParts = name.ToLower().Split(' ').Where(p => p.Length > 0).Append($"{mgnr}").ToArray(); | ||||||
|  |             InitializeComponent(); | ||||||
|  |             Title += " - " + name; | ||||||
|  |             AreaComInput.IsEnabled = numAreaComs != 0; | ||||||
|  |             AreaComInput.Content += $" ({numAreaComs:N0})"; | ||||||
|  |             DeliveryInput.IsEnabled = numDeliveries != 0; | ||||||
|  |             DeliveryInput.Content += $" ({numDeliveries:N0})"; | ||||||
|  |             PaymentInput.IsEnabled = numCredits != 0; | ||||||
|  |             PaymentInput.Content += $" ({numCredits:N0})"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void NameInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             Update(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void CheckBox_Changed(object sender, RoutedEventArgs evt) { | ||||||
|  |             Update(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static void UpdateCheckBox(CheckBox cb) { | ||||||
|  |             if (cb.IsEnabled && cb.IsChecked != true) { | ||||||
|  |                 ControlUtils.SetInputInvalid(cb); | ||||||
|  |             } else { | ||||||
|  |                 ControlUtils.ClearInputState(cb); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void Update() { | ||||||
|  |             var t = NameInput.Text.ToLower().Split(' '); | ||||||
|  |             var nameValid = NameParts.All(t.Contains); | ||||||
|  |             UpdateCheckBox(AreaComInput); | ||||||
|  |             UpdateCheckBox(DeliveryInput); | ||||||
|  |             UpdateCheckBox(PaymentInput); | ||||||
|  |             if (!nameValid) { | ||||||
|  |                 ControlUtils.SetInputInvalid(NameInput); | ||||||
|  |             } else { | ||||||
|  |                 ControlUtils.ClearInputState(NameInput); | ||||||
|  |             } | ||||||
|  |             ConfirmButton.IsEnabled = | ||||||
|  |                 (!AreaComInput.IsEnabled || DeleteAreaComs) && | ||||||
|  |                 (!DeliveryInput.IsEnabled || DeleteDeliveries) && | ||||||
|  |                 (!PaymentInput.IsEnabled || DeletePaymentData) && | ||||||
|  |                 nameValid; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										57
									
								
								Elwig/Dialogs/DeliveryExtractionDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								Elwig/Dialogs/DeliveryExtractionDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,57 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.DeliveryExtractionDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         FocusManager.FocusedElement="{Binding ElementName=WeightInput}" | ||||||
|  |         Title="Teillieferung extrahieren" Height="210" Width="380"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <Grid.ColumnDefinitions> | ||||||
|  |             <ColumnDefinition Width="200"/> | ||||||
|  |             <ColumnDefinition/> | ||||||
|  |         </Grid.ColumnDefinitions> | ||||||
|  |  | ||||||
|  |         <TextBlock Margin="10,10,0,10" TextWrapping="Wrap"> | ||||||
|  |             Was soll mit der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/> | ||||||
|  |             von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/> geschehen? | ||||||
|  |         </TextBlock> | ||||||
|  |         <RadioButton x:Name="NewDeliveryButton" Content="Neue Lieferung erstellen" | ||||||
|  |                      Margin="10,80,0,10" HorizontalAlignment="Left" VerticalAlignment="Top" | ||||||
|  |                      Checked="Selection_Changed" Unchecked="Selection_Changed"/> | ||||||
|  |         <RadioButton x:Name="AddToDeliveryButton" Content="Zu Lieferung hinzufügen" | ||||||
|  |                      Margin="10,100,0,10" HorizontalAlignment="Left" VerticalAlignment="Top" | ||||||
|  |                      Checked="Selection_Changed" Unchecked="Selection_Changed"/> | ||||||
|  |  | ||||||
|  |         <ListBox x:Name="DeliveryList" Grid.Column="1" Margin="10,10,10,45" | ||||||
|  |                  SelectionChanged="DeliveryList_SelectionChanged"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="2" IsEnabled="False" IsDefault="True" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="2" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										37
									
								
								Elwig/Dialogs/DeliveryExtractionDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								Elwig/Dialogs/DeliveryExtractionDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,37 @@ | |||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Windows; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class DeliveryExtractionDialog : Window { | ||||||
|  |  | ||||||
|  |         public string? AddTo; | ||||||
|  |  | ||||||
|  |         public DeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) { | ||||||
|  |             InitializeComponent(); | ||||||
|  |             TextLsNr.Text = lsnr; | ||||||
|  |             TextMember.Text = name; | ||||||
|  |             NewDeliveryButton.IsEnabled = !single; | ||||||
|  |             DeliveryList.IsEnabled = false; | ||||||
|  |             DeliveryList.ItemsSource = lsnrs; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             AddTo = NewDeliveryButton.IsChecked == true ? "new" : DeliveryList.SelectedItem as string; | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void UpdateButtons() { | ||||||
|  |             ConfirmButton.IsEnabled = NewDeliveryButton.IsChecked == true || (AddToDeliveryButton.IsChecked == true && DeliveryList.SelectedItem != null); | ||||||
|  |             DeliveryList.IsEnabled = AddToDeliveryButton.IsChecked == true; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void Selection_Changed(object sender, RoutedEventArgs evt) { | ||||||
|  |             UpdateButtons(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void DeliveryList_SelectionChanged(object sender, RoutedEventArgs evt) { | ||||||
|  |             UpdateButtons(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										50
									
								
								Elwig/Dialogs/LinearPriceIncreaseDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								Elwig/Dialogs/LinearPriceIncreaseDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,50 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.LinearPriceIncreaseDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         FocusManager.FocusedElement="{Binding ElementName=PriceInput}" | ||||||
|  |         Title="Linear wachsen" Height="140" Width="270"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <Grid.ColumnDefinitions> | ||||||
|  |             <ColumnDefinition Width="55"/> | ||||||
|  |             <ColumnDefinition/> | ||||||
|  |         </Grid.ColumnDefinitions> | ||||||
|  |  | ||||||
|  |         <Label Content="Preis:" Margin="10,20,10,10"/> | ||||||
|  |         <Grid Grid.Column="1" Width="145" Height="25" Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"> | ||||||
|  |             <TextBox x:Name="PriceInput" TextAlignment="Right" Padding="2,2,30,2" | ||||||
|  |                      TextChanged="PriceInput_TextChanged"/> | ||||||
|  |             <Label Content="€/kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/> | ||||||
|  |         </Grid> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="17,0,133,10" IsEnabled="False" IsDefault="True" | ||||||
|  |                 Click="ConfirmButton_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="0,0,20,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										29
									
								
								Elwig/Dialogs/LinearPriceIncreaseDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								Elwig/Dialogs/LinearPriceIncreaseDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,29 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class LinearPriceIncreaseDialog : Window { | ||||||
|  |  | ||||||
|  |         public double Price = 0.0; | ||||||
|  |  | ||||||
|  |         public LinearPriceIncreaseDialog() { | ||||||
|  |             InitializeComponent(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Price = double.Parse(PriceInput.Text.Replace(Utils.GroupSeparator, "")); | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void UpdateButtons(ValidationResult res) { | ||||||
|  |             ConfirmButton.IsEnabled = res.IsValid; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void PriceInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             var res = Validator.CheckDecimal(PriceInput, true, 2, 8); | ||||||
|  |             UpdateButtons(res); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										54
									
								
								Elwig/Dialogs/ManualWeighingDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								Elwig/Dialogs/ManualWeighingDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,54 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.ManualWeighingDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         FocusManager.FocusedElement="{Binding ElementName=WeightInput}" | ||||||
|  |         Title="Handwiegung" Height="170" Width="400"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="TextBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Padding" Value="2"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <Grid.ColumnDefinitions> | ||||||
|  |             <ColumnDefinition Width="70"/> | ||||||
|  |             <ColumnDefinition/> | ||||||
|  |         </Grid.ColumnDefinitions> | ||||||
|  |  | ||||||
|  |         <Label Content="Gewicht:" Margin="10,20,10,10"/> | ||||||
|  |         <Grid Grid.Column="1" Width="70" Height="25" Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"> | ||||||
|  |             <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" | ||||||
|  |                      TextChanged="WeightInput_TextChanged"/> | ||||||
|  |             <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/> | ||||||
|  |         </Grid> | ||||||
|  |  | ||||||
|  |         <Label Content="Grund:" Margin="10,50,10,10"/> | ||||||
|  |         <TextBox x:Name="ReasonInput" Grid.Column="1" Margin="0,50,10,10" | ||||||
|  |                  TextChanged="ReasonInput_TextChanged"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" IsDefault="True" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										38
									
								
								Elwig/Dialogs/ManualWeighingDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								Elwig/Dialogs/ManualWeighingDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,38 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Text.RegularExpressions; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class ManualWeighingDialog : Window { | ||||||
|  |  | ||||||
|  |         public int Weight = 0; | ||||||
|  |         public string? Reason = null; | ||||||
|  |  | ||||||
|  |         public ManualWeighingDialog(string? reason = null) { | ||||||
|  |             InitializeComponent(); | ||||||
|  |             ReasonInput.Text = reason; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Weight = int.Parse(WeightInput.Text); | ||||||
|  |             Reason = Regex.Replace(ReasonInput.Text, @"\s+", " ").Trim(); | ||||||
|  |             if (Reason == "") Reason = null; | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void UpdateButtons() { | ||||||
|  |             ConfirmButton.IsEnabled = WeightInput.Text.Length > 0; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             Validator.CheckInteger(WeightInput, true, 5); | ||||||
|  |             UpdateButtons(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ReasonInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||||
|  |             UpdateButtons(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										69
									
								
								Elwig/Dialogs/NewSeasonDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								Elwig/Dialogs/NewSeasonDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,69 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.NewSeasonDialog" | ||||||
|  |         AutomationProperties.AutomationId="NewSeasonDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         DataContext="{Binding RelativeSource={RelativeSource Self}}" | ||||||
|  |         Title="Saison anlegen" Height="180" Width="400"> | ||||||
|  |     <Window.Resources> | ||||||
|  |         <Style TargetType="Label"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="Padding" Value="2,4,2,4"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="ComboBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |             <Setter Property="FontSize" Value="14"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="CheckBox"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Top"/> | ||||||
|  |         </Style> | ||||||
|  |         <Style TargetType="Button"> | ||||||
|  |             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||||
|  |             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||||
|  |             <Setter Property="Width" Value="100"/> | ||||||
|  |             <Setter Property="Height" Value="25"/> | ||||||
|  |         </Style> | ||||||
|  |     </Window.Resources> | ||||||
|  |     <Grid> | ||||||
|  |         <Label Content="Währung:" Margin="10,10,10,10"/> | ||||||
|  |         <ComboBox x:Name="CurrencyInput" Width="150" Margin="130,10,10,10" | ||||||
|  |                   ItemsSource="{Binding Currencies}"> | ||||||
|  |             <ComboBox.ItemTemplate> | ||||||
|  |                 <DataTemplate> | ||||||
|  |                     <StackPanel Orientation="Horizontal"> | ||||||
|  |                         <TextBlock Text="{Binding Code}" Width="30"/> | ||||||
|  |                         <TextBlock Text="- "/> | ||||||
|  |                         <TextBlock Text="{Binding Name}"/> | ||||||
|  |                     </StackPanel> | ||||||
|  |                 </DataTemplate> | ||||||
|  |             </ComboBox.ItemTemplate> | ||||||
|  |         </ComboBox> | ||||||
|  |  | ||||||
|  |         <Label Content="Nachkommastellen:" Margin="10,40,10,10"/> | ||||||
|  |         <ComboBox x:Name="PrecisionInput" Width="50" Margin="130,40,10,10"> | ||||||
|  |             <ComboBoxItem>2</ComboBoxItem> | ||||||
|  |             <ComboBoxItem>3</ComboBoxItem> | ||||||
|  |             <ComboBoxItem IsSelected="True">4</ComboBoxItem> | ||||||
|  |             <ComboBoxItem>5</ComboBoxItem> | ||||||
|  |             <ComboBoxItem>6</ComboBoxItem> | ||||||
|  |             <ComboBoxItem>7</ComboBoxItem> | ||||||
|  |             <ComboBoxItem>8</ComboBoxItem> | ||||||
|  |         </ComboBox> | ||||||
|  |  | ||||||
|  |         <CheckBox x:Name="CopyModifiersInput" Content="Zu-/Abschläge der letzten Saison übernehmen" | ||||||
|  |                   Margin="15,75,10,10" IsChecked="{Binding CopyModifiers}"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsDefault="True" | ||||||
|  |                 Click="ConfirmButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										30
									
								
								Elwig/Dialogs/NewSeasonDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								Elwig/Dialogs/NewSeasonDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Windows; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class NewSeasonDialog : Window { | ||||||
|  |  | ||||||
|  |         public IEnumerable<Currency> Currencies { get; set; } | ||||||
|  |         public int Year { get; set; } | ||||||
|  |  | ||||||
|  |         public string CurrencyCode => (CurrencyInput.SelectedItem as Currency)!.Code; | ||||||
|  |         public byte Precision => (byte)(PrecisionInput.SelectedIndex + 2); | ||||||
|  |         public bool CopyModifiers { get; set; } | ||||||
|  |  | ||||||
|  |         public NewSeasonDialog(Season? s, IEnumerable<Currency> currencies) { | ||||||
|  |             Currencies = currencies; | ||||||
|  |             CopyModifiers = s != null; | ||||||
|  |             InitializeComponent(); | ||||||
|  |             CopyModifiersInput.IsEnabled = s != null; | ||||||
|  |             ControlUtils.SelectItemWithPk(CurrencyInput, s?.CurrencyCode ?? "EUR"); | ||||||
|  |             PrecisionInput.SelectedIndex = (s?.Precision ?? 4) - 2; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             DialogResult = true; | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										32
									
								
								Elwig/Dialogs/UpdateDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								Elwig/Dialogs/UpdateDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | |||||||
|  | <Window x:Class="Elwig.Dialogs.UpdateDialog" | ||||||
|  |         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||||||
|  |         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||||
|  |         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||||
|  |         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||||
|  |         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||||
|  |         WindowStartupLocation="CenterOwner" | ||||||
|  |         Title="Neues Update verfügbar - Elwig" Height="190" Width="400" | ||||||
|  |         Closed="OnClosed"> | ||||||
|  |     <Grid> | ||||||
|  |         <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,40" | ||||||
|  |                    HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"> | ||||||
|  |             Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar! | ||||||
|  |             (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungen</Hyperlink>)<LineBreak/> | ||||||
|  |             Soll das Update heruntergeladen und<LineBreak/> | ||||||
|  |             installiert werden? (ca. <Run x:Name="SizeText">100</Run> MB)<LineBreak/> | ||||||
|  |             <Run FontWeight="Bold">Achtung</Run>: Elwig wird dabei geschlossen! | ||||||
|  |         </TextBlock> | ||||||
|  |  | ||||||
|  |         <ProgressBar x:Name="ProgressBar" Margin="0,0,0,27" Visibility="Hidden" | ||||||
|  |                      HorizontalAlignment="Center" VerticalAlignment="Center" | ||||||
|  |                      Height="27" Width="300" SnapsToDevicePixels="True"/> | ||||||
|  |  | ||||||
|  |         <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,20" | ||||||
|  |                 FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom" | ||||||
|  |                 Width="100" Height="27" | ||||||
|  |                 Click="InstallButton_Click"/> | ||||||
|  |         <Button x:Name="CancelButton" Content="Abbrechen" Margin="115,10,10,20" IsCancel="True" | ||||||
|  |                 FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom" | ||||||
|  |                 Width="100" Height="27"/> | ||||||
|  |     </Grid> | ||||||
|  | </Window> | ||||||
							
								
								
									
										67
									
								
								Elwig/Dialogs/UpdateDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								Elwig/Dialogs/UpdateDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,67 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using System; | ||||||
|  | using System.Diagnostics; | ||||||
|  | using System.IO; | ||||||
|  | using System.Net.Http; | ||||||
|  | using System.Threading; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Navigation; | ||||||
|  |  | ||||||
|  | namespace Elwig.Dialogs { | ||||||
|  |     public partial class UpdateDialog : Window { | ||||||
|  |  | ||||||
|  |         public string Version { get; private set; } | ||||||
|  |         public string Url { get; private set; } | ||||||
|  |  | ||||||
|  |         private readonly CancellationTokenSource Cancellation; | ||||||
|  |  | ||||||
|  |         public UpdateDialog(string version, string url, long size) { | ||||||
|  |             Version = version; | ||||||
|  |             Url = url; | ||||||
|  |             Cancellation = new(); | ||||||
|  |             InitializeComponent(); | ||||||
|  |             VersionText.Text = version; | ||||||
|  |             SizeText.Text = $"{size / 1024 / 1024}"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void OnClosed(object sender, EventArgs evt) { | ||||||
|  |             Cancellation.Cancel(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async void InstallButton_Click(object sender, RoutedEventArgs evt) { | ||||||
|  |             Description.Visibility = Visibility.Hidden; | ||||||
|  |             ProgressBar.Visibility = Visibility.Visible; | ||||||
|  |             InstallButton.IsEnabled = false; | ||||||
|  |             await Install(); | ||||||
|  |             Close(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Install() { | ||||||
|  |             var fileName = Path.Combine(App.TempPath, $"Elwig-{Version}.exe"); | ||||||
|  |             try { | ||||||
|  |                 using var stream = new FileStream(fileName, FileMode.Create); | ||||||
|  |                 using var client = new HttpClient() { | ||||||
|  |                     Timeout = TimeSpan.FromSeconds(5), | ||||||
|  |                 }; | ||||||
|  |                 await client.DownloadAsync(Url, stream, new Progress<double>(p => { | ||||||
|  |                     ProgressBar.Value = p * 100.0; | ||||||
|  |                 }), Cancellation.Token); | ||||||
|  |             } catch (OperationCanceledException) { | ||||||
|  |                 File.Delete(fileName); | ||||||
|  |                 return; | ||||||
|  |             } catch (Exception exc) { | ||||||
|  |                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |             } | ||||||
|  |             Process.Start(fileName); | ||||||
|  |             DialogResult = true; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) { | ||||||
|  |             Process.Start(new ProcessStartInfo { | ||||||
|  |                 FileName = e.Uri.ToString(), | ||||||
|  |                 UseShellExecute = true, | ||||||
|  |             }); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										182
									
								
								Elwig/Documents/BusinessDocument.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										182
									
								
								Elwig/Documents/BusinessDocument.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,182 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public abstract class BusinessDocument : Document { | ||||||
|  |  | ||||||
|  |         public Member Member; | ||||||
|  |         public string? Location; | ||||||
|  |         public bool IncludeSender = false; | ||||||
|  |         public bool UseBillingAddress = false; | ||||||
|  |         public bool ShowDateAndLocation = false; | ||||||
|  |         public string Aside; | ||||||
|  |  | ||||||
|  |         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) { | ||||||
|  |             Member = m; | ||||||
|  |             Location = App.BranchLocation; | ||||||
|  |             IncludeSender = includeSender; | ||||||
|  |             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>"); | ||||||
|  |             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" + | ||||||
|  |                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" + | ||||||
|  |                 $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" + | ||||||
|  |                 $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" + | ||||||
|  |                 $"<tr><th>UID:</th><td>{uid}</td></tr>" + | ||||||
|  |                 $"</tbody></table>"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public string Address { | ||||||
|  |             get { | ||||||
|  |                 IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member; | ||||||
|  |                 var plz = addr.PostalDest.AtPlz; | ||||||
|  |                 return string.Join("\n", ((string?[])[Member.BillingAddress?.FullName, Member.AdministrativeName, Member.ForTheAttentionOf, addr.Address, $"{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}", addr.PostalDest.Country.Name]).Where(s => !string.IsNullOrWhiteSpace(s))); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static string GetColGroup(IEnumerable<double> cols) { | ||||||
|  |             return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static string PrintSortenaufteilung(List<MemberStat> stats) { | ||||||
|  |             List<string> discrs = [""]; | ||||||
|  |             List<string> names = ["ohne Attr./Bewirt."]; | ||||||
|  |             List<string> bucketAttrs = [ | ||||||
|  |                 .. stats | ||||||
|  |                 .Select(s => s.Discr) | ||||||
|  |                 .Distinct() | ||||||
|  |                 .Where(s => s.Length > 0) | ||||||
|  |                 .Order() | ||||||
|  |             ]; | ||||||
|  |             names.AddRange(bucketAttrs); | ||||||
|  |             names.Add("Gesamt"); | ||||||
|  |             discrs.AddRange(bucketAttrs); | ||||||
|  |  | ||||||
|  |             List<double> cols = [40]; | ||||||
|  |             cols.AddRange(names.Select(_ => 125.0 / names.Count)); | ||||||
|  |             string tbl = GetColGroup(cols); | ||||||
|  |             tbl += "<thead><tr>" + | ||||||
|  |                 $"<th><b>Sortenaufteilung</b> [kg]</th>" + | ||||||
|  |                 string.Join("", names.Select(c => $"<th>{c}</th>")) + | ||||||
|  |                 "</tr></thead>"; | ||||||
|  |  | ||||||
|  |             tbl += string.Join("\n", stats | ||||||
|  |                 .GroupBy(b => b.Variety) | ||||||
|  |                 .OrderBy(b => b.Key) | ||||||
|  |                 .Select(g => { | ||||||
|  |                     var dict = g.ToDictionary(a => a.Discr, a => a.Weight); | ||||||
|  |                     var vals = discrs.Select(a => dict.GetValueOrDefault(a, 0)).ToList(); | ||||||
|  |                     return $"<tr><th>{g.Key}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) + | ||||||
|  |                         $"<td class=\"number\">{dict.Values.Sum():N0}</td></tr>"; | ||||||
|  |                 }) | ||||||
|  |             ); | ||||||
|  |             var totalDict = stats.GroupBy(s => s.Discr).ToDictionary(g => g.Key, g => g.Sum(a => a.Weight)); | ||||||
|  |             var totals = discrs.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0); | ||||||
|  |             tbl += "<tr class=\"sum bold\"><td></td>" + string.Join("", totals.Select(v => $"<td class=\"number\">{v:N0}</td>")) + | ||||||
|  |                 $"<td class=\"number\">{totalDict.Values.Sum():N0}</td></tr>"; | ||||||
|  |  | ||||||
|  |             return "<table class=\"sortenaufteilung small number cohere\">" + tbl + "</table>"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static string FormatRow( | ||||||
|  |             int obligation, int right, int delivery, int? payment = null, int? area = null, | ||||||
|  |             bool isGa = false, bool showPayment = false, bool showArea = false | ||||||
|  |         ) { | ||||||
|  |             payment ??= delivery; | ||||||
|  |             var baseline = showPayment ? payment : delivery; | ||||||
|  |  | ||||||
|  |             if (showArea) { | ||||||
|  |                 return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" + | ||||||
|  |                     $"<td>{obligation:N0}</td>" + | ||||||
|  |                     $"<td>{right:N0}</td>"; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" + | ||||||
|  |                 $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" + | ||||||
|  |                 $"<td>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" + | ||||||
|  |                 $"<td>{(baseline >= obligation && delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" + | ||||||
|  |                 $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" + | ||||||
|  |                 (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") + | ||||||
|  |                 $"<td>{delivery:N0}</td>"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) { | ||||||
|  |             return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.Payment, bucket.Area, isGa, showPayment, showArea); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public string PrintBucketTable( | ||||||
|  |             Season season, Dictionary<string, MemberBucket> buckets, | ||||||
|  |             bool includeDelivery = true, bool includePayment = false, | ||||||
|  |             bool isTiny = false, IEnumerable<string>? filter = null | ||||||
|  |         ) { | ||||||
|  |             includePayment = includePayment && includeDelivery; | ||||||
|  |             string tbl = GetColGroup(!includeDelivery ? [105, 20, 20, 20] : includePayment ? [45, 17, 17, 17, 19, 16, 17, 17] : [45, 20, 20, 20, 20, 20, 20]); | ||||||
|  |             tbl += $""" | ||||||
|  |                 <thead> | ||||||
|  |                     <tr> | ||||||
|  |                         <th{(!includeDelivery ? " rowspan=\"2\"" : "")}> | ||||||
|  |                             <b>{(includeDelivery ? "Lese " + season.Year : "Zusammengefasste Flächenbindungen")}</b> | ||||||
|  |                             per {Date:dd.MM.yyyy} {(includeDelivery ? "[kg]" : "")} | ||||||
|  |                         </th> | ||||||
|  |                         {(!includeDelivery ? "<th>Fläche</th>" : "")} | ||||||
|  |                         <th>Lieferpflicht</th> | ||||||
|  |                         <th>Lieferrecht</th> | ||||||
|  |                         {(includeDelivery ? "<th>Unterliefert</th>" : "")} | ||||||
|  |                         {(includeDelivery ? "<th>Noch lieferbar</th>" : "")} | ||||||
|  |                         {(includeDelivery ? "<th>Überliefert</th>" : "")} | ||||||
|  |                         {(includePayment ? "<th>Zugeteilt</th>" : "")} | ||||||
|  |                         {(includeDelivery ? "<th>Geliefert</th>" : "")} | ||||||
|  |                     </tr> | ||||||
|  |                     {(!includeDelivery ? "<tr><th class=\"unit\">[m²]</th><th class=\"unit\">[kg]</th><th class=\"unit\">[kg]</th></tr>" : "")} | ||||||
|  |                 </thead> | ||||||
|  |                 """; | ||||||
|  |  | ||||||
|  |             var mBuckets = buckets | ||||||
|  |                 .Where(b => ((!includeDelivery && b.Value.Area > 0) || | ||||||
|  |                              (includeDelivery && (b.Value.Right > 0 || b.Value.Obligation > 0 || b.Value.Delivery > 0))) && | ||||||
|  |                             (filter == null || filter.Contains(b.Key[..2]))) | ||||||
|  |                 .ToList(); | ||||||
|  |             var fbVars = mBuckets | ||||||
|  |                 .Where(b => b.Value.Right > 0 || b.Value.Obligation > 0) | ||||||
|  |                 .Select(b => b.Key.Replace("_", "")) | ||||||
|  |                 .Order() | ||||||
|  |                 .ToArray(); | ||||||
|  |             var fbs = mBuckets | ||||||
|  |                 .Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2) | ||||||
|  |                 .OrderBy(b => b.Value.Name); | ||||||
|  |             var vtr = mBuckets | ||||||
|  |                 .Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2) | ||||||
|  |                 .OrderBy(b => b.Value.Name); | ||||||
|  |             var rem = mBuckets | ||||||
|  |                 .Where(b => !fbVars.Contains(b.Key)) | ||||||
|  |                 .OrderBy(b => b.Value.Name); | ||||||
|  |  | ||||||
|  |             tbl += "\n<tbody>\n"; | ||||||
|  |             tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow( | ||||||
|  |                     Member.BusinessShares * season.MinKgPerBusinessShare, | ||||||
|  |                     Member.BusinessShares * season.MaxKgPerBusinessShare, | ||||||
|  |                     season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight), | ||||||
|  |                     isGa: true, showPayment: includePayment, showArea: !includeDelivery | ||||||
|  |                 )}</tr>"; | ||||||
|  |             if (fbs.Any()) { | ||||||
|  |                 tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" + | ||||||
|  |                     $"Flächenbindungen{(vtr.Any() ? " (inkl. Verträge)" : "")}:</th></tr>"; | ||||||
|  |                 foreach (var (id, b) in fbs) { | ||||||
|  |                     tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>"; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (vtr.Any()) { | ||||||
|  |                 tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" + | ||||||
|  |                     "Verträge:</th></tr>"; | ||||||
|  |                 foreach (var (id, b) in vtr) { | ||||||
|  |                     tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>"; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             tbl += "\n</tbody>\n"; | ||||||
|  |  | ||||||
|  |             return $"<table class=\"buckets {(isTiny ? "tiny" : "small")} number cohere\">\n" + tbl + "\n</table>"; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -2,7 +2,7 @@ | |||||||
| @inherits TemplatePage<Elwig.Documents.BusinessDocument> | @inherits TemplatePage<Elwig.Documents.BusinessDocument> | ||||||
| @model Elwig.Documents.BusinessDocument | @model Elwig.Documents.BusinessDocument | ||||||
| @{ Layout = "Document"; } | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/> | ||||||
| <div class="info-wrapper"> | <div class="info-wrapper"> | ||||||
|     <div class="address-wrapper"> |     <div class="address-wrapper"> | ||||||
|         <div class="sender"> |         <div class="sender"> | ||||||
| @@ -13,8 +13,9 @@ | |||||||
|         </div> |         </div> | ||||||
|         <address>@Model.Address</address> |         <address>@Model.Address</address> | ||||||
|     </div> |     </div> | ||||||
|     <aside></aside> |     <aside>@Raw(Model.Aside)</aside> | ||||||
|  |     @if (Model.ShowDateAndLocation) { | ||||||
|  |         <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div> | ||||||
|  |     } | ||||||
| </div> | </div> | ||||||
| <main> | @RenderBody() | ||||||
|     @RenderBody() |  | ||||||
| </main> |  | ||||||
|   | |||||||
| @@ -1,26 +0,0 @@ | |||||||
| using Elwig.Models; |  | ||||||
|  |  | ||||||
| namespace Elwig.Documents { |  | ||||||
|     public abstract class BusinessDocument : Document { |  | ||||||
|  |  | ||||||
|         public Member Member; |  | ||||||
|         public bool IncludeSender = false; |  | ||||||
|  |  | ||||||
|         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) { |  | ||||||
|             Member = m; |  | ||||||
|             IncludeSender = includeSender; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public string Address { |  | ||||||
|             get { |  | ||||||
|                 var b = Member.BillingAddress; |  | ||||||
|                 var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz; |  | ||||||
|                 if (b != null) { |  | ||||||
|                     return $"{b.Name}\n{b.Address}\n{plz.Plz} {plz.Dest}"; |  | ||||||
|                 } else { |  | ||||||
|                     return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}"; |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										150
									
								
								Elwig/Documents/BusinessDocument.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										150
									
								
								Elwig/Documents/BusinessDocument.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,150 @@ | |||||||
|  |  | ||||||
|  | .address-wrapper, aside { | ||||||
|  |     overflow: hidden; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .spacing { | ||||||
|  |     height: 20mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .info-wrapper { | ||||||
|  |     width: 100%; | ||||||
|  |     height: 45mm; | ||||||
|  |     margin: 0 0 2mm 0; | ||||||
|  |     position: relative; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .info-wrapper .date { | ||||||
|  |     text-align: right; | ||||||
|  |     position: absolute; | ||||||
|  |     right: 0; | ||||||
|  |     bottom: -1.5em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .address-wrapper { | ||||||
|  |     height: 45mm; | ||||||
|  |     width: 85mm; | ||||||
|  |     margin: 0; | ||||||
|  |     padding: 5mm; | ||||||
|  |     position: absolute; | ||||||
|  |     left: -5mm; | ||||||
|  |     top: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .address-wrapper .sender { | ||||||
|  |     height: 4em; | ||||||
|  |     font-size: 8pt; | ||||||
|  |     padding: 1em 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | address { | ||||||
|  |     height: 5em; | ||||||
|  |     white-space: pre-line; | ||||||
|  |     font-size: 12pt; | ||||||
|  |     font-style: normal; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside { | ||||||
|  |     height: 40mm; | ||||||
|  |     width: 75mm; | ||||||
|  |     margin: 0; | ||||||
|  |     position: absolute; | ||||||
|  |     left: 100mm; | ||||||
|  |     top: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table { | ||||||
|  |     border-collapse: collapse; | ||||||
|  |     border: var(--border-thickness) solid #808080; | ||||||
|  |     width: 65mm; | ||||||
|  |     margin-right: 10mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table thead:not(:first-child) tr { | ||||||
|  |     border-top: var(--border-thickness) solid #808080; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table thead tr { | ||||||
|  |     background-color: #E0E0E0; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table tbody th, | ||||||
|  | aside table tbody td { | ||||||
|  |     text-align: left; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table tbody th { | ||||||
|  |     padding: 0.25mm 0.5mm 0.25mm 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table tbody td { | ||||||
|  |     padding: 0.25mm 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | aside table tbody th { | ||||||
|  |     font-weight: normal; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main { | ||||||
|  |     margin: 2em 0 1em 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main > *:first-child { | ||||||
|  |     margin-top: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main h1, | ||||||
|  | main h2, | ||||||
|  | main h3, | ||||||
|  | .main-wrapper p { | ||||||
|  |     font-size: 12pt; | ||||||
|  |     margin: 1em 0; | ||||||
|  |     text-align: justify; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper p { | ||||||
|  |     widows: 3; | ||||||
|  |     orphans: 3; | ||||||
|  |     hyphens: manual; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main h1 { | ||||||
|  |     margin-top: 0; | ||||||
|  |     margin-bottom: 2em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper p.comment { | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper p.custom { | ||||||
|  |     white-space: pre-wrap; | ||||||
|  |     break-inside: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper .hidden { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper .bottom { | ||||||
|  |     bottom: 0; | ||||||
|  |     position: absolute; | ||||||
|  |     width: 165mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper .signatures { | ||||||
|  |     width: 100%; | ||||||
|  |     display: flex; | ||||||
|  |     justify-content: space-around; | ||||||
|  |     margin: 20mm 0 2mm 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .main-wrapper .signatures > * { | ||||||
|  |     width: 50mm; | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  |     padding-top: 1mm; | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
| @@ -1,9 +1,7 @@ | |||||||
| using Elwig.Models; | using Elwig.Models.Entities; | ||||||
| 
 | 
 | ||||||
| namespace Elwig.Documents { | namespace Elwig.Documents { | ||||||
|     public class BusinessLetter : BusinessDocument { |     public class BusinessLetter : BusinessDocument { | ||||||
|         public BusinessLetter(string title, Member m) : base(title, m) { |         public BusinessLetter(string title, Member m) : base(title, m) { } | ||||||
| 
 |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -2,7 +2,8 @@ | |||||||
| @inherits TemplatePage<Elwig.Documents.BusinessLetter> | @inherits TemplatePage<Elwig.Documents.BusinessLetter> | ||||||
| @model Elwig.Documents.BusinessLetter | @model Elwig.Documents.BusinessLetter | ||||||
| @{ Layout = "BusinessDocument"; } | @{ Layout = "BusinessDocument"; } | ||||||
|  | <main> | ||||||
| <p>Sehr geehrtes Mitglied,</p> | <p>Sehr geehrtes Mitglied,</p> | ||||||
| <p>nein.</p> | <p>nein.</p> | ||||||
| <p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p> | <p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p> | ||||||
|  | </main> | ||||||
|   | |||||||
							
								
								
									
										98
									
								
								Elwig/Documents/CreditNote.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										98
									
								
								Elwig/Documents/CreditNote.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,98 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class CreditNote : BusinessDocument { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Traubengutschrift"; | ||||||
|  |  | ||||||
|  |         public PaymentMember? Payment; | ||||||
|  |         public Credit? Credit; | ||||||
|  |         public CreditNoteDeliveryData Data; | ||||||
|  |         public string? Text; | ||||||
|  |         public string CurrencySymbol; | ||||||
|  |         public int Precision; | ||||||
|  |         public string MemberModifier; | ||||||
|  |         public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries; | ||||||
|  |         public decimal MemberTotalUnderDelivery; | ||||||
|  |         public int MemberAutoBusinessShares; | ||||||
|  |         public decimal MemberAutoBusinessSharesAmount; | ||||||
|  |         public PaymentCustom? CustomPayment; | ||||||
|  |  | ||||||
|  |         public CreditNote( | ||||||
|  |             AppDbContext ctx, | ||||||
|  |             PaymentMember p, | ||||||
|  |             CreditNoteDeliveryData data, | ||||||
|  |             bool considerContractPenalties, | ||||||
|  |             bool considerTotalPenalty, | ||||||
|  |             bool considerAutoBusinessShares, | ||||||
|  |             bool considerCustomModifiers, | ||||||
|  |             Dictionary<string, UnderDelivery>? underDeliveries = null | ||||||
|  |         ) : | ||||||
|  |             base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) { | ||||||
|  |             UseBillingAddress = true; | ||||||
|  |             ShowDateAndLocation = true; | ||||||
|  |             Data = data; | ||||||
|  |             Payment = p; | ||||||
|  |             Credit = p.Credit; | ||||||
|  |             var season = p.Variant.Season; | ||||||
|  |             if (considerCustomModifiers) { | ||||||
|  |                 CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null; | ||||||
|  |             if (CustomPayment?.ModComment != null) { | ||||||
|  |                 MemberModifier = CustomPayment.ModComment; | ||||||
|  |             } else if (mod != null) { | ||||||
|  |                 MemberModifier = $"{mod.Name} ({mod.ValueStr})"; | ||||||
|  |             } else { | ||||||
|  |                 MemberModifier = "Sonstige Zu-/Abschläge"; | ||||||
|  |             } | ||||||
|  |             Aside = Aside.Replace("</table>", "") + | ||||||
|  |                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" + | ||||||
|  |                 $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" + | ||||||
|  |                 $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" + | ||||||
|  |                 $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" + | ||||||
|  |                 $"</tbody></table>"; | ||||||
|  |             Text = App.Client.TextCreditNote; | ||||||
|  |             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr); | ||||||
|  |             CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code; | ||||||
|  |             Precision = season.Precision; | ||||||
|  |  | ||||||
|  |             if (considerTotalPenalty) { | ||||||
|  |                 var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value); | ||||||
|  |                 var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare; | ||||||
|  |                 MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0; | ||||||
|  |                 if (total == 0) | ||||||
|  |                     MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0); | ||||||
|  |             } | ||||||
|  |             if (considerAutoBusinessShares) { | ||||||
|  |                 var fromDate = $"{season.Year}-01-01"; | ||||||
|  |                 var toDate = $"{season.Year}-12-31"; | ||||||
|  |                 MemberAutoBusinessShares = ctx.MemberHistory | ||||||
|  |                     .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto") | ||||||
|  |                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0) | ||||||
|  |                     .Sum(h => h.BusinessShares); | ||||||
|  |                 MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0); | ||||||
|  |             } | ||||||
|  |             if (considerContractPenalties) { | ||||||
|  |                 var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v); | ||||||
|  |                 var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a); | ||||||
|  |                 var comTypes = ctx.AreaCommitmentTypes.ToDictionary(t => t.VtrgId, t => t); | ||||||
|  |                 MemberUnderDeliveries = underDeliveries? | ||||||
|  |                     .OrderBy(u => u.Key) | ||||||
|  |                     .Select(u => ( | ||||||
|  |                         varieties[u.Key[..2]].Name + (u.Key.Length > 2 ? " " + attributes[u.Key[2..]].Name : ""), | ||||||
|  |                         u.Value.Diff, | ||||||
|  |                         u.Value.Diff * (comTypes[u.Key].PenaltyPerKg ?? 0) | ||||||
|  |                           - (comTypes[u.Key].PenaltyAmount ?? 0) | ||||||
|  |                           - ((u.Value.Weight == 0 ? comTypes[u.Key].PenaltyNone : null) ?? 0))) | ||||||
|  |                     .Where(u => u.Item3 != 0) | ||||||
|  |                     .ToList(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     }} | ||||||
							
								
								
									
										185
									
								
								Elwig/Documents/CreditNote.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										185
									
								
								Elwig/Documents/CreditNote.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,185 @@ | |||||||
|  | @using Elwig.Helpers | ||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.CreditNote> | ||||||
|  | @model Elwig.Documents.CreditNote | ||||||
|  | @{ Layout = "BusinessDocument"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/> | ||||||
|  | <main> | ||||||
|  |     <h1>@Model.Title</h1> | ||||||
|  |     <table class="credit"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width:  5mm;"/> | ||||||
|  |             <col style="width: 22mm;"/> | ||||||
|  |             <col style="width: 15mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 15mm;"/> | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             <col style="width: 13mm;"/> | ||||||
|  |             <col style="width:  5mm;"/> | ||||||
|  |             <col style="width: 17mm;"/> | ||||||
|  |             <col style="width: 16mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th> | ||||||
|  |                 <th rowspan="2" class="narrow">Pos.</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Sorte</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th> | ||||||
|  |                 <th colspan="2">Gradation</th> | ||||||
|  |                 <th colspan="2">Flächenbindung</th> | ||||||
|  |                 <th>Preis</th> | ||||||
|  |                 <th class="narrow">Rbl.</th> | ||||||
|  |                 <th class="narrow">Zu-/Abschläge</th> | ||||||
|  |                 <th>Betrag</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th class="unit">[°Oe]</th> | ||||||
|  |                 <th class="unit narrow">[°KMW]</th> | ||||||
|  |                 <th class="unit" colspan="2">[kg]</th> | ||||||
|  |                 <th class="unit">[@Model.CurrencySymbol/kg]</th> | ||||||
|  |                 <th class="narrow unit">[%]</th> | ||||||
|  |                 <th class="unit">[@Model.CurrencySymbol]</th> | ||||||
|  |                 <th class="unit">[@Model.CurrencySymbol]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody class="sum"> | ||||||
|  |             @foreach (var p in Model.Data.Rows) { | ||||||
|  |                 var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1); | ||||||
|  |                 @for (int i = 0; i < rows; i++) { | ||||||
|  |                     <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")"> | ||||||
|  |                         @if (i == 0) { | ||||||
|  |                             <td rowspan="@rows">@p.LsNr</td> | ||||||
|  |                             <td rowspan="@rows">@p.DPNr</td> | ||||||
|  |                             <td class="small">@p.Variety</td> | ||||||
|  |                             <td class="small"> | ||||||
|  |                                 @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation | ||||||
|  |                                 @((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI" ? " / " : "")@Raw(p.QualId == "WEI" ? "<i>abgew.</i>" : "") | ||||||
|  |                             </td> | ||||||
|  |                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td> | ||||||
|  |                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td> | ||||||
|  |                         } | ||||||
|  |                         @if (i > 0 && i <= p.Modifiers.Length) { | ||||||
|  |                             <td colspan="4" class="small mod">@p.Modifiers[i - 1]</td> | ||||||
|  |                         } else if (i > 0) { | ||||||
|  |                             <td colspan="4"></td> | ||||||
|  |                         } | ||||||
|  |                         @if (i < p.Buckets.Length) { | ||||||
|  |                             var bucket = p.Buckets[i]; | ||||||
|  |                             <td class="small">@bucket.Name:</td> | ||||||
|  |                             <td class="number">@($"{bucket.Value:N0}")</td> | ||||||
|  |                             <td class="number">@($"{bucket.Price:N4}")</td> | ||||||
|  |                         } else { | ||||||
|  |                             <td></td> | ||||||
|  |                         } | ||||||
|  |                         @if (i == p.Buckets.Length - 1) { | ||||||
|  |                             var rebelMod = p.WeighingModifier * 100; | ||||||
|  |                             var totalMod = p.TotalModifiers ?? 0; | ||||||
|  |                             <td class="tiny center">@(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"))</td> | ||||||
|  |                             <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td> | ||||||
|  |                             <td class="number">@($"{p.Amount:N2}")</td> | ||||||
|  |                         } else { | ||||||
|  |                             <td colspan="2"></td> | ||||||
|  |                         } | ||||||
|  |                     </tr> | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |     <div class="hint"> | ||||||
|  |         Hinweis:<br/> | ||||||
|  |         Die Summe der Lieferungen und die Summe der anfal­lenden Pönalen werden mit | ||||||
|  |         @Model.Payment?.Variant.Season.Precision Nach­komma­stellen berechnent, | ||||||
|  |         erst das Ergebnis wird kauf­männisch auf 2 Nach­komma­stellen gerundet. | ||||||
|  |     </div> | ||||||
|  |     <table class="credit-sum"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: auto;"/> | ||||||
|  |             <col style="width:  5mm;"/> | ||||||
|  |             <col style="width: 30mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         @{ | ||||||
|  |             string FormatRow(string name, decimal? value, bool add = false, bool bold = false, bool subCat = false, bool noTopBorder = false) { | ||||||
|  |                 return $"<tr class=\"{(!add && !noTopBorder ? "sum" : !add ? "large" : "")} {(bold ? "large bold" : "")}\">" | ||||||
|  |                      + $"<td class=\"{(subCat ? "small" : "")}\">{name}:</td>" | ||||||
|  |                      + $"<td class=\"number {(subCat ? "small" : "large")}\">{(value < 0 ? "–" : (add ? "+" : ""))}</td>" | ||||||
|  |                      + $"<td class=\"number {(subCat ? "small" : "large")}\">" | ||||||
|  |                      +   $"<span class=\"fleft\">{Model.CurrencySymbol}</span>{Math.Abs(value ?? 0):N2}</td>" | ||||||
|  |                      + $"</tr>\n"; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         <tbody style="break-inside: avoid;"> | ||||||
|  |             @{ var sum = Model.Data.Rows.Sum(p => p.Amount); } | ||||||
|  |             @if (Model.Payment == null) { | ||||||
|  |                 @Raw(FormatRow("Gesamt", sum, bold: true, noTopBorder: true)) | ||||||
|  |             } else { | ||||||
|  |                 var noBorder = true; | ||||||
|  |                 if (Model.Payment.NetAmount != Model.Payment.Amount) { | ||||||
|  |                     @Raw(FormatRow("Zwischensumme", Model.Payment.NetAmount, noTopBorder: noBorder)) | ||||||
|  |                     noBorder = false; | ||||||
|  |                     @Raw(FormatRow(Model.MemberModifier, Model.Payment.Amount - Model.Payment.NetAmount, add: true)) | ||||||
|  |                 } | ||||||
|  |                 if (Model.Credit == null) { | ||||||
|  |                     @Raw(FormatRow("Gesamtbetrag", Model.Payment.Amount, bold: true, noTopBorder: noBorder)) | ||||||
|  |                     // TODO Mock VAT | ||||||
|  |                 } else { | ||||||
|  |                     var hasPrev = Model.Credit.PrevNetAmount != null; | ||||||
|  |                     @Raw(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Model.Credit.NetAmount, bold: true, noTopBorder: noBorder)) | ||||||
|  |                     if (hasPrev) { | ||||||
|  |                         @Raw(FormatRow("Bisher berücksichtigt", -Model.Credit.PrevNetAmount, add: true)) | ||||||
|  |                         @Raw(FormatRow("Nettobetrag", Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0))) | ||||||
|  |                     } | ||||||
|  |                     @Raw(FormatRow($"Mehrwertsteuer ({Model.Credit.Vat * 100} %)", Model.Credit.VatAmount, add: true)) | ||||||
|  |                     @Raw(FormatRow("Bruttobetrag", Model.Credit.GrossAmount, bold: true)) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |         <tbody style="break-inside: avoid;"> | ||||||
|  |             @{ decimal penalty = 0; } | ||||||
|  |  | ||||||
|  |             @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) { | ||||||
|  |                 <tr class="small"> | ||||||
|  |                     <td colspan="2" style="padding-top: 5mm;">Anfallende Pönalen durch Unterlieferungen:</td> | ||||||
|  |                     <td></td> | ||||||
|  |                 </tr> | ||||||
|  |                 foreach (var u in Model.MemberUnderDeliveries) { | ||||||
|  |                     @Raw(FormatRow($"{u.Name} ({u.Kg:N0} kg)", u.Amount, add: true, subCat: true)) | ||||||
|  |                     penalty += u.Amount; | ||||||
|  |                 } | ||||||
|  |                 penalty = Math.Round(penalty, 2, MidpointRounding.AwayFromZero); | ||||||
|  |             } | ||||||
|  |             @if (Model.MemberTotalUnderDelivery != 0) { | ||||||
|  |                 @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true)); | ||||||
|  |                 penalty += Model.MemberTotalUnderDelivery; | ||||||
|  |             } | ||||||
|  |             @if (Model.MemberAutoBusinessSharesAmount != 0) { | ||||||
|  |                 @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true)); | ||||||
|  |                 penalty += Model.MemberAutoBusinessSharesAmount; | ||||||
|  |             } | ||||||
|  |             @if (Model.CustomPayment?.Amount != null) { | ||||||
|  |                 @Raw(FormatRow(Model.CustomPayment.Comment ?? ((Model.CustomPayment.Amount.Value) < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount.Value, add: true)); | ||||||
|  |                 penalty += Model.CustomPayment.Amount.Value; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             @if (Model.Credit == null) { | ||||||
|  |                 @Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true)) | ||||||
|  |             } else { | ||||||
|  |                 var diff = Model.Credit.Modifiers - penalty; | ||||||
|  |                 if (diff != 0) { | ||||||
|  |                     @Raw(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true)) | ||||||
|  |                 } | ||||||
|  |                 if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) { | ||||||
|  |                     @Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true)) | ||||||
|  |                 } | ||||||
|  |                 @Raw(FormatRow("Auszahlungsbetrag", Model.Credit.Amount, bold: true)) | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |     <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p> | ||||||
|  |     <div style="margin-top: 1em;"> | ||||||
|  |         @if (Model.Text != null) { | ||||||
|  |             <p class="custom">@Model.Text</p> | ||||||
|  |         } | ||||||
|  |     </div> | ||||||
|  | </main> | ||||||
							
								
								
									
										48
									
								
								Elwig/Documents/CreditNote.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								Elwig/Documents/CreditNote.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,48 @@ | |||||||
|  |  | ||||||
|  | table.credit { | ||||||
|  |     margin-bottom: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit .mod { | ||||||
|  |     padding-left: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit tbody tr:not(.first) { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit tbody tr:not(.last) { | ||||||
|  |     break-after: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit tr:not(.first) td { | ||||||
|  |     padding-top: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit tr.last td { | ||||||
|  |     padding-bottom: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit-sum { | ||||||
|  |     width: 60%; | ||||||
|  |     margin-left: 40%; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit-sum tr.sum, | ||||||
|  | table.credit-sum tr .sum { | ||||||
|  |     font-size: 12pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.credit-sum tr.sum td, | ||||||
|  | table.credit-sum td.sum { | ||||||
|  |     padding-top: 1mm !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .hint { | ||||||
|  |     font-style: italic; | ||||||
|  |     font-size: 8pt; | ||||||
|  |     width: 56mm; | ||||||
|  |     position: absolute; | ||||||
|  |     left: 0; | ||||||
|  |     margin: 2mm 4mm; | ||||||
|  | } | ||||||
							
								
								
									
										21
									
								
								Elwig/Documents/DeliveryAncmtList.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								Elwig/Documents/DeliveryAncmtList.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class DeliveryAncmtList : Document { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Anmeldeliste"; | ||||||
|  |  | ||||||
|  |         public string Filter; | ||||||
|  |         public IEnumerable<DeliveryAncmtListRow> Announcements; | ||||||
|  |  | ||||||
|  |         public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) : base($"{Name} {filter}") { | ||||||
|  |             Filter = filter; | ||||||
|  |             Announcements = announcements; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public DeliveryAncmtList(string filter, DeliveryAncmtListData data) : | ||||||
|  |             this(filter, data.Rows) { | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										49
									
								
								Elwig/Documents/DeliveryAncmtList.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								Elwig/Documents/DeliveryAncmtList.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.DeliveryAncmtList> | ||||||
|  | @model Elwig.Documents.DeliveryAncmtList | ||||||
|  | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" /> | ||||||
|  | <main> | ||||||
|  |     <h1>Anmeldeliste</h1> | ||||||
|  |     <h2>@Model.Filter</h2> | ||||||
|  |     <table class="announcement-list"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 18mm;"/> | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             <col style="width: 70mm;"/> | ||||||
|  |             <col style="width: 40mm;"/> | ||||||
|  |             <col style="width: 11mm;"/> | ||||||
|  |             <col style="width: 14mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2">Datum</th> | ||||||
|  |                 <th rowspan="2">MgNr.</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Mitglied</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Sorte</th> | ||||||
|  |                 <th rowspan="2">Anmldg.</th> | ||||||
|  |                 <th>Gewicht</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th class="unit">[kg]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody> | ||||||
|  |             @foreach (var a in Model.Announcements) { | ||||||
|  |                 <tr> | ||||||
|  |                     <td>@($"{a.Date:dd.MM.yyyy}")</td> | ||||||
|  |                     <td class="number">@a.MgNr</td> | ||||||
|  |                     <td>@a.AdministrativeName</td> | ||||||
|  |                     <td>@a.Variety</td> | ||||||
|  |                     <td class="small center">@(a.Status ?? "-")</td> | ||||||
|  |                     <td class="number">@($"{a.Weight:N0}")</td> | ||||||
|  |                 </tr> | ||||||
|  |             } | ||||||
|  |             <tr class="sum bold"> | ||||||
|  |                 <td colspan="2">Gesamt:</td> | ||||||
|  |                 <td colspan="2">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  | </main> | ||||||
							
								
								
									
										13
									
								
								Elwig/Documents/DeliveryAncmtList.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								Elwig/Documents/DeliveryAncmtList.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | |||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 24pt; | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     margin-bottom: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin-top: 2mm; | ||||||
|  | } | ||||||
							
								
								
									
										29
									
								
								Elwig/Documents/DeliveryConfirmation.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								Elwig/Documents/DeliveryConfirmation.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,29 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class DeliveryConfirmation : BusinessDocument { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Anlieferungsbestätigung"; | ||||||
|  |  | ||||||
|  |         public Season Season; | ||||||
|  |         public DeliveryConfirmationDeliveryData Data; | ||||||
|  |         public string? Text = App.Client.TextDeliveryConfirmation; | ||||||
|  |         public Dictionary<string, MemberBucket> MemberBuckets; | ||||||
|  |         public List<MemberStat> MemberStats; | ||||||
|  |  | ||||||
|  |         public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) : | ||||||
|  |             base($"{Name} {year}", m) { | ||||||
|  |             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season"); | ||||||
|  |             ShowDateAndLocation = true; | ||||||
|  |             UseBillingAddress = true; | ||||||
|  |             DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}"; | ||||||
|  |             Data = data; | ||||||
|  |             MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult(); | ||||||
|  |             MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										112
									
								
								Elwig/Documents/DeliveryConfirmation.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										112
									
								
								Elwig/Documents/DeliveryConfirmation.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,112 @@ | |||||||
|  | @using Elwig.Documents | ||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation> | ||||||
|  | @model Elwig.Documents.DeliveryConfirmation | ||||||
|  | @{ Layout = "BusinessDocument"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/> | ||||||
|  | <main> | ||||||
|  |     <h1>@Model.Title</h1> | ||||||
|  |     <table class="delivery-confirmation"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width:  5mm;"/> | ||||||
|  |             <col style="width: 24mm;"/> | ||||||
|  |             <col style="width: 16mm;"/> | ||||||
|  |             <col style="width: 17mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 15mm;"/> | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             <col style="width: 14mm;"/> | ||||||
|  |             <col style="width:  3mm;"/> | ||||||
|  |             <col style="width: 14mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th> | ||||||
|  |                 <th rowspan="2" class="narrow">Pos.</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Sorte</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th> | ||||||
|  |                 <th colspan="2">Gradation</th> | ||||||
|  |                 <th colspan="2">Flächenbindung</th> | ||||||
|  |                 <th>Gewicht</th> | ||||||
|  |                 <th rowspan="3" style="padding: 0;"> | ||||||
|  |                     <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg"> | ||||||
|  |                         <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman" | ||||||
|  |                               style="text-anchor: start; alignment-baseline: middle;"> | ||||||
|  |                             gerebelt | ||||||
|  |                         </text> | ||||||
|  |                     </svg> | ||||||
|  |                 </th> | ||||||
|  |                 <th>Davon<br/>abzuwerten</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th class="unit">[°Oe]</th> | ||||||
|  |                 <th class="unit narrow">[°KMW]</th> | ||||||
|  |                 <th class="unit" colspan="2">[kg]</th> | ||||||
|  |                 <th class="unit">[kg]</th> | ||||||
|  |                 <th class="unit">[kg]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody> | ||||||
|  |             @{ | ||||||
|  |                 var lastVariety = ""; | ||||||
|  |             } | ||||||
|  |             @foreach (var p in Model.Data.Rows) { | ||||||
|  |                 var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1); | ||||||
|  |                 var first = true; | ||||||
|  |                 @for (int i = 0; i < rows; i++) { | ||||||
|  |                     <tr class="@(first ? "first" : "") @(p.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")"> | ||||||
|  |                         @if (first) { | ||||||
|  |                             <td rowspan="@rows">@p.LsNr</td> | ||||||
|  |                             <td rowspan="@rows">@p.DPNr</td> | ||||||
|  |                             <td class="small">@p.Variety</td> | ||||||
|  |                             <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td> | ||||||
|  |                             <td class="small">@p.QualityLevel</td> | ||||||
|  |                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td> | ||||||
|  |                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td> | ||||||
|  |                         } | ||||||
|  |                         @if (i > 0 && i <= p.Modifiers.Length) { | ||||||
|  |                             <td colspan="3" class="small mod">@(p.Modifiers[i - 1])</td> | ||||||
|  |                         } else if (i > 0) { | ||||||
|  |                             <td colspan="3"></td> | ||||||
|  |                         } | ||||||
|  |                         @if (i < p.Buckets.Length) { | ||||||
|  |                             var bucket = p.Buckets[i]; | ||||||
|  |                             <td class="small">@bucket.Name:</td> | ||||||
|  |                             <td class="number">@($"{bucket.Value:N0}")</td> | ||||||
|  |                         } else { | ||||||
|  |                             <td colspan="2"></td> | ||||||
|  |                         } | ||||||
|  |                         @if (i == p.Buckets.Length - 1) { | ||||||
|  |                             <td class="number">@($"{p.Weight:N0}")</td> | ||||||
|  |                             <td style="font-size: 7pt;">@(p.IsNetWeight ? "\u2611" : "\u2610")</td> | ||||||
|  |                         } else { | ||||||
|  |                             <td></td> | ||||||
|  |                             <td></td> | ||||||
|  |                         } | ||||||
|  |                         @if (first) { | ||||||
|  |                             <td rowspan="@rows" class="number"></td> | ||||||
|  |                             first = false; | ||||||
|  |                         } | ||||||
|  |                     </tr> | ||||||
|  |                     lastVariety = p.Variety; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             <tr class="sum bold"> | ||||||
|  |                 <td colspan="8">Gesamt:</td> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td> | ||||||
|  |                 <td></td> | ||||||
|  |                 <td></td> | ||||||
|  |             </tr> | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |     @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats)) | ||||||
|  |     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true)) | ||||||
|  |     <div style="margin-top: 2em;"> | ||||||
|  |         @if (Model.Text != null) { | ||||||
|  |             <p class="custom comment">@Model.Text</p> | ||||||
|  |         } | ||||||
|  |     </div> | ||||||
|  | </main> | ||||||
							
								
								
									
										32
									
								
								Elwig/Documents/DeliveryConfirmation.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								Elwig/Documents/DeliveryConfirmation.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | |||||||
|  |  | ||||||
|  | table.delivery-confirmation .mod { | ||||||
|  |     padding-left: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-confirmation tr:not(.first) { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-confirmation tr:not(.first) td { | ||||||
|  |     padding-top: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-confirmation tr.last td { | ||||||
|  |     padding-bottom: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-confirmation tr.sum { | ||||||
|  |     font-size: 12pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-confirmation tr.sum td { | ||||||
|  |     padding-top: 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.sortenaufteilung { | ||||||
|  |     break-after: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.buckets { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
							
								
								
									
										21
									
								
								Elwig/Documents/DeliveryJournal.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								Elwig/Documents/DeliveryJournal.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class DeliveryJournal : Document { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Lieferjournal"; | ||||||
|  |  | ||||||
|  |         public string Filter; | ||||||
|  |         public IEnumerable<DeliveryJournalRow> Deliveries; | ||||||
|  |  | ||||||
|  |         public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) : base($"{Name} {filter}") { | ||||||
|  |             Filter = filter; | ||||||
|  |             Deliveries = deliveries; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public DeliveryJournal(string filter, DeliveryJournalData data) : | ||||||
|  |             this(filter, data.Rows) { | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										68
									
								
								Elwig/Documents/DeliveryJournal.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								Elwig/Documents/DeliveryJournal.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,68 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.DeliveryJournal> | ||||||
|  | @model Elwig.Documents.DeliveryJournal | ||||||
|  | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/> | ||||||
|  | <main> | ||||||
|  |     <h1>Lieferjournal</h1> | ||||||
|  |     <h2>@Model.Filter</h2> | ||||||
|  |     <table class="journal"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 5mm;"/> | ||||||
|  |             <col style="width: 15mm;"/> | ||||||
|  |             <col style="width: 8mm;"/> | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             <col style="width: 38mm;"/> | ||||||
|  |             <col style="width: 28mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 10mm;"/> | ||||||
|  |             <col style="width: 14mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th> | ||||||
|  |                 <th rowspan="2" class="narrow">Pos.</th> | ||||||
|  |                 <th rowspan="2">Datum</th> | ||||||
|  |                 <th rowspan="2">Zeit</th> | ||||||
|  |                 <th rowspan="2">MgNr.</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Mitglied</th> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Sorte</th> | ||||||
|  |                 <th colspan="2">Gradation</th> | ||||||
|  |                 <th>Gewicht</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th class="unit">[°Oe]</th> | ||||||
|  |                 <th class="unit narrow">[°KMW]</th> | ||||||
|  |                 <th class="unit">[kg]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody> | ||||||
|  |             @foreach (var p in Model.Deliveries) { | ||||||
|  |                 <tr> | ||||||
|  |                     <td>@p.LsNr</td> | ||||||
|  |                     <td>@p.Pos</td> | ||||||
|  |                     <td class="small">@($"{p.Date:dd.MM.yyyy}")</td> | ||||||
|  |                     <td class="small">@($"{p.Time:HH:mm}")</td> | ||||||
|  |                     <td class="number">@p.MgNr</td> | ||||||
|  |                     <td class="small">@p.AdministrativeName</td> | ||||||
|  |                     <td class="small">@p.Variety</td> | ||||||
|  |                     <td class="center">@($"{p.Oe:N0}")</td> | ||||||
|  |                     <td class="center">@($"{p.Kmw:N1}")</td> | ||||||
|  |                     <td class="number">@($"{p.Weight:N0}")</td> | ||||||
|  |                 </tr> | ||||||
|  |             } | ||||||
|  |             <tr class="sum bold"> | ||||||
|  |                 @{ | ||||||
|  |                     var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries); | ||||||
|  |                     var oe = Elwig.Helpers.Utils.KmwToOe(kmw); | ||||||
|  |                 } | ||||||
|  |                 <td colspan="2">Gesamt:</td> | ||||||
|  |                 <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td> | ||||||
|  |                 <td class="center">@($"{oe:N0}")</td> | ||||||
|  |                 <td class="center">@($"{kmw:N1}")</td> | ||||||
|  |                 <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  | </main> | ||||||
							
								
								
									
										13
									
								
								Elwig/Documents/DeliveryJournal.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								Elwig/Documents/DeliveryJournal.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | |||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 24pt; | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     margin-bottom: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin-top: 2mm; | ||||||
|  | } | ||||||
							
								
								
									
										35
									
								
								Elwig/Documents/DeliveryNote.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								Elwig/Documents/DeliveryNote.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class DeliveryNote : BusinessDocument { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Traubenübernahmeschein"; | ||||||
|  |  | ||||||
|  |         public Delivery Delivery; | ||||||
|  |         public string? Text; | ||||||
|  |         public Dictionary<string, MemberBucket> MemberBuckets; | ||||||
|  |  | ||||||
|  |         // 0 - none | ||||||
|  |         // 1 - GA only | ||||||
|  |         // 2 - GA only and area commitments of varieties from delivery note | ||||||
|  |         // 3 - full | ||||||
|  |         public int DisplayStats = App.Client.ModeDeliveryNoteStats; | ||||||
|  |  | ||||||
|  |         public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"{Name} Nr. {d.LsNr}", d.Member) { | ||||||
|  |             UseBillingAddress = true; | ||||||
|  |             ShowDateAndLocation = true; | ||||||
|  |             Delivery = d; | ||||||
|  |             Aside = Aside.Replace("</table>", "") + | ||||||
|  |                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" + | ||||||
|  |                 $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" + | ||||||
|  |                 $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" + | ||||||
|  |                 $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" + | ||||||
|  |                 $"</tbody></table>"; | ||||||
|  |             Text = App.Client.TextDeliveryNote; | ||||||
|  |             DocumentId = d.LsNr; | ||||||
|  |             MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? []; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -2,31 +2,114 @@ | |||||||
| @inherits TemplatePage<Elwig.Documents.DeliveryNote> | @inherits TemplatePage<Elwig.Documents.DeliveryNote> | ||||||
| @model Elwig.Documents.DeliveryNote | @model Elwig.Documents.DeliveryNote | ||||||
| @{ Layout = "BusinessDocument"; } | @{ Layout = "BusinessDocument"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" /> | ||||||
| <h1>Traubenübernahmeschein Nr. @Model.Delivery.LsNr</h1> | <main> | ||||||
| <table> | <h1>@Model.Title</h1> | ||||||
| <thead> | <table class="delivery large"> | ||||||
| <tr> |     <colgroup> | ||||||
|     <th rowspan="2">Sorte</th> |         <col style="width: 10.00mm;"/> | ||||||
|     <th rowspan="2">Qualitätsstufe</th> |         <col style="width: 21.00mm;"/> | ||||||
|  |         <col style="width: 25.00mm;"/> | ||||||
|  |         <col style="width: 19.50mm;"/> | ||||||
|  |         <col style="width: 19.50mm;"/> | ||||||
|  |         <col style="width: 30.00mm;"/> | ||||||
|  |         <col style="width: 12.50mm;"/> | ||||||
|  |         <col style="width: 12.50mm;"/> | ||||||
|  |         <col style="width: 15.00mm;"/> | ||||||
|  |     </colgroup> | ||||||
|  |     <thead> | ||||||
|  |         <tr> | ||||||
|  |             <th class="main center narrow" rowspan="2">Pos.</th> | ||||||
|  |             <th class="main" rowspan="2" colspan="2">Sorte</th> | ||||||
|  |             <th class="main" rowspan="2" colspan="2">Attribut</th> | ||||||
|  |             <th class="main" rowspan="2">Qualitätsstufe</th> | ||||||
|             <th colspan="2">Gradation</th> |             <th colspan="2">Gradation</th> | ||||||
|             <th>Gewicht</th> |             <th>Gewicht</th> | ||||||
| </tr> |         </tr> | ||||||
| <tr> |  | ||||||
|     <th>°KMW</th> |  | ||||||
|     <th>°Oe</th> |  | ||||||
|     <th>kg</th> |  | ||||||
| </tr> |  | ||||||
| </thead> |  | ||||||
| <tbody> |  | ||||||
|     @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) { |  | ||||||
|         <tr> |         <tr> | ||||||
|             <td>@part.Variant.Name</td> |             <th class="unit">[°Oe]</th> | ||||||
|  |             <th class="unit narrow">[°KMW]</th> | ||||||
|  |             <th class="unit">[kg]</th> | ||||||
|  |         </tr> | ||||||
|  |     </thead> | ||||||
|  |     <tbody> | ||||||
|  |         @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) { | ||||||
|  |             <tr class="main"> | ||||||
|  |                 <td class="center">@part.DPNr</td> | ||||||
|  |                 <td colspan="2">@part.Variety.Name</td> | ||||||
|  |                 <td colspan="2">@part.Attribute?.Name</td> | ||||||
|                 <td>@part.Quality.Name</td> |                 <td>@part.Quality.Name</td> | ||||||
|             <td>@part.Kmw</td> |                 <td class="center">@($"{part.Oe:N0}")</td> | ||||||
|             <td>@part.Oe</td> |                 <td class="center">@($"{part.Kmw:N1}")</td> | ||||||
|             <td>@part.Weight</td> |                 <td class="number">@($"{part.Weight:N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |             @if (part.Cultivation != null) { | ||||||
|  |                 <tr><td></td><td><i>Bewirtschaftung:</i></td><td colspan="4"><b> | ||||||
|  |                     @part.Cultivation.Name | ||||||
|  |                     @if(part.Cultivation.Description != null) { | ||||||
|  |                         @("(")@part.Cultivation.Description@(")") | ||||||
|  |                     } | ||||||
|  |                     </b></td></tr> | ||||||
|  |             } | ||||||
|  |             <tr><td></td><td colspan="5" style="white-space: pre;"><i>Herkunft:</i> @part.OriginString</td></tr> | ||||||
|  |             @if (part.Modifiers.Count() > 0) { | ||||||
|  |                 var first = true; | ||||||
|  |                 foreach (var mod in part.Modifiers) { | ||||||
|  |                     <tr class="tight @(first ? "first" : "")"><td></td><td>@Raw(first ? "<i>Zu-/Abschläge:</i>" : "")</td><td colspan="3"><b>@mod.Name</b></td><td style="white-space: pre;">@mod.ValueStr</td></tr> | ||||||
|  |                     first = false; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             <tr><td></td><td colspan="5"> | ||||||
|  |                 @if (part.IsManualWeighing) { | ||||||
|  |                     <i>Handwiegung @(part.IsNetWeight ? " (gerebelt gewogen)" : " (nicht gerebelt gewogen)")</i>@Raw(part.WeighingReason != null ? ", <i>Begründung:</i> " : "") @part.WeighingReason | ||||||
|  |                 } else { | ||||||
|  |                     var info = part.WeighingInfo; | ||||||
|  |                     <i>Waage:</i> @(part.ScaleId ?? "?")@(", ") <i>ID:</i> @(info.Id ?? "?") | ||||||
|  |                     @(info.Date != null || info.Time != null ? " – " : "")@(info.Time != null ? $"{info.Time:HH:mm}" : "")@(info.Date != null ? $", {info.Date:dd.MM.yyyy}" : "") | ||||||
|  |                     @if (info.Gross != null && info.Tare != null && info.Net != null) { | ||||||
|  |                         <br/><i>Brutto:</i> @($"{info.Gross:N0} kg")@(" – ") <i>Tara:</i> @($"{info.Tare:N0} kg")@(" – ") <i>Netto:</i> @($"{info.Net:N0} kg")@(" – ")@Raw(part.IsNetWeight ? "<i>gerebelt gewogen</i>" : "<i>nicht gerebelt gewogen</i>") | ||||||
|  |                     } else { | ||||||
|  |                         @Raw($" <i>({(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen")})</i>") | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             </td></tr> | ||||||
|  |             @if (part.Comment != null) { | ||||||
|  |                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr> | ||||||
|  |             } | ||||||
|  |             @if (part.Temperature != null || part.Acid != null) { | ||||||
|  |                 <tr><td></td><td colspan="5">@Raw(part.Temperature != null ? $"<i>Temperatur:</i> {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@Raw(part.Acid != null ? $"<i>Säure:</i> {part.Acid:N1} g/l" : "")</td></tr> | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         @if (Model.Delivery.Parts.Count() > 1) { | ||||||
|  |             <tr class="main sum bold"> | ||||||
|  |                 <td colspan="6">Gesamt:</td> | ||||||
|  |                 <td class="center">@($"{Model.Delivery.Oe:N0}")</td> | ||||||
|  |                 <td class="center">@($"{Model.Delivery.Kmw:N1}")</td> | ||||||
|  |                 <td class="number">@($"{Model.Delivery.Weight:N0}")</td> | ||||||
|             </tr> |             </tr> | ||||||
|         } |         } | ||||||
| </tbody> |     </tbody> | ||||||
| </table> | </table> | ||||||
|  | @if (Model.Delivery.Comment != null) { | ||||||
|  |     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p> | ||||||
|  | } | ||||||
|  | @if (Model.DisplayStats > 0) { | ||||||
|  |     @Raw(Model.PrintBucketTable( | ||||||
|  |         Model.Delivery.Season, Model.MemberBuckets, isTiny: true, | ||||||
|  |         filter: Model.DisplayStats > 2 ? null : | ||||||
|  |                 Model.DisplayStats == 1 ? new List<string>() : | ||||||
|  |                 Model.Delivery.Parts.Select(p => p.SortId).Distinct().ToList() | ||||||
|  |     )) | ||||||
|  | } | ||||||
|  | </main> | ||||||
|  | @for (int i = 0; i < 2; i++) { | ||||||
|  |     <div class="text @(i == 0 ? "hidden" : "bottom")"> | ||||||
|  |         @if (Model.Text != null) { | ||||||
|  |             <p class="comment">@Model.Text</p> | ||||||
|  |         } | ||||||
|  |         <div class="signatures"> | ||||||
|  |             <div>Genossenschaft</div> | ||||||
|  |             <div>Mitglied</div> | ||||||
|  |         </div> | ||||||
|  |     </div> | ||||||
|  | } | ||||||
|   | |||||||
| @@ -1,12 +0,0 @@ | |||||||
| using Elwig.Models; |  | ||||||
|  |  | ||||||
| namespace Elwig.Documents { |  | ||||||
|     public class DeliveryNote : BusinessDocument { |  | ||||||
|  |  | ||||||
|         public Delivery Delivery; |  | ||||||
|  |  | ||||||
|         public DeliveryNote(Delivery d) : base($"Lieferschein {d.LsNr}", d.Member) { |  | ||||||
|             Delivery = d; |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										46
									
								
								Elwig/Documents/DeliveryNote.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								Elwig/Documents/DeliveryNote.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,46 @@ | |||||||
|  |  | ||||||
|  | main h1 { | ||||||
|  |     margin-bottom: 1.5em !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery { | ||||||
|  |     margin-bottom: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr:not(.main) { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery th.main { | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr.main td { | ||||||
|  |     font-weight: bold; | ||||||
|  |     padding-top: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tbody tr:not(.main) td { | ||||||
|  |     font-size: 8pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr.tight:not(.first) td { | ||||||
|  |     padding-top: 0; | ||||||
|  |     padding-bottom: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr.tight.first td { | ||||||
|  |     padding-bottom: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr.tight:has(+ tr:not(.tight)) td { | ||||||
|  |     padding-bottom: 0.5mm !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery tr.sum td { | ||||||
|  |     padding-top: 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.delivery-note-stats { | ||||||
|  |     break-after: avoid; | ||||||
|  | } | ||||||
							
								
								
									
										76
									
								
								Elwig/Documents/Document.Page.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										76
									
								
								Elwig/Documents/Document.Page.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,76 @@ | |||||||
|  |  | ||||||
|  | .m1, .m2, .m3 { | ||||||
|  |     height: 0; | ||||||
|  |     width: 10mm; | ||||||
|  |     position: fixed; | ||||||
|  |     left: -25mm; | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  | } | ||||||
|  | .m1.r, .m2.r, .m3.r { | ||||||
|  |     left: initial; | ||||||
|  |     right: -20mm; | ||||||
|  | } | ||||||
|  | .m1 {top: 80mm;} | ||||||
|  | .m2 {top: 123.5mm;} | ||||||
|  | .m3 {top: 185mm;} | ||||||
|  |  | ||||||
|  | .page-break { | ||||||
|  |     break-before: page; | ||||||
|  | } | ||||||
|  | hr.page-break { | ||||||
|  |     display: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @page { | ||||||
|  |     size: A4; | ||||||
|  |     margin: 25mm 20mm 35mm 25mm; | ||||||
|  |  | ||||||
|  |     @bottom-center { | ||||||
|  |         content: element(page-footer); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @media screen { | ||||||
|  |     body, header, .footer-wrapper { | ||||||
|  |         width: 210mm; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     header, .address-wrapper, aside, main { | ||||||
|  |         border: 1px solid lightgray; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     .m1, .m2, .m3 { | ||||||
|  |         display: none; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     header { | ||||||
|  |         top: 0; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     .spacing { | ||||||
|  |         height: 45mm; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     .main-wrapper { | ||||||
|  |         margin: 0 20mm 40mm 25mm; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     .footer-wrapper { | ||||||
|  |         position: fixed; | ||||||
|  |         bottom: 0; | ||||||
|  |         left: 0; | ||||||
|  |         right: 0; | ||||||
|  |         background: white; | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @media print { | ||||||
|  |     .page::after { | ||||||
|  |         content: "Seite " counter(page) " von " counter(pages) !important; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     a { | ||||||
|  |         text-decoration: inherit; | ||||||
|  |         color: inherit; | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										178
									
								
								Elwig/Documents/Document.Table.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										178
									
								
								Elwig/Documents/Document.Table.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,178 @@ | |||||||
|  |  | ||||||
|  | main table { | ||||||
|  |     border-collapse: collapse; | ||||||
|  |     margin-bottom: 10mm; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  | main table.large {font-size: 12pt;} | ||||||
|  | main table.tiny { | ||||||
|  |     font-size: 8pt; | ||||||
|  |     margin-bottom: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.border { | ||||||
|  |     border: var(--border-thickness) solid black; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr { | ||||||
|  |     break-inside: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table th, | ||||||
|  | main table td { | ||||||
|  |     overflow: hidden; | ||||||
|  |     white-space: nowrap; | ||||||
|  |     vertical-align: middle; | ||||||
|  |     padding: 0.5mm 1mm; | ||||||
|  |     font-weight: normal; | ||||||
|  | } | ||||||
|  | main table.small th, | ||||||
|  | main table.small td, | ||||||
|  | main table.tiny th, | ||||||
|  | main table.tiny td { | ||||||
|  |     padding: 0.125mm 0.125mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table td[rowspan] { | ||||||
|  |     vertical-align: top; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table thead { | ||||||
|  |     font-size: 8pt; | ||||||
|  | } | ||||||
|  | main table.large thead { | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table th { | ||||||
|  |     font-style: italic; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tbody { | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table .small { | ||||||
|  |     font-size: 8pt; | ||||||
|  | } | ||||||
|  | main table .large { | ||||||
|  |     font-size: 12pt; | ||||||
|  | } | ||||||
|  | main table .tiny { | ||||||
|  |     font-size: 6pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.number td, | ||||||
|  | main table.number th { | ||||||
|  |     padding-left: 0; | ||||||
|  |     padding-right: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.number thead th, | ||||||
|  | main table.number td, | ||||||
|  | main table tbody td.number { | ||||||
|  |     text-align: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.center tbody td, | ||||||
|  | main table tbody td.center { | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tbody th { | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.cohere { | ||||||
|  |     break-inside: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.subheading th, | ||||||
|  | main table tr.subheading td { | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.subheading th { | ||||||
|  |     text-align: left; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.small tr.subheading th, | ||||||
|  | main table.small tr.subheading td, | ||||||
|  | main table.tiny tr.subheading th, | ||||||
|  | main table.tiny tr.subheading td { | ||||||
|  |     font-size: 8pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.sectionheading { | ||||||
|  |     background-color: #E0E0E0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.sectionheading th { | ||||||
|  |     padding-top: 0.5mm; | ||||||
|  |     padding-bottom: 0.5mm; | ||||||
|  |     font-weight: bold; | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 10pt; | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.header { | ||||||
|  |     border: var(--border-thickness) solid black; | ||||||
|  |     background-color: #E0E0E0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.header th { | ||||||
|  |     font-weight: bold; | ||||||
|  |     font-style: normal; | ||||||
|  |     font-size: 16pt; | ||||||
|  |     padding: 1mm 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.spacing td, | ||||||
|  | main table tr.spacing th { | ||||||
|  |     height: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.spacing ~ tr.header { | ||||||
|  |     break-before: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.number thead tr:first-child th:first-child { | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.bold td { | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table tr.sum, | ||||||
|  | main table td.sum, | ||||||
|  | main table tr.new, | ||||||
|  | main table tr.border { | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table th.unit { | ||||||
|  |     font-size: 8pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table.number th.unit { | ||||||
|  |     padding-right: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table th.narrow { | ||||||
|  |     padding-left: 0; | ||||||
|  |     padding-right: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main table .tborder {border-top: var(--border-thickness) solid black;} | ||||||
|  | main table .lborder {border-left: var(--border-thickness) solid black;} | ||||||
|  | main table .rborder {border-right: var(--border-thickness) solid black;} | ||||||
|  |  | ||||||
|  | main table .fleft { | ||||||
|  |     float: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main tbody.sum tr:last-child { | ||||||
|  |     border-bottom: var(--border-thickness) solid black; | ||||||
|  | } | ||||||
							
								
								
									
										185
									
								
								Elwig/Documents/Document.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										185
									
								
								Elwig/Documents/Document.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,185 @@ | |||||||
|  | using System; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using System.IO; | ||||||
|  | using Elwig.Helpers; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using Elwig.Helpers.Printing; | ||||||
|  | using MimeKit; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public abstract partial class Document : IDisposable { | ||||||
|  |  | ||||||
|  |         public static string Name => "Dokument"; | ||||||
|  |  | ||||||
|  |         protected static readonly double GenerationProportion = 0.125; | ||||||
|  |  | ||||||
|  |         protected TempFile? _pdfFile = null; | ||||||
|  |         protected string? _pdfPath; | ||||||
|  |         protected string? PdfPath => _pdfPath ?? _pdfFile?.FilePath; | ||||||
|  |         public int? TotalPages { get; private set; } | ||||||
|  |         public int? Pages => TotalPages / (DoublePaged ? 2 : 1); | ||||||
|  |  | ||||||
|  |         public bool ShowFoldMarks = App.Config.Debug; | ||||||
|  |         public bool DoublePaged = false; | ||||||
|  |  | ||||||
|  |         public string DataPath; | ||||||
|  |         public int CurrentNextSeason; | ||||||
|  |         public string? DocumentId; | ||||||
|  |         public string Title; | ||||||
|  |         public string Author; | ||||||
|  |         public string Header; | ||||||
|  |         public string Footer; | ||||||
|  |         public DateOnly Date; | ||||||
|  |  | ||||||
|  |         public Document(string title) { | ||||||
|  |             var c = App.Client; | ||||||
|  |             DataPath = App.DataPath; | ||||||
|  |             CurrentNextSeason = Utils.CurrentNextSeason; | ||||||
|  |             Title = title; | ||||||
|  |             Author = c.NameFull; | ||||||
|  |             Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>"; | ||||||
|  |             Footer = Utils.GenerateFooter("<br/>", " \u00b7 ") | ||||||
|  |                 .Item(c.NameFull).NextLine() | ||||||
|  |                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine() | ||||||
|  |                 .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null) | ||||||
|  |                     .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null) | ||||||
|  |                     .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine() | ||||||
|  |                 .Item("BIC", c.Bic).Item("IBAN", c.Iban) | ||||||
|  |                 .ToString(); | ||||||
|  |             Date = DateOnly.FromDateTime(Utils.Today); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         ~Document() { | ||||||
|  |             Dispose(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Dispose() { | ||||||
|  |             _pdfFile?.Dispose(); | ||||||
|  |             _pdfFile = null; | ||||||
|  |             GC.SuppressFinalize(this); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Document Merge(IEnumerable<Document> docs) { | ||||||
|  |             return new MergedDocument(docs); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Document FromPdf(string path) { | ||||||
|  |             return new PdfDocument(path); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task<string> Render() { | ||||||
|  |             string name; | ||||||
|  |             if (this is BusinessLetter) { | ||||||
|  |                 name = "BusinessLetter"; | ||||||
|  |             } else if (this is DeliveryNote) { | ||||||
|  |                 name = "DeliveryNote"; | ||||||
|  |             } else if (this is CreditNote) { | ||||||
|  |                 name = "CreditNote"; | ||||||
|  |             } else if (this is DeliveryJournal) { | ||||||
|  |                 name = "DeliveryJournal"; | ||||||
|  |             } else if (this is Letterhead) { | ||||||
|  |                 name = "Letterhead"; | ||||||
|  |             } else if (this is DeliveryConfirmation) { | ||||||
|  |                 name = "DeliveryConfirmation"; | ||||||
|  |             } else if (this is MemberDataSheet) { | ||||||
|  |                 name = "MemberDataSheet"; | ||||||
|  |             } else if (this is MemberList) { | ||||||
|  |                 name = "MemberList"; | ||||||
|  |             } else if (this is WineQualityStatistics) { | ||||||
|  |                 name = "WineQualityStatistics"; | ||||||
|  |             } else if (this is PaymentVariantSummary) { | ||||||
|  |                 name = "PaymentVariantSummary"; | ||||||
|  |             } else if (this is DeliveryAncmtList) { | ||||||
|  |                 name = "DeliveryAncmtList"; | ||||||
|  |             } else { | ||||||
|  |                 throw new InvalidOperationException("Invalid document object"); | ||||||
|  |             } | ||||||
|  |             return await Render(name); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task<string> Render(string name) { | ||||||
|  |             return await Html.CompileRenderAsync(name, this); ; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Generate(IProgress<double>? progress = null) { | ||||||
|  |             if (_pdfFile != null) | ||||||
|  |                 return; | ||||||
|  |             progress?.Report(0.0); | ||||||
|  |             if (this is PdfDocument) { | ||||||
|  |                 // nothing to do | ||||||
|  |             } else if (this is MergedDocument m) { | ||||||
|  |                 var pdf = new TempFile("pdf"); | ||||||
|  |                 var tmpHtmls = new List<TempFile>(); | ||||||
|  |                 var tmpFiles = new List<string>(); | ||||||
|  |                 var n = m.Documents.Count(); | ||||||
|  |                 int i = 0; | ||||||
|  |                 foreach (var doc in m.Documents) { | ||||||
|  |                     if (doc is PdfDocument) { | ||||||
|  |                         tmpFiles.Add(doc.PdfPath!); | ||||||
|  |                         continue; | ||||||
|  |                     } | ||||||
|  |                     var tmpHtml = new TempFile("html"); | ||||||
|  |                     await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8); | ||||||
|  |                     tmpHtmls.Add(tmpHtml); | ||||||
|  |                     tmpFiles.Add((doc is Letterhead ? "#" : "") + tmpHtml.FileName); | ||||||
|  |                     i++; | ||||||
|  |                     progress?.Report(GenerationProportion * 100 * i / n); | ||||||
|  |                 } | ||||||
|  |                 progress?.Report(GenerationProportion * 100); | ||||||
|  |                 var pages = await Pdf.Convert(tmpFiles, pdf.FileName, DoublePaged, new Progress<double>(v => progress?.Report(GenerationProportion * 100 + v * (1 - GenerationProportion)))); | ||||||
|  |                 TotalPages = pages.Pages; | ||||||
|  |                 foreach (var tmp in tmpHtmls) { | ||||||
|  |                     tmp.Dispose(); | ||||||
|  |                 } | ||||||
|  |                 _pdfFile = pdf; | ||||||
|  |             } else { | ||||||
|  |                 var pdf = new TempFile("pdf"); | ||||||
|  |                 using (var tmpHtml = new TempFile("html")) { | ||||||
|  |                     await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8); | ||||||
|  |                     progress?.Report(50.0); | ||||||
|  |                     var pages = await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, DoublePaged); | ||||||
|  |                     TotalPages = pages.Pages; | ||||||
|  |                 } | ||||||
|  |                 _pdfFile = pdf; | ||||||
|  |             } | ||||||
|  |             progress?.Report(100.0); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void SaveTo(string pdfPath) { | ||||||
|  |             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||||
|  |             File.Copy(PdfPath, pdfPath, true); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Print(int copies = 1) { | ||||||
|  |             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||||
|  |             await Pdf.Print(PdfPath, copies); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Show() { | ||||||
|  |             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||||
|  |             Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.FullName}" : "")); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public MimePart AsEmailAttachment(string filename) { | ||||||
|  |             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||||
|  |             return new("application", "pdf") { | ||||||
|  |                 Content = new MimeContent(File.OpenRead(PdfPath)), | ||||||
|  |                 ContentDisposition = new ContentDisposition(ContentDisposition.Attachment), | ||||||
|  |                 ContentTransferEncoding = ContentEncoding.Base64, | ||||||
|  |                 FileName = filename | ||||||
|  |             }; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private class MergedDocument(IEnumerable<Document> docs) : Document("Mehrere Dokumente") { | ||||||
|  |             public IEnumerable<Document> Documents = docs; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private class PdfDocument : Document { | ||||||
|  |             public PdfDocument(string pdfPath) : | ||||||
|  |                 base(Path.GetFileNameWithoutExtension(pdfPath)) { | ||||||
|  |                 _pdfPath = pdfPath; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,34 +1,54 @@ | |||||||
| @using RazorLight | @using RazorLight | ||||||
| @inherits TemplatePage<Elwig.Documents.Document> | @inherits TemplatePage<Elwig.Documents.Document> | ||||||
| @model Elwig.Documents.Document | @model Elwig.Documents.Document | ||||||
|  |  | ||||||
| <!DOCTYPE html> | <!DOCTYPE html> | ||||||
| <html lang="de-AT"> | <html lang="de-AT"> | ||||||
| <head> | <head> | ||||||
|     <title>@Model.Title</title> |     <title>@Model.Title</title> | ||||||
|  |     <meta name="author" value="@Model.Author"/> | ||||||
|     <meta charset="UTF-8"/> |     <meta charset="UTF-8"/> | ||||||
|     <script> |     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/> | ||||||
|         window.PagedConfig = { auto: false }; |     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/> | ||||||
|         if (!navigator.webdriver) { |     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/> | ||||||
|             window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); }); |     @if (Model.DoublePaged) { | ||||||
|             window.addEventListener("afterprint", () => { location.reload(); }); |         <style> | ||||||
|  |             @@page :left { | ||||||
|  |                 margin: 25mm 25mm 35mm 20mm; | ||||||
|  |                 @@bottom-center { | ||||||
|  |                     content: element(page-footer-left); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         </style> | ||||||
|     } |     } | ||||||
|     </script> |  | ||||||
|     <script src="@Raw(Model.DataPath)\resources\paged.polyfill.js"></script> |  | ||||||
|     <link rel="stylesheet" href="@Raw(Model.DataPath)\resources\style.css" /> |  | ||||||
| </head> | </head> | ||||||
| <body> | <body> | ||||||
|  |     @if (Model.ShowFoldMarks) { | ||||||
|         <div class="m1"></div> |         <div class="m1"></div> | ||||||
|         <div class="m2"></div> |         <div class="m2"></div> | ||||||
|         <div class="m3"></div> |         <div class="m3"></div> | ||||||
|     <header>@Raw(Model.Header)</header> |         <div class="m1 r"></div> | ||||||
|  |         <div class="m2 r"></div> | ||||||
|  |         <div class="m3 r"></div> | ||||||
|  |     } | ||||||
|     <div class="footer-wrapper"> |     <div class="footer-wrapper"> | ||||||
|         <div class="pre-footer"> |         <div class="pre-footer"> | ||||||
|             <span class="date">@Model.FullDateString</span> |             <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span> | ||||||
|  |             <span class="doc-id">@Model.DocumentId</span> | ||||||
|             <span class="page"></span> |             <span class="page"></span> | ||||||
|         </div> |         </div> | ||||||
|         <footer>@Raw(Model.Footer)</footer> |         <footer>@Raw(Model.Footer)</footer> | ||||||
|     </div> |     </div> | ||||||
|  |     @if (Model.DoublePaged) { | ||||||
|  |         <div class="footer-wrapper left"> | ||||||
|  |             <div class="pre-footer"> | ||||||
|  |                 <span class="page"></span> | ||||||
|  |                 <span class="doc-id">@Model.DocumentId</span> | ||||||
|  |                 <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span> | ||||||
|  |             </div> | ||||||
|  |             <footer>@Raw(Model.Footer)</footer> | ||||||
|  |         </div> | ||||||
|  |     } | ||||||
|  |     <header>@Raw(Model.Header)</header> | ||||||
|     <div class="spacing"></div> |     <div class="spacing"></div> | ||||||
|     <div class="main-wrapper"> |     <div class="main-wrapper"> | ||||||
|         @RenderBody() |         @RenderBody() | ||||||
|   | |||||||
| @@ -1,79 +0,0 @@ | |||||||
| using System; |  | ||||||
| using System.Threading.Tasks; |  | ||||||
| using System.IO; |  | ||||||
| using Elwig.Helpers; |  | ||||||
|  |  | ||||||
| namespace Elwig.Documents { |  | ||||||
|     public abstract class Document : IDisposable { |  | ||||||
|  |  | ||||||
|         private TempFile? PdfFile = null; |  | ||||||
|  |  | ||||||
|         public Document(string title) { |  | ||||||
|             DataPath = App.DataPath; |  | ||||||
|             Title = title; |  | ||||||
|             Header = $"<h1>{App.Client.Name}</h1>"; |  | ||||||
|             Footer = App.Client.NameFull; |  | ||||||
|             Date = DateTime.Today; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         ~Document() { |  | ||||||
|             Dispose(); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public void Dispose() { |  | ||||||
|             PdfFile?.Dispose(); |  | ||||||
|             PdfFile = null; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public string DataPath { get; set; } |  | ||||||
|  |  | ||||||
|         public string Title { get; set; } |  | ||||||
|  |  | ||||||
|         public string Header { get; set; } |  | ||||||
|  |  | ||||||
|         public string Footer { get; set; } |  | ||||||
|  |  | ||||||
|         public string FullDateString { |  | ||||||
|             get => Date.ToString("dddd, d. MMMM yyyy"); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public DateTime Date { get; set; } |  | ||||||
|  |  | ||||||
|         private async Task<string> Render() { |  | ||||||
|             string name; |  | ||||||
|             if (this is BusinessLetter) { |  | ||||||
|                 name = "BusinessLetter"; |  | ||||||
|             } else if (this is DeliveryNote) { |  | ||||||
|                 name = "DeliveryNote"; |  | ||||||
|             } else { |  | ||||||
|                 throw new InvalidOperationException("Invalid document object"); |  | ||||||
|             } |  | ||||||
|             return await Html.CompileRenderAsync(name, this); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public async Task Generate() { |  | ||||||
|             var pdf = new TempFile("pdf"); |  | ||||||
|             using (var tmpHtml = new TempFile("html")) { |  | ||||||
|                 await File.WriteAllTextAsync(tmpHtml.FilePath, await Render()); |  | ||||||
|                 await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath); |  | ||||||
|             } |  | ||||||
|             Pdf.UpdateMetadata(pdf.FilePath, Title, "Winzergenossenschaft für Matzen und Umgebung reg. Gen.m.b.H."); |  | ||||||
|             PdfFile = pdf; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public void SaveTo(string pdfPath) { |  | ||||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); |  | ||||||
|             File.Copy(PdfFile.FilePath, pdfPath); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public async Task Print() { |  | ||||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); |  | ||||||
|             Pdf.Print(PdfFile.FilePath); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public void Show() { |  | ||||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); |  | ||||||
|             Pdf.Show(PdfFile.NewReference(), Title); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										113
									
								
								Elwig/Documents/Document.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										113
									
								
								Elwig/Documents/Document.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,113 @@ | |||||||
|  |  | ||||||
|  | :root { | ||||||
|  |     font-family: "Times New Roman", serif; | ||||||
|  |     line-height: 1; | ||||||
|  |     --border-thickness: 0.5pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | * { | ||||||
|  |     box-sizing: border-box; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | body { | ||||||
|  |     margin: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table { | ||||||
|  |     width: 100%; | ||||||
|  |     border-collapse: collapse; | ||||||
|  |     table-layout: fixed; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table td, | ||||||
|  | table th { | ||||||
|  |     padding: 0.5mm 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table th { | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header { | ||||||
|  |     height: 45mm; | ||||||
|  |     padding: 10mm 0 0 0; | ||||||
|  |     position: absolute; | ||||||
|  |     top: -25mm; | ||||||
|  |     left: 0; | ||||||
|  |     right: 0; | ||||||
|  |     text-align: center; | ||||||
|  |     overflow: hidden; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header .name { | ||||||
|  |     font-size: 18pt; | ||||||
|  |     margin-top: 8mm; | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header .suffix { | ||||||
|  |     font-size: 14pt; | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header .type { | ||||||
|  |     font-size: 12pt; | ||||||
|  |     font-weight: normal; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .footer-wrapper { | ||||||
|  |     position: running(page-footer); | ||||||
|  |     width: 165mm; | ||||||
|  |     /* for some reason the position without the following statement changes on the second page */ | ||||||
|  |     border: var(--border-thickness) solid #00000000; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .footer-wrapper.left { | ||||||
|  |     position: running(page-footer-left); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer { | ||||||
|  |     margin: 1em 0; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer > * { | ||||||
|  |     display: inline-block; | ||||||
|  |     width: 33%; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer > *:first-child { | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer > *:nth-child(2) { | ||||||
|  |     text-align: center; | ||||||
|  |     font-style: italic; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer > *:last-child { | ||||||
|  |     text-align: right; | ||||||
|  |     float: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pre-footer .page::after { | ||||||
|  |     content: "Seite 1 von 1"; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | footer { | ||||||
|  |     font-size: 10pt; | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  |     height: 25mm; | ||||||
|  |     padding-top: 1mm; | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .hidden { | ||||||
|  |     visibility: hidden; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | hr { | ||||||
|  |     border: none; | ||||||
|  |     border-top: var(--border-thickness) solid black; | ||||||
|  |     margin: 5mm 0; | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								Elwig/Documents/Letterhead.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								Elwig/Documents/Letterhead.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | using Elwig.Models.Entities; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class Letterhead : BusinessDocument { | ||||||
|  |         public Letterhead(Member m) : base($"Briefkopf {m.FullName}", m, true) { | ||||||
|  |             Aside = ""; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.Letterhead> | ||||||
|  | @model Elwig.Documents.Letterhead | ||||||
|  | @{ Layout = "BusinessDocument"; } | ||||||
|  | <style> | ||||||
|  |     header, .footer-wrapper { | ||||||
|  |         visibility: hidden; | ||||||
|  |     } | ||||||
|  | </style> | ||||||
							
								
								
									
										23
									
								
								Elwig/Documents/MemberDataSheet.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								Elwig/Documents/MemberDataSheet.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class MemberDataSheet : BusinessDocument { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Stammdatenblatt"; | ||||||
|  |  | ||||||
|  |         public Season Season; | ||||||
|  |         public Dictionary<string, MemberBucket> MemberBuckets; | ||||||
|  |         public IEnumerable<AreaCom> ActiveAreaCommitments; | ||||||
|  |  | ||||||
|  |         public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) { | ||||||
|  |             DocumentId = $"{Name} {m.MgNr}"; | ||||||
|  |             Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season"); | ||||||
|  |             MemberBuckets = ctx.GetMemberBuckets(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult(); | ||||||
|  |             ActiveAreaCommitments = m.ActiveAreaCommitments(ctx); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										222
									
								
								Elwig/Documents/MemberDataSheet.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										222
									
								
								Elwig/Documents/MemberDataSheet.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,222 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @using Elwig.Helpers | ||||||
|  | @inherits TemplatePage<Elwig.Documents.MemberDataSheet> | ||||||
|  | @model Elwig.Documents.MemberDataSheet | ||||||
|  | @{ Layout = "BusinessDocument"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" /> | ||||||
|  | <main> | ||||||
|  |     <h1>@Model.Title</h1> | ||||||
|  |     <table class="member border"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 30.0mm;"/> | ||||||
|  |             <col style="width: 51.5mm;"/> | ||||||
|  |             <col style="width: 20.0mm;"/> | ||||||
|  |             <col style="width: 12.0mm;"/> | ||||||
|  |             <col style="width: 18.0mm;"/> | ||||||
|  |             <col style="width: 31.5mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <tbody> | ||||||
|  |             <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr> | ||||||
|  |             <tr> | ||||||
|  |                 @if (Model.Member.IsJuridicalPerson) { | ||||||
|  |                     <th colspan="3" class="small">Name</th> | ||||||
|  |                     <th colspan="3" class="small">Zu Handen</th> | ||||||
|  |                 } else { | ||||||
|  |                     <th class="small">Titel (vorangestellt)</th> | ||||||
|  |                     <th class="small">Vorname</th> | ||||||
|  |                     <th colspan="3" class="small">Nachname</th> | ||||||
|  |                     <th class="small">Titel (nachgestellt)</th> | ||||||
|  |                 } | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 @if (Model.Member.IsJuridicalPerson) { | ||||||
|  |                     <td colspan="3" class="large">@Model.Member.Name</td> | ||||||
|  |                     <td colspan="3" class="large">@Model.Member.ForTheAttentionOf</td> | ||||||
|  |                 } else { | ||||||
|  |                     <td class="large">@Model.Member.Prefix</td> | ||||||
|  |                     <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td> | ||||||
|  |                     <td class="large" colspan="3">@Model.Member.Name</td> | ||||||
|  |                     <td class="large">@Model.Member.Suffix</td> | ||||||
|  |                 } | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Mitglieds-Nr.:</th> | ||||||
|  |                 <td>@Model.Member.MgNr</td> | ||||||
|  |                 <th colspan="2">@(Model.Member.IsJuridicalPerson ? "Gründungsjahr/-tag" : "Geburtsjahr/-tag"):</th> | ||||||
|  |                 <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Adresse:</th> | ||||||
|  |                 <td colspan="5">@Model.Member.Address</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>PLZ/Ort:</th> | ||||||
|  |                 <td colspan="5"> | ||||||
|  |                     @Model.Member.PostalDest.AtPlz?.Plz | ||||||
|  |                     @Model.Member.PostalDest.AtPlz?.Dest | ||||||
|  |                     (@Model.Member.PostalDest.AtPlz?.Ort.Name) | ||||||
|  |                 </td> | ||||||
|  |             </tr> | ||||||
|  |             <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Name:</th> | ||||||
|  |                 <td colspan="5">@Model.Member.BillingAddress?.FullName</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Adresse:</th> | ||||||
|  |                 <td colspan="5">@Model.Member.BillingAddress?.Address</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>PLZ/Ort:</th> | ||||||
|  |                 <td colspan="5"> | ||||||
|  |                     @if (Model.Member.BillingAddress != null) { | ||||||
|  |                         @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz | ||||||
|  |                         @(" ")@Model.Member.BillingAddress.PostalDest.AtPlz?.Dest | ||||||
|  |                         @(" (")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")") | ||||||
|  |                     } | ||||||
|  |                 </td> | ||||||
|  |             </tr> | ||||||
|  |             <tr class="sectionheading"> | ||||||
|  |                 <th colspan="3">Kontaktdaten</th> | ||||||
|  |                 <th colspan="3" class="lborder">Bankverbindung</th> | ||||||
|  |             </tr> | ||||||
|  |             @{ | ||||||
|  |                 List<string?[]> subTbl1 = new(); | ||||||
|  |                 subTbl1.AddRange(Model.Member.EmailAddresses.Select(a => new[] { "E-Mail-Adresse", a.Address })); | ||||||
|  |                 subTbl1.AddRange(Model.Member.TelephoneNumbers.Select(n => new[] { Utils.PhoneNrTypeToString(n.Type), n.Number, n.Comment })); | ||||||
|  |                 subTbl1.Add(new[] { "Tel.-Nr./E-Mail-Adr.", null }); | ||||||
|  |  | ||||||
|  |                 List<string?[]> subTbl2 = new(); | ||||||
|  |                 subTbl2.Add(new[] { "IBAN", Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : null }); | ||||||
|  |                 subTbl2.Add(new[] { "BIC", Model.Member.Bic }); | ||||||
|  |             } | ||||||
|  |             @for (int i = 0; i < Math.Max(subTbl1.Count, subTbl2.Count); i++) { | ||||||
|  |                 <tr> | ||||||
|  |                     <th>@(i < subTbl1.Count ? subTbl1[i][0] + ":" : "")</th> | ||||||
|  |                     @if (i < subTbl1.Count && subTbl1[i].Length >= 3 && subTbl1[i][2] != null) { | ||||||
|  |                         <td>@subTbl1[i][1]</td> | ||||||
|  |                         <td>(@subTbl1[i][2])</td> | ||||||
|  |                     } else { | ||||||
|  |                         <td colspan="2">@(i < subTbl1.Count ? subTbl1[i][1] : "")</td> | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     <th class="lborder">@(i < subTbl2.Count ? subTbl2[i][0] + ":" : "")</th> | ||||||
|  |                     <td colspan="2">@(i < subTbl2.Count ? subTbl2[i][1] : "")</td> | ||||||
|  |                 </tr> | ||||||
|  |             } | ||||||
|  |             <tr class="sectionheading"><th colspan="6">Betrieb</th></tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Betriebs-Nr.:</th> | ||||||
|  |                 <td>@Model.Member.LfbisNr</td> | ||||||
|  |                 <th colspan="2">UID:</th> | ||||||
|  |                 <td colspan="2">@Model.Member.UstIdNr</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Stammgemeinde:</th> | ||||||
|  |                 <td>@Model.Member.DefaultKg?.Name</td> | ||||||
|  |                 <th colspan="2">Buchführend:</th> | ||||||
|  |                 <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th> | ||||||
|  |                 <th colspan="2">Bio:</th> | ||||||
|  |                 <td colspan="2">@(Model.Member.IsOrganic ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr class="sectionheading"><th colspan="6">Genossenschaft</th></tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Status:</th> | ||||||
|  |                 <td> | ||||||
|  |                     @(Model.Member.IsActive ? "Aktiv" : "Nicht aktiv") | ||||||
|  |                     <span class="small"> | ||||||
|  |                         (@(Model.Member.ExitDate != null ? | ||||||
|  |                         $"{Model.Member.EntryDate:dd.MM.yyyy}–{Model.Member.ExitDate:dd.MM.yyyy}" : | ||||||
|  |                         $"seit {Model.Member.EntryDate:dd.MM.yyyy}")) | ||||||
|  |                     </span> | ||||||
|  |                 </td> | ||||||
|  |                 <th colspan="2">Geschäftsanteile:</th> | ||||||
|  |                 <td colspan="2">@Model.Member.BusinessShares</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Stamm-Zweigstelle:</th> | ||||||
|  |                 <td>@Model.Member.Branch?.Name</td> | ||||||
|  |                 <th colspan="2">Volllierferant:</th> | ||||||
|  |                 <td colspan="2">@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Zusendungen via...</th> | ||||||
|  |                 <td> | ||||||
|  |                     <i>Post:</i> @(Model.Member.ContactViaPost ? "Ja" : "Nein") – | ||||||
|  |                     <i>E-Mail:</i> @(Model.Member.ContactViaEmail ? "Ja" : "Nein") | ||||||
|  |                 </td> | ||||||
|  |                 <th colspan="2">Funktionär:</th> | ||||||
|  |                 <td colspan="2">@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |  | ||||||
|  |     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false)) | ||||||
|  |  | ||||||
|  |     @{ | ||||||
|  |         var areaComs = Model.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new { | ||||||
|  |             AreaComType = group.Key, | ||||||
|  |             AreaComs = group.OrderBy(c => c.Kg.AtKg.Name), | ||||||
|  |             Size = group.Sum(c => c.Area) | ||||||
|  |         }).OrderByDescending(a => a.Size).ToList(); | ||||||
|  |         var lastContract = ""; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @if (areaComs.Count != 0) { | ||||||
|  |         <br class="area-commitements"/> | ||||||
|  |         <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2> | ||||||
|  |         <table class="area-commitements"> | ||||||
|  |             <colgroup> | ||||||
|  |                 <col style="width: 40mm;"/> | ||||||
|  |                 <col style="width: 30mm;"/> | ||||||
|  |                 <col style="width: 35mm;"/> | ||||||
|  |                 <col style="width: 15mm;"/> | ||||||
|  |                 <col style="width: 25mm;"/> | ||||||
|  |                 <col style="width: 20mm;"/> | ||||||
|  |             </colgroup> | ||||||
|  |             <thead> | ||||||
|  |                 <tr> | ||||||
|  |                     <th rowspan="2" style="text-align: left;">Katastralgemeinde</th> | ||||||
|  |                     <th rowspan="2" style="text-align: left;">Ried</th> | ||||||
|  |                     <th rowspan="2" style="text-align: left;">Parzelle(n)</th> | ||||||
|  |                     <th>Fläche</th> | ||||||
|  |                     <th rowspan="2" style="text-align: center;">Bewirt.</th> | ||||||
|  |                     <th rowspan="2" style="text-align: center;">Laufzeit</th> | ||||||
|  |                 </tr> | ||||||
|  |                 <tr> | ||||||
|  |                     <th>[m²]</th> | ||||||
|  |                 </tr> | ||||||
|  |             </thead> | ||||||
|  |             <tbody> | ||||||
|  |                 @foreach (var contractType in areaComs) { | ||||||
|  |                     <tr class="subheading @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")"> | ||||||
|  |                         <th colspan="3"> | ||||||
|  |                             @($"{contractType.AreaComType.WineVar.Name} {(contractType.AreaComType.WineAttr != null ? "(" + contractType.AreaComType.WineAttr + ")" : "")}") | ||||||
|  |                         </th> | ||||||
|  |                         <td class="number">@($"{contractType.Size:N0}")</td> | ||||||
|  |                         <td colspan="2"></td> | ||||||
|  |                     </tr> | ||||||
|  |                     @foreach (var areaCom in contractType.AreaComs) { | ||||||
|  |                         <tr class="area-commitment"> | ||||||
|  |                             <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@($"{areaCom.Kg.AtKg.KgNr:00000}"))</span></td> | ||||||
|  |                             <td>@areaCom.Rd?.Name</td> | ||||||
|  |                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td> | ||||||
|  |                             <td class="number">@($"{areaCom.Area:N0}")</td> | ||||||
|  |                             <td class="center">@areaCom.WineCult?.Name</td> | ||||||
|  |                             <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td> | ||||||
|  |                         </tr> | ||||||
|  |                         lastContract = contractType.AreaComType.DisplayName; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 <tr class="sum bold"> | ||||||
|  |                     <td colspan="3">Gesamt:</td> | ||||||
|  |                     <td class="number">@($"{Model.ActiveAreaCommitments.Sum(a => a.Area):N0}")</td> | ||||||
|  |                     <td colspan="2"></td> | ||||||
|  |                 </tr> | ||||||
|  |             </tbody> | ||||||
|  |         </table> | ||||||
|  |     } | ||||||
|  | </main> | ||||||
							
								
								
									
										30
									
								
								Elwig/Documents/MemberDataSheet.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								Elwig/Documents/MemberDataSheet.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     margin-bottom: 0.5em !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.member { | ||||||
|  |     margin-bottom: 5mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.area-commitements { | ||||||
|  |     margin-top: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.area-commitements td { | ||||||
|  |     vertical-align: top; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.area-commitements td.text { | ||||||
|  |     white-space: normal; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.area-commitements tr.sum { | ||||||
|  |     font-size: 12pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @page :not(:first) { | ||||||
|  |     br.area-commitements { | ||||||
|  |         display: none; | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										30
									
								
								Elwig/Documents/MemberList.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								Elwig/Documents/MemberList.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class MemberList : Document { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Mitgliederliste"; | ||||||
|  |  | ||||||
|  |         public string Filter; | ||||||
|  |         public IEnumerable<MemberListRow> Members; | ||||||
|  |  | ||||||
|  |         public string[] AreaComFilters; | ||||||
|  |         public bool FilterAreaComs => AreaComFilters.Length > 0; | ||||||
|  |  | ||||||
|  |         public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) { | ||||||
|  |             Filter = filter; | ||||||
|  |             Members = members; | ||||||
|  |             AreaComFilters = [..members | ||||||
|  |                 .SelectMany(m => m.AreaCommitmentsFiltered) | ||||||
|  |                 .Select(c => c.VtrgId) | ||||||
|  |                 .Distinct() | ||||||
|  |                 .Order()]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public MemberList(string filter, MemberListData data) : | ||||||
|  |             this(filter, data.Rows) { | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										109
									
								
								Elwig/Documents/MemberList.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										109
									
								
								Elwig/Documents/MemberList.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,109 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @inherits TemplatePage<Elwig.Documents.MemberList> | ||||||
|  | @model Elwig.Documents.MemberList | ||||||
|  | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/> | ||||||
|  | <main> | ||||||
|  |     <h1>Mitgliederliste</h1> | ||||||
|  |     <h2>@Model.Filter</h2> | ||||||
|  |     <table class="members"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width:  8mm;"/> | ||||||
|  |             @if (Model.AreaComFilters.Length > 1) { | ||||||
|  |                 <col style="width: 38mm;"/> | ||||||
|  |             } else { | ||||||
|  |                 <col style="width: 42mm;"/> | ||||||
|  |             } | ||||||
|  |             @if (Model.AreaComFilters.Length > 1) { | ||||||
|  |                 <col style="width: 36mm;"/> | ||||||
|  |             } else { | ||||||
|  |                 <col style="width: 40mm;"/> | ||||||
|  |             } | ||||||
|  |             <col style="width:  8mm;"/> | ||||||
|  |             @if (Model.AreaComFilters.Length > 1) { | ||||||
|  |                 <col style="width: 18mm;"/> | ||||||
|  |             } else { | ||||||
|  |                 <col style="width: 20mm;"/> | ||||||
|  |             } | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             <col style="width:  5mm;"/> | ||||||
|  |             @if (Model.AreaComFilters.Length > 1) { | ||||||
|  |                 <col style="width: 16mm;"/> | ||||||
|  |             } else { | ||||||
|  |                 <col style="width: 18mm;"/> | ||||||
|  |             } | ||||||
|  |             <col style="width: 12mm;"/> | ||||||
|  |             @if (Model.AreaComFilters.Length > 1) { | ||||||
|  |                 <col style="width: 12mm;"/> | ||||||
|  |             } | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 @{ | ||||||
|  |                     var headerSpan = Model.FilterAreaComs ? 3 : 2; | ||||||
|  |                 } | ||||||
|  |                 <th rowspan="@headerSpan">Nr.</th> | ||||||
|  |                 <th rowspan="@headerSpan" style="text-align: left;">Name</th> | ||||||
|  |                 <th rowspan="@headerSpan" style="text-align: left;">Adresse</th> | ||||||
|  |                 <th rowspan="@headerSpan">PLZ</th> | ||||||
|  |                 <th rowspan="@headerSpan" style="text-align: left;">Ort</th> | ||||||
|  |                 <th rowspan="@headerSpan">Betr.-Nr.</th> | ||||||
|  |                 <th rowspan="@headerSpan">GA</th> | ||||||
|  |                 <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th> | ||||||
|  |                 <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th> | ||||||
|  |             </tr> | ||||||
|  |             @if (Model.FilterAreaComs) { | ||||||
|  |                 <tr> | ||||||
|  |                     @foreach (var vtrgId in Model.AreaComFilters) { | ||||||
|  |                         <th>@vtrgId</th> | ||||||
|  |                     } | ||||||
|  |                 </tr> | ||||||
|  |             } | ||||||
|  |             <tr> | ||||||
|  |                 @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) { | ||||||
|  |                     <th class="unit">[m²]</th> | ||||||
|  |                 } | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody class="small"> | ||||||
|  |             @{ | ||||||
|  |                 string? lastBranch = Model.Members.Select(m => m.Branch).Distinct().Count() == 1 ? null : ""; | ||||||
|  |             } | ||||||
|  |             @foreach (var m in Model.Members) { | ||||||
|  |                 if (lastBranch != null && m.Branch != lastBranch) { | ||||||
|  |                     <tr class="spacing"><td colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr> | ||||||
|  |                     <tr class="header"> | ||||||
|  |                         <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th> | ||||||
|  |                     </tr> | ||||||
|  |                     lastBranch = m.Branch; | ||||||
|  |                 } | ||||||
|  |                 <tr> | ||||||
|  |                     <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td> | ||||||
|  |                     <td>@m.AdminName1 @m.Name2</td> | ||||||
|  |                     <td>@m.Address</td> | ||||||
|  |                     <td>@m.Plz</td> | ||||||
|  |                     <td class="tiny">@m.Locality</td> | ||||||
|  |                     <td>@m.LfbisNr</td> | ||||||
|  |                     <td class="number">@m.BusinessShares</td> | ||||||
|  |                     <td class="tiny">@m.DefaultKg</td> | ||||||
|  |                     @if (Model.AreaComFilters.Length > 0) { | ||||||
|  |                         foreach (var v in Model.AreaComFilters) { | ||||||
|  |                             <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td> | ||||||
|  |                         } | ||||||
|  |                     } else { | ||||||
|  |                         <td class="number">@($"{m.AreaCommitment:N0}")</td> | ||||||
|  |                     } | ||||||
|  |                 </tr> | ||||||
|  |                 if (m.BillingName != null) { | ||||||
|  |                     <tr> | ||||||
|  |                         <td>@m.BillingName</td> | ||||||
|  |                         <td>@m.BillingAddress</td> | ||||||
|  |                         <td>@m.BillingPlz</td> | ||||||
|  |                         <td class="tiny">@m.BillingLocality</td> | ||||||
|  |                         <td colspan="4"></td> | ||||||
|  |                     </tr> | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  | </main> | ||||||
							
								
								
									
										13
									
								
								Elwig/Documents/MemberList.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								Elwig/Documents/MemberList.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | |||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 24pt; | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     margin-bottom: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin-top: 2mm; | ||||||
|  | } | ||||||
							
								
								
									
										36
									
								
								Elwig/Documents/PaymentVariantSummary.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								Elwig/Documents/PaymentVariantSummary.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | using Elwig.Helpers; | ||||||
|  | using Elwig.Helpers.Billing; | ||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class PaymentVariantSummary : Document { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Auszahlungsvariante"; | ||||||
|  |  | ||||||
|  |         public PaymentVariantSummaryData Data; | ||||||
|  |         public PaymentVar Variant; | ||||||
|  |         public BillingData BillingData; | ||||||
|  |         public string CurrencySymbol; | ||||||
|  |         public int MemberNum; | ||||||
|  |         public int DeliveryNum; | ||||||
|  |         public int DeliveryPartNum; | ||||||
|  |         public List<ModifierStat> ModifierStat; | ||||||
|  |         public Dictionary<string, Modifier> Modifiers; | ||||||
|  |  | ||||||
|  |         public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) : | ||||||
|  |             base($"{Name} {v.Year} - {v.Name}") { | ||||||
|  |             Variant = v; | ||||||
|  |             BillingData = BillingData.FromJson(v.Data); | ||||||
|  |             Data = data; | ||||||
|  |             CurrencySymbol = v.Season.Currency.Symbol ?? v.Season.Currency.Code; | ||||||
|  |             MemberNum = v.Credits.Count; | ||||||
|  |             DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count(); | ||||||
|  |             DeliveryPartNum = v.DeliveryPartPayments.Count; | ||||||
|  |             ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult(); | ||||||
|  |             Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										279
									
								
								Elwig/Documents/PaymentVariantSummary.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										279
									
								
								Elwig/Documents/PaymentVariantSummary.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,279 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @using Elwig.Helpers | ||||||
|  | @inherits TemplatePage<Elwig.Documents.PaymentVariantSummary> | ||||||
|  | @model Elwig.Documents.PaymentVariantSummary | ||||||
|  | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" /> | ||||||
|  | <main> | ||||||
|  |     <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1> | ||||||
|  |     <h2>@Model.Variant.Name</h2> | ||||||
|  |     <table class="payment-variant border"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 20.0mm;"/> | ||||||
|  |             <col style="width: 30.0mm;"/> | ||||||
|  |             <col style="width:  4.5mm;"/> | ||||||
|  |             <col style="width: 28.0mm;"/> | ||||||
|  |             <col style="width: 47.5mm;"/> | ||||||
|  |             <col style="width: 15.0mm;"/> | ||||||
|  |             <col style="width: 20.0mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         @{ | ||||||
|  |             //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount); | ||||||
|  |             //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount); | ||||||
|  |             var deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount); | ||||||
|  |             var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount); | ||||||
|  |             var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount); | ||||||
|  |             var sum1 = sum2 - deliveryModifiers - memberModifiers; | ||||||
|  |             var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m); | ||||||
|  |             var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m); | ||||||
|  |             var vat = Model.Variant.Credits.Sum(p => p.VatAmount); | ||||||
|  |             var grossSum = Model.Variant.Credits.Sum(p => p.GrossAmount); | ||||||
|  |             var totalMods = Model.Variant.Credits.Sum(p => p.Modifiers ?? 0m); | ||||||
|  |             var considered = -Model.Variant.Credits.Sum(p => p.PrevModifiers ?? 0m); | ||||||
|  |             var totalSum = Model.Variant.Credits.Sum(p => p.Amount); | ||||||
|  |         } | ||||||
|  |         <tbody> | ||||||
|  |             <tr class="sectionheading"> | ||||||
|  |                 <th colspan="4">Allgemein</th> | ||||||
|  |                 <th colspan="3" class="lborder">Berücksichtigt</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Name:</th> | ||||||
|  |                 <td colspan="3">@Model.Variant.Name</td> | ||||||
|  |                 <th colspan="2" class="lborder">Zu-/Abschläge bei Lieferungen:</th> | ||||||
|  |                 <td class="center">@(Model.BillingData.ConsiderDelieryModifiers ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Beschr.:</th> | ||||||
|  |                 <td colspan="3">@Model.Variant.Comment</td> | ||||||
|  |                 <th colspan="2" class="lborder">Pönalen bei Unterlieferungen (FB):</th> | ||||||
|  |                 <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th style="overflow: visible;">Rebel-Zuschl.:</th> | ||||||
|  |                 <td colspan="3" class="center"> | ||||||
|  |                     @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % / | ||||||
|  |                     @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") % | ||||||
|  |                 </td> | ||||||
|  |                 <th colspan="2" class="lborder">Strafen bei Unterlieferungen (GA):</th> | ||||||
|  |                 <td class="center">@(Model.BillingData.ConsiderTotalPenalty ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th style="overflow: visible;">Datum/Überw.:</th> | ||||||
|  |                 <td colspan="3" class="center"> | ||||||
|  |                     @($"{Model.Variant.Date:dd.MM.yyyy}") / | ||||||
|  |                     @($"{Model.Variant.TransferDate:dd.MM.yyyy}") | ||||||
|  |                 </td> | ||||||
|  |                 <th colspan="2" class="lborder">Automatische Nachzeichnung der GA:</th> | ||||||
|  |                 <td class="center">@(Model.BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>Berechnung:</th> | ||||||
|  |                 <td colspan="3" class="center">@($"{Model.Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}")</td> | ||||||
|  |                 <th colspan="2" class="lborder">Benutzerdef. Zu-/Abschläge pro Mitglied:</th> | ||||||
|  |                 <td class="center">@(Model.BillingData.ConsiderCustomModifiers ? "Ja" : "Nein")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr class="sectionheading"> | ||||||
|  |                 <th colspan="4">Beträge</th> | ||||||
|  |                 <th colspan="3" class="lborder">Statistik</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Zwischensumme:</th> | ||||||
|  |                 <td></td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum1:N2}")</td> | ||||||
|  |                 <th class="lborder">Lieferanten:</th> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Zu-/Abschläge (Mitglieder):</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(memberModifiers)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td> | ||||||
|  |                 <th class="lborder">Lieferungen:</th> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Zu-/Abschläge (Lieferungen):</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(deliveryModifiers)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td> | ||||||
|  |                 <th class="lborder">Teillieferungen:</th> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Gesamtsumme:</th> | ||||||
|  |                 <td class="number tborder"></td> | ||||||
|  |                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td> | ||||||
|  |                 <th class="lborder"></th> | ||||||
|  |                 <td colspan="2"></td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Bisher ausgezahlt:</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(payed)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td> | ||||||
|  |                 @{ | ||||||
|  |                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein"); | ||||||
|  |                     var minWei = weiRows.Min(r => r.Ungeb.Price); | ||||||
|  |                     var maxWei = weiRows.Max(r => r.Ungeb.Price); | ||||||
|  |                 } | ||||||
|  |                 <th class="lborder tborder">Preis (abgewertet):</th> | ||||||
|  |                 <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Nettosumme:</th> | ||||||
|  |                 <td class="number tborder"></td> | ||||||
|  |                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td> | ||||||
|  |                 @{ | ||||||
|  |                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein"); | ||||||
|  |                     var minPrice = quwRows.Min(r => r.Ungeb.Price); | ||||||
|  |                     var maxPrice = quwRows.Max(r => r.Ungeb.Price); | ||||||
|  |                 } | ||||||
|  |                 <th class="lborder">Preis (ungeb., nicht abgew.):</th> | ||||||
|  |                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Mehrwertsteuer:</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(vat)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td> | ||||||
|  |                 @{ | ||||||
|  |                     var gebRows = Model.Data.Rows | ||||||
|  |                     .Where(r => r.Geb.Price != null && r.Ungeb.Price != null) | ||||||
|  |                     .Select(r => r.Geb.Price - r.Ungeb.Price); | ||||||
|  |                     var minGeb = gebRows.Min(); | ||||||
|  |                     var maxGeb = gebRows.Max(); | ||||||
|  |                 } | ||||||
|  |                 <th class="lborder">Gebunden-Zuschlag:</th> | ||||||
|  |                 <td colspan="2" class="center"> | ||||||
|  |                     @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg") | ||||||
|  |                 </td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Bruttosumme:</th> | ||||||
|  |                 <td class="number tborder"></td> | ||||||
|  |                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td> | ||||||
|  |                 <th class="lborder"></th> | ||||||
|  |                 <td colspan="2"></td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(totalMods)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(totalMods):N2}")</td> | ||||||
|  |                 <th class="lborder tborder">Menge (ungebunden):</th> | ||||||
|  |                 <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight):N0}") kg</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Bereits berücksichtigte Abzüge:</th> | ||||||
|  |                 <td class="number">@Utils.GetSign(considered)</td> | ||||||
|  |                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(considered):N2}")</td> | ||||||
|  |                 <th class="lborder">Menge (gebunden):</th> | ||||||
|  |                 <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(r => r.Geb.Weight):N0}") kg</td> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th colspan="2">Auszahlungsbetrag:</th> | ||||||
|  |                 <td class="number tborder"></td> | ||||||
|  |                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{totalSum:N2}")</td> | ||||||
|  |                 <th class="lborder">Gesamtmenge:</th> | ||||||
|  |                 <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight + r.Geb.Weight):N0}") kg</td> | ||||||
|  |             </tr> | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |     <table class="payment-variant border"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 35mm;"/> | ||||||
|  |             <col style="width: 30mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr class="sectionheading"> | ||||||
|  |                 <th colspan="6">Statistik Zu-/Abschläge</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2">Name</th> | ||||||
|  |                 <th rowspan="2">Zu-/Abschlag</th> | ||||||
|  |                 <th>Lieferungen</th> | ||||||
|  |                 <th>Minimum</th> | ||||||
|  |                 <th>Maximum</th> | ||||||
|  |                 <th>Betrag</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>[#]</th> | ||||||
|  |                 <th>[@Model.CurrencySymbol]</th> | ||||||
|  |                 <th>[@Model.CurrencySymbol]</th> | ||||||
|  |                 <th>[@Model.CurrencySymbol]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody> | ||||||
|  |             @foreach (var m in Model.ModifierStat) { | ||||||
|  |                 var mod = Model.Modifiers[m.ModId]; | ||||||
|  |                 <tr> | ||||||
|  |                     <th>@mod.Name</th> | ||||||
|  |                     <td class="number">@mod.ValueStr</td> | ||||||
|  |                     <td class="number">@($"{m.Count:N0}")</td> | ||||||
|  |                     <td class="number">@($"{m.Min:N2}")</td> | ||||||
|  |                     <td class="number">@($"{m.Max:N2}")</td> | ||||||
|  |                     <td class="number">@($"{m.Sum:N2}")</td> | ||||||
|  |                 </tr> | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  |     <table class="payment-variant-data"> | ||||||
|  |         <colgroup> | ||||||
|  |             <col style="width: 30mm;"/> | ||||||
|  |             <col style="width: 20mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 20mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |             <col style="width: 20mm;"/> | ||||||
|  |             <col style="width: 25mm;"/> | ||||||
|  |         </colgroup> | ||||||
|  |         <thead> | ||||||
|  |             <tr> | ||||||
|  |                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th> | ||||||
|  |                 <th>Gradation</th> | ||||||
|  |                 <th colspan="2">ungebunden</th> | ||||||
|  |                 <th colspan="2">gebunden</th> | ||||||
|  |                 <th>Gesamt</th> | ||||||
|  |             </tr> | ||||||
|  |             <tr> | ||||||
|  |                 <th>[@(true ? "°Oe" : "°KMW")]</th> | ||||||
|  |                 <th>[kg]</th> | ||||||
|  |                 <th>[@(Model.CurrencySymbol)/kg]</th> | ||||||
|  |                 <th>[kg]</th> | ||||||
|  |                 <th>[@(Model.CurrencySymbol)/kg]</th> | ||||||
|  |                 <th>[@(Model.CurrencySymbol)]</th> | ||||||
|  |             </tr> | ||||||
|  |         </thead> | ||||||
|  |         <tbody> | ||||||
|  |             @{ | ||||||
|  |                 string? lastHdr = null; | ||||||
|  |             } | ||||||
|  |             @foreach (var row in Model.Data.Rows) { | ||||||
|  |                 var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}"; | ||||||
|  |                 if (lastHdr != hdr) { | ||||||
|  |                     var rows = Model.Data.Rows | ||||||
|  |                         .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation) | ||||||
|  |                         .ToList(); | ||||||
|  |                     <tr class="subheading @(lastHdr != null ? "new" : "")"> | ||||||
|  |                         <th colspan="2">@hdr</th> | ||||||
|  |                         <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td> | ||||||
|  |                         <td></td> | ||||||
|  |                         <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td> | ||||||
|  |                         <td></td> | ||||||
|  |                         <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td> | ||||||
|  |                     </tr> | ||||||
|  |                 } | ||||||
|  |                 <tr> | ||||||
|  |                     <td>@(row.QualityLevel)</td> | ||||||
|  |                     <td class="center">@($"{row.Oe:N0}")</td> | ||||||
|  |                     <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td> | ||||||
|  |                     <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td> | ||||||
|  |                     <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td> | ||||||
|  |                     <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td> | ||||||
|  |                     <td class="number">@($"{row.Amount:N2}")</td> | ||||||
|  |                 </tr> | ||||||
|  |                 lastHdr = hdr; | ||||||
|  |             } | ||||||
|  |         </tbody> | ||||||
|  |     </table> | ||||||
|  | </main> | ||||||
							
								
								
									
										21
									
								
								Elwig/Documents/PaymentVariantSummary.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								Elwig/Documents/PaymentVariantSummary.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 24pt; | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     margin-bottom: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin-top: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.payment-variant { | ||||||
|  |     margin-top: 10mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.payment-variant-data { | ||||||
|  |     break-before: page; | ||||||
|  | } | ||||||
| @@ -1,80 +0,0 @@ | |||||||
| using System; |  | ||||||
| using System.Threading.Tasks; |  | ||||||
| using System.Windows; |  | ||||||
| using PdfSharp.Pdf.IO; |  | ||||||
| using PuppeteerSharp; |  | ||||||
| using Elwig.Helpers; |  | ||||||
| using Elwig.Windows; |  | ||||||
|  |  | ||||||
| namespace Elwig.Documents { |  | ||||||
|     public static class Pdf { |  | ||||||
|  |  | ||||||
|         private static readonly string Chromium = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"; |  | ||||||
|         private static IBrowser? Browser = null; |  | ||||||
|         public static bool IsReady => Browser != null; |  | ||||||
|  |  | ||||||
|         public static async Task Init(Action evtHandler) { |  | ||||||
|             Browser = await Puppeteer.LaunchAsync(new LaunchOptions { |  | ||||||
|                 Headless = true, |  | ||||||
|                 ExecutablePath = Chromium, |  | ||||||
|                 // paged.js uses XHRs to load styles, so this is needed |  | ||||||
|                 Args = new[] { "--allow-file-access-from-files" }, |  | ||||||
|             }); |  | ||||||
|             evtHandler(); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static async Task Close() { |  | ||||||
|             if (Browser == null) return; |  | ||||||
|             await Browser.CloseAsync(); |  | ||||||
|             Browser = null; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static async Task Convert(string htmlPath, string pdfPath) { |  | ||||||
|             if (Browser == null) throw new InvalidOperationException("The puppeteer engine has not been initialized yet"); |  | ||||||
|             using var page = await Browser.NewPageAsync(); |  | ||||||
|             page.Console += OnConsole; |  | ||||||
|             await page.GoToAsync($"file://{htmlPath}"); |  | ||||||
|             await page.EvaluateFunctionAsync("async () => { await window.PagedPolyfill.preview(); }"); |  | ||||||
|             await page.PdfAsync(pdfPath, new() { |  | ||||||
|                 PreferCSSPageSize = true, |  | ||||||
|                 //Format = PaperFormat.A4, |  | ||||||
|                 DisplayHeaderFooter = false, |  | ||||||
|                 MarginOptions = new() { |  | ||||||
|                     Top = "0mm", |  | ||||||
|                     Right = "0mm", |  | ||||||
|                     Bottom = "0mm", |  | ||||||
|                     Left = "0mm", |  | ||||||
|                 }, |  | ||||||
|             }); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         private static void OnConsole(object sender, ConsoleEventArgs e) { |  | ||||||
|             MessageBox.Show(e.Message.Text); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static void UpdateMetadata(string path, string title, string author) { |  | ||||||
|             using var doc = PdfReader.Open(path); |  | ||||||
|             doc.Info.Title = title; |  | ||||||
|             doc.Info.Author = author; |  | ||||||
|             doc.Save(path); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static void Show(TempFile file, string title) { |  | ||||||
|             App.MainDispatcher.BeginInvoke(() => { |  | ||||||
|                 var w = new DocumentViewerWindow(title, file); |  | ||||||
|                 w.Show(); |  | ||||||
|             }); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static void Show(string path, string title) { |  | ||||||
|             App.MainDispatcher.BeginInvoke(() => { |  | ||||||
|                 var w = new DocumentViewerWindow(title, path); |  | ||||||
|                 w.Show(); |  | ||||||
|             }); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public static void Print(string path) { |  | ||||||
|             // TODO print pdf |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										27
									
								
								Elwig/Documents/WineQualityStatistics.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								Elwig/Documents/WineQualityStatistics.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Documents { | ||||||
|  |     public class WineQualityStatistics : Document { | ||||||
|  |  | ||||||
|  |         public new static string Name => "Qualitätsstatistik"; | ||||||
|  |  | ||||||
|  |         public readonly string[][] QualIds = [["WEI"], ["RSW", "LDW"], ["QUW"], ["KAB"]]; | ||||||
|  |         public readonly Dictionary<string, string> QualityLevels = new() { | ||||||
|  |             ["WEI"] = "Wein", | ||||||
|  |             ["RSW"] = "Rebsortenwein", | ||||||
|  |             ["LDW"] = "Landwein", | ||||||
|  |             ["QUW"] = "Qualitätswein", | ||||||
|  |             ["KAB"] = "Kabinett", | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         public string Filter; | ||||||
|  |         public WineQualityStatisticsData Data; | ||||||
|  |         public bool UseOe => Data.UseOe; | ||||||
|  |  | ||||||
|  |         public WineQualityStatistics(string filter, WineQualityStatisticsData data) : base($"{Name} {filter}") { | ||||||
|  |             Filter = filter; | ||||||
|  |             Data = data; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										81
									
								
								Elwig/Documents/WineQualityStatistics.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										81
									
								
								Elwig/Documents/WineQualityStatistics.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,81 @@ | |||||||
|  | @using RazorLight | ||||||
|  | @using Elwig.Helpers | ||||||
|  | @inherits TemplatePage<Elwig.Documents.WineQualityStatistics> | ||||||
|  | @model Elwig.Documents.WineQualityStatistics | ||||||
|  | @{ Layout = "Document"; } | ||||||
|  | <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/> | ||||||
|  | <main> | ||||||
|  |     <h1>Qualitätsstatistik</h1> | ||||||
|  |     <h2>@Model.Filter</h2> | ||||||
|  |     @foreach (var sec in Model.Data.Sections) { | ||||||
|  |         <table> | ||||||
|  |             <colgroup> | ||||||
|  |                 <col style="width: 25%;"/> | ||||||
|  |                 <col style="width: 25%;"/> | ||||||
|  |                 <col style="width: 25%;"/> | ||||||
|  |                 <col style="width: 25%;"/> | ||||||
|  |             </colgroup> | ||||||
|  |             <thead> | ||||||
|  |                 <tr> | ||||||
|  |                     <th colspan="4" class="header @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")"> | ||||||
|  |                         <h3>@sec.Name</h3> | ||||||
|  |                     </th> | ||||||
|  |                 </tr> | ||||||
|  |             </thead> | ||||||
|  |             <tbody> | ||||||
|  |                 <tr> | ||||||
|  |                     @foreach (var qualIds in Model.QualIds) { | ||||||
|  |                         <td class="container"> | ||||||
|  |                             <div class="row"> | ||||||
|  |                                 <span class="units">[@(Model.UseOe ? "°Oe" : "°KMW")]</span> | ||||||
|  |                                 <span class="units">[#]</span> | ||||||
|  |                                 <span class="units">[kg]</span> | ||||||
|  |                             </div> | ||||||
|  |                             @foreach (var qualId in qualIds) { | ||||||
|  |                                 <h4>@(Model.QualityLevels.GetValueOrDefault(qualId, qualId))</h4> | ||||||
|  |                                 @foreach (var (grad, avgKmw, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(double, double, int, int)>())) { | ||||||
|  |                                     <div class="row"> | ||||||
|  |                                         <span class="gradation">@(Model.UseOe ? $"{grad:N0}" : $"{grad:N1}")</span> | ||||||
|  |                                         <span class="number">@($"{num:N0}")</span> | ||||||
|  |                                         <span class="number">@($"{weight:N0}")</span> | ||||||
|  |                                     </div> | ||||||
|  |                                 } | ||||||
|  |                             } | ||||||
|  |                         </td> | ||||||
|  |                     } | ||||||
|  |                 </tr> | ||||||
|  |                 <tr> | ||||||
|  |                     @foreach (var qualIds in Model.QualIds) { | ||||||
|  |                         var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(double Grad, double AvgKmw, int Num, int Weight)>())); | ||||||
|  |                         var weight = quals.Sum(q => q.Sum(kv => kv.Weight)); | ||||||
|  |                         var num = quals.Sum(q => q.Sum(kv => kv.Num)); | ||||||
|  |                         var kmw = quals.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / weight; | ||||||
|  |                         <td class="container bold"> | ||||||
|  |                             <div class="row"> | ||||||
|  |                                 <span class="gradation">@(weight == 0 ? "-" : Model.UseOe ? $"{Utils.KmwToOe(kmw):N0}" : $"{kmw:N1}")</span> | ||||||
|  |                                 <span class="number">@($"{num:N0}")</span> | ||||||
|  |                                 <span class="number">@($"{weight:N0}")</span> | ||||||
|  |                             </div> | ||||||
|  |                         </td> | ||||||
|  |                     } | ||||||
|  |                 </tr> | ||||||
|  |             </tbody> | ||||||
|  |             <tfoot> | ||||||
|  |                 <tr> | ||||||
|  |                     @{ | ||||||
|  |                         var totalWeight = sec.Data.Values.Sum(q => q.Sum(kv => kv.Weight)); | ||||||
|  |                         var totalNum = sec.Data.Values.Sum(q => q.Sum(kv => kv.Num)); | ||||||
|  |                         var totalKmw = sec.Data.Values.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / totalWeight; | ||||||
|  |                     } | ||||||
|  |                     <td colspan="4" class="container bold footer @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")"> | ||||||
|  |                         <div class="row" style="width: 24%; margin-left: 76%;"> | ||||||
|  |                             <span class="gradation">@(totalWeight == 0 ? "-" : Model.UseOe ? $"{Utils.KmwToOe(totalKmw):N0}" : $"{totalKmw:N1}")</span> | ||||||
|  |                             <span class="number">@($"{totalNum:N0}")</span> | ||||||
|  |                             <span class="number">@($"{totalWeight:N0}")</span> | ||||||
|  |                         </div> | ||||||
|  |                     </td> | ||||||
|  |                 </tr> | ||||||
|  |             </tfoot> | ||||||
|  |         </table> | ||||||
|  |     } | ||||||
|  | </main> | ||||||
							
								
								
									
										97
									
								
								Elwig/Documents/WineQualityStatistics.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								Elwig/Documents/WineQualityStatistics.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,97 @@ | |||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 24pt; | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     margin-bottom: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin-top: 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h3 { | ||||||
|  |     font-weight: bold; | ||||||
|  |     font-style: normal; | ||||||
|  |     font-size: 14pt; | ||||||
|  |     margin: 0; | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h4 { | ||||||
|  |     font-weight: bold; | ||||||
|  |     font-style: italic; | ||||||
|  |     font-size: 10pt; | ||||||
|  |     margin: 0; | ||||||
|  |     text-align: center; | ||||||
|  |     margin: 2mm 0 2mm 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .row:first-child { margin-top: 0.5mm; } | ||||||
|  | .row:last-child { margin-bottom: 0.5mm; } | ||||||
|  |  | ||||||
|  | .bold { | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table { | ||||||
|  |     margin-top: 10mm; | ||||||
|  |     break-inside: avoid; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table th, | ||||||
|  | table td { | ||||||
|  |     border: var(--border-thickness) solid black; | ||||||
|  |     vertical-align: top !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table .header { | ||||||
|  |     padding: 1mm 2mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table .header, | ||||||
|  | table .footer { | ||||||
|  |     background-color: #E0E0E0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table .header.red, | ||||||
|  | table .footer.red { | ||||||
|  |     background-color: #FFC0C0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table .header.green, | ||||||
|  | table .footer.green { | ||||||
|  |     background-color: #C0FFC0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .row { | ||||||
|  |     display: flex; | ||||||
|  |     width: 100%; | ||||||
|  |     font-size: 10pt; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .row span { | ||||||
|  |     flex: 10mm 1 1; | ||||||
|  |     display: block; | ||||||
|  |     padding: 0 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .row .units { | ||||||
|  |     text-align: center; | ||||||
|  |     font-size: 8pt; | ||||||
|  |     font-style: italic; | ||||||
|  |     padding: 1mm; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .gradation { | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .number { | ||||||
|  |     text-align: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .row span:first-child { flex-basis: 7.5mm; } | ||||||
|  | .row span:last-child { flex-basis: 17.5mm; } | ||||||
| @@ -1,181 +0,0 @@ | |||||||
|  |  | ||||||
| :root { |  | ||||||
|     font-family: "Times New Roman", serif; |  | ||||||
|     line-height: 1; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| * { |  | ||||||
|     box-sizing: border-box; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| body { |  | ||||||
|     margin: 0; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .m1, .m2, .m3 { |  | ||||||
|     height: 0; |  | ||||||
|     width: 1cm; |  | ||||||
|     position: fixed; |  | ||||||
|     left: 0; |  | ||||||
|     border-top: 1pt solid black; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .m1 {top: 105mm;} |  | ||||||
| .m2 {top: 148.5mm;} |  | ||||||
| .m3 {top: 210mm;} |  | ||||||
|  |  | ||||||
| header { |  | ||||||
|     height: 45mm; |  | ||||||
|     padding: 5mm; |  | ||||||
|     position: absolute; |  | ||||||
|     top: -25mm; |  | ||||||
|     left: 0; |  | ||||||
|     right: 0; |  | ||||||
|     text-align: center; |  | ||||||
| } |  | ||||||
| .spacing {height: 20mm;} |  | ||||||
| .info-wrapper { |  | ||||||
|     width: 100%; |  | ||||||
|     height:45mm; |  | ||||||
|     margin: 0 0 8.46mm 0; |  | ||||||
|     position: relative; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .address-wrapper { |  | ||||||
|     height: 45mm; |  | ||||||
|     width: 85mm; |  | ||||||
|     margin: 0; |  | ||||||
|     padding: 5mm; |  | ||||||
|     position: absolute; |  | ||||||
|     left: 20mm; |  | ||||||
|     top: 0; |  | ||||||
|     display: flex; |  | ||||||
|     flex-direction: column; |  | ||||||
|     justify-content: flex-end; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .address-wrapper .sender { |  | ||||||
|     flex: 17.7mm 1 1; |  | ||||||
|     font-size: 8pt; |  | ||||||
|     display: flex; |  | ||||||
|     flex-direction: column; |  | ||||||
|     justify-content: flex-end; |  | ||||||
|     padding-bottom: 2mm; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| address { |  | ||||||
|     flex: 27.3mm 1 1; |  | ||||||
|     white-space: pre-line; |  | ||||||
|     font-size: 12pt; |  | ||||||
|     font-style: normal; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| aside { |  | ||||||
|     height: 40mm; |  | ||||||
|     width: 75mm; |  | ||||||
|     margin: 0; |  | ||||||
|     position: absolute; |  | ||||||
|     left: 125mm; |  | ||||||
|     top: 5mm; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| main { |  | ||||||
|     margin: 8.46mm 20mm 4.23mm 25mm; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| main :first-child { |  | ||||||
|     margin-top: 0; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| main h1, main p { |  | ||||||
|     font-size: 12pt; |  | ||||||
|     margin: 1em 0; |  | ||||||
|     text-align: justify; |  | ||||||
|     widows: 3; |  | ||||||
|     orphans: 3; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| main .date { |  | ||||||
|     margin-bottom: 2em; |  | ||||||
|     text-align: right; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| main h1 { |  | ||||||
|     margin-bottom: 2em; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .footer-wrapper { |  | ||||||
|     padding: 0 20mm 0 25mm; |  | ||||||
|     position: running(page-footer); |  | ||||||
|     bottom: 0; |  | ||||||
|     left: 0; |  | ||||||
|     right: 0; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .pre-footer { |  | ||||||
|     margin: 4.23mm 0; |  | ||||||
|     font-size: 10pt; |  | ||||||
|     display: flex; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .pre-footer .date, .pre-footer .page { |  | ||||||
|     flex: 100px 1 1; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .pre-footer .date {text-align: left;} |  | ||||||
| .pre-footer .page {text-align: right;} |  | ||||||
| .page::after { |  | ||||||
|     content: "Seite 1 von 1"; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| footer { |  | ||||||
|     font-size: 10pt; |  | ||||||
|     border-top: 1pt solid black; |  | ||||||
|     height: 25mm; |  | ||||||
|     padding-top: 1mm; |  | ||||||
|     text-align: center; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| table { |  | ||||||
|     width: 100%; |  | ||||||
|     border-collapse: collapse; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @page { |  | ||||||
|     size: A4; |  | ||||||
|     margin: 25mm 0 35mm 0; |  | ||||||
|     @bottom-center { |  | ||||||
|         content: element(page-footer); |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @media screen { |  | ||||||
|     body, header, .footer-wrapper { |  | ||||||
|         width: 210mm; |  | ||||||
|     } |  | ||||||
|     header, .address-wrapper, aside, main { |  | ||||||
|         border: 1px solid lightgray; |  | ||||||
|     } |  | ||||||
|     .m1, .m2, .m3 {display: none;} |  | ||||||
|     header {top: 0;} |  | ||||||
|     .spacing {height: 45mm;} |  | ||||||
|     .main-wrapper { |  | ||||||
|         margin-bottom: 40mm; |  | ||||||
|     } |  | ||||||
|     .footer-wrapper { |  | ||||||
|         position: fixed; |  | ||||||
|         bottom: 0; |  | ||||||
|         left: 0; |  | ||||||
|         right: 0; |  | ||||||
|         background: white; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @media print { |  | ||||||
|     .page::after { |  | ||||||
|         content: "Seite " counter(page) " von " counter(pages); |  | ||||||
|     } |  | ||||||
|     .footer-wrapper { |  | ||||||
|         display: none; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -2,37 +2,42 @@ | |||||||
|  |  | ||||||
|   <PropertyGroup> |   <PropertyGroup> | ||||||
|     <OutputType>WinExe</OutputType> |     <OutputType>WinExe</OutputType> | ||||||
|     <TargetFramework>net7.0-windows</TargetFramework> |     <TargetFramework>net8.0-windows</TargetFramework> | ||||||
|     <Nullable>enable</Nullable> |     <Nullable>enable</Nullable> | ||||||
|     <UseWPF>true</UseWPF> |     <UseWPF>true</UseWPF> | ||||||
|     <PreserveCompilationContext>true</PreserveCompilationContext> |     <PreserveCompilationContext>true</PreserveCompilationContext> | ||||||
|     <ApplicationIcon>elwig.ico</ApplicationIcon> |     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon> | ||||||
|  |     <Version>0.10.8</Version> | ||||||
|  |     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages> | ||||||
|  |     <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||||||
|  |     <ApplicationManifest>app.manifest</ApplicationManifest> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <Content Include="elwig.ico" /> |     <Resource Include="Resources\Images\Elwig.png" /> | ||||||
|   </ItemGroup> |     <Content Include="Resources\Images\Elwig.ico" /> | ||||||
|  |     <EmbeddedResource Include="Resources\Schemas\PaymentVariantData.json" /> | ||||||
|   <ItemGroup> |     <EmbeddedResource Include="Resources\Sql\*" /> | ||||||
|     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" /> |  | ||||||
|     <PackageReference Include="ini-parser" Version="2.5.2" /> |  | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.16" /> |  | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.5" /> |  | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" /> |  | ||||||
|     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1774.30" /> |  | ||||||
|     <PackageReference Include="PdfSharp" Version="1.50.5147" /> |  | ||||||
|     <PackageReference Include="PuppeteerSharp" Version="10.0.0" /> |  | ||||||
|     <PackageReference Include="RazorLight" Version="2.3.1" /> |  | ||||||
|     <PackageReference Include="System.IO.Ports" Version="7.0.0" /> |  | ||||||
|     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" /> |  | ||||||
|   </ItemGroup> |  | ||||||
|  |  | ||||||
|   <ItemGroup> |  | ||||||
|     <Resource Include="elwig.png" /> |  | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|   <Target Name="PreBuild" BeforeTargets="PreBuildEvent"> |   <Target Name="PreBuild" BeforeTargets="PreBuildEvent"> | ||||||
|     <Exec Command="call fetch-resources.bat" /> |     <Exec Command="call fetch-resources.bat" /> | ||||||
|   </Target> |   </Target> | ||||||
|  |  | ||||||
|  |   <ItemGroup> | ||||||
|  |     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> | ||||||
|  |     <PackageReference Include="LinqKit" Version="1.3.0" /> | ||||||
|  |     <PackageReference Include="MailKit" Version="4.7.1.1" /> | ||||||
|  |     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.32" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" /> | ||||||
|  |     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" /> | ||||||
|  |     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" /> | ||||||
|  |     <PackageReference Include="NJsonSchema" Version="11.0.2" /> | ||||||
|  |     <PackageReference Include="RazorLight" Version="2.3.1" /> | ||||||
|  |     <PackageReference Include="ScottPlot.WPF" Version="5.0.36" /> | ||||||
|  |     <PackageReference Include="System.IO.Ports" Version="8.0.0" /> | ||||||
|  |     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" /> | ||||||
|  |   </ItemGroup> | ||||||
|  |  | ||||||
| </Project> | </Project> | ||||||
|   | |||||||
							
								
								
									
										22
									
								
								Elwig/Helpers/ActionCommand.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								Elwig/Helpers/ActionCommand.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | |||||||
|  | using System; | ||||||
|  | using System.Windows.Input; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers { | ||||||
|  |     public class ActionCommand : ICommand { | ||||||
|  |  | ||||||
|  |         public event EventHandler? CanExecuteChanged; | ||||||
|  |         private readonly Action Action; | ||||||
|  |  | ||||||
|  |         public ActionCommand(Action action) { | ||||||
|  |             Action = action; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Execute(object? parameter) { | ||||||
|  |             Action(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public bool CanExecute(object? parameter) { | ||||||
|  |             return true; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,13 +1,26 @@ | |||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Elwig.Models; | using Elwig.Models.Entities; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using System.Threading.Tasks; | using System.Threading.Tasks; | ||||||
| using System.IO; | using System.IO; | ||||||
| using System; | using System; | ||||||
| using System.Windows; | using System.Windows; | ||||||
| using Microsoft.Extensions.Logging; | using Microsoft.Extensions.Logging; | ||||||
|  | using Microsoft.Data.Sqlite; | ||||||
|  | using System.Text.RegularExpressions; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System.Reflection; | ||||||
|  | using System.Data; | ||||||
|  |  | ||||||
| namespace Elwig.Helpers { | namespace Elwig.Helpers { | ||||||
|  |  | ||||||
|  |     public record struct AreaComBucket(int Area, int Obligation, int Right); | ||||||
|  |     public record struct UnderDelivery(int Weight, int Diff); | ||||||
|  |     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment); | ||||||
|  |     public record struct MemberStat(string Variety, string Discr, int Weight); | ||||||
|  |     public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum); | ||||||
|  |  | ||||||
|     public class AppDbContext : DbContext { |     public class AppDbContext : DbContext { | ||||||
|  |  | ||||||
|         public DbSet<Country> Countries { get; private set; } |         public DbSet<Country> Countries { get; private set; } | ||||||
| @@ -23,22 +36,55 @@ namespace Elwig.Helpers { | |||||||
|         public DbSet<WineVar> WineVarieties { get; private set; } |         public DbSet<WineVar> WineVarieties { get; private set; } | ||||||
|  |  | ||||||
|         public DbSet<ClientParam> ClientParameters { get; private set; } |         public DbSet<ClientParam> ClientParameters { get; private set; } | ||||||
|  |         public DbSet<WbGl> WbGls { get; private set; } | ||||||
|  |         public DbSet<WbGem> WbGems { get; private set; } | ||||||
|         public DbSet<WbKg> WbKgs { get; private set; } |         public DbSet<WbKg> WbKgs { get; private set; } | ||||||
|         public DbSet<WbRd> WbRde { get; private set; } |         public DbSet<WbRd> WbRde { get; private set; } | ||||||
|         public DbSet<WineAttr> WineAttributes { get; private set; } |         public DbSet<WineAttr> WineAttributes { get; private set; } | ||||||
|         public DbSet<WineCult> WineCultivations { get; private set; } |         public DbSet<WineCult> WineCultivations { get; private set; } | ||||||
|         public DbSet<Branch> Branches { get; private set; } |         public DbSet<Branch> Branches { get; private set; } | ||||||
|  |         public DbSet<AreaComType> AreaCommitmentTypes { get; private set; } | ||||||
|         public DbSet<Member> Members { get; private set; } |         public DbSet<Member> Members { get; private set; } | ||||||
|         public DbSet<BillingAddr> BillingAddresses { get; private set; } |         public DbSet<BillingAddr> BillingAddresses { get; private set; } | ||||||
|  |         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; } | ||||||
|  |         public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; } | ||||||
|  |         public DbSet<MemberHistory> MemberHistory { get; private set; } | ||||||
|         public DbSet<AreaCom> AreaCommitments { get; private set; } |         public DbSet<AreaCom> AreaCommitments { get; private set; } | ||||||
|         public DbSet<AreaComAttr> AreaCommitmentAttributes { get; private set; } |  | ||||||
|         public DbSet<Season> Seasons { get; private set; } |         public DbSet<Season> Seasons { get; private set; } | ||||||
|  |         public DbSet<DeliverySchedule> DeliverySchedules { get; private set; } | ||||||
|  |         public DbSet<DeliveryScheduleWineVar> DeliveryScheduleWineVarieties { get; private set; } | ||||||
|  |         public DbSet<DeliveryAncmt> DeliveryAnnouncements { get; private set; } | ||||||
|  |         public DbSet<Modifier> Modifiers { get; private set; } | ||||||
|         public DbSet<Delivery> Deliveries { get; private set; } |         public DbSet<Delivery> Deliveries { get; private set; } | ||||||
|         public DbSet<DeliveryPart> DeliveryParts { get; private set; } |         public DbSet<DeliveryPart> DeliveryParts { get; private set; } | ||||||
|         public DbSet<DeliveryPartAttr> DeliveryPartAttributes { get; private set; } |  | ||||||
|         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; } |         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; } | ||||||
|  |         public DbSet<PaymentVar> PaymentVariants { get; private set; } | ||||||
|  |         public DbSet<PaymentMember> MemberPayments { get; private set; } | ||||||
|  |         public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; } | ||||||
|  |         public DbSet<PaymentCustom> CustomPayments { get; private set; } | ||||||
|  |         public DbSet<Credit> Credits { get; private set; } | ||||||
|  |  | ||||||
|  |         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; } | ||||||
|  |         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; } | ||||||
|  |         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; } | ||||||
|  |         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; } | ||||||
|  |         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; } | ||||||
|  |         public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; } | ||||||
|  |         public DbSet<PaymentVariantSummaryRow> PaymentVariantSummaryRows { get; private set; } | ||||||
|  |  | ||||||
|         private readonly StreamWriter? LogFile = null; |         private readonly StreamWriter? LogFile = null; | ||||||
|  |         public static DateTime LastWriteTime => File.GetLastWriteTime(App.Config.DatabaseFile); | ||||||
|  |         public DateTime SavedLastWriteTime { get; private set; } | ||||||
|  |         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime; | ||||||
|  |  | ||||||
|  |         public static string? ConnectionStringOverride { get; set; } = null; | ||||||
|  |         public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default"; | ||||||
|  |  | ||||||
|  |         private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = []; | ||||||
|  |         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = []; | ||||||
|  |         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBucketsStrict = []; | ||||||
|  |         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = []; | ||||||
|  |         private readonly Dictionary<int, Dictionary<int, Dictionary<string, UnderDelivery>>> _memberUnderDelivery = []; | ||||||
|  |  | ||||||
|         public AppDbContext() { |         public AppDbContext() { | ||||||
|             if (App.Config.DatabaseLog != null) { |             if (App.Config.DatabaseLog != null) { | ||||||
| @@ -51,10 +97,59 @@ namespace Elwig.Helpers { | |||||||
|                     MessageBox.Show($"Unable to open database log file:\n\n{e.Message}", "Database Log", MessageBoxButton.OK, MessageBoxImage.Error); |                     MessageBox.Show($"Unable to open database log file:\n\n{e.Message}", "Database Log", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|  |             SavedLastWriteTime = LastWriteTime; | ||||||
|  |             SavedChanges += OnSavedChanges; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static SqliteConnection Connect(string? connectionString = null) { | ||||||
|  |             var cnx = new SqliteConnection(connectionString ?? ConnectionString); | ||||||
|  |             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true); | ||||||
|  |             cnx.Open(); | ||||||
|  |             return cnx; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<SqliteConnection> ConnectAsync(string? connectionString = null) { | ||||||
|  |             var cnx = new SqliteConnection(connectionString ?? ConnectionString); | ||||||
|  |             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true); | ||||||
|  |             await cnx.OpenAsync(); | ||||||
|  |             return cnx; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task ExecuteBatch(SqliteConnection cnx, string sql) { | ||||||
|  |             using var cmd = cnx.CreateCommand(); | ||||||
|  |             cmd.CommandText = sql; | ||||||
|  |             await (await cmd.ExecuteReaderAsync()).CloseAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task ExecuteEmbeddedScript(SqliteConnection cnx, Assembly asm, string name) { | ||||||
|  |             using var stream = asm.GetManifestResourceStream(name) ?? throw new FileNotFoundException("Unable to load embedded resource"); | ||||||
|  |             using var reader = new StreamReader(stream); | ||||||
|  |             await ExecuteBatch(cnx, await reader.ReadToEndAsync()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<object?> ExecuteScalar(SqliteConnection cnx, string sql) { | ||||||
|  |             using var cmd = cnx.CreateCommand(); | ||||||
|  |             cmd.CommandText = sql; | ||||||
|  |             return await cmd.ExecuteScalarAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<(string Table, long RowId, string Parent, long FkId)[]> ForeignKeyCheck(SqliteConnection cnx) { | ||||||
|  |             using var cmd = cnx.CreateCommand(); | ||||||
|  |             cmd.CommandText = "PRAGMA foreign_key_check"; | ||||||
|  |             using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |             var list = new List<(string, long, string, long)>(); | ||||||
|  |             while (await reader.ReadAsync()) { | ||||||
|  |                 var table = reader.GetString(0); | ||||||
|  |                 var rowid = reader.GetInt64(1); | ||||||
|  |                 var parent = reader.GetString(2); | ||||||
|  |                 var fkid = reader.GetInt64(3); | ||||||
|  |                 list.Add((table, rowid, parent, fkid)); | ||||||
|  |             } | ||||||
|  |             return [.. list]; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { |         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { | ||||||
|             optionsBuilder.UseSqlite($"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default"); |             optionsBuilder.UseSqlite(ConnectionString); | ||||||
|             optionsBuilder.UseLazyLoadingProxies(); |             optionsBuilder.UseLazyLoadingProxies(); | ||||||
|             optionsBuilder.LogTo(Log, LogLevel.Information); |             optionsBuilder.LogTo(Log, LogLevel.Information); | ||||||
|             base.OnConfiguring(optionsBuilder); |             base.OnConfiguring(optionsBuilder); | ||||||
| @@ -66,6 +161,10 @@ namespace Elwig.Helpers { | |||||||
|             GC.SuppressFinalize(this); |             GC.SuppressFinalize(this); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         private void OnSavedChanges(object? sender, SavedChangesEventArgs evt) { | ||||||
|  |             SavedLastWriteTime = LastWriteTime; | ||||||
|  |         } | ||||||
|  |  | ||||||
|         protected void Log(string msg) { |         protected void Log(string msg) { | ||||||
|             LogFile?.WriteLine(msg); |             LogFile?.WriteLine(msg); | ||||||
|         } |         } | ||||||
| @@ -78,18 +177,330 @@ namespace Elwig.Helpers { | |||||||
|             return await AreaCommitments.FindAsync(fbnr) != null; |             return await AreaCommitments.FindAsync(fbnr) != null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         public async Task<bool> SortIdExists(string sortId) { | ||||||
|  |             return await WineVarieties.FindAsync(sortId) != null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<bool> AttrIdExists(string attrId) { | ||||||
|  |             return await WineAttributes.FindAsync(attrId) != null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<bool> CultIdExists(string cultId) { | ||||||
|  |             return await WineCultivations.FindAsync(cultId) != null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|         public async Task<int> NextMgNr() { |         public async Task<int> NextMgNr() { | ||||||
|             int c = await Members.Select(m => m.MgNr).MinAsync(); |             int c = 0; | ||||||
|             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync()) |             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync()) | ||||||
|                 .ForEach(a => { if (a <= c + 100) c = a; }); |                 .ForEach(a => { if (a <= c + 10000) c = a; }); | ||||||
|             return c + 1; |             return c + 1; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<int> NextFbNr() { |         public async Task<int> NextFbNr() { | ||||||
|             int c = await AreaCommitments.Select(ac => ac.FbNr).MinAsync(); |             int c = 0; | ||||||
|             (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync()) |             (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 10000) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextLNr(DateOnly date) { | ||||||
|  |             var dateStr = date.ToString("yyyy-MM-dd"); | ||||||
|  |             int c = 0; | ||||||
|  |             (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync()) | ||||||
|                 .ForEach(a => { if (a <= c + 100) c = a; }); |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|             return c + 1; |             return c + 1; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextDId(int year) { | ||||||
|  |             int c = 0; | ||||||
|  |             (await Deliveries.Where(d => d.Year == year).Select(d => d.DId).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextDPNr(int year, int did) { | ||||||
|  |             int c = 0; | ||||||
|  |             (await DeliveryParts.Where(p => p.Year == year && p.DId == did).Select(d => d.DPNr).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextRdNr(int kgnr) { | ||||||
|  |             int c = 0; | ||||||
|  |             (await WbRde.Where(r => r.KgNr == kgnr).Select(r => r.RdNr).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextAvNr(int year) { | ||||||
|  |             int c = 0; | ||||||
|  |             (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<int> NextDsNr(int year) { | ||||||
|  |             int c = 0; | ||||||
|  |             (await DeliverySchedules.Where(s => s.Year == year).Select(s => s.DsNr).ToListAsync()) | ||||||
|  |                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||||
|  |             return c + 1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<WineQualLevel> GetWineQualityLevel(double kmw) { | ||||||
|  |             return await WineQualityLevels | ||||||
|  |                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw)) | ||||||
|  |                 .OrderBy(q => q.MinKmw) | ||||||
|  |                 .LastAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) { | ||||||
|  |             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) { | ||||||
|  |                 var mod = new DeliveryPartModifier { | ||||||
|  |                     Year = part.Year, | ||||||
|  |                     DId = part.DId, | ||||||
|  |                     DPNr = part.DPNr, | ||||||
|  |                     ModId = m.ModId, | ||||||
|  |                 }; | ||||||
|  |                 var old = oldModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault(); | ||||||
|  |                 if (newModifiers.Any(md => md.ModId == m.ModId)) { | ||||||
|  |                     if (old == null) { | ||||||
|  |                         Add(mod); | ||||||
|  |                     } else { | ||||||
|  |                         Update(mod); | ||||||
|  |                     } | ||||||
|  |                 } else { | ||||||
|  |                     if (old != null) { | ||||||
|  |                         Remove(mod); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) { | ||||||
|  |             foreach (var v in WineVarieties) { | ||||||
|  |                 var e = new DeliveryScheduleWineVar { | ||||||
|  |                     Year = schedule.Year, | ||||||
|  |                     DsNr = schedule.DsNr, | ||||||
|  |                     SortId = v.SortId, | ||||||
|  |                     Priority = 1, | ||||||
|  |                 }; | ||||||
|  |                 var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1); | ||||||
|  |                 var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1); | ||||||
|  |                 if (n != -1) { | ||||||
|  |                     e.Priority = n; | ||||||
|  |                     if (o == -1) { | ||||||
|  |                         Add(e); | ||||||
|  |                     } else { | ||||||
|  |                         Update(e); | ||||||
|  |                     } | ||||||
|  |                 } else { | ||||||
|  |                     if (o != -1) { | ||||||
|  |                         Remove(e); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var buckets = new Dictionary<int, Dictionary<string, AreaComBucket>>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $"SELECT mgnr, bucket, area, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}"; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var mgnr = reader.GetInt32(0); | ||||||
|  |                     var vtrgid = reader.GetString(1); | ||||||
|  |                     if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = []; | ||||||
|  |                     buckets[mgnr][vtrgid] = new(reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4)); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             _memberAreaCommitmentBuckets[year] = buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var buckets = new Dictionary<int, Dictionary<string, int>>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket WHERE year = {year}"; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var mgnr = reader.GetInt32(0); | ||||||
|  |                     var bucket = reader.GetString(1); | ||||||
|  |                     if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = []; | ||||||
|  |                     buckets[mgnr][bucket] = reader.GetInt32(2); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             _memberDeliveryBuckets[year] = buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task FetchMemberDeliveryBucketsStrict(int year, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var buckets = new Dictionary<int, Dictionary<string, int>>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket_strict WHERE year = {year}"; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var mgnr = reader.GetInt32(0); | ||||||
|  |                     var bucket = reader.GetString(1); | ||||||
|  |                     if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = []; | ||||||
|  |                     buckets[mgnr][bucket] = reader.GetInt32(2); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             _memberDeliveryBucketsStrict[year] = buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task FetchMemberPaymentBuckets(int year, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var buckets = new Dictionary<int, Dictionary<string, int>>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_payment_bucket WHERE year = {year}"; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var mgnr = reader.GetInt32(0); | ||||||
|  |                     var bucket = reader.GetString(1); | ||||||
|  |                     if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = []; | ||||||
|  |                     buckets[mgnr][bucket] = reader.GetInt32(2); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             _memberPaymentBuckets[year] = buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private async Task FetchMemberUnderDelivery(int year, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var buckets = new Dictionary<int, Dictionary<string, UnderDelivery>>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $"SELECT mgnr, bucket, weight, diff FROM v_under_delivery WHERE year = {year}"; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var mgnr = reader.GetInt32(0); | ||||||
|  |                     var bucket = reader.GetString(1); | ||||||
|  |                     if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = []; | ||||||
|  |                     buckets[mgnr][bucket] = new(reader.GetInt32(2), reader.GetInt32(3)); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             _memberUnderDelivery[year] = buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             if (!_memberAreaCommitmentBuckets.ContainsKey(year)) | ||||||
|  |                 await FetchMemberAreaCommitmentBuckets(year, cnx); | ||||||
|  |             return _memberAreaCommitmentBuckets[year].GetValueOrDefault(mgnr, []); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             if (!_memberDeliveryBuckets.ContainsKey(year)) | ||||||
|  |                 await FetchMemberDeliveryBuckets(year, cnx); | ||||||
|  |             return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, []); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, int>> GetMemberDeliveryBucketsStrict(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             if (!_memberDeliveryBucketsStrict.ContainsKey(year)) | ||||||
|  |                 await FetchMemberDeliveryBucketsStrict(year, cnx); | ||||||
|  |             return _memberDeliveryBucketsStrict[year].GetValueOrDefault(mgnr, []); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             if (!_memberPaymentBuckets.ContainsKey(year)) | ||||||
|  |                 await FetchMemberPaymentBuckets(year, cnx); | ||||||
|  |             return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, []); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, UnderDelivery>> GetMemberUnderDelivery(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             if (!_memberUnderDelivery.ContainsKey(year)) | ||||||
|  |                 await FetchMemberUnderDelivery(year, cnx); | ||||||
|  |             return _memberUnderDelivery[year].GetValueOrDefault(mgnr, []); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Dictionary<string, MemberBucket>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var rightsAndObligations = await GetMemberAreaCommitmentBuckets(year, mgnr, cnx); | ||||||
|  |             var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx); | ||||||
|  |             var deliveryBucketsStrict = await GetMemberDeliveryBucketsStrict(year, mgnr, cnx); | ||||||
|  |             var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx); | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |  | ||||||
|  |             var buckets = new Dictionary<string, MemberBucket>(); | ||||||
|  |             foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) { | ||||||
|  |                 var variety = await WineVarieties.FindAsync(id[..2]); | ||||||
|  |                 var attribute = await WineAttributes.FindAsync(id[2..]); | ||||||
|  |                 var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : ""); | ||||||
|  |                 buckets[id] = new( | ||||||
|  |                     name, | ||||||
|  |                     rightsAndObligations.GetValueOrDefault(id).Area, | ||||||
|  |                     rightsAndObligations.GetValueOrDefault(id).Obligation, | ||||||
|  |                     rightsAndObligations.GetValueOrDefault(id).Right, | ||||||
|  |                     deliveryBuckets.GetValueOrDefault(id), | ||||||
|  |                     deliveryBucketsStrict.GetValueOrDefault(id), | ||||||
|  |                     paymentBuckets.GetValueOrDefault(id) | ||||||
|  |                 ); | ||||||
|  |             } | ||||||
|  |             return buckets; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<List<MemberStat>> GetMemberStats(int year, int mgnr, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var list = new List<MemberStat>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT v.name AS variety, | ||||||
|  |                            COALESCE(a.name, '') || IIF(a.name IS NOT NULL AND c.name IS NOT NULL, ' / ', '') || COALESCE(c.name, '') AS disc, | ||||||
|  |                            SUM(weight) AS weight | ||||||
|  |                     FROM v_delivery d | ||||||
|  |                         LEFT JOIN wine_variety v ON v.sortid = d.sortid | ||||||
|  |                         LEFT JOIN wine_attribute a ON a.attrid = d.attrid | ||||||
|  |                         LEFT JOIN wine_cultivation c ON c.cultid = d.cultid | ||||||
|  |                     WHERE d.year = {year} AND d.mgnr = {mgnr} | ||||||
|  |                     GROUP BY d.sortid, d.attrid, d.cultid | ||||||
|  |                     ORDER BY variety, disc; | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2))); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             return list; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<List<ModifierStat>> GetModifierStats(int year, int avnr, SqliteConnection? cnx = null) { | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await ConnectAsync(); | ||||||
|  |             var list = new List<ModifierStat>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT m.modid, m.name, m.count, m.min, m.max, m.sum, s.precision | ||||||
|  |                     FROM v_stat_modifier m | ||||||
|  |                         JOIN season s ON s.year = m.year | ||||||
|  |                     WHERE m.year = {year} AND m.avnr = {avnr} | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     var prec = (byte)reader.GetInt16(6); | ||||||
|  |                     long? min = reader.IsDBNull(3) ? null : reader.GetInt64(3); | ||||||
|  |                     long? max = reader.IsDBNull(4) ? null : reader.GetInt64(4); | ||||||
|  |                     var sum = reader.GetInt64(5); | ||||||
|  |                     if (min != null && max != null && Math.Abs((long)min) > Math.Abs((long)max)) | ||||||
|  |                         (min, max) = (max, min); | ||||||
|  |                     list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2), | ||||||
|  |                         min == null ? null : Utils.DecFromDb((long)min, prec), | ||||||
|  |                         max == null ? null : Utils.DecFromDb((long)max, prec), | ||||||
|  |                         Utils.DecFromDb(sum, prec))); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             return list; | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										90
									
								
								Elwig/Helpers/AppDbUpdater.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								Elwig/Helpers/AppDbUpdater.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,90 @@ | |||||||
|  | using Microsoft.Data.Sqlite; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Reflection; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers { | ||||||
|  |     public static class AppDbUpdater { | ||||||
|  |  | ||||||
|  |         // Don't forget to update value in Tests/fetch-resources.bat! | ||||||
|  |         public static readonly int RequiredSchemaVersion = 28; | ||||||
|  |  | ||||||
|  |         private static int VersionOffset = 0; | ||||||
|  |  | ||||||
|  |         public static async Task<Version> CheckDb() { | ||||||
|  |             using var cnx = AppDbContext.Connect(); | ||||||
|  |  | ||||||
|  |             var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0; | ||||||
|  |             if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})"); | ||||||
|  |  | ||||||
|  |             var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0; | ||||||
|  |             VersionOffset = (int)(schemaVers % 100); | ||||||
|  |             if (VersionOffset != 0) { | ||||||
|  |                 // schema was modified manually/externally | ||||||
|  |                 // TODO issue warning | ||||||
|  |             } | ||||||
|  |             await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion); | ||||||
|  |  | ||||||
|  |             var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0; | ||||||
|  |             var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)(userVers & 0xFFFF)); | ||||||
|  |  | ||||||
|  |             if (App.Version > v) { | ||||||
|  |                 long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | App.Version.Build; | ||||||
|  |                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return v; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) { | ||||||
|  |             if (fromVersion == toVersion) { | ||||||
|  |                 return; | ||||||
|  |             } else if (fromVersion > toVersion) { | ||||||
|  |                 throw new Exception("schema_version of database is too new"); | ||||||
|  |             } else if (fromVersion <= 0) { | ||||||
|  |                 throw new Exception("schema_version of database is invalid"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var asm = Assembly.GetExecutingAssembly(); | ||||||
|  |             (int From, int To, string Name)[] scripts = asm.GetManifestResourceNames() | ||||||
|  |                 .Where(n => n.StartsWith("Elwig.Resources.Sql.")) | ||||||
|  |                 .Select(n => { | ||||||
|  |                     var p = n.Split(".")[^2].Split("-"); | ||||||
|  |                     return (int.Parse(p[0]), int.Parse(p[1]), n); | ||||||
|  |                 }) | ||||||
|  |                 .OrderBy(s => s.Item1).ThenBy(s => s.Item2) | ||||||
|  |                 .ToArray(); | ||||||
|  |  | ||||||
|  |             List<string> toExecute = []; | ||||||
|  |             var vers = fromVersion; | ||||||
|  |             while (vers < toVersion) { | ||||||
|  |                 var (_, to, name) = scripts.Where(s => s.From == vers).Last(); | ||||||
|  |                 toExecute.Add(name); | ||||||
|  |                 vers = to; | ||||||
|  |             } | ||||||
|  |             if (toExecute.Count == 0) | ||||||
|  |                 return; | ||||||
|  |  | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, """ | ||||||
|  |                 PRAGMA locking_mode = EXCLUSIVE; | ||||||
|  |                 BEGIN EXCLUSIVE; | ||||||
|  |                 """); | ||||||
|  |             foreach (var script in toExecute) { | ||||||
|  |                 await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script); | ||||||
|  |             } | ||||||
|  |             var violations = await AppDbContext.ForeignKeyCheck(cnx); | ||||||
|  |             if (violations.Length > 0) { | ||||||
|  |                 throw new Exception($"Foreign key violations ({violations.Length}):\n" + string.Join("\n", violations | ||||||
|  |                     .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}"))); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 COMMIT; | ||||||
|  |                 VACUUM; | ||||||
|  |                 PRAGMA schema_version = {toVersion * 100 + VersionOffset}; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										256
									
								
								Elwig/Helpers/Billing/Billing.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										256
									
								
								Elwig/Helpers/Billing/Billing.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,256 @@ | |||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using Microsoft.Data.Sqlite; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class Billing { | ||||||
|  |  | ||||||
|  |         protected readonly int Year; | ||||||
|  |         protected readonly Season Season; | ||||||
|  |         protected readonly Dictionary<string, string> Attributes; | ||||||
|  |         protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers; | ||||||
|  |         protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes; | ||||||
|  |  | ||||||
|  |         public Billing(int year) { | ||||||
|  |             Year = year; | ||||||
|  |             using var ctx = new AppDbContext(); | ||||||
|  |             Season = ctx.Seasons.Find(Year)!; | ||||||
|  |             Attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name); | ||||||
|  |             Modifiers = ctx.Modifiers.Where(m => m.Year == Year).Include(m => m.Season).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel)); | ||||||
|  |             AreaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task FinishSeason() { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 UPDATE season | ||||||
|  |                 SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year}) | ||||||
|  |                 WHERE year = {Year}; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) { | ||||||
|  |             if (addMinBs < 1) addMinBs = 1; | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 UPDATE member | ||||||
|  |                 SET business_shares = member.business_shares - h.business_shares | ||||||
|  |                 FROM member_history h | ||||||
|  |                 WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active; | ||||||
|  |  | ||||||
|  |                 INSERT INTO member_history (mgnr, date, type, business_shares) | ||||||
|  |                 SELECT u.mgnr, | ||||||
|  |                        '{date:yyyy-MM-dd}', | ||||||
|  |                        'auto', | ||||||
|  |                        CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs | ||||||
|  |                             - {allowanceBs.ToString(CultureInfo.InvariantCulture)} | ||||||
|  |                             - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs | ||||||
|  |                 FROM v_total_under_delivery u | ||||||
|  |                     JOIN season s ON s.year = u.year | ||||||
|  |                     JOIN member m ON m.mgnr = u.mgnr | ||||||
|  |                 WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active | ||||||
|  |                 ON CONFLICT DO UPDATE | ||||||
|  |                 SET business_shares = excluded.business_shares; | ||||||
|  |  | ||||||
|  |                 UPDATE member | ||||||
|  |                 SET business_shares = member.business_shares + h.business_shares | ||||||
|  |                 FROM member_history h | ||||||
|  |                 WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task UnAdjustBusinessShares() { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 UPDATE member | ||||||
|  |                 SET business_shares = member.business_shares - h.business_shares | ||||||
|  |                 FROM member_history h | ||||||
|  |                 WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active; | ||||||
|  |  | ||||||
|  |                 DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto'; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task CalculateBuckets( | ||||||
|  |             bool? honorGebundenField = null, | ||||||
|  |             bool? allowAttributesIntoLower = null, | ||||||
|  |             bool? avoidUnderDeliveries = null, | ||||||
|  |             SqliteConnection? cnx = null | ||||||
|  |          ) { | ||||||
|  |             using var ctx = new AppDbContext(); | ||||||
|  |             var honorGebunden = honorGebundenField ?? Season.Billing_HonorGebunden; | ||||||
|  |             var allowAttrsIntoLower = allowAttributesIntoLower ?? Season.Billing_AllowAttrsIntoLower; | ||||||
|  |             var avoidUnderDlvrs = avoidUnderDeliveries ?? Season.Billing_AvoidUnderDeliveries; | ||||||
|  |             var attrVals = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower)); | ||||||
|  |             var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray(); | ||||||
|  |             var ownCnx = cnx == null; | ||||||
|  |             cnx ??= await AppDbContext.ConnectAsync(); | ||||||
|  |             await ctx.GetMemberAreaCommitmentBuckets(Year, 0, cnx); | ||||||
|  |             var inserts = new List<(int, int, int, string, int)>(); | ||||||
|  |  | ||||||
|  |             var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden | ||||||
|  |                     FROM v_delivery | ||||||
|  |                     WHERE year = {Year} | ||||||
|  |                     ORDER BY mgnr, sortid, abgewertet ASC, {(honorGebunden ? "gebunden IS NOT NULL DESC, gebunden DESC," : "")} | ||||||
|  |                              attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, lsnr, dpnr | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     deliveries.Add(( | ||||||
|  |                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4), | ||||||
|  |                         reader.GetDouble(5), reader.GetString(6), | ||||||
|  |                         reader.IsDBNull(7) ? null : reader.GetString(7), | ||||||
|  |                         reader.IsDBNull(8) ? [] : reader.GetString(8).Split(",").Order().ToArray(), | ||||||
|  |                         reader.IsDBNull(9) ? null : reader.GetBoolean(9) | ||||||
|  |                     )); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             int lastMgNr = 0; | ||||||
|  |             Dictionary<string, AreaComBucket>? rightsAndObligations = null; | ||||||
|  |             Dictionary<string, int> used = []; | ||||||
|  |             foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) { | ||||||
|  |                 if (lastMgNr != mgnr) { | ||||||
|  |                     rightsAndObligations = await ctx.GetMemberAreaCommitmentBuckets(Year, mgnr); | ||||||
|  |                     used = []; | ||||||
|  |                 } | ||||||
|  |                 if ((honorGebunden && gebunden == false) || | ||||||
|  |                     rightsAndObligations == null || rightsAndObligations.Count == 0 || | ||||||
|  |                     qualid == "WEI" || qualid == "RSW" || qualid == "LDW") | ||||||
|  |                 { | ||||||
|  |                     // Explizit als ungebunden markiert, | ||||||
|  |                     // Mitglied hat keine Flächenbindungen, oder | ||||||
|  |                     // Nicht mindestens Qualitätswein (QUW) | ||||||
|  |                     // -> ungebunden | ||||||
|  |                     inserts.Add((did, dpnr, 0, "_", weight)); | ||||||
|  |                     continue; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 int w = weight; | ||||||
|  |                 var attributes = attrid == null ? [] : new string[] { attrid }; | ||||||
|  |                 var isStrict = attrid != null && attrVals[attrid].IsStrict; | ||||||
|  |                 foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) { | ||||||
|  |                     var c = p.Count(); | ||||||
|  |                     var key = sortid + string.Join("", p); | ||||||
|  |                     if (rightsAndObligations.TryGetValue(key, out AreaComBucket value)) { | ||||||
|  |                         int i = (c == 0) ? 1 : 2; | ||||||
|  |                         var u = used.GetValueOrDefault(key, 0); | ||||||
|  |                         var vr = Math.Max(0, Math.Min(value.Right - u, w)); | ||||||
|  |                         var vo = Math.Max(0, Math.Min(value.Obligation - u, w)); | ||||||
|  |                         var v = (attributes.Length == c || attributes.Select(a => !attrVals[a].IsStrict ? 2 : attrVals[a].FillLower).Min() == 2) ? vr : vo; | ||||||
|  |                         used[key] = u + v; | ||||||
|  |                         if (key.Length > 2 && !isStrict) used[key[..2]] = used.GetValueOrDefault(key[..2], 0) + v; | ||||||
|  |                         inserts.Add((did, dpnr, i, key[2..], v)); | ||||||
|  |                         w -= v; | ||||||
|  |                     } | ||||||
|  |                     if (w == 0 || (!allowAttrsIntoLower && isStrict)) break; | ||||||
|  |                 } | ||||||
|  |                 inserts.Add((did, dpnr, 0, "_", w)); | ||||||
|  |                 lastMgNr = mgnr; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $"UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year}"); | ||||||
|  |             if (inserts.Count > 0) { | ||||||
|  |                 await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                     INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value) | ||||||
|  |                     VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))} | ||||||
|  |                     ON CONFLICT DO UPDATE | ||||||
|  |                     SET discr = excluded.discr, value = value + excluded.value; | ||||||
|  |                     """); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             if (!avoidUnderDlvrs) { | ||||||
|  |                 if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |                 return; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             // FIXME avoidUnderDelivery-calculations not always right! | ||||||
|  |  | ||||||
|  |             var underDeliveries = new Dictionary<(int, string), int>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff | ||||||
|  |                     FROM v_area_commitment_bucket c | ||||||
|  |                         LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket) | ||||||
|  |                     WHERE c.year = {Year} AND LENGTH(c.bucket) = 2 AND diff < 0 | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     underDeliveries[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var fittingBuckets = new Dictionary<(int, string), int>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff | ||||||
|  |                     FROM v_area_commitment_bucket c | ||||||
|  |                         LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket) | ||||||
|  |                     WHERE c.year = {Year} AND LENGTH(c.bucket) = 3 AND diff > 0 | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     fittingBuckets[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             foreach (var item in fittingBuckets) { | ||||||
|  |                 var mgnr = item.Key.Item1; | ||||||
|  |                 var id = item.Key.Item2[..2]; | ||||||
|  |                 var attr = item.Key.Item2[2..]; | ||||||
|  |                 var available = item.Value; | ||||||
|  |                 var needed = -underDeliveries.GetValueOrDefault((mgnr, id), 0); | ||||||
|  |                 if (needed <= 0) continue; | ||||||
|  |  | ||||||
|  |                 var fittingDeliveries = new List<(int, int, int, int)>(); | ||||||
|  |                 using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                     cmd.CommandText = $""" | ||||||
|  |                         SELECT d.did, d.dpnr, d.weight, b.value | ||||||
|  |                         FROM v_delivery d | ||||||
|  |                             JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}' | ||||||
|  |                         WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attrid = '{attr}' | ||||||
|  |                         ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC | ||||||
|  |                         """; | ||||||
|  |                     using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                     while (await reader.ReadAsync()) { | ||||||
|  |                         fittingDeliveries.Add(( | ||||||
|  |                             reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3) | ||||||
|  |                         )); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var negChanges = new List<(int, int, int, int)>(); | ||||||
|  |                 var posChanges = new List<(int, int, int, int)>(); | ||||||
|  |                 foreach (var (did, dpnr, _, w) in fittingDeliveries) { | ||||||
|  |                     int v = Math.Min(needed, w); | ||||||
|  |                     needed -= v; | ||||||
|  |                     posChanges.Add((did, dpnr, 1, v)); | ||||||
|  |                     negChanges.Add((did, dpnr, 2, w - v)); | ||||||
|  |                     if (needed == 0) break; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                     INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value) | ||||||
|  |                     VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))} | ||||||
|  |                     ON CONFLICT DO UPDATE | ||||||
|  |                     SET value = value + excluded.value; | ||||||
|  |  | ||||||
|  |                     INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value) | ||||||
|  |                     VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))} | ||||||
|  |                     ON CONFLICT DO UPDATE | ||||||
|  |                     SET value = excluded.value; | ||||||
|  |                     """); | ||||||
|  |  | ||||||
|  |                 if (ownCnx) await cnx.DisposeAsync(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										460
									
								
								Elwig/Helpers/Billing/BillingData.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										460
									
								
								Elwig/Helpers/Billing/BillingData.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,460 @@ | |||||||
|  | using Newtonsoft.Json; | ||||||
|  | using NJsonSchema; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Reflection; | ||||||
|  | using System.Text.Json.Nodes; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class BillingData { | ||||||
|  |  | ||||||
|  |         public enum CalculationMode { Elwig, WgMaster } | ||||||
|  |         public enum CurveMode { Oe, Kmw } | ||||||
|  |         public record struct Curve(CurveMode Mode, Dictionary<double, decimal> Normal, Dictionary<double, decimal>? Gebunden); | ||||||
|  |  | ||||||
|  |         public static JsonSchema? Schema { get; private set; } | ||||||
|  |  | ||||||
|  |         public static async Task Init() { | ||||||
|  |             var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Elwig.Resources.Schemas.PaymentVariantData.json"); | ||||||
|  |             Schema = await JsonSchema.FromJsonAsync(stream ?? throw new ArgumentException("JSON schema not found")); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public readonly JsonObject Data; | ||||||
|  |         public readonly CalculationMode Mode; | ||||||
|  |  | ||||||
|  |         public bool ConsiderDelieryModifiers { | ||||||
|  |             get => GetConsider("consider_delivery_modifiers"); | ||||||
|  |             set => SetConsider(value, "consider_delivery_modifiers"); | ||||||
|  |         } | ||||||
|  |         public bool ConsiderContractPenalties { | ||||||
|  |             get => GetConsider("consider_contract_penalties"); | ||||||
|  |             set => SetConsider(value, "consider_contract_penalties"); | ||||||
|  |         } | ||||||
|  |         public bool ConsiderTotalPenalty { | ||||||
|  |             get => GetConsider("consider_total_penalty"); | ||||||
|  |             set => SetConsider(value, "consider_total_penalty"); | ||||||
|  |         } | ||||||
|  |         public bool ConsiderAutoBusinessShares { | ||||||
|  |             get => GetConsider("consider_auto_business_shares"); | ||||||
|  |             set => SetConsider(value, "consider_auto_business_shares"); | ||||||
|  |         } | ||||||
|  |         public bool ConsiderCustomModifiers { | ||||||
|  |             get => GetConsider("consider_custom_modifiers"); | ||||||
|  |             set => SetConsider(value, "consider_custom_modifiers"); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public double NetWeightModifier { | ||||||
|  |             get => GetWeightModifier("net_weight_modifier", "Rebelzuschlag"); | ||||||
|  |             set => SetWeightModifier(value, "net_weight_modifier", "Rebelzuschlag"); | ||||||
|  |         } | ||||||
|  |         public double GrossWeightModifier { | ||||||
|  |             get => GetWeightModifier("gross_weight_modifier"); | ||||||
|  |             set => SetWeightModifier(value, "gross_weight_modifier"); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private bool GetConsider(string name, string? wgMasterName = null) { | ||||||
|  |             return ((Mode == CalculationMode.Elwig) ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<bool>() ?? false; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SetConsider(bool value, string name, string? wgMasterName = null) { | ||||||
|  |             if (Mode == CalculationMode.WgMaster && wgMasterName == null) { | ||||||
|  |                 return; | ||||||
|  |             } else if (value) { | ||||||
|  |                 Data[(Mode == CalculationMode.Elwig) ? name : wgMasterName ?? ""] = value; | ||||||
|  |             } else { | ||||||
|  |                 Data.Remove((Mode == CalculationMode.Elwig) ? name : wgMasterName ?? ""); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private double GetWeightModifier(string name, string? wgMasterName = null) { | ||||||
|  |             var isElwig = (Mode == CalculationMode.Elwig); | ||||||
|  |             var val = (isElwig ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<double>() ?? 0; | ||||||
|  |             return isElwig ? val : val / 100.0; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void SetWeightModifier(double value, string name, string? wgMasterName = null) { | ||||||
|  |             var isElwig = (Mode == CalculationMode.Elwig); | ||||||
|  |             if (Mode == CalculationMode.WgMaster && wgMasterName == null) { | ||||||
|  |                 return; | ||||||
|  |             } else if (value != 0) { | ||||||
|  |                 Data[isElwig ? name : wgMasterName ?? ""] = isElwig ? value : value * 100.0; | ||||||
|  |             } else { | ||||||
|  |                 Data.Remove(isElwig ? name : wgMasterName ?? ""); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public BillingData(JsonObject data) { | ||||||
|  |             Data = data; | ||||||
|  |             var mode = Data["mode"]?.GetValue<string>(); | ||||||
|  |             Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static JsonObject ParseJson(string json) { | ||||||
|  |             if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first"); | ||||||
|  |             try { | ||||||
|  |                 var errors = Schema.Validate(json); | ||||||
|  |                 if (errors.Count != 0) throw new ArgumentException("Invalid JSON data"); | ||||||
|  |                 return JsonNode.Parse(json)?.AsObject() ?? throw new ArgumentException("Invalid JSON data"); | ||||||
|  |             } catch (JsonReaderException) { | ||||||
|  |                 throw new ArgumentException("Invalid JSON data"); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static BillingData FromJson(string json) { | ||||||
|  |             return new(ParseJson(json)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected JsonArray GetCurvesEntry() { | ||||||
|  |             return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected JsonNode GetPaymentEntry() { | ||||||
|  |             return Data[Mode == CalculationMode.Elwig ? "payment" : "AuszahlungSorten"] ?? throw new InvalidOperationException(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected JsonObject? GetQualityEntry() { | ||||||
|  |             return Data[Mode == CalculationMode.Elwig ? "quality" : "AuszahlungSortenQualitätsstufe"]?.AsObject(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static Dictionary<double, decimal> GetCurveData(JsonObject data, CurveMode mode) { | ||||||
|  |             var dict = new Dictionary<double, decimal>(); | ||||||
|  |             foreach (var (index, price) in data) { | ||||||
|  |                 double idx; | ||||||
|  |                 bool? gtlt = index.StartsWith('>') ? true : index.StartsWith('<') ? false : null; | ||||||
|  |                 if (index.EndsWith("kmw")) { | ||||||
|  |                     idx = double.Parse(index[(gtlt != null ? 1 : 0)..^3], CultureInfo.InvariantCulture); | ||||||
|  |                     if (mode == CurveMode.Oe) { | ||||||
|  |                         idx = Utils.KmwToOe(idx); | ||||||
|  |                     } | ||||||
|  |                 } else if (index.EndsWith("oe")) { | ||||||
|  |                     idx = double.Parse(index[(gtlt != null ? 1 : 0)..^2], CultureInfo.InvariantCulture); | ||||||
|  |                     if (mode == CurveMode.Kmw) { | ||||||
|  |                         idx = Utils.OeToKmw(idx); | ||||||
|  |                     } | ||||||
|  |                 } else { | ||||||
|  |                     throw new InvalidOperationException(); | ||||||
|  |                 } | ||||||
|  |                 if (gtlt == true) { | ||||||
|  |                     idx = Math.BitIncrement(idx); | ||||||
|  |                 } else if (gtlt == false) { | ||||||
|  |                     idx = Math.BitDecrement(idx); | ||||||
|  |                 } | ||||||
|  |                 dict[idx] = price?.AsValue().GetValue<decimal>() ?? throw new InvalidOperationException(); | ||||||
|  |             } | ||||||
|  |             return dict; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected Dictionary<int, Curve> GetCurves() { | ||||||
|  |             var dict = new Dictionary<int, Curve>(); | ||||||
|  |             var curves = GetCurvesEntry(); | ||||||
|  |             foreach (var c in curves) { | ||||||
|  |                 var obj = c?.AsObject() ?? throw new InvalidOperationException(); | ||||||
|  |                 var id = obj["id"]?.GetValue<int>() ?? throw new InvalidOperationException(); | ||||||
|  |                 var cMode = (obj["mode"]?.GetValue<string>() == "kmw") ? CurveMode.Kmw : CurveMode.Oe; | ||||||
|  |                 double quw = cMode == CurveMode.Oe ? 73 : 15; | ||||||
|  |  | ||||||
|  |                 Dictionary<double, decimal> c1; | ||||||
|  |                 Dictionary<double, decimal>? c2 = null; | ||||||
|  |                 var norm = obj["data"]; | ||||||
|  |                 if (norm is JsonObject) { | ||||||
|  |                     c1 = GetCurveData(norm.AsObject(), cMode); | ||||||
|  |                 } else if (norm?.AsValue().TryGetValue(out decimal v) == true) { | ||||||
|  |                     c1 = new() { { quw, v } }; | ||||||
|  |                 } else { | ||||||
|  |                     throw new InvalidOperationException(); | ||||||
|  |                 } | ||||||
|  |                 var geb = obj["geb"]; | ||||||
|  |                 if (geb is JsonObject) { | ||||||
|  |                     c2 = GetCurveData(geb.AsObject(), cMode); | ||||||
|  |                 } else if (geb?.AsValue().TryGetValue(out decimal v) == true) { | ||||||
|  |                     var splitVal = GetCurveValueAt(c1, quw); | ||||||
|  |                     c2 = c1.ToDictionary(e => e.Key, e => e.Value + (e.Key >= quw ? v : 0)); | ||||||
|  |                     c2[quw] = splitVal + v; | ||||||
|  |                     c2[Math.BitDecrement(quw)] = splitVal; | ||||||
|  |                 } | ||||||
|  |                 dict.Add(id, new(cMode, c1, c2)); | ||||||
|  |             } | ||||||
|  |             return dict; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static Dictionary<RawVaribute, JsonValue> GetSelection(JsonNode value, IEnumerable<RawVaribute> vaributes) { | ||||||
|  |             if (value is JsonValue flatRate) { | ||||||
|  |                 return vaributes.ToDictionary(e => e, _ => flatRate); | ||||||
|  |             } if (value is not JsonObject data) { | ||||||
|  |                 throw new InvalidOperationException(); | ||||||
|  |             } | ||||||
|  |             Dictionary<RawVaribute, JsonValue> dict; | ||||||
|  |             if (data["default"] is JsonValue def) { | ||||||
|  |                 dict = vaributes.ToDictionary(e => e, _ => def); | ||||||
|  |             } else { | ||||||
|  |                 dict = []; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var conv = data | ||||||
|  |                 .Where(p => p.Key != "default") | ||||||
|  |                 .Select(p => (new RawVaribute(p.Key), p.Value)) | ||||||
|  |                 .OrderBy(p => (p.Item1.SortId != null ? 10 : 0) + (p.Item1.AttrId != null ? 12 : 0) + (p.Item1.CultId != null ? 11 : 0)) | ||||||
|  |                 .ToList(); | ||||||
|  |             foreach (var (idx, v) in conv) { | ||||||
|  |                 var curve = v?.AsValue() ?? throw new InvalidOperationException(); | ||||||
|  |                 foreach (var i in vaributes.Where(e => | ||||||
|  |                         (idx.SortId == null || idx.SortId == e.SortId) && | ||||||
|  |                         (idx.AttrId == null || idx.AttrId == e.AttrId) && | ||||||
|  |                         (idx.CultId == null || idx.CultId == e.CultId))) { | ||||||
|  |                     dict[i] = curve; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return dict; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static decimal GetCurveValueAt(Dictionary<double, decimal> curve, double key) { | ||||||
|  |             if (curve.Count == 1) return curve.First().Value; | ||||||
|  |  | ||||||
|  |             var lt = curve.Keys.Where(v => v <= key); | ||||||
|  |             var gt = curve.Keys.Where(v => v >= key); | ||||||
|  |             if (!lt.Any()) { | ||||||
|  |                 return curve[gt.Min()]; | ||||||
|  |             } else if (!gt.Any()) { | ||||||
|  |                 return curve[lt.Max()]; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var max = lt.Max(); | ||||||
|  |             var min = gt.Min(); | ||||||
|  |             if (max == min) return curve[key]; | ||||||
|  |  | ||||||
|  |             var p1 = ((decimal)key - (decimal)min) / ((decimal)max - (decimal)min); | ||||||
|  |             var p2 = 1 - p1; | ||||||
|  |             return curve[min] * p2 + curve[max] * p1; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static JsonObject GraphToJson(Graph graph, string mode) { | ||||||
|  |             var x = graph.DataX; | ||||||
|  |             var y = graph.DataY; | ||||||
|  |             var prec = graph.Precision; | ||||||
|  |  | ||||||
|  |             try { | ||||||
|  |                 return new JsonObject() { | ||||||
|  |                     ["15kmw"] = Math.Round(y.Distinct().Single(), prec) | ||||||
|  |                 }; | ||||||
|  |             } catch { } | ||||||
|  |  | ||||||
|  |             var data = new JsonObject(); | ||||||
|  |             if (y[0] != y[1]) { | ||||||
|  |                 data[$"{x[0]}{mode}"] = Math.Round(y[0], prec); | ||||||
|  |             } | ||||||
|  |             for (int i = 1; i < x.Length - 1; i++) { | ||||||
|  |                 var d1 = Math.Round(y[i] - y[i - 1], prec); | ||||||
|  |                 var d2 = Math.Round(y[i + 1] - y[i], prec); | ||||||
|  |                 if (d1 != d2) { | ||||||
|  |                     data[$"{x[i]}{mode}"] = Math.Round(y[i], prec); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (y[^1] != y[^2]) { | ||||||
|  |                 data[$"{x[^1]}{mode}"] = Math.Round(y[^1], prec); | ||||||
|  |             } | ||||||
|  |             return data; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static JsonNode GraphEntryToJson(GraphEntry entry) { | ||||||
|  |             try { | ||||||
|  |                 if (entry.GebundenFlatBonus == null) { | ||||||
|  |                     return JsonValue.Create((decimal)entry.DataGraph.DataY.Distinct().Single()); | ||||||
|  |                 } | ||||||
|  |             } catch { } | ||||||
|  |  | ||||||
|  |             var curve = new JsonObject { | ||||||
|  |                 ["id"] = entry.Id, | ||||||
|  |                 ["mode"] = entry.Mode.ToString().ToLower(), | ||||||
|  |             }; | ||||||
|  |  | ||||||
|  |             curve["data"] = GraphToJson(entry.DataGraph, entry.Mode.ToString().ToLower()); | ||||||
|  |  | ||||||
|  |             if (entry.GebundenFlatBonus != null) { | ||||||
|  |                 curve["geb"] = (decimal)entry.GebundenFlatBonus; | ||||||
|  |             } else if (entry.GebundenGraph != null) { | ||||||
|  |                 curve["geb"] = GraphToJson(entry.GebundenGraph, entry.Mode.ToString().ToLower()); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return curve; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static (Dictionary<string, List<string>>, Dictionary<decimal, List<string>>) GetReverseKeys(JsonObject data, bool strict = true) { | ||||||
|  |             Dictionary<string, List<string>> rev1 = []; | ||||||
|  |             Dictionary<decimal, List<string>> rev2 = []; | ||||||
|  |             foreach (var (k, v) in data) { | ||||||
|  |                 if (k == "default" || (strict && (k.StartsWith('/') || !k.Contains('/'))) || v is not JsonValue val) { | ||||||
|  |                     continue; | ||||||
|  |                 } else if (val.TryGetValue<decimal>(out var dec)) { | ||||||
|  |                     rev2[dec] = rev2.GetValueOrDefault(dec) ?? []; | ||||||
|  |                     rev2[dec].Add(k); | ||||||
|  |                 } else if (val.TryGetValue<string>(out var cur)) { | ||||||
|  |                     rev1[cur] = rev1.GetValueOrDefault(cur) ?? []; | ||||||
|  |                     rev1[cur].Add(k); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             return (rev1, rev2); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) { | ||||||
|  |             var (rev1, rev2) = GetReverseKeys(data); | ||||||
|  |             if (!data.ContainsKey("default")) { | ||||||
|  |                 foreach (var (v, ks) in rev1) { | ||||||
|  |                     if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) { | ||||||
|  |                         foreach (var k in ks) data.Remove(k); | ||||||
|  |                         data["default"] = v; | ||||||
|  |                         CollapsePaymentData(data, vaributes, useDefault); | ||||||
|  |                         return; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 foreach (var (v, ks) in rev2) { | ||||||
|  |                     if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) { | ||||||
|  |                         foreach (var k in ks) data.Remove(k); | ||||||
|  |                         data["default"] = v; | ||||||
|  |                         CollapsePaymentData(data, vaributes, useDefault); | ||||||
|  |                         return; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var attributes = data | ||||||
|  |                 .Select(e => e.Key) | ||||||
|  |                 .Where(k => k.Length > 3 && k.Contains('/')) | ||||||
|  |                 .Select(k => k.Split('/')[1]) | ||||||
|  |                 .Distinct() | ||||||
|  |                 .ToList(); | ||||||
|  |             foreach (var idx in attributes) { | ||||||
|  |                 var len = vaributes.Count(e => $"{e.AttrId}{(e.CultId != null && e.CultId != "" ? "-" : "")}{e.CultId}" == idx); | ||||||
|  |                 foreach (var (v, ks) in rev1) { | ||||||
|  |                     var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList(); | ||||||
|  |                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) { | ||||||
|  |                         foreach (var k in myKs) data.Remove(k); | ||||||
|  |                         data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 foreach (var (v, ks) in rev2) { | ||||||
|  |                     var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList(); | ||||||
|  |                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) { | ||||||
|  |                         foreach (var k in myKs) data.Remove(k); | ||||||
|  |                         data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             if (!useDefault) | ||||||
|  |                 return; | ||||||
|  |  | ||||||
|  |             var keys = data.Select(p => p.Key).ToList(); | ||||||
|  |             foreach (var k in keys) { | ||||||
|  |                 if (k.Length == 3 && k.EndsWith('/') && !keys.Contains(k[..2])) { | ||||||
|  |                     data.Remove(k, out var val); | ||||||
|  |                     data.Add(k[..2], val); | ||||||
|  |                 } else if (k.Contains("/-")) { | ||||||
|  |                     data.Remove(k, out var val); | ||||||
|  |                     data.Add(k.Replace("/-", "-"), val); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             (rev1, rev2) = GetReverseKeys(data, false); | ||||||
|  |             var keyVaributes = data | ||||||
|  |                 .Select(e => e.Key.Split('-')[0]) | ||||||
|  |                 .Where(e => e.Length > 0 && e != "default") | ||||||
|  |                 .Distinct() | ||||||
|  |                 .ToList(); | ||||||
|  |             foreach (var idx in keyVaributes) { | ||||||
|  |                 var len = data.Count(e => e.Key == idx || (e.Key.Length > idx.Length && e.Key.StartsWith(idx) && e.Key[idx.Length] == '-')); | ||||||
|  |                 foreach (var (v, ks) in rev1) { | ||||||
|  |                     var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList(); | ||||||
|  |                     if (myKs.Count == len) { | ||||||
|  |                         foreach (var k in myKs) { | ||||||
|  |                             if (k != idx) data.Remove(k); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 foreach (var (v, ks) in rev2) { | ||||||
|  |                     var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList(); | ||||||
|  |                     if (myKs.Count == len) { | ||||||
|  |                         foreach (var k in myKs) { | ||||||
|  |                             if (k != idx) data.Remove(k); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static JsonObject FromGraphEntries( | ||||||
|  |             IEnumerable<GraphEntry> graphEntries, | ||||||
|  |             BillingData? origData = null, | ||||||
|  |             IEnumerable<RawVaribute>? vaributes = null, | ||||||
|  |             bool useDefaultPayment = true, | ||||||
|  |             bool useDefaultQuality = true | ||||||
|  |         ) { | ||||||
|  |             var payment = new JsonObject(); | ||||||
|  |             var qualityWei = new JsonObject(); | ||||||
|  |             var curves = new JsonArray(); | ||||||
|  |             int curveId = 0; | ||||||
|  |             foreach (var entry in graphEntries) { | ||||||
|  |                 var curve = GraphEntryToJson(entry); | ||||||
|  |                 JsonValue node; | ||||||
|  |                 if (curve is JsonObject obj) { | ||||||
|  |                     obj["id"] = ++curveId; | ||||||
|  |                     node = JsonValue.Create($"curve:{curveId}"); | ||||||
|  |                     curves.Add(obj); | ||||||
|  |                 } else if (curve is JsonValue val && val.TryGetValue<decimal>(out var flat)) { | ||||||
|  |                     node = JsonValue.Create(flat); | ||||||
|  |                 } else { | ||||||
|  |                     continue; | ||||||
|  |                 } | ||||||
|  |                 foreach (var c in entry.Vaributes) { | ||||||
|  |                     var v = new RawVaribute(c.Variety!.SortId, c.Attribute?.AttrId ?? "", c.Cultivation?.CultId); | ||||||
|  |                     if (v.CultId == "") v.CultId = null; | ||||||
|  |                     if (entry.Abgewertet) {; | ||||||
|  |                         qualityWei[v.ToString()] = node.DeepClone(); | ||||||
|  |                     } else { | ||||||
|  |                         payment[v.ToString()] = node.DeepClone(); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             CollapsePaymentData(payment, vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment); | ||||||
|  |             CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality); | ||||||
|  |  | ||||||
|  |             var data = new JsonObject { | ||||||
|  |                 ["mode"] = "elwig", | ||||||
|  |                 ["version"] = 1, | ||||||
|  |             }; | ||||||
|  |  | ||||||
|  |             if (origData?.ConsiderDelieryModifiers == true) | ||||||
|  |                 data["consider_delivery_modifiers"] = true; | ||||||
|  |             if (origData?.ConsiderContractPenalties == true) | ||||||
|  |                 data["consider_contract_penalties"] = true; | ||||||
|  |             if (origData?.ConsiderTotalPenalty == true) | ||||||
|  |                 data["consider_total_penalty"] = true; | ||||||
|  |             if (origData?.ConsiderAutoBusinessShares == true) | ||||||
|  |                 data["consider_auto_business_shares"] = true; | ||||||
|  |  | ||||||
|  |             if (payment.Count == 0) { | ||||||
|  |                 data["payment"] = 0; | ||||||
|  |             } else if (payment.Count == 1 && payment.First().Key == "default") { | ||||||
|  |                 data["payment"] = payment.Single().Value?.DeepClone(); | ||||||
|  |             } else { | ||||||
|  |                 data["payment"] = payment; | ||||||
|  |             } | ||||||
|  |             if (qualityWei.Count == 1 && qualityWei.First().Key == "default") { | ||||||
|  |                 data["quality"] = new JsonObject() { | ||||||
|  |                     ["WEI"] = qualityWei.Single().Value?.DeepClone() | ||||||
|  |                 }; | ||||||
|  |             } else if (qualityWei.Count >= 1) { | ||||||
|  |                 data["quality"] = new JsonObject() { | ||||||
|  |                     ["WEI"] = qualityWei | ||||||
|  |                 }; | ||||||
|  |             } | ||||||
|  |             data["curves"] = curves; | ||||||
|  |  | ||||||
|  |             return data; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										209
									
								
								Elwig/Helpers/Billing/BillingVariant.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										209
									
								
								Elwig/Helpers/Billing/BillingVariant.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,209 @@ | |||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using Microsoft.Data.Sqlite; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class BillingVariant : Billing { | ||||||
|  |  | ||||||
|  |         protected readonly int AvNr; | ||||||
|  |         protected readonly PaymentVar PaymentVariant; | ||||||
|  |         protected readonly PaymentBillingData Data; | ||||||
|  |  | ||||||
|  |         public BillingVariant(int year, int avnr) : base(year) { | ||||||
|  |             AvNr = avnr; | ||||||
|  |             using var ctx = new AppDbContext(); | ||||||
|  |             PaymentVariant = ctx.PaymentVariants.Include(v => v.Season).Where(v => v.Year == Year && v.AvNr == AvNr).Single() ?? throw new ArgumentException("PaymentVar not found"); | ||||||
|  |             Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             using var tx = await cnx.BeginTransactionAsync(); | ||||||
|  |             await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx); | ||||||
|  |             await DeleteInDb(cnx); | ||||||
|  |             await SetCalcTime(cnx); | ||||||
|  |             await CalculatePrices(cnx); | ||||||
|  |             if (Data.ConsiderDelieryModifiers) { | ||||||
|  |                 await CalculateDeliveryModifiers(cnx); | ||||||
|  |             } | ||||||
|  |             if (Data.ConsiderCustomModifiers) { | ||||||
|  |                 await CalculateMemberModifiers(cnx); | ||||||
|  |             } | ||||||
|  |             await tx.CommitAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Commit() { | ||||||
|  |             await Revert(); | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                     INSERT INTO credit (year, tgnr, mgnr, avnr, net_amount, prev_net_amount, vat, modifiers, prev_modifiers) | ||||||
|  |                     SELECT s.year, | ||||||
|  |                            COALESCE(t.tgnr, 0) + ROW_NUMBER() OVER(ORDER BY m.mgnr) AS tgnr, | ||||||
|  |                            m.mgnr, | ||||||
|  |                            v.avnr, | ||||||
|  |                            ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount, | ||||||
|  |                            ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount, | ||||||
|  |                            IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat, | ||||||
|  |                            ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) + | ||||||
|  |                            ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) + | ||||||
|  |                            ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) + | ||||||
|  |                            IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0) | ||||||
|  |                            AS modifiers, | ||||||
|  |                            lc.modifiers AS prev_modifiers | ||||||
|  |                     FROM season s | ||||||
|  |                         JOIN payment_variant v ON v.year = s.year | ||||||
|  |                         LEFT JOIN payment_variant l ON l.year = s.year | ||||||
|  |                             AND l.avnr = (SELECT avnr | ||||||
|  |                                           FROM payment_variant | ||||||
|  |                                           WHERE year = s.year AND NOT test_variant | ||||||
|  |                                           ORDER BY COALESCE(transfer_date, date) DESC, avnr DESC | ||||||
|  |                                           LIMIT 1) | ||||||
|  |                         LEFT JOIN (SELECT year, MAX(tgnr) AS tgnr FROM credit GROUP BY year) t ON t.year = s.year | ||||||
|  |                         JOIN (SELECT DISTINCT year, mgnr FROM delivery) d ON d.year = s.year | ||||||
|  |                         JOIN member m ON m.mgnr = d.mgnr | ||||||
|  |                         LEFT JOIN payment_member lp ON (lp.year, lp.avnr, lp.mgnr) = (l.year, l.avnr, m.mgnr) | ||||||
|  |                         LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (v.year, v.avnr, m.mgnr) | ||||||
|  |                         LEFT JOIN credit lc ON (lc.year, lc.avnr, lc.mgnr) = (l.year, l.avnr, m.mgnr) | ||||||
|  |                         LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr) | ||||||
|  |                         LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr) | ||||||
|  |                         LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr) | ||||||
|  |                         LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr) | ||||||
|  |                     WHERE s.year = {Year} AND v.avnr = {AvNr}; | ||||||
|  |                     """); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task Revert() { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 DELETE FROM credit WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 UPDATE payment_variant SET test_variant = TRUE WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected async Task SetCalcTime(SqliteConnection cnx) { | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 UPDATE payment_variant SET calc_time = UNIXEPOCH() WHERE (year, avnr) = ({Year}, {AvNr}) | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected async Task DeleteInDb(SqliteConnection cnx) { | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 DELETE FROM payment_delivery_part_bucket WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 UPDATE payment_variant SET calc_time = NULL WHERE (year, avnr) = ({Year}, {AvNr}); | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected async Task CalculateMemberModifiers(SqliteConnection cnx) { | ||||||
|  |             if (App.Client.IsMatzen) { | ||||||
|  |                 var lastYears = 3; | ||||||
|  |                 var multiplier = 0.50; | ||||||
|  |                 var includePredecessor = true; | ||||||
|  |                 var modName = "Treue%"; | ||||||
|  |                 await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                     INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel) | ||||||
|  |                     SELECT c.year, {AvNr}, s.mgnr, 0, | ||||||
|  |                            ROUND(s.sum * COALESCE(m.abs, 0)), | ||||||
|  |                            COALESCE(m.rel, 0) | ||||||
|  |                     FROM (SELECT {Year} AS year, m.mgnr, | ||||||
|  |                                  ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline, | ||||||
|  |                                  COUNT(*) = {lastYears} AND MIN(COALESCE(a.sum, b.sum)) > 0 AS allowed | ||||||
|  |                           FROM member m | ||||||
|  |                               LEFT JOIN v_stat_member a ON a.mgnr = m.mgnr | ||||||
|  |                               FULL OUTER JOIN v_stat_member b ON b.mgnr = m.predecessor_mgnr AND b.year = a.year AND {(includePredecessor ? "TRUE" : "FALSE")} | ||||||
|  |                           WHERE a.year > {Year} - {lastYears} | ||||||
|  |                           GROUP BY m.mgnr | ||||||
|  |                           HAVING allowed) c | ||||||
|  |                         JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr) | ||||||
|  |                         LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}' | ||||||
|  |                     WHERE sum >= baseline | ||||||
|  |                     ON CONFLICT DO UPDATE | ||||||
|  |                     SET mod_abs = mod_abs + excluded.mod_abs, | ||||||
|  |                         mod_rel = mod_rel + excluded.mod_rel | ||||||
|  |                     """); | ||||||
|  |             } | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel) | ||||||
|  |                 SELECT x.year, {AvNr}, x.mgnr, 0, COALESCE(x.mod_abs * POW(10, s.precision - 2), 0), COALESCE(x.mod_rel, 0) | ||||||
|  |                 FROM payment_custom x | ||||||
|  |                     JOIN season s ON s.year = x.year | ||||||
|  |                 WHERE x.year = {Year} | ||||||
|  |                 ON CONFLICT DO UPDATE | ||||||
|  |                 SET mod_abs = mod_abs + excluded.mod_abs, | ||||||
|  |                     mod_rel = mod_rel + excluded.mod_rel | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected async Task CalculatePrices(SqliteConnection cnx) { | ||||||
|  |             var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>(); | ||||||
|  |             using (var cmd = cnx.CreateCommand()) { | ||||||
|  |                 cmd.CommandText = $""" | ||||||
|  |                     SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, d.cultid, b.discr, b.value, d.oe, d.kmw, d.qualid, COALESCE(a.area_com, TRUE) | ||||||
|  |                     FROM delivery_part_bucket b | ||||||
|  |                         JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr) | ||||||
|  |                         LEFT JOIN v_wine_attribute a ON a.attrid = d.attrid | ||||||
|  |                     WHERE b.year = {Year} | ||||||
|  |                     """; | ||||||
|  |                 using var reader = await cmd.ExecuteReaderAsync(); | ||||||
|  |                 while (await reader.ReadAsync()) { | ||||||
|  |                     parts.Add(( | ||||||
|  |                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3), | ||||||
|  |                         reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5), | ||||||
|  |                         reader.IsDBNull(6) ? null : reader.GetString(6), reader.GetString(7), | ||||||
|  |                         reader.GetInt32(8), reader.GetDouble(9), reader.GetDouble(10), reader.GetString(11), | ||||||
|  |                         reader.GetBoolean(12) | ||||||
|  |                     )); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>(); | ||||||
|  |             foreach (var part in parts) { | ||||||
|  |                 if (part.Value == 0) | ||||||
|  |                     continue; | ||||||
|  |                 var ungeb = part.Discr == "_"; | ||||||
|  |                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr; | ||||||
|  |                 var attrId = part.AttrAreaCom ? payAttrId : part.AttrId; | ||||||
|  |                 var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom); | ||||||
|  |                 var price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw); | ||||||
|  |                 var priceL = PaymentVariant.Season.DecToDb(price); | ||||||
|  |                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value)); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount) | ||||||
|  |                 VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))}; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) { | ||||||
|  |             var netMod = Data.NetWeightModifier.ToString().Replace(',', '.'); | ||||||
|  |             var grossMod = Data.GrossWeightModifier.ToString().Replace(',', '.'); | ||||||
|  |             await AppDbContext.ExecuteBatch(cnx, $""" | ||||||
|  |                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel) | ||||||
|  |                 SELECT d.year, d.did, d.dpnr, {AvNr}, 0, 0, IIF(d.net_weight, {netMod}, {grossMod}) | ||||||
|  |                 FROM delivery_part d | ||||||
|  |                 WHERE d.year = {Year} | ||||||
|  |                 ON CONFLICT DO UPDATE | ||||||
|  |                 SET mod_rel = mod_rel + excluded.mod_rel; | ||||||
|  |  | ||||||
|  |                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel) | ||||||
|  |                 SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0) | ||||||
|  |                 FROM delivery_part d | ||||||
|  |                     LEFT JOIN delivery_part_modifier p ON (p.year, p.did, p.dpnr) = (d.year, d.did, d.dpnr) | ||||||
|  |                     LEFT JOIN modifier m ON (m.year, m.modid) = (d.year, p.modid) | ||||||
|  |                 WHERE d.year = {Year} | ||||||
|  |                 ON CONFLICT DO UPDATE | ||||||
|  |                 SET mod_abs = mod_abs + excluded.mod_abs, | ||||||
|  |                     mod_rel = mod_rel + excluded.mod_rel; | ||||||
|  |                 """); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										107
									
								
								Elwig/Helpers/Billing/EditBillingData.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										107
									
								
								Elwig/Helpers/Billing/EditBillingData.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,107 @@ | |||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text.Json.Nodes; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class EditBillingData : BillingData { | ||||||
|  |  | ||||||
|  |         protected readonly IEnumerable<RawVaribute> Vaributes; | ||||||
|  |  | ||||||
|  |         public EditBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) : | ||||||
|  |             base(data) { | ||||||
|  |             Vaributes = vaributes; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static EditBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) { | ||||||
|  |             return new(ParseJson(json), vaributes); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private (Dictionary<int, Curve>, Dictionary<int, List<RawVaribute>>) GetGraphEntries(JsonNode root) { | ||||||
|  |             Dictionary<int, List<string>> dict1 = []; | ||||||
|  |             Dictionary<decimal, List<string>> dict2 = []; | ||||||
|  |             if (root is JsonObject paymentObj) { | ||||||
|  |                 foreach (var (selector, node) in paymentObj) { | ||||||
|  |                     var val = node?.AsValue(); | ||||||
|  |                     if (val == null) { | ||||||
|  |                         continue; | ||||||
|  |                     } else if (val.TryGetValue<decimal>(out var price)) { | ||||||
|  |                         if (!dict2.ContainsKey(price)) dict2[price] = []; | ||||||
|  |                         dict2[price].Add(selector); | ||||||
|  |                     } else if (val.TryGetValue<string>(out var curve)) { | ||||||
|  |                         var idx = int.Parse(curve.Split(":")[1] ?? "0"); | ||||||
|  |                         if (!dict1.ContainsKey(idx)) dict1[idx] = []; | ||||||
|  |                         dict1[idx].Add(selector); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else if (root is JsonValue paymentVal) { | ||||||
|  |                 if (paymentVal.TryGetValue<decimal>(out var price)) { | ||||||
|  |                     if (!dict2.ContainsKey(price)) dict2[price] = []; | ||||||
|  |                     dict2[price].Add("default"); | ||||||
|  |                 } else if (paymentVal.TryGetValue<string>(out var curve)) { | ||||||
|  |                     var idx = int.Parse(curve.Split(":")[1] ?? "0"); | ||||||
|  |                     if (!dict1.ContainsKey(idx)) dict1[idx] = []; | ||||||
|  |                     dict1[idx].Add("default"); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var virtOffset = dict1.Count > 0 ? dict1.Max(e => e.Key) + 1 : 1; | ||||||
|  |             Dictionary<int, Curve> curves = GetCurves(); | ||||||
|  |             decimal[] virtCurves = [.. dict2.Keys.Order()]; | ||||||
|  |             for (int i = 0; i < virtCurves.Length; i++) { | ||||||
|  |                 var idx = virtCurves[i]; | ||||||
|  |                 dict1[i + virtOffset] = dict2[idx]; | ||||||
|  |                 curves[i + virtOffset] = new Curve(CurveMode.Oe, new() { { 73, idx } }, null); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             Dictionary<int, List<RawVaribute>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<RawVaribute>()); | ||||||
|  |             foreach (var (selector, value) in GetSelection(root, Vaributes)) { | ||||||
|  |                 int? idx = null; | ||||||
|  |                 if (value.TryGetValue<decimal>(out var val)) { | ||||||
|  |                     idx = Array.IndexOf(virtCurves, val) + virtOffset; | ||||||
|  |                 } else if (value.TryGetValue<string>(out var str)) { | ||||||
|  |                     idx = int.Parse(str.Split(":")[1]); | ||||||
|  |                 } | ||||||
|  |                 if (idx != null) | ||||||
|  |                     dict3[(int)idx].Add(selector); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return (curves, dict3); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static List<GraphEntry> CreateGraphEntries( | ||||||
|  |             AppDbContext ctx, int precision, | ||||||
|  |             Dictionary<int, Curve> curves, | ||||||
|  |             Dictionary<int, List<RawVaribute>> entries | ||||||
|  |         ) { | ||||||
|  |             var vars = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v); | ||||||
|  |             var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a); | ||||||
|  |             var cults = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c); | ||||||
|  |             return entries | ||||||
|  |                 .Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value | ||||||
|  |                     .Select(s => new Varibute(s, vars, attrs, cults)) | ||||||
|  |                     .ToList())) | ||||||
|  |                 .ToList(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public IEnumerable<GraphEntry> GetPaymentGraphEntries(AppDbContext ctx, Season season) { | ||||||
|  |             var root = GetPaymentEntry(); | ||||||
|  |             var (curves, entries) = GetGraphEntries(root); | ||||||
|  |             return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public IEnumerable<GraphEntry> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) { | ||||||
|  |             var root = GetQualityEntry(); | ||||||
|  |             if (root == null || root["WEI"] is not JsonNode qualityWei) | ||||||
|  |                 return []; | ||||||
|  |             var (curves, entries) = GetGraphEntries(qualityWei); | ||||||
|  |             var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0); | ||||||
|  |             foreach (var e in list) { | ||||||
|  |                 e.Id += idOffset; | ||||||
|  |                 e.Abgewertet = true; | ||||||
|  |             } | ||||||
|  |             return list; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										107
									
								
								Elwig/Helpers/Billing/Graph.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										107
									
								
								Elwig/Helpers/Billing/Graph.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,107 @@ | |||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class Graph : ICloneable { | ||||||
|  |  | ||||||
|  |         public readonly int Precision; | ||||||
|  |         public double[] DataX { get; set; } | ||||||
|  |         public double[] DataY { get; set; } | ||||||
|  |         public int MinX { get; set; } | ||||||
|  |         public int MaxX { get; set; } | ||||||
|  |  | ||||||
|  |         public Graph(int precision, int minX, int maxX) { | ||||||
|  |             Precision = precision; | ||||||
|  |             MinX = minX; | ||||||
|  |             MaxX = maxX; | ||||||
|  |             DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray(); | ||||||
|  |             DataY = new double[DataX.Length]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public Graph(Dictionary<double, decimal> data, int precision, int minX, int maxX) { | ||||||
|  |             Precision = precision; | ||||||
|  |             MinX = minX; | ||||||
|  |             MaxX = maxX; | ||||||
|  |             DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray(); | ||||||
|  |             DataY = DataX.Select(i => (double)BillingData.GetCurveValueAt(data, i)).ToArray(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public Graph(double[] values, int precision, int minX, int maxX) { | ||||||
|  |             Precision = precision; | ||||||
|  |             MinX = minX; | ||||||
|  |             MaxX = maxX; | ||||||
|  |             DataX = Enumerable.Range(MinX, MaxX - MinX + 1).Select(i => (double)i).ToArray(); | ||||||
|  |             DataY = values; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private Graph(double[] dataX, double[] dataY, int precision, int minX, int maxX) { | ||||||
|  |             Precision = precision; | ||||||
|  |             MinX = minX; | ||||||
|  |             MaxX = maxX; | ||||||
|  |             DataX = dataX; | ||||||
|  |             DataY = dataY; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public double GetOechsleAt(int index) { | ||||||
|  |             return DataX[index]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void SetOechsleAt(int index, double oechsle) { | ||||||
|  |             DataX[index] = oechsle; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void SetPriceAt(int index, double price) { | ||||||
|  |             DataY[index] = price; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public double GetPriceAt(int index) { | ||||||
|  |             return DataY[index]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public double GetPriceAtOe(double oe) { | ||||||
|  |             return DataY[Array.IndexOf(DataX, oe)]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void FlattenGraph(int begin, int end, double value) { | ||||||
|  |             for (int i = begin; i <= end; i++) { | ||||||
|  |                 DataY[i] = value; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void FlattenGraphLeft(int pointIndex) { | ||||||
|  |             FlattenGraph(0, pointIndex, DataY[pointIndex]); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void FlattenGraphRight(int pointIndex) { | ||||||
|  |             FlattenGraph(pointIndex, DataY.Length - 1, DataY[pointIndex]); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private void LinearIncreaseGraph(int begin, int end, double inc) { | ||||||
|  |             for (int i = begin; i < end; i++) { | ||||||
|  |                 DataY[i + 1] = Math.Round(DataY[i] + inc, Precision); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void LinearIncreaseGraphToEnd(int begin, double inc) { | ||||||
|  |             LinearIncreaseGraph(begin, DataY.Length - 1, inc); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void InterpolateGraph(int firstPoint, int secondPoint) { | ||||||
|  |             int steps = Math.Abs(firstPoint - secondPoint); | ||||||
|  |             if (firstPoint == -1 || secondPoint == -1 || steps < 2) { | ||||||
|  |                 return; | ||||||
|  |             } | ||||||
|  |             var (lowIndex, highIndex) = firstPoint < secondPoint ? (firstPoint, secondPoint) : (secondPoint, firstPoint); | ||||||
|  |             double step = (DataY[highIndex] - DataY[lowIndex]) / steps; | ||||||
|  |  | ||||||
|  |             for (int i = lowIndex; i < highIndex - 1; i++) { | ||||||
|  |                 DataY[i + 1] = Math.Round(DataY[i] + step, Precision); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public object Clone() { | ||||||
|  |             return new Graph((double[])DataX.Clone(), (double[])DataY.Clone(), Precision, MinX, MaxX); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										88
									
								
								Elwig/Helpers/Billing/GraphEntry.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								Elwig/Helpers/Billing/GraphEntry.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,88 @@ | |||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class GraphEntry { | ||||||
|  |  | ||||||
|  |         public const int MinX = 50; | ||||||
|  |         public const int MinXGeb = 73; | ||||||
|  |         public const int MaxX = 120; | ||||||
|  |  | ||||||
|  |         public int Id { get; set; } | ||||||
|  |         public BillingData.CurveMode Mode { get; set; } | ||||||
|  |         public bool Abgewertet { get; set; } | ||||||
|  |  | ||||||
|  |         public Graph DataGraph { get; set; } | ||||||
|  |         public Graph? GebundenGraph { get; set; } | ||||||
|  |         public double? GebundenFlatBonus { | ||||||
|  |             get { | ||||||
|  |                 try { | ||||||
|  |                     var val = GebundenGraph?.DataX.Zip(GebundenGraph.DataY) | ||||||
|  |                         .Select(e => Math.Round(e.Second - DataGraph.GetPriceAtOe(e.First), Precision)) | ||||||
|  |                         .Distinct() | ||||||
|  |                         .Single(); | ||||||
|  |                     return (val == 0) ? null : val; | ||||||
|  |                 } catch { | ||||||
|  |                     return null; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             set { | ||||||
|  |                 if (value is not double v) return; | ||||||
|  |                 var values = Enumerable.Range(MinXGeb, MaxX - MinXGeb + 1) | ||||||
|  |                     .Select(i => Math.Round(DataGraph.GetPriceAtOe(i) + v, Precision)) | ||||||
|  |                     .ToArray(); | ||||||
|  |                 GebundenGraph = new Graph(values, Precision, MinXGeb, MaxX); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public List<Varibute> Vaributes { get; set; } | ||||||
|  |         public string VaributeStringSimple => (Abgewertet ? "Abgew.: " : "") + (Vaributes.Count != 0 ? (Vaributes.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Vaributes.Select(c => c.Listing))) : "-"); | ||||||
|  |         public string VaributeString => Vaributes.Count != 0 ? string.Join("\n", Vaributes.Select(c => c.FullName)) : "-"; | ||||||
|  |         public string VaributeStringChange => (Abgewertet ? "A." : "") + string.Join(",", Vaributes.Select(c => c.Listing)); | ||||||
|  |         private readonly int Precision; | ||||||
|  |  | ||||||
|  |         public GraphEntry(int id, int precision, BillingData.CurveMode mode) { | ||||||
|  |             Id = id; | ||||||
|  |             Precision = precision; | ||||||
|  |             Mode = mode; | ||||||
|  |             DataGraph = new Graph(precision, MinX, MaxX); ; | ||||||
|  |             Vaributes = []; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public GraphEntry(int id, int precision, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? gebunden) : | ||||||
|  |             this(id, precision, mode) { | ||||||
|  |             DataGraph = new Graph(data, precision, MinX, MaxX); | ||||||
|  |             if (gebunden != null) GebundenGraph = new Graph(gebunden, precision, MinXGeb, MaxX); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public GraphEntry(int id, int precision, BillingData.Curve curve, List<Varibute> vaributes) : | ||||||
|  |             this(id, precision, curve.Mode) { | ||||||
|  |             DataGraph = new Graph(curve.Normal, precision, MinX, MaxX); | ||||||
|  |             if (curve.Gebunden != null) | ||||||
|  |                 GebundenGraph = new Graph(curve.Gebunden, precision, MinXGeb, MaxX); | ||||||
|  |             Vaributes = vaributes; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph, List<Varibute> vaributes) { | ||||||
|  |             Id = id; | ||||||
|  |             Precision = precision; | ||||||
|  |             Mode = mode; | ||||||
|  |             DataGraph = dataGraph; | ||||||
|  |             GebundenGraph = gebundenGraph; | ||||||
|  |             Vaributes = vaributes; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void AddGebundenGraph() { | ||||||
|  |             GebundenGraph ??= new Graph(Precision, MinXGeb, MaxX); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void RemoveGebundenGraph() { | ||||||
|  |             GebundenGraph = null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public GraphEntry Copy(int id) { | ||||||
|  |             return new GraphEntry(id, Precision, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), []); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										71
									
								
								Elwig/Helpers/Billing/PaymentBillingData.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								Elwig/Helpers/Billing/PaymentBillingData.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,71 @@ | |||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text.Json.Nodes; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |     public class PaymentBillingData : BillingData { | ||||||
|  |  | ||||||
|  |         protected readonly Dictionary<int, Curve> Curves; | ||||||
|  |         protected readonly Dictionary<RawVaribute, Curve> PaymentData; | ||||||
|  |         protected readonly Dictionary<RawQualVaribute, Curve> QualityData; | ||||||
|  |         protected readonly IEnumerable<RawVaribute> Vaributes; | ||||||
|  |  | ||||||
|  |         public PaymentBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) : | ||||||
|  |             base(data) { | ||||||
|  |             Vaributes = vaributes; | ||||||
|  |             Curves = GetCurves(); | ||||||
|  |             PaymentData = GetPaymentData(); | ||||||
|  |             QualityData = GetQualityData(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static PaymentBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) { | ||||||
|  |             return new(ParseJson(json), vaributes); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private Dictionary<RawVaribute, Curve> GetData(JsonNode data) { | ||||||
|  |             return GetSelection(data, Vaributes).ToDictionary(e => e.Key, e => LookupCurve(e.Value)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected Dictionary<RawVaribute, Curve> GetPaymentData() { | ||||||
|  |             return GetData(GetPaymentEntry()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected Dictionary<RawQualVaribute, Curve> GetQualityData() { | ||||||
|  |             Dictionary<RawQualVaribute, Curve> dict = []; | ||||||
|  |             var q = GetQualityEntry(); | ||||||
|  |             if (q == null) return dict; | ||||||
|  |  | ||||||
|  |             foreach (var (qualid, data) in q) { | ||||||
|  |                 foreach (var (idx, d) in GetData(data ?? throw new InvalidOperationException())) { | ||||||
|  |                     dict[new(qualid, idx.SortId, idx.AttrId, idx.CultId)] = d; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             return dict; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public decimal CalculatePrice(string sortid, string? attrid, string? cultid, string qualid, bool gebunden, double oe, double kmw) { | ||||||
|  |             var curve = GetQualityCurve(qualid, sortid, attrid, cultid) ?? GetCurve(sortid, attrid, cultid); | ||||||
|  |             return GetCurveValueAt((gebunden ? curve.Gebunden : null) ?? curve.Normal, curve.Mode == CurveMode.Oe ? oe : kmw); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private Curve LookupCurve(JsonValue val) { | ||||||
|  |             if (val.TryGetValue(out string? curve)) { | ||||||
|  |                 var curveId = int.Parse(curve.Split(":")[1]); | ||||||
|  |                 return Curves[curveId]; | ||||||
|  |             } else if (val.TryGetValue(out decimal value)) { | ||||||
|  |                 return new(CurveMode.Oe, new() { { 73, value } }, null); | ||||||
|  |             } | ||||||
|  |             throw new InvalidOperationException(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected Curve GetCurve(string sortid, string? attrid, string? cultid) { | ||||||
|  |             return PaymentData[new(sortid, attrid ?? "", cultid ?? "")]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected Curve? GetQualityCurve(string qualid, string sortid, string? attrid, string? cultid) { | ||||||
|  |             return QualityData.TryGetValue(new(qualid, sortid, attrid ?? "", cultid ?? ""), out var curve) ? curve : null; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										91
									
								
								Elwig/Helpers/Billing/Varibute.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										91
									
								
								Elwig/Helpers/Billing/Varibute.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,91 @@ | |||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Billing { | ||||||
|  |  | ||||||
|  |     public record struct RawQualVaribute { | ||||||
|  |         public string QualId; | ||||||
|  |         public string? SortId; | ||||||
|  |         public string? AttrId; | ||||||
|  |         public string? CultId; | ||||||
|  |  | ||||||
|  |         public RawQualVaribute(string qualid, string? sortid, string? attrid, string? cultid) { | ||||||
|  |             QualId = qualid; | ||||||
|  |             SortId = sortid; | ||||||
|  |             AttrId = attrid; | ||||||
|  |             CultId = cultid; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     public record struct RawVaribute : IComparable<RawVaribute> { | ||||||
|  |         public string? SortId; | ||||||
|  |         public string? AttrId; | ||||||
|  |         public string? CultId; | ||||||
|  |  | ||||||
|  |         public RawVaribute(string? sortid, string? attrid, string? cultid) { | ||||||
|  |             SortId = sortid; | ||||||
|  |             AttrId = attrid; | ||||||
|  |             CultId = cultid; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public RawVaribute(string id) { | ||||||
|  |             var p1 = id.Split('/')[0].Split('-')[0]; | ||||||
|  |             SortId = p1 == "" ? null : p1; | ||||||
|  |             AttrId = id.Contains('/') ? id.Split('/')[1].Split('-')[0] : null; | ||||||
|  |             CultId = id.Contains('-') ? id.Split('-')[1] : null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public readonly override string ToString() { | ||||||
|  |             return $"{SortId}" + (AttrId != null ? $"/{AttrId}" : "") + (CultId != null ? $"-{CultId}" : ""); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public readonly int CompareTo(RawVaribute other) { | ||||||
|  |             return $"{SortId}/{AttrId}-{CultId}".CompareTo($"{other.SortId}/{other.AttrId}-{other.CultId}"); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [PrimaryKey("Listing")] | ||||||
|  |     public class Varibute : IComparable<Varibute> { | ||||||
|  |  | ||||||
|  |         public WineVar? Variety { get; } | ||||||
|  |         public WineAttr? Attribute { get; } | ||||||
|  |         public WineCult? Cultivation { get; } | ||||||
|  |         public int? AssignedGraphId { get; set; } | ||||||
|  |         public int? AssignedAbgewGraphId { get; set; } | ||||||
|  |  | ||||||
|  |         public string Listing => $"{Variety?.SortId}" + | ||||||
|  |             (Attribute != null ? $"/{Attribute.AttrId}" : "") + | ||||||
|  |             (Cultivation != null ? $"-{Cultivation.CultId}" : ""); | ||||||
|  |         public string FullName => $"{Variety?.Name}" + | ||||||
|  |             (Variety != null && Attribute != null ? " " : "") + $"{Attribute?.Name}" + | ||||||
|  |             ((Variety != null || Attribute != null) && Cultivation != null ? " " : "") + $"{Cultivation?.Name}"; | ||||||
|  |  | ||||||
|  |         public Varibute(RawVaribute raw) : | ||||||
|  |             this(raw.SortId != null ? new WineVar(raw.SortId, raw.SortId) : null, | ||||||
|  |                  raw.AttrId != null ? new WineAttr() { AttrId = raw.AttrId, Name = raw.AttrId } : null, | ||||||
|  |                  raw.CultId != null ? new WineCult() { CultId = raw.CultId, Name = raw.CultId } : null) { | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public Varibute(RawVaribute raw, Dictionary<string, WineVar> vars, Dictionary<string, WineAttr> attrs, Dictionary<string, WineCult> cults) : | ||||||
|  |             this(raw.SortId != null && raw.SortId != "" ? vars[raw.SortId] : null, | ||||||
|  |                  raw.AttrId != null && raw.AttrId != "" ? attrs[raw.AttrId] : null, | ||||||
|  |                  raw.CultId != null && raw.CultId != "" ? cults[raw.CultId] : null) { | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public Varibute(WineVar? var, WineAttr? attr, WineCult? cult) { | ||||||
|  |             Variety = var; | ||||||
|  |             Attribute = attr; | ||||||
|  |             Cultivation = cult; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public override string ToString() { | ||||||
|  |             return Listing; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public int CompareTo(Varibute? other) { | ||||||
|  |             return Listing.CompareTo(other?.Listing); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,30 +1,55 @@ | |||||||
| using Elwig.Models; | using Elwig.Models.Entities; | ||||||
|  | using Microsoft.Data.Sqlite; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
| namespace Elwig.Helpers { | namespace Elwig.Helpers { | ||||||
|     public class ClientParameters { |     public class ClientParameters { | ||||||
|  |  | ||||||
|  |         public enum Type { Matzen, Winzerkeller, Weinland, Baden }; | ||||||
|  |  | ||||||
|  |         public bool IsMatzen => Client == Type.Matzen; | ||||||
|  |         public bool IsWinzerkeller => Client == Type.Winzerkeller; | ||||||
|  |         public bool IsWeinland => Client == Type.Weinland; | ||||||
|  |         public bool IsBaden => Client == Type.Baden; | ||||||
|  |         public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W"; | ||||||
|  |         public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H"; | ||||||
|  |         public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S"; | ||||||
|  |         public bool IsGrInzersdorf => IsWeinland; | ||||||
|  |  | ||||||
|  |         public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W"); | ||||||
|  |         public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId); | ||||||
|  |         public bool HasNetWeighing() => HasNetWeighing(App.ZwstId); | ||||||
|  |  | ||||||
|         public string NameToken; |         public string NameToken; | ||||||
|         public string NameShort; |         public string NameShort; | ||||||
| 		public string NameShortened; |  | ||||||
|         public string Name; |         public string Name; | ||||||
| 		public string NameSuffix; |         public string? NameSuffix; | ||||||
| 		public string NameFull => $"{Name} {NameSuffix}"; |         public string NameType; | ||||||
|  |         public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch { | ||||||
|  |             "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung", | ||||||
|  |             _ => NameType, | ||||||
|  |         }; | ||||||
|  |         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}"; | ||||||
|  |         public Type? Client; | ||||||
|  |  | ||||||
|         public PostalDest PostalDest { |         public PostalDest PostalDest { | ||||||
|             set { |             set { | ||||||
| 				Plz = value.AtPlz.Plz; |                 Plz = value.AtPlz!.Plz; | ||||||
| 				Ort = value.AtPlz.Ort.Name; |                 Ort = value.AtPlz!.Ort.Name; | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| 		public int Plz { get; private set; } |         public int Plz; | ||||||
| 		public string Ort { get; private set; } |         public string Ort; | ||||||
|         public string Address; |         public string Address; | ||||||
|         public string Sender1 => $"{NameShort} | {Address} | {Plz} {Ort}"; |         public string Sender1 => $"{NameShort} | {Address} | {Plz} {Ort}"; | ||||||
|         public string Sender2; |         public string Sender2; | ||||||
|  |  | ||||||
|         public string? Iban; |         public string? Iban; | ||||||
|         public string? Bic; |         public string? Bic; | ||||||
| 		public string? UstId; |         public string? UstIdNr; | ||||||
|         public string? LfbisNr; |         public string? LfbisNr; | ||||||
|  |  | ||||||
|         public string? PhoneNr; |         public string? PhoneNr; | ||||||
| @@ -32,16 +57,184 @@ namespace Elwig.Helpers { | |||||||
|         public string? EmailAddress; |         public string? EmailAddress; | ||||||
|         public string? Website; |         public string? Website; | ||||||
|  |  | ||||||
| 		public ClientParameters() { |         public int ModeDeliveryNoteStats; | ||||||
| 			NameToken = "WGM"; |         public int ModeWineQualityStatistics; | ||||||
| 			NameShort = "WG Matzen"; |         public int OrderingMemberList; | ||||||
| 			NameShortened = "Winzergenossenschaft f. Matzen u. Umgebung"; |  | ||||||
| 			Name = "Winzergenossenschaft für Matzen und Umgebung"; |         public string? TextDeliveryNote; | ||||||
| 			NameSuffix = "reg. Gen.m.b.H."; |         public string? TextDeliveryConfirmation; | ||||||
| 			Plz = 2243; |         public string? TextCreditNote; | ||||||
| 			Ort = "Matzen"; |         public string? TextEmailSubject; | ||||||
| 			Address = "Schloßstraße 6"; |         public string? TextEmailBody; | ||||||
| 			Sender2 = "E Österreichische Post AG Eco Brief"; |  | ||||||
|  |         public int ExportEbicsVersion; | ||||||
|  |         public int ExportEbicsAddress; | ||||||
|  |  | ||||||
|  |         public (int? AllowanceKg, double? AllowanceBs, int? AllowanceKgPerBs, double? AllowancePercent, int? MinBs) AutoAdjustBs; | ||||||
|  |  | ||||||
|  |         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { } | ||||||
|  |  | ||||||
|  |         public ClientParameters(Dictionary<string, string?> parameters) { | ||||||
|  |             try { | ||||||
|  |                 NameToken = parameters["CLIENT_NAME_TOKEN"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 NameShort = parameters["CLIENT_NAME_SHORT"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 Name = parameters["CLIENT_NAME"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX"); | ||||||
|  |                 NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 switch (Name) { | ||||||
|  |                     case "Winzergenossenschaft für Matzen und Umgebung": | ||||||
|  |                         Client = Type.Matzen; break; | ||||||
|  |                     case "Winzerkeller im Weinviertel": | ||||||
|  |                         Client = Type.Winzerkeller; break; | ||||||
|  |                     case "Winzergenossenschaft Weinland": | ||||||
|  |                         Client = Type.Weinland; break; | ||||||
|  |                     case "Winzergenossenschaft Baden - Bad Vöslau": | ||||||
|  |                         Client = Type.Baden; break; | ||||||
|  |                 }; | ||||||
|  |  | ||||||
|  |                 Plz = int.Parse(parameters["CLIENT_PLZ"] ?? ""); | ||||||
|  |                 Ort = parameters["CLIENT_ORT"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 Address = parameters["CLIENT_ADDRESS"] ?? throw new KeyNotFoundException(); | ||||||
|  |                 PhoneNr = parameters.GetValueOrDefault("CLIENT_PHONE"); | ||||||
|  |                 FaxNr = parameters.GetValueOrDefault("CLIENT_FAX"); | ||||||
|  |                 EmailAddress = parameters.GetValueOrDefault("CLIENT_EMAIL"); | ||||||
|  |                 Website = parameters.GetValueOrDefault("CLIENT_WEBSITE"); | ||||||
|  |                 LfbisNr = parameters.GetValueOrDefault("CLIENT_LFBISNR"); | ||||||
|  |                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR"); | ||||||
|  |                 Bic = parameters.GetValueOrDefault("CLIENT_BIC"); | ||||||
|  |                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN"); | ||||||
|  |  | ||||||
|  |                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) { | ||||||
|  |                     case "NONE": ModeDeliveryNoteStats = 0; break; | ||||||
|  |                     case "GA_ONLY": ModeDeliveryNoteStats = 1; break; | ||||||
|  |                     case "SHORT": ModeDeliveryNoteStats = 2; break; | ||||||
|  |                     case "FULL": ModeDeliveryNoteStats = 3; break; | ||||||
|  |                 } | ||||||
|  |                 switch (parameters.GetValueOrDefault("MODE_WINEQUALITYSTATISTICS", "OE")?.ToUpper()) { | ||||||
|  |                     case "OE": ModeWineQualityStatistics = 0; break; | ||||||
|  |                     case "KMW/1": ModeWineQualityStatistics = 1; break; | ||||||
|  |                     case "KMW/2": ModeWineQualityStatistics = 2; break; | ||||||
|  |                     case "KMW/5": ModeWineQualityStatistics = 3; break; | ||||||
|  |                     case "KMW/10": ModeWineQualityStatistics = 4; break; | ||||||
|  |                 } | ||||||
|  |                 switch (parameters.GetValueOrDefault("ORDERING_MEMBERLIST", "")?.ToUpper()) { | ||||||
|  |                     case "MGNR": OrderingMemberList = 0; break; | ||||||
|  |                     case "NAME": OrderingMemberList = 1; break; | ||||||
|  |                     case "KG": OrderingMemberList = 2; break; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? ""; | ||||||
|  |                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE"); | ||||||
|  |                 if (TextDeliveryNote == "") TextDeliveryNote = null; | ||||||
|  |                 TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION"); | ||||||
|  |                 if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null; | ||||||
|  |                 TextCreditNote = parameters.GetValueOrDefault("TEXT_CREDITNOTE"); | ||||||
|  |                 if (TextCreditNote == "") TextCreditNote = null; | ||||||
|  |                 TextEmailSubject = parameters.GetValueOrDefault("TEXT_EMAIL_SUBJECT"); | ||||||
|  |                 if (TextEmailSubject == "") TextEmailSubject = null; | ||||||
|  |                 TextEmailBody = parameters.GetValueOrDefault("TEXT_EMAIL_BODY"); | ||||||
|  |                 if (TextEmailBody == "") TextEmailBody = null; | ||||||
|  |  | ||||||
|  |                 ExportEbicsVersion = int.TryParse(parameters.GetValueOrDefault("EXPORT_EBICS_VERSION"), out var v) ? v : 9; | ||||||
|  |                 switch (parameters.GetValueOrDefault("EXPORT_EBICS_ADDRESS", "FULL")?.ToUpper()) { | ||||||
|  |                     case "OMIT": ExportEbicsAddress = 0; break; | ||||||
|  |                     case "LINES": ExportEbicsAddress = 1; break; | ||||||
|  |                     case "FULL": ExportEbicsAddress = 2; break; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var autoAdjust = (parameters.GetValueOrDefault("AUTOADJUST_BUSINESSSHARES") ?? "").Split(';'); | ||||||
|  |                 AutoAdjustBs = autoAdjust.Length == 5 ? ( | ||||||
|  |                     int.TryParse(autoAdjust[0], out var v1) ? v1 : null, | ||||||
|  |                     double.TryParse(autoAdjust[1], out var v2) ? v2 : null, | ||||||
|  |                     int.TryParse(autoAdjust[2], out var v3) ? v3 : null, | ||||||
|  |                     double.TryParse(autoAdjust[3], out var v4) ? v4 : null, | ||||||
|  |                     int.TryParse(autoAdjust[4], out var v5) ? v5 : null | ||||||
|  |                     ) : (null, null, null, null, null); | ||||||
|  |             } catch { | ||||||
|  |                 throw new KeyNotFoundException(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private IEnumerable<(string, string?)> GetParamValues() { | ||||||
|  |             string deliveryNoteStats = "SHORT"; | ||||||
|  |             switch (ModeDeliveryNoteStats) { | ||||||
|  |                 case 0: deliveryNoteStats = "NONE"; break; | ||||||
|  |                 case 1: deliveryNoteStats = "GA_ONLY"; break; | ||||||
|  |                 case 2: deliveryNoteStats = "SHORT"; break; | ||||||
|  |                 case 3: deliveryNoteStats = "FULL"; break; | ||||||
|  |             } | ||||||
|  |             string modeWineQualityStatistics = "OE"; | ||||||
|  |             switch (ModeWineQualityStatistics) { | ||||||
|  |                 case 0: modeWineQualityStatistics = "OE"; break; | ||||||
|  |                 case 1: modeWineQualityStatistics = "KMW/1"; break; | ||||||
|  |                 case 2: modeWineQualityStatistics = "KMW/2"; break; | ||||||
|  |                 case 3: modeWineQualityStatistics = "KMW/5"; break; | ||||||
|  |                 case 4: modeWineQualityStatistics = "KMW/10"; break; | ||||||
|  |             } | ||||||
|  |             string orderingMemberList = "MGNR"; | ||||||
|  |             switch (OrderingMemberList) { | ||||||
|  |                 case 0: orderingMemberList = "MGNR"; break; | ||||||
|  |                 case 1: orderingMemberList = "NAME"; break; | ||||||
|  |                 case 2: orderingMemberList = "KG"; break; | ||||||
|  |             } | ||||||
|  |             string exportEbicsAddress = "FULL"; | ||||||
|  |             switch (ExportEbicsAddress) { | ||||||
|  |                 case 0: exportEbicsAddress = "OMIT"; break; | ||||||
|  |                 case 1: exportEbicsAddress = "LINES"; break; | ||||||
|  |                 case 2: exportEbicsAddress = "FULL"; break; | ||||||
|  |             } | ||||||
|  |             string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" + | ||||||
|  |                                 $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" + | ||||||
|  |                                 $"{AutoAdjustBs.MinBs}"; | ||||||
|  |             return [ | ||||||
|  |                 ("CLIENT_NAME_TOKEN", NameToken), | ||||||
|  |                 ("CLIENT_NAME_SHORT", NameShort), | ||||||
|  |                 ("CLIENT_NAME", Name), | ||||||
|  |                 ("CLIENT_NAME_SUFFIX", NameSuffix), | ||||||
|  |                 ("CLIENT_NAME_TYPE", NameType), | ||||||
|  |                 ("CLIENT_PLZ", Plz.ToString()), | ||||||
|  |                 ("CLIENT_ORT", Ort), | ||||||
|  |                 ("CLIENT_ADDRESS", Address), | ||||||
|  |                 ("CLIENT_PHONE", PhoneNr), | ||||||
|  |                 ("CLIENT_FAX", FaxNr), | ||||||
|  |                 ("CLIENT_EMAIL", EmailAddress), | ||||||
|  |                 ("CLIENT_WEBSITE", Website), | ||||||
|  |                 ("CLIENT_LFBISNR", LfbisNr), | ||||||
|  |                 ("CLIENT_USTIDNR", UstIdNr), | ||||||
|  |                 ("CLIENT_BIC", Bic), | ||||||
|  |                 ("CLIENT_IBAN", Iban), | ||||||
|  |                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats), | ||||||
|  |                 ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics), | ||||||
|  |                 ("ORDERING_MEMBERLIST", orderingMemberList), | ||||||
|  |                 ("DOCUMENT_SENDER", Sender2), | ||||||
|  |                 ("TEXT_DELIVERYNOTE", TextDeliveryNote), | ||||||
|  |                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation), | ||||||
|  |                 ("TEXT_CREDITNOTE", TextCreditNote), | ||||||
|  |                 ("TEXT_EMAIL_SUBJECT", TextEmailSubject), | ||||||
|  |                 ("TEXT_EMAIL_BODY", TextEmailBody), | ||||||
|  |                 ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()), | ||||||
|  |                 ("EXPORT_EBICS_ADDRESS", exportEbicsAddress), | ||||||
|  |                 ("AUTOADJUST_BUSINESSSHARES", autoAdjust), | ||||||
|  |             ]; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task UpdateValues() { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             using var cmd = cnx.CreateCommand(); | ||||||
|  |             var pv = GetParamValues(); | ||||||
|  |             cmd.CommandText = "INSERT INTO client_parameter (param, value) VALUES " + | ||||||
|  |                 string.Join(", ", pv.Select((pv, i) => $"(@p{i}, " + (pv.Item2 != null ? $"@v{i}" : "NULL") + ")")) + | ||||||
|  |                 " ON CONFLICT DO UPDATE SET value = excluded.value"; | ||||||
|  |  | ||||||
|  |             int i = 0; | ||||||
|  |             foreach (var (p, v) in pv) { | ||||||
|  |                 cmd.Parameters.Add(new SqliteParameter($"@p{i}", p)); | ||||||
|  |                 if (v != null) | ||||||
|  |                     cmd.Parameters.Add(new SqliteParameter($"@v{i}", v)); | ||||||
|  |                 i++; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await cmd.ExecuteNonQueryAsync(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,18 +1,64 @@ | |||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using System.IO; | using System.IO; | ||||||
| using System.Linq; | using System.Linq; | ||||||
| using System.Text; | using Microsoft.Extensions.Configuration; | ||||||
| using IniParser; |  | ||||||
| using IniParser.Model; |  | ||||||
|  |  | ||||||
| namespace Elwig.Helpers { | namespace Elwig.Helpers { | ||||||
|  |  | ||||||
|  |     public record struct ScaleConfig { | ||||||
|  |         public string Id; | ||||||
|  |         public string? Type; | ||||||
|  |         public string? Model; | ||||||
|  |         public string? Connection; | ||||||
|  |         public string? Empty; | ||||||
|  |         public string? Filling; | ||||||
|  |         public string? Limit; | ||||||
|  |         public bool Required; | ||||||
|  |         public string? Log; | ||||||
|  |         public string? _Log; | ||||||
|  |  | ||||||
|  |         public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, bool? required, string? log) { | ||||||
|  |             Id = id; | ||||||
|  |             Type = type; | ||||||
|  |             Model = model; | ||||||
|  |             Connection = cnx; | ||||||
|  |             Empty = empty; | ||||||
|  |             Filling = filling; | ||||||
|  |             Limit = limit; | ||||||
|  |             Required = required ?? true; | ||||||
|  |             _Log = log; | ||||||
|  |             Log = log != null ? Path.Combine(App.DataPath, log) : null; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|     public class Config { |     public class Config { | ||||||
|  |  | ||||||
|  |         private static readonly string[] TrueValues = ["1", "true", "yes", "on"]; | ||||||
|  |  | ||||||
|         private readonly string FileName; |         private readonly string FileName; | ||||||
|  |  | ||||||
|  |         public bool Debug; | ||||||
|         public string DatabaseFile = App.DataPath + "database.sqlite3"; |         public string DatabaseFile = App.DataPath + "database.sqlite3"; | ||||||
|         public string? DatabaseLog = null; |         public string? DatabaseLog = null; | ||||||
|         public IEnumerable<string[]> Scales; |         public string? Branch = null; | ||||||
|         private readonly LinkedList<string[]> ScaleList = new(); |         public string? UpdateUrl = null; | ||||||
|  |         public bool UpdateAuto = false; | ||||||
|  |         public string? SyncUrl = null; | ||||||
|  |         public string SyncUsername = ""; | ||||||
|  |         public string SyncPassword = ""; | ||||||
|  |  | ||||||
|  |         public string? SmtpHost = null; | ||||||
|  |         public int? SmtpPort = null; | ||||||
|  |         public string? SmtpMode = null; | ||||||
|  |         public string? SmtpUsername = null; | ||||||
|  |         public string? SmtpPassword = null; | ||||||
|  |         public string? SmtpFrom = null; | ||||||
|  |         public (string Host, int Port, string Mode, string Username, string Password, string From)? Smtp => | ||||||
|  |             SmtpHost == null || SmtpPort == null || SmtpMode == null || SmtpUsername == null || SmtpPassword == null || SmtpFrom == null ? | ||||||
|  |             null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom); | ||||||
|  |  | ||||||
|  |         public IList<ScaleConfig> Scales; | ||||||
|  |         private readonly List<ScaleConfig> ScaleList = []; | ||||||
|  |  | ||||||
|         public Config(string filename) { |         public Config(string filename) { | ||||||
|             FileName = filename; |             FileName = filename; | ||||||
| @@ -21,49 +67,36 @@ namespace Elwig.Helpers { | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         public void Read() { |         public void Read() { | ||||||
|             var parser = new FileIniDataParser(); |             var config = new ConfigurationBuilder().AddIniFile(FileName).Build(); | ||||||
|             IniData? ini = null; |  | ||||||
|             try { |  | ||||||
|                 ini = parser.ReadFile(FileName, Encoding.UTF8); |  | ||||||
|             } catch {} |  | ||||||
|  |  | ||||||
|             if (ini == null || !ini.TryGetKey("database.file", out string db)) { |             DatabaseFile = Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, config["database:file"] ?? "database.sqlite3"); | ||||||
|                 DatabaseFile = App.DataPath + "database.sqlite3"; |             var log = config["database:log"]; | ||||||
|             } else if (db.Length > 1 && (db[1] == ':' || db[0] == '/' || db[0] == '\\')) { |             DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null; | ||||||
|                 DatabaseFile = db; |             Branch = config["general:branch"]; | ||||||
|             } else { |             Debug = TrueValues.Contains(config["general:debug"]?.ToLower()); | ||||||
|                 DatabaseFile = App.DataPath + db; |             UpdateUrl = config["update:url"]; | ||||||
|             } |             UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower()); | ||||||
|  |             SyncUrl = config["sync:url"]; | ||||||
|  |             SyncUsername = config["sync:username"] ?? ""; | ||||||
|  |             SyncPassword = config["sync:password"] ?? ""; | ||||||
|  |  | ||||||
|             if (ini == null || !ini.TryGetKey("database.log", out string log)) { |             SmtpHost = config["smtp:host"]; | ||||||
|                 DatabaseLog = null; |             SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null; | ||||||
|             } else if (log.Length > 1 && (log[1] == ':' || log[0] == '/' || log[0] == '\\')) { |             SmtpMode = config["smtp:mode"]; | ||||||
|                 DatabaseLog = log; |             SmtpUsername = config["smtp:username"]; | ||||||
|             } else { |             SmtpPassword = config["smtp:password"]; | ||||||
|                 DatabaseLog = App.DataPath + log; |             SmtpFrom = config["smtp:from"]; | ||||||
|             } |  | ||||||
|  |  | ||||||
|  |             var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order(); | ||||||
|             ScaleList.Clear(); |             ScaleList.Clear(); | ||||||
|             Scales = ScaleList; |             Scales = ScaleList; | ||||||
|             if (ini != null) { |             foreach (var s in scales) { | ||||||
|                 foreach (var s in ini.Sections.Where(s => s.SectionName.StartsWith("scale."))) { |                 ScaleList.Add(new( | ||||||
|                     ScaleList.AddLast(new string[] { |                     s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"], | ||||||
|                         s.SectionName[6..], s.Keys["type"], s.Keys["model"], s.Keys["connection"], |                     config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], | ||||||
|                         s.Keys["empty"], s.Keys["filling"], s.Keys["limit"] |                     config[$"scale.{s}:required"] != null ? TrueValues.Contains(config[$"scale.{s}:required"]?.ToLower()) : null, | ||||||
|                     }); |                     config[$"scale.{s}:log"] | ||||||
|                 } |                 )); | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         public void Write() { |  | ||||||
|             using var file = new StreamWriter(FileName, false, Encoding.UTF8); |  | ||||||
|             file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n"); |  | ||||||
|             if (DatabaseLog != null) file.Write($"log = {DatabaseLog}\r\n"); |  | ||||||
|             foreach (var s in ScaleList) { |  | ||||||
|                 file.Write($"\r\n[scale.{s[0]}]\r\ntype = {s[1]}\r\nmodel = {s[2]}\r\nconnection = {s[3]}\r\n"); |  | ||||||
|                 if (s[4] != null) file.Write($"empty = {s[4]}\r\n"); |  | ||||||
|                 if (s[5] != null) file.Write($"filling = {s[5]}\r\n"); |  | ||||||
|                 if (s[6] != null) file.Write($"limit = {s[6]}\r\n"); |  | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
							
								
								
									
										238
									
								
								Elwig/Helpers/ControlUtils.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										238
									
								
								Elwig/Helpers/ControlUtils.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,238 @@ | |||||||
|  | using System; | ||||||
|  | using System.Collections; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Windows; | ||||||
|  | using System.Windows.Controls; | ||||||
|  | using System.Windows.Controls.Primitives; | ||||||
|  | using Brush = System.Windows.Media.Brush; | ||||||
|  | using Brushes = System.Windows.Media.Brushes; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers { | ||||||
|  |     public class ControlUtils { | ||||||
|  |  | ||||||
|  |         public enum RenewSourceDefault { None, IfOnly, First } | ||||||
|  |  | ||||||
|  |         private static void SetControlBorderBrush(Control input, Brush brush) { | ||||||
|  |             if (input is ComboBox cb) { | ||||||
|  |                 var border = GetComboBoxBorder(cb); | ||||||
|  |                 if (border != null) border.BorderBrush = brush; | ||||||
|  |             } else { | ||||||
|  |                 input.BorderBrush = brush; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SetInputNotDefault(Control input) { | ||||||
|  |             SetControlBorderBrush(input, Brushes.Gold); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SetInputChanged(Control input) { | ||||||
|  |             SetControlBorderBrush(input, Brushes.Orange); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SetInputInvalid(Control input) { | ||||||
|  |             SetControlBorderBrush(input, Brushes.Red); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void ClearInputState(Control input) { | ||||||
|  |             if (input is ComboBox cb) { | ||||||
|  |                 GetComboBoxBorder(cb)?.ClearValue(Border.BorderBrushProperty); | ||||||
|  |             } else { | ||||||
|  |                 input.ClearValue(Control.BorderBrushProperty); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static Border? GetComboBoxBorder(ComboBox cb) { | ||||||
|  |             var toggleButton = cb.Template.FindName("toggleButton", cb) as ToggleButton; | ||||||
|  |             return toggleButton?.Template.FindName("templateRoot", toggleButton) as Border; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj) where T : DependencyObject { | ||||||
|  |             if (depObj == null) | ||||||
|  |                 yield return (T)Enumerable.Empty<T>(); | ||||||
|  |             foreach (var child in LogicalTreeHelper.GetChildren(depObj)) { | ||||||
|  |                 if (child == null) { | ||||||
|  |                     continue; | ||||||
|  |                 } else if (child is T t) { | ||||||
|  |                     yield return t; | ||||||
|  |                 } | ||||||
|  |                 if (child is DependencyObject childDepOpj) { | ||||||
|  |                     foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) { | ||||||
|  |                         yield return childOfChild; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj, IEnumerable<DependencyObject> exempt) where T : DependencyObject { | ||||||
|  |             return FindAllChildren<T>(depObj).Where(c => !exempt.Contains(c)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static T? FindNextSibling<T>(Control me) where T : DependencyObject { | ||||||
|  |             var found = false; | ||||||
|  |             foreach (var child in LogicalTreeHelper.GetChildren(me.Parent)) { | ||||||
|  |                 if (found && child is T c) { | ||||||
|  |                     return c; | ||||||
|  |                 } else if (child == me) { | ||||||
|  |                     found = true; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             return null; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void RenewItemsSource(Selector selector, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) { | ||||||
|  |             if (selector.ItemsSource == source) | ||||||
|  |                 return; | ||||||
|  |             var selectedId = Utils.GetEntityIdentifier(selector.SelectedItem); | ||||||
|  |             object? selItem = null; | ||||||
|  |             if (selectedId != 0 && source != null) | ||||||
|  |                 selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i))); | ||||||
|  |             if (source != null && selItem == null) { | ||||||
|  |                 if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) { | ||||||
|  |                     selItem = source.Cast<object>().First(); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (handler != null && selItem != null) selector.SelectionChanged -= handler; | ||||||
|  |             selector.ItemsSource = source; | ||||||
|  |             if (handler != null && selItem != null) selector.SelectionChanged += handler; | ||||||
|  |             selector.SelectedItem = selItem; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) { | ||||||
|  |             if (dataGrid.ItemsSource == source) | ||||||
|  |                 return; | ||||||
|  |             var column = dataGrid.CurrentCell.Column; | ||||||
|  |             var sortColumns = dataGrid.Columns.Select(c => c.SortDirection).ToList(); | ||||||
|  |             var sort = dataGrid.Items.SortDescriptions.ToList(); | ||||||
|  |             var selectedId = Utils.GetEntityIdentifier(dataGrid.SelectedItem); | ||||||
|  |             object? selItem = null; | ||||||
|  |             if (selectedId != 0 && source != null) | ||||||
|  |                 selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i))); | ||||||
|  |             if (source != null && selItem == null) { | ||||||
|  |                 if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) { | ||||||
|  |                     selItem = source.Cast<object>().First(); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             if (handler != null && selItem != null) dataGrid.SelectionChanged -= handler; | ||||||
|  |             dataGrid.ItemsSource = source; | ||||||
|  |             if (handler != null && selItem != null) dataGrid.SelectionChanged += handler; | ||||||
|  |             dataGrid.SelectedItem = selItem; | ||||||
|  |             if (keepSort) { | ||||||
|  |                 for (int i = 0; i < dataGrid.Columns.Count; i++) | ||||||
|  |                     dataGrid.Columns[i].SortDirection = sortColumns[i]; | ||||||
|  |                 foreach (var s in sort) | ||||||
|  |                     dataGrid.Items.SortDescriptions.Add(s); | ||||||
|  |             } | ||||||
|  |             if (dataGrid.SelectedItem != null && column != null) | ||||||
|  |                 dataGrid.CurrentCell = new(dataGrid.SelectedItem, column); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void RenewItemsSource(ListBox listBox, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) { | ||||||
|  |             if (listBox.ItemsSource == source) | ||||||
|  |                 return; | ||||||
|  |             if (listBox.SelectionMode == SelectionMode.Single) { | ||||||
|  |                 var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem); | ||||||
|  |                 object? selItem = null; | ||||||
|  |                 if (selectedId != 0 && source != null) | ||||||
|  |                     selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i))); | ||||||
|  |                 if (source != null && selItem == null) { | ||||||
|  |                     if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) { | ||||||
|  |                         selItem = source.Cast<object>().FirstOrDefault(); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 if (handler != null && selItem != null) listBox.SelectionChanged -= handler; | ||||||
|  |                 listBox.ItemsSource = source; | ||||||
|  |                 if (handler != null && selItem != null) listBox.SelectionChanged += handler; | ||||||
|  |                 listBox.SelectedItem = selItem; | ||||||
|  |             } else { | ||||||
|  |                 var selectedIds = listBox.SelectedItems.Cast<object>().Select(Utils.GetEntityIdentifier).ToList(); | ||||||
|  |                 if (handler != null && selectedIds != null) listBox.SelectionChanged -= handler; | ||||||
|  |                 listBox.ItemsSource = source; | ||||||
|  |                 if (source != null && selectedIds != null) { | ||||||
|  |                     listBox.SelectedItems.Clear(); | ||||||
|  |                     foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i)))) | ||||||
|  |                         listBox.SelectedItems.Add(i); | ||||||
|  |                 } | ||||||
|  |                 if (handler != null && selectedIds != null) listBox.SelectionChanged += handler; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static object? GetItemFromSource(IEnumerable source, int? hash) { | ||||||
|  |             if (source == null) | ||||||
|  |                 return null; | ||||||
|  |             var items = source.Cast<object>(); | ||||||
|  |             var item = items.Where(i => Utils.GetEntityIdentifier(i) == hash).FirstOrDefault(); | ||||||
|  |             if (item == null && items.Any(i => i is NullItem)) | ||||||
|  |                 return items.Where(i => i is NullItem).First(); | ||||||
|  |             return item; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static T? GetItemFromSource<T>(IEnumerable source, T? item) { | ||||||
|  |             return (T?)GetItemFromSource(source, Utils.GetEntityIdentifier(item)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static object? GetItemFromSourceWithPk(IEnumerable source, params object?[] primaryKey) { | ||||||
|  |             return GetItemFromSource(source, (int?)Utils.GetEntityIdetifierForPk(primaryKey)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SelectItemWithHash(Selector input, int? hash) { | ||||||
|  |             if (hash == null) { | ||||||
|  |                 input.SelectedItem = null; | ||||||
|  |             } else { | ||||||
|  |                 input.SelectedItem = GetItemFromSource(input.ItemsSource, hash); | ||||||
|  |             } | ||||||
|  |             if (input is ListBox lb && lb.SelectedItem is object lbItem) { | ||||||
|  |                 lb.ScrollIntoView(lbItem); | ||||||
|  |             } else if (input is DataGrid dg && dg.SelectedItem is object dgItem) { | ||||||
|  |                 dg.ScrollIntoView(dgItem); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SelectItemWithPk(Selector input, params object?[] pk) { | ||||||
|  |             SelectItemWithHash(input, Utils.GetEntityIdentifier(pk)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SelectItem(Selector input, object? item) { | ||||||
|  |             SelectItemWithHash(input, Utils.GetEntityIdentifier(item)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<int?> ids) { | ||||||
|  |             if (source == null) | ||||||
|  |                 return []; | ||||||
|  |             return source.Cast<object>().Where(i => ids.Any(c => c == Utils.GetEntityIdentifier(i))); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<object?>? items) { | ||||||
|  |             if (items == null) | ||||||
|  |                 return []; | ||||||
|  |             return GetItemsFromSource(source, items.Select(Utils.GetEntityIdentifier)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SelectItems(ListBox lb, IEnumerable<int?>? ids) { | ||||||
|  |             lb.SelectedItems.Clear(); | ||||||
|  |             if (ids == null) return; | ||||||
|  |             foreach (var id in ids) | ||||||
|  |                 lb.SelectedItems.Add(GetItemFromSource(lb.ItemsSource, id)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void SelectItems(ListBox lb, IEnumerable<object>? items) { | ||||||
|  |             SelectItems(lb, items?.Select(Utils.GetEntityIdentifier)); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static int? GetInputHashCode(Control input) { | ||||||
|  |             if (input is TextBox tb) { | ||||||
|  |                 return Utils.GetEntityIdentifier(tb.Text); | ||||||
|  |             } else if (input is ComboBox sb) { | ||||||
|  |                 return Utils.GetEntityIdentifier(sb.SelectedItem); | ||||||
|  |             } else if (input is ListBox lb) { | ||||||
|  |                 return Utils.GetEntityIdentifier(lb.SelectedItems); | ||||||
|  |             } else if (input is CheckBox cb) { | ||||||
|  |                 return Utils.GetEntityIdentifier(cb.IsChecked); | ||||||
|  |             } else if (input is RadioButton rb) { | ||||||
|  |                 return Utils.GetEntityIdentifier(rb.IsChecked); | ||||||
|  |             } else { | ||||||
|  |                 return null; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										67
									
								
								Elwig/Helpers/Export/Bki.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								Elwig/Helpers/Export/Bki.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,67 @@ | |||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using System; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Export { | ||||||
|  |  | ||||||
|  |     using Row = Tuple<(string?, string?, string?, string?, string, int, string, int), (string, int, string, string, string, int, string, double, double)>; | ||||||
|  |  | ||||||
|  |     public class Bki : Csv<Row> { | ||||||
|  |  | ||||||
|  |         private readonly string _clientData; | ||||||
|  |  | ||||||
|  |         public Bki(string filename) : base(filename, ';', Encoding.Latin1) { | ||||||
|  |             Header = """ | ||||||
|  |                 EDV-Liste zum automatischen Einlesen in die Weindatenbank;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||||
|  |                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||||
|  |                 Stammdaten;;;;;;;;;;;;;;Transportschein;;;;;;;;;;;;;;;; | ||||||
|  |                 Empfänger:;;;;;;;Versender:;;;;;;;;;;;;;;;;;;;;;;; | ||||||
|  |                 Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Datum der Lieferung;Menge in kg;Art;Weiß;Rot;Sorte1;Sorte2;Sorte3;Qualitätsstufe;Jahrgang;Herkunft;°KMW;°Oe;Vollablieferer;Ha Gesamt;Ha Ertragsfähig;Flächenbindung in Ha für AMA | ||||||
|  |                 """; | ||||||
|  |             var c = App.Client; | ||||||
|  |             var (a1, a2) = Utils.SplitAddress(c.Address); | ||||||
|  |             _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};{a2};{c.Plz};{c.Ort}"; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task ExportAsync(int year) { | ||||||
|  |             using var cnx = await AppDbContext.ConnectAsync(); | ||||||
|  |             using var cmd = cnx.CreateCommand(); | ||||||
|  |             cmd.CommandText = $""" | ||||||
|  |                 SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area, | ||||||
|  |                        date, weight, type, sortid, qualid, year, hkid, kmw, oe | ||||||
|  |                 FROM v_bki_delivery | ||||||
|  |                 WHERE year = {year} | ||||||
|  |                 """; | ||||||
|  |             var r = await cmd.ExecuteReaderAsync(); | ||||||
|  |             List<Row> rows = new(); | ||||||
|  |             while (await r.ReadAsync()) { | ||||||
|  |                 rows.Add(new( | ||||||
|  |                     (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)), | ||||||
|  |                     (r.GetString(8), r.GetInt32(9), r.GetString(10), r.GetString(11), r.GetString(12), r.GetInt32(13), r.GetString(14), r.GetDouble(15), r.GetDouble(16)) | ||||||
|  |                 )); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await ExportAsync(rows); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Export(int year) { | ||||||
|  |             ExportAsync(year).GetAwaiter().GetResult(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public override string FormatRow(Row row) { | ||||||
|  |             var (member, delivery) = row; | ||||||
|  |             var (lfBisNr, familyName, name, billingName, address, plz, ort, area) = member; | ||||||
|  |             var (date, weight, type, sortid, qualid, year, hkid, kmw, oe) = delivery; | ||||||
|  |  | ||||||
|  |             var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName); | ||||||
|  |             var (a1, a2) = Utils.SplitAddress(address); | ||||||
|  |             var memberData = $"{lfBisNr};{n1};{n2};{a1};{a2};{plz};{ort}"; | ||||||
|  |             var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}"; | ||||||
|  |             var vollData = $"N;;;{area / 10_000.0}"; | ||||||
|  |  | ||||||
|  |             return $"{_clientData};{memberData};{deliveryData};{vollData}"; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										61
									
								
								Elwig/Helpers/Export/Csv.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										61
									
								
								Elwig/Helpers/Export/Csv.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,61 @@ | |||||||
|  | using System; | ||||||
|  | using System.Collections; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.IO; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Export { | ||||||
|  |     public abstract class Csv<T> : IExporter<T> { | ||||||
|  |  | ||||||
|  |         public static string FileExtension => "csv"; | ||||||
|  |  | ||||||
|  |         private readonly StreamWriter _writer; | ||||||
|  |         protected readonly char Separator; | ||||||
|  |         protected string? Header; | ||||||
|  |  | ||||||
|  |         public Csv(string filename, char separator = ';') : this(filename, separator, Utils.UTF8) { } | ||||||
|  |  | ||||||
|  |         public Csv(string filename, char separator, Encoding encoding) { | ||||||
|  |             _writer = new StreamWriter(filename, false, encoding); | ||||||
|  |             Separator = separator; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Dispose() { | ||||||
|  |             GC.SuppressFinalize(this); | ||||||
|  |             _writer.Dispose(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public ValueTask DisposeAsync() { | ||||||
|  |             GC.SuppressFinalize(this); | ||||||
|  |             return _writer.DisposeAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task ExportAsync(IEnumerable<T> data, IProgress<double>? progress = null) { | ||||||
|  |             progress?.Report(0.0); | ||||||
|  |             int count = data.Count() + 2, i = 0; | ||||||
|  |  | ||||||
|  |             if (Header != null) await _writer.WriteLineAsync(Header); | ||||||
|  |             progress?.Report(100.0 * ++i / count); | ||||||
|  |  | ||||||
|  |             foreach (var row in data) { | ||||||
|  |                 await _writer.WriteLineAsync(FormatRow(row)); | ||||||
|  |                 progress?.Report(100.0 * ++i / count); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await _writer.FlushAsync(); | ||||||
|  |             progress?.Report(100.0); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Export(IEnumerable<T> data, IProgress<double>? progress = null) { | ||||||
|  |             ExportAsync(data, progress).GetAwaiter().GetResult(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public string FormatRow(IEnumerable row) { | ||||||
|  |             return string.Join(Separator, row); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public abstract string FormatRow(T row); | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										116
									
								
								Elwig/Helpers/Export/Ebics.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										116
									
								
								Elwig/Helpers/Export/Ebics.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,116 @@ | |||||||
|  | using Elwig.Models; | ||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.IO; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Security; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Export { | ||||||
|  |     public class Ebics(PaymentVar variant, string filename, int version, Ebics.AddressMode mode = Ebics.AddressMode.Full) : IBankingExporter { | ||||||
|  |  | ||||||
|  |         public enum AddressMode { Omit = 0, Lines = 1, Full = 2 } | ||||||
|  |  | ||||||
|  |         public static string FileExtension => "xml"; | ||||||
|  |  | ||||||
|  |         private readonly StreamWriter Writer = new(filename, false, Utils.UTF8); | ||||||
|  |         private readonly DateOnly Date = variant.TransferDate ?? throw new ArgumentException("TransferDate has to be set in PaymentVar"); | ||||||
|  |         private readonly int Year = variant.Year; | ||||||
|  |         private readonly string Name = variant.Name; | ||||||
|  |         private readonly int AvNr = variant.AvNr; | ||||||
|  |         private readonly int Version = version; | ||||||
|  |         private readonly AddressMode ShowAddresses = mode; | ||||||
|  |  | ||||||
|  |         public void Dispose() { | ||||||
|  |             GC.SuppressFinalize(this); | ||||||
|  |             Writer.Dispose(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public ValueTask DisposeAsync() { | ||||||
|  |             GC.SuppressFinalize(this); | ||||||
|  |             return Writer.DisposeAsync(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Export(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) { | ||||||
|  |             ExportAsync(transactions, progress).GetAwaiter().GetResult(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) { | ||||||
|  |             if (transactions.Any(tx => tx.Amount < 0)) { | ||||||
|  |                 throw new ArgumentException("Tranaction amount may not be negative"); | ||||||
|  |             } else if (App.Client.Iban == null) { | ||||||
|  |                 throw new ArgumentException("Client IBAN has to be set"); | ||||||
|  |             } | ||||||
|  |             progress?.Report(0.0); | ||||||
|  |             var nbOfTxs = transactions.Count(); | ||||||
|  |             int count = nbOfTxs + 2, i = 0; | ||||||
|  |             var ctrlSum = transactions.Sum(tx => tx.Amount); | ||||||
|  |             var msgId = $"ELWIG-{App.Client.NameToken}-{Year}-AV{AvNr:00}"; | ||||||
|  |             var pmtInfId = $"{msgId}-1"; | ||||||
|  |  | ||||||
|  |             await Writer.WriteLineAsync($""" | ||||||
|  |                 <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |                 <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.{Version:00}"> | ||||||
|  |                  <CstmrCdtTrfInitn> | ||||||
|  |                   <GrpHdr> | ||||||
|  |                    <MsgId>{msgId}</MsgId> | ||||||
|  |                    <CreDtTm>{DateTime.UtcNow:o}</CreDtTm> | ||||||
|  |                    <NbOfTxs>{nbOfTxs}</NbOfTxs> | ||||||
|  |                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum> | ||||||
|  |                    <InitgPty><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></InitgPty> | ||||||
|  |                   </GrpHdr> | ||||||
|  |                   <PmtInf> | ||||||
|  |                    <PmtInfId>{pmtInfId}</PmtInfId> | ||||||
|  |                    <PmtMtd>TRF</PmtMtd> | ||||||
|  |                    <NbOfTxs>{nbOfTxs}</NbOfTxs> | ||||||
|  |                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum> | ||||||
|  |                    <ReqdExctnDt>{(Version >= 8 ? "<Dt>" : "")}{Date:yyyy-MM-dd}{(Version >= 8 ? "</Dt>" : "")}</ReqdExctnDt> | ||||||
|  |                    <Dbtr><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></Dbtr> | ||||||
|  |                    <DbtrAcct><Id><IBAN>{App.Client.Iban!.Replace(" ", "")}</IBAN></Id></DbtrAcct> | ||||||
|  |                    <DbtrAgt><FinInstnId>{(Version >= 4 ? "<BICFI>" : "<BIC>")}{App.Client.Bic ?? "NOTPROVIDED"}{(Version >= 4 ? "</BICFI>" : "</BIC>")}</FinInstnId></DbtrAgt> | ||||||
|  |                 """); | ||||||
|  |             progress?.Report(100.0 * ++i / count); | ||||||
|  |  | ||||||
|  |             foreach (var tx in transactions) { | ||||||
|  |                 var a = (IAddress?)tx.Member.BillingAddress ?? tx.Member; | ||||||
|  |                 var (a1, a2) = Utils.SplitAddress(a.Address); | ||||||
|  |                 var id = $"ELWIG-{App.Client.NameToken}-{Year}-TG{tx.Nr:0000}"; | ||||||
|  |                 var info = $"{Name} - Traubengutschrift Nr. {Year}/{tx.Nr:000}"; | ||||||
|  |                 await Writer.WriteLineAsync($""" | ||||||
|  |                        <CdtTrfTxInf> | ||||||
|  |                         <PmtId><EndToEndId>{id}</EndToEndId></PmtId> | ||||||
|  |                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt> | ||||||
|  |                         <Cdtr> | ||||||
|  |                          <Nm>{SecurityElement.Escape(a.FullName[..Math.Min(140, a.FullName.Length)])}</Nm> | ||||||
|  |                     """); | ||||||
|  |                 if (ShowAddresses != AddressMode.Omit) { | ||||||
|  |                     var full = ShowAddresses == AddressMode.Full; | ||||||
|  |                     await Writer.WriteLineAsync($""" | ||||||
|  |                              <PstlAdr>{(full ? "" : $"\r\n      <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>")} | ||||||
|  |                               {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" : | ||||||
|  |                                        $"<AdrLine>{SecurityElement.Escape(a.Address[..Math.Min(70, a.Address.Length)])}</AdrLine>")} | ||||||
|  |                               <{(full ? "PstCd" : "AdrLine")}>{a.PostalDest.AtPlz?.Plz}{(full ? "</PstCd> <TwnNm>" : " ")}{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</{(full ? "TwnNm" : "AdrLine")}> | ||||||
|  |                              {(full ? $" <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>\r\n     " : "")}</PstlAdr> | ||||||
|  |                         """); | ||||||
|  |                 } | ||||||
|  |                 await Writer.WriteLineAsync($""" | ||||||
|  |                         </Cdtr> | ||||||
|  |                         <CdtrAcct><Id><IBAN>{tx.Member.Iban!}</IBAN></Id></CdtrAcct> | ||||||
|  |                         <RmtInf><Ustrd>{SecurityElement.Escape(info)}</Ustrd></RmtInf> | ||||||
|  |                        </CdtTrfTxInf> | ||||||
|  |                     """); | ||||||
|  |                 progress?.Report(100.0 * ++i / count); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             await Writer.WriteLineAsync(""" | ||||||
|  |                   </PmtInf> | ||||||
|  |                  </CstmrCdtTrfInitn> | ||||||
|  |                 </Document> | ||||||
|  |                 """); | ||||||
|  |             await Writer.FlushAsync(); | ||||||
|  |             progress?.Report(100.0); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								Elwig/Helpers/Export/Elba.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Elwig/Helpers/Export/Elba.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | using Elwig.Models.Dtos; | ||||||
|  | using System; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Export { | ||||||
|  |     public class Elba : Csv<Transaction>, IBankingExporter { | ||||||
|  |  | ||||||
|  |         public static new string FileExtension => "elba"; | ||||||
|  |  | ||||||
|  |         public Elba(string filename) : base(filename) { } | ||||||
|  |  | ||||||
|  |         public override string FormatRow(Transaction row) { | ||||||
|  |             throw new NotImplementedException(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										667
									
								
								Elwig/Helpers/Export/ElwigData.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										667
									
								
								Elwig/Helpers/Export/ElwigData.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,667 @@ | |||||||
|  | using System.IO.Compression; | ||||||
|  | using System.IO; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using Elwig.Models.Entities; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System; | ||||||
|  | using System.Text.Json.Nodes; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Windows; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using System.Text.Json; | ||||||
|  |  | ||||||
|  | namespace Elwig.Helpers.Export { | ||||||
|  |     public static class ElwigData { | ||||||
|  |  | ||||||
|  |         public enum ImportMode { Auto, Interactively, FromBranches } | ||||||
|  |  | ||||||
|  |         public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt"); | ||||||
|  |  | ||||||
|  |         private static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping }; | ||||||
|  |  | ||||||
|  |         public static async Task<string[]> GetImportedFiles() { | ||||||
|  |             try { | ||||||
|  |                 return await File.ReadAllLinesAsync(ImportedTxt, Utils.UTF8); | ||||||
|  |             } catch { | ||||||
|  |                 return []; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task AddImportedFiles(params string[] filenames) { | ||||||
|  |             await File.AppendAllLinesAsync(ImportedTxt, filenames, Utils.UTF8); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Task Import(string filename, ImportMode mode) => Import([filename], mode); | ||||||
|  |  | ||||||
|  |         public static async Task Import(IEnumerable<string> filenames, ImportMode mode) { | ||||||
|  |             try { | ||||||
|  |                 Dictionary<string, Branch> branches; | ||||||
|  |                 Dictionary<int, int> currentDids; | ||||||
|  |                 Dictionary<string, int> currentLsNrs; | ||||||
|  |                 Dictionary<int, List<WbRd>> currentWbRde; | ||||||
|  |                 Dictionary<int, AT_Kg> kgs; | ||||||
|  |  | ||||||
|  |                 using (var ctx = new AppDbContext()) { | ||||||
|  |                     branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId); | ||||||
|  |                     currentDids = await ctx.Deliveries | ||||||
|  |                         .GroupBy(d => d.Year) | ||||||
|  |                         .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId)); | ||||||
|  |                     currentLsNrs = await ctx.Deliveries | ||||||
|  |                         .ToDictionaryAsync(d => d.LsNr, d => d.DId); | ||||||
|  |                     currentWbRde = await ctx.WbRde | ||||||
|  |                         .GroupBy(r => r.KgNr) | ||||||
|  |                         .ToDictionaryAsync(g => g.Key, g => g.ToList()); | ||||||
|  |                     kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var data = new List<( | ||||||
|  |                     List<Member> Members, | ||||||
|  |                     List<BillingAddr> BillingAddresses, | ||||||
|  |                     List<MemberTelNr> TelephoneNumbers, | ||||||
|  |                     List<MemberEmailAddr> EmailAddresses, | ||||||
|  |                     List<AreaCom> AreaCommitments, | ||||||
|  |                     List<WbRd> Riede, | ||||||
|  |                     List<Delivery> Deliveries, | ||||||
|  |                     List<DeliveryPart> DeliveryParts, | ||||||
|  |                     List<DeliveryPartModifier> Modifiers)>(); | ||||||
|  |  | ||||||
|  |                 var metaData = new List<(string FileName, string ZwstId, string Device, | ||||||
|  |                     int? MemberNum, string? MemberFilters, | ||||||
|  |                     int? AreaComNum, string? AreaComFilters, | ||||||
|  |                     int? DeliveryNum, string? DeliveryFilters)>(); | ||||||
|  |  | ||||||
|  |                 foreach (var filename in filenames) { | ||||||
|  |                     // TODO read encrypted files | ||||||
|  |                     using var zip = ZipFile.Open(filename, ZipArchiveMode.Read); | ||||||
|  |  | ||||||
|  |                     var version = zip.GetEntry("version"); | ||||||
|  |                     using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) { | ||||||
|  |                         if (await reader.ReadToEndAsync() != "elwig:1") | ||||||
|  |                             throw new FileFormatException($"Ungültige Export-Datei ({filename})"); | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     var metaJson = zip.GetEntry("meta.json"); | ||||||
|  |                     var meta = await JsonNode.ParseAsync(metaJson!.Open()); | ||||||
|  |                     var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>(); | ||||||
|  |                     var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray(); | ||||||
|  |                     var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>(); | ||||||
|  |                     var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray(); | ||||||
|  |                     var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>(); | ||||||
|  |                     var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray(); | ||||||
|  |                     metaData.Add((Path.GetFileName(filename), | ||||||
|  |                         meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(), | ||||||
|  |                         memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null, | ||||||
|  |                         areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null, | ||||||
|  |                         deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null)); | ||||||
|  |  | ||||||
|  |                     data.Add(new([], [], [], [], [], [], [], new([], []))); | ||||||
|  |                     var r = data[^1]; | ||||||
|  |  | ||||||
|  |                     var membersJson = zip.GetEntry("members.json"); | ||||||
|  |                     if (membersJson != null) { | ||||||
|  |                         using var reader = new StreamReader(membersJson.Open(), Utils.UTF8); | ||||||
|  |                         string? line; | ||||||
|  |                         while ((line = await reader.ReadLineAsync()) != null) { | ||||||
|  |                             var obj = JsonNode.Parse(line)!.AsObject(); | ||||||
|  |                             var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs); | ||||||
|  |                             r.Members.Add(m); | ||||||
|  |                             if (b != null) r.BillingAddresses.Add(b); | ||||||
|  |                             r.TelephoneNumbers.AddRange(telNrs); | ||||||
|  |                             r.EmailAddresses.AddRange(emailAddrs); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     var areaComsJson = zip.GetEntry("area_commitments.json"); | ||||||
|  |                     if (areaComsJson != null) { | ||||||
|  |                         using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8); | ||||||
|  |                         string? line; | ||||||
|  |                         while ((line = await reader.ReadLineAsync()) != null) { | ||||||
|  |                             var obj = JsonNode.Parse(line)!.AsObject(); | ||||||
|  |                             var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde); | ||||||
|  |                             r.AreaCommitments.Add(areaCom); | ||||||
|  |                             if (wbrd != null) { | ||||||
|  |                                 currentWbRde[wbrd.KgNr].Add(wbrd); | ||||||
|  |                                 r.Riede.Add(wbrd); | ||||||
|  |                             } | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     var deliveriesJson = zip.GetEntry("deliveries.json"); | ||||||
|  |                     if (deliveriesJson != null) { | ||||||
|  |                         using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8); | ||||||
|  |                         string? line; | ||||||
|  |                         while ((line = await reader.ReadLineAsync()) != null) { | ||||||
|  |                             var obj = JsonNode.Parse(line)!.AsObject(); | ||||||
|  |                             var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids); | ||||||
|  |                             r.Deliveries.Add(d); | ||||||
|  |                             r.DeliveryParts.AddRange(parts); | ||||||
|  |                             r.Modifiers.AddRange(mods); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>(); | ||||||
|  |                 var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>(); | ||||||
|  |                 var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>(); | ||||||
|  |  | ||||||
|  |                 foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) { | ||||||
|  |                     var branch = branches[meta.ZwstId]; | ||||||
|  |                     var device = meta.Device; | ||||||
|  |  | ||||||
|  |                     using var ctx = new AppDbContext(); | ||||||
|  |  | ||||||
|  |                     var mgnrs = members.Select(m => m.MgNr).ToList(); | ||||||
|  |                     var duplicateMgNrs = await ctx.Members | ||||||
|  |                         .Where(m => mgnrs.Contains(m.MgNr)) | ||||||
|  |                         .Select(m => m.MgNr) | ||||||
|  |                         .ToListAsync(); | ||||||
|  |                     bool importNewMembers = false, importDuplicateMembers = false; | ||||||
|  |                     if (mode == ImportMode.Interactively) { | ||||||
|  |                         if (mgnrs.Count - duplicateMgNrs.Count > 0) | ||||||
|  |                             importNewMembers = ImportQuestion(branch.Name, device, "Mitglieder", false, mgnrs.Count - duplicateMgNrs.Count); | ||||||
|  |                     } else { | ||||||
|  |                         importNewMembers = true; | ||||||
|  |                     } | ||||||
|  |                     if (duplicateMgNrs.Count > 0) | ||||||
|  |                         importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count); | ||||||
|  |  | ||||||
|  |                     var fbnrs = areaCommitments.Select(c => c.FbNr).ToList(); | ||||||
|  |                     var duplicateFbNrs = await ctx.AreaCommitments | ||||||
|  |                         .Where(c => fbnrs.Contains(c.FbNr)) | ||||||
|  |                         .Select(c => c.FbNr) | ||||||
|  |                         .ToListAsync(); | ||||||
|  |  | ||||||
|  |                     var lsnrs = deliveries.Select(d => d.LsNr).ToList(); | ||||||
|  |                     var duplicateLsNrs = await ctx.Deliveries | ||||||
|  |                         .Where(d => lsnrs.Contains(d.LsNr)) | ||||||
|  |                         .Select(d => d.LsNr) | ||||||
|  |                         .ToListAsync(); | ||||||
|  |                     var duplicateDIds = deliveries | ||||||
|  |                         .Where(d => duplicateLsNrs.Contains(d.LsNr)) | ||||||
|  |                         .Select(d => (d.Year, d.DId)) | ||||||
|  |                         .ToList(); | ||||||
|  |                     var allowedDuplicateLsNrs = new List<string>(); | ||||||
|  |                     bool importNewDeliveries = false, importDuplicateDeliveries = false; | ||||||
|  |                     if (mode == ImportMode.Interactively) { | ||||||
|  |                         if (lsnrs.Count - duplicateLsNrs.Count > 0) | ||||||
|  |                             importNewDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", false, lsnrs.Count - duplicateLsNrs.Count); | ||||||
|  |                         if (duplicateLsNrs.Count > 0) | ||||||
|  |                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count); | ||||||
|  |                     } else if (mode == ImportMode.FromBranches) { | ||||||
|  |                         importNewDeliveries = true; | ||||||
|  |                         if (duplicateLsNrs.Count > 0) { | ||||||
|  |                             allowedDuplicateLsNrs = await ctx.Deliveries | ||||||
|  |                                 .Where(d => lsnrs.Contains(d.LsNr) && d.ZwstId == branch.ZwstId) | ||||||
|  |                                 .Select(d => d.LsNr) | ||||||
|  |                                 .ToListAsync(); | ||||||
|  |                             if (duplicateLsNrs.Count - allowedDuplicateLsNrs.Count > 0) | ||||||
|  |                                 importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count - allowedDuplicateLsNrs.Count); | ||||||
|  |                         } | ||||||
|  |                     } else { | ||||||
|  |                         importNewDeliveries = true; | ||||||
|  |                         if (duplicateLsNrs.Count > 0) | ||||||
|  |                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count); | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     if (importDuplicateMembers) { | ||||||
|  |                         ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr))); | ||||||
|  |                         ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr))); | ||||||
|  |                         ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr))); | ||||||
|  |                         ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr))); | ||||||
|  |                         ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr))); | ||||||
|  |                     } | ||||||
|  |                     if (importNewMembers) { | ||||||
|  |                         ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr))); | ||||||
|  |                         ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr))); | ||||||
|  |                         ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr))); | ||||||
|  |                         ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr))); | ||||||
|  |                         ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr))); | ||||||
|  |                     } | ||||||
|  |                     if (members.Count > 0) { | ||||||
|  |                         var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0; | ||||||
|  |                         var o = importDuplicateMembers ? duplicateMgNrs.Count : 0; | ||||||
|  |                         importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters)); | ||||||
|  |                     } | ||||||
|  |                     if (areaCommitments.Count > 0) { | ||||||
|  |                         ctx.AddRange(riede); | ||||||
|  |                         var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList(); | ||||||
|  |                         importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters)); | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     if (allowedDuplicateLsNrs.Count > 0) { | ||||||
|  |                         var dids = deliveries | ||||||
|  |                             .Where(d => allowedDuplicateLsNrs.Contains(d.LsNr)) | ||||||
|  |                             .Select(d => (d.Year, d.DId)) | ||||||
|  |                             .ToList(); | ||||||
|  |                         ctx.RemoveRange(ctx.DeliveryParts | ||||||
|  |                             .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)) | ||||||
|  |                             .SelectMany(p => p.PartModifiers)); | ||||||
|  |                         ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))); | ||||||
|  |                         ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId)))); | ||||||
|  |                         ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId)))); | ||||||
|  |                         ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId)))); | ||||||
|  |                     } | ||||||
|  |                     if (importDuplicateDeliveries) { | ||||||
|  |                         var l = duplicateLsNrs.Except(allowedDuplicateLsNrs).ToList(); | ||||||
|  |                         var dids = deliveries | ||||||
|  |                             .Where(d => l.Contains(d.LsNr)) | ||||||
|  |                             .Select(d => (d.Year, d.DId)) | ||||||
|  |                             .ToList(); | ||||||
|  |                         ctx.RemoveRange(ctx.DeliveryParts | ||||||
|  |                             .Where(p => l.Contains(p.Delivery.LsNr)) | ||||||
|  |                             .SelectMany(p => p.PartModifiers)); | ||||||
|  |                         ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr))); | ||||||
|  |                         ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId)))); | ||||||
|  |                         ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId)))); | ||||||
|  |                         ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId)))); | ||||||
|  |                     } | ||||||
|  |                     if (importNewDeliveries) { | ||||||
|  |                         ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId)))); | ||||||
|  |                         ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId)))); | ||||||
|  |                         ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId)))); | ||||||
|  |                     } | ||||||
|  |                     if (deliveries.Count > 0) { | ||||||
|  |                         var n = importNewDeliveries ? deliveries.Count - duplicateDIds.Count : 0; | ||||||
|  |                         var o = allowedDuplicateLsNrs.Count + (importDuplicateDeliveries ? duplicateDIds.Count - allowedDuplicateLsNrs.Count : 0); | ||||||
|  |                         importedDeliveries.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, deliveries.Count - n - o, meta.DeliveryFilters)); | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     await ctx.SaveChangesAsync(); | ||||||
|  |                     await AddImportedFiles(Path.GetFileName(meta.FileName)); | ||||||
|  |                 } | ||||||
|  |                 await App.HintContextChange(); | ||||||
|  |  | ||||||
|  |                 MessageBox.Show( | ||||||
|  |                     $"Das importieren der Daten war erfolgreich!\n" + | ||||||
|  |                     $"Folgendes wurde importiert:\n" + | ||||||
|  |                     string.Join("\n", [ | ||||||
|  |                         $"Mitglieder: {importedMembers.Sum(d => d.New + d.Overwritten)}", | ||||||
|  |                         ..importedMembers.Select(d => | ||||||
|  |                             $"  {d.FileName} ({d.New + d.Overwritten})\n" + | ||||||
|  |                             $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" + | ||||||
|  |                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" + | ||||||
|  |                             $"    Filter: {d.Filters}"), | ||||||
|  |                         $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}", | ||||||
|  |                         ..importedAreaComs.Select(d => | ||||||
|  |                             $"  {d.FileName} ({d.Imported})\n" + | ||||||
|  |                             $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" + | ||||||
|  |                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" + | ||||||
|  |                             $"    Filter: {d.Filters}"), | ||||||
|  |                         $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}", | ||||||
|  |                         ..importedDeliveries.Select(d => | ||||||
|  |                             $"  {d.FileName} ({d.New + d.Overwritten})\n" + | ||||||
|  |                             $"    ({d.New} neu, {d.Overwritten} überschr., {d.NotImported} nicht importiert)\n" + | ||||||
|  |                             $"    Zwst.: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" + | ||||||
|  |                             $"    Filter: {d.Filters}") | ||||||
|  |                     ]), | ||||||
|  |                     "Importieren erfolgreich", | ||||||
|  |                     MessageBoxButton.OK, MessageBoxImage.Information); | ||||||
|  |             } catch (Exception exc) { | ||||||
|  |                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message; | ||||||
|  |                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message; | ||||||
|  |                 MessageBox.Show(str, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||||
|  |             } | ||||||
|  |             GC.Collect(); | ||||||
|  |             GC.WaitForPendingFinalizers(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         private static bool ImportQuestion(string branch, string device, string subject, bool duplicate, int number) { | ||||||
|  |             return MessageBox.Show( | ||||||
|  |                 $"Sollen {number} {(duplicate ? "" : "neue ")}{subject} durch die Zweigstelle\n" + | ||||||
|  |                 $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?", | ||||||
|  |                 $"{subject} importieren", | ||||||
|  |                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes | ||||||
|  |             ) == MessageBoxResult.Yes; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<string> filters) { | ||||||
|  |             return new ElwigExport { | ||||||
|  |                 Members = (members, filters) | ||||||
|  |             }.Export(filename); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<string> filters) { | ||||||
|  |             return new ElwigExport { | ||||||
|  |                 Members = (members, filters), | ||||||
|  |                 AreaComs = (areaComs, ["von exportierten Mitgliedern"]), | ||||||
|  |             }.Export(filename); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) { | ||||||
|  |             return new ElwigExport { | ||||||
|  |                 Deliveries = (deliveries, filters) | ||||||
|  |             }.Export(filename); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public class ElwigExport { | ||||||
|  |             public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; } | ||||||
|  |             public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; } | ||||||
|  |             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; } | ||||||
|  |  | ||||||
|  |             public async Task Export(string filename) { | ||||||
|  |                 File.Delete(filename); | ||||||
|  |                 using var zip = ZipFile.Open(filename, ZipArchiveMode.Create); | ||||||
|  |  | ||||||
|  |                 var version = zip.CreateEntry("version", CompressionLevel.NoCompression); | ||||||
|  |                 using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) { | ||||||
|  |                     await writer.WriteAsync("elwig:1"); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression); | ||||||
|  |                 using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) { | ||||||
|  |                     var obj = new JsonObject { | ||||||
|  |                         ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}", | ||||||
|  |                         ["zwstid"] = App.ZwstId, | ||||||
|  |                         ["device"] = Environment.MachineName, | ||||||
|  |                     }; | ||||||
|  |                     if (Members != null) | ||||||
|  |                         obj["members"] = new JsonObject { | ||||||
|  |                             ["count"] = Members.Value.Members.Count(), | ||||||
|  |                             ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()), | ||||||
|  |                         }; | ||||||
|  |                     if (AreaComs != null) | ||||||
|  |                         obj["area_commitments"] = new JsonObject { | ||||||
|  |                             ["count"] = AreaComs.Value.AreaComs.Count(), | ||||||
|  |                             ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()), | ||||||
|  |                         }; | ||||||
|  |                     if (Deliveries != null) | ||||||
|  |                         obj["deliveries"] = new JsonObject { | ||||||
|  |                             ["count"] = Deliveries.Value.Deliveries.Count(), | ||||||
|  |                             ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count), | ||||||
|  |                             ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()), | ||||||
|  |                         }; | ||||||
|  |                     await writer.WriteAsync(obj.ToJsonString(JsonOpts)); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 // TODO encrypt files | ||||||
|  |                 if (Members != null) { | ||||||
|  |                     var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize); | ||||||
|  |                     using var writer = new StreamWriter(json.Open(), Utils.UTF8); | ||||||
|  |                     foreach (var m in Members.Value.Members) { | ||||||
|  |                         await writer.WriteLineAsync(m.ToJson().ToJsonString(JsonOpts)); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 if (AreaComs != null) { | ||||||
|  |                     var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize); | ||||||
|  |                     using var writer = new StreamWriter(json.Open(), Utils.UTF8); | ||||||
|  |                     foreach (var c in AreaComs.Value.AreaComs) { | ||||||
|  |                         await writer.WriteLineAsync(c.ToJson().ToJsonString(JsonOpts)); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 if (Deliveries != null) { | ||||||
|  |                     var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize); | ||||||
|  |                     using var writer = new StreamWriter(json.Open(), Utils.UTF8); | ||||||
|  |                     foreach (var d in Deliveries.Value.Deliveries) { | ||||||
|  |                         await writer.WriteLineAsync(d.ToJson().ToJsonString(JsonOpts)); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static JsonObject ToJson(this Member m) { | ||||||
|  |             return new JsonObject { | ||||||
|  |                 ["mgnr"] = m.MgNr, | ||||||
|  |                 ["predecessor_mgnr"] = m.PredecessorMgNr, | ||||||
|  |                 ["name"] = m.Name, | ||||||
|  |                 ["prefix"] = m.Prefix, | ||||||
|  |                 ["given_name"] = m.GivenName, | ||||||
|  |                 ["middle_names"] = m.MiddleName, | ||||||
|  |                 ["suffix"] = m.Suffix, | ||||||
|  |                 ["attn"] = m.ForTheAttentionOf, | ||||||
|  |                 ["birthday"] = m.Birthday, | ||||||
|  |                 ["entry_date"] = m.EntryDate != null ? $"{m.EntryDate:yyyy-MM-dd}" : null, | ||||||
|  |                 ["exit_date"] = m.ExitDate != null ? $"{m.ExitDate:yyyy-MM-dd}" : null, | ||||||
|  |                 ["business_shares"] = m.BusinessShares, | ||||||
|  |                 ["accounting_nr"] = m.AccountingNr, | ||||||
|  |                 ["zwstid"] = m.ZwstId, | ||||||
|  |                 ["lfbis_nr"] = m.LfbisNr, | ||||||
|  |                 ["ustid_nr"] = m.UstIdNr, | ||||||
|  |                 ["juridical_pers"] = m.IsJuridicalPerson, | ||||||
|  |                 ["volllieferant"] = m.IsVollLieferant, | ||||||
|  |                 ["buchführend"] = m.IsBuchführend, | ||||||
|  |                 ["organic"] = m.IsOrganic, | ||||||
|  |                 ["funktionär"] = m.IsFunktionär, | ||||||
|  |                 ["active"] = m.IsActive, | ||||||
|  |                 ["deceased"] = m.IsDeceased, | ||||||
|  |                 ["iban"] = m.Iban, | ||||||
|  |                 ["bic"] = m.Bic, | ||||||
|  |                 ["default_kgnr"] = m.DefaultKgNr, | ||||||
|  |                 ["contact_postal"] = m.ContactViaPost, | ||||||
|  |                 ["contact_email"] = m.ContactViaEmail, | ||||||
|  |                 ["address"] = new JsonObject { | ||||||
|  |                     ["address"] = m.Address, | ||||||
|  |                     ["postal_dest"] = m.PostalDestId, | ||||||
|  |                     ["country"] = m.CountryNum, | ||||||
|  |                 }, | ||||||
|  |                 ["billing_address"] = m.BillingAddress != null ? new JsonObject { | ||||||
|  |                     ["name"] = m.BillingAddress.FullName, | ||||||
|  |                     ["address"] = m.BillingAddress.Address, | ||||||
|  |                     ["postal_dest"] = m.BillingAddress.PostalDestId, | ||||||
|  |                     ["country"] = m.BillingAddress.CountryNum, | ||||||
|  |                 } : null, | ||||||
|  |                 ["telephone_numbers"] = new JsonArray(m.TelephoneNumbers.OrderBy(n => n.Nr).Select(n => { | ||||||
|  |                     var obj = new JsonObject { | ||||||
|  |                         ["number"] = n.Number, | ||||||
|  |                         ["type"] = n.Type, | ||||||
|  |                     }; | ||||||
|  |                     if (n.Comment != null) obj["comment"] = n.Comment; | ||||||
|  |                     return obj; | ||||||
|  |                 }).ToArray()), | ||||||
|  |                 ["email_addresses"] = new JsonArray(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => { | ||||||
|  |                     var obj = new JsonObject { | ||||||
|  |                         ["address"] = a.Address, | ||||||
|  |                     }; | ||||||
|  |                     if (a.Comment != null) obj["comment"] = a.Comment; | ||||||
|  |                     return obj; | ||||||
|  |                 }).ToArray()), | ||||||
|  |                 ["comment"] = m.Comment, | ||||||
|  |             }; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) { | ||||||
|  |             var mgnr = json["mgnr"]!.AsValue().GetValue<int>(); | ||||||
|  |             var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>(); | ||||||
|  |             if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) { | ||||||
|  |                 throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)"); | ||||||
|  |             } | ||||||
|  |             return (new Member { | ||||||
|  |                 MgNr = mgnr, | ||||||
|  |                 PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(), | ||||||
|  |                 Name = json["name"]?.AsValue().GetValue<string>() ?? json["family_name"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Prefix = json["prefix"]?.AsValue().GetValue<string>(), | ||||||
|  |                 GivenName = json["given_name"]?.AsValue().GetValue<string>(), | ||||||
|  |                 MiddleName = json["middle_names"]?.AsValue().GetValue<string>(), | ||||||
|  |                 Suffix = json["suffix"]?.AsValue().GetValue<string>(), | ||||||
|  |                 ForTheAttentionOf = json["attn"]?.AsValue().GetValue<string>(), | ||||||
|  |                 Birthday = json["birthday"]?.AsValue().GetValue<string>(), | ||||||
|  |                 EntryDateString = json["entry_date"]?.AsValue().GetValue<string>(), | ||||||
|  |                 ExitDateString = json["exit_date"]?.AsValue().GetValue<string>(), | ||||||
|  |                 BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0, | ||||||
|  |                 AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(), | ||||||
|  |                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(), | ||||||
|  |                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(), | ||||||
|  |                 UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(), | ||||||
|  |                 IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsOrganic = json["organic"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsFunktionär = json["funktionär"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsActive = json["active"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsDeceased = json["deceased"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 Iban = json["iban"]?.AsValue().GetValue<string>(), | ||||||
|  |                 Bic = json["bic"]?.AsValue().GetValue<string>(), | ||||||
|  |                 CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(), | ||||||
|  |                 PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Address = json["address"]!["address"]!.AsValue().GetValue<string>(), | ||||||
|  |                 DefaultKgNr = kgnr, | ||||||
|  |                 ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 Comment = json["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |             }, json["billing_address"] is JsonObject a ? new BillingAddr { | ||||||
|  |                 MgNr = mgnr, | ||||||
|  |                 FullName = a["name"]!.AsValue().GetValue<string>(), | ||||||
|  |                 CountryNum = a["country"]!.AsValue().GetValue<int>(), | ||||||
|  |                 PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Address = a["address"]!.AsValue().GetValue<string>(), | ||||||
|  |             } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr { | ||||||
|  |                 MgNr = mgnr, | ||||||
|  |                 Nr = i + 1, | ||||||
|  |                 Type = n["type"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Number = n["number"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Comment = n["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |             }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr { | ||||||
|  |                 MgNr = mgnr, | ||||||
|  |                 Nr = i + 1, | ||||||
|  |                 Address = a["address"]!.AsValue().GetValue<string>(), | ||||||
|  |                 Comment = a["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |             }).ToList()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static JsonObject ToJson(this AreaCom c) { | ||||||
|  |             return new JsonObject { | ||||||
|  |                 ["fbnr"] = c.FbNr, | ||||||
|  |                 ["mgnr"] = c.MgNr, | ||||||
|  |                 ["vtrgid"] = c.VtrgId, | ||||||
|  |                 ["cultid"] = c.CultId, | ||||||
|  |                 ["area"] = c.Area, | ||||||
|  |                 ["kgnr"] = c.KgNr, | ||||||
|  |                 ["gstnr"] = c.GstNr, | ||||||
|  |                 ["ried"] = c.Rd?.Name, | ||||||
|  |                 ["year_from"] = c.YearFrom, | ||||||
|  |                 ["year_to"] = c.YearTo, | ||||||
|  |                 ["comment"] = c.Comment, | ||||||
|  |             }; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) { | ||||||
|  |             var kgnr = json["kgnr"]!.AsValue().GetValue<int>(); | ||||||
|  |             var ried = json["ried"]?.AsValue().GetValue<string>(); | ||||||
|  |             WbRd? rd = null; | ||||||
|  |             bool newRd = false; | ||||||
|  |             if (ried != null) { | ||||||
|  |                 var rde = riede[kgnr] ?? throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)"); | ||||||
|  |                 rd = rde.FirstOrDefault(r => r.Name == ried); | ||||||
|  |                 if (rd == null) { | ||||||
|  |                     newRd = true; | ||||||
|  |                     rd = new WbRd { | ||||||
|  |                         KgNr = kgnr, | ||||||
|  |                         RdNr = (rde.Count == 0 ? 0 : rde.Max(r => r.RdNr)) + 1, | ||||||
|  |                         Name = ried, | ||||||
|  |                     }; | ||||||
|  |                     rde.Add(rd); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             return (new AreaCom { | ||||||
|  |                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(), | ||||||
|  |                 CultId = json["cultid"]?.AsValue().GetValue<string>(), | ||||||
|  |                 Area = json["area"]!.AsValue().GetValue<int>(), | ||||||
|  |                 KgNr = kgnr, | ||||||
|  |                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-", | ||||||
|  |                 RdNr = rd?.RdNr, | ||||||
|  |                 YearFrom = json["year_from"]!.AsValue().GetValue<int>(), | ||||||
|  |                 YearTo = json["year_to"]?.AsValue().GetValue<int>(), | ||||||
|  |                 Comment = json["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |             }, newRd ? rd : null); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static JsonObject ToJson(this Delivery d) { | ||||||
|  |             return new JsonObject { | ||||||
|  |                 ["lsnr"] = d.LsNr, | ||||||
|  |                 ["year"] = d.Year, | ||||||
|  |                 ["date"] = $"{d.Date:yyyy-MM-dd}", | ||||||
|  |                 ["zwstid"] = d.ZwstId, | ||||||
|  |                 ["lnr"] = d.LNr, | ||||||
|  |                 ["time"] = d.Time != null ? $"{d.Time:HH:mm:ss}" : null, | ||||||
|  |                 ["mgnr"] = d.MgNr, | ||||||
|  |                 ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => { | ||||||
|  |                     var obj = new JsonObject { | ||||||
|  |                         ["dpnr"] = p.DPNr, | ||||||
|  |                         ["sortid"] = p.SortId, | ||||||
|  |                         ["attrid"] = p.AttrId, | ||||||
|  |                         ["cultid"] = p.CultId, | ||||||
|  |                         ["weight"] = p.Weight, | ||||||
|  |                         ["kmw"] = p.Kmw, | ||||||
|  |                         ["qualid"] = p.QualId, | ||||||
|  |                         ["hkid"] = p.HkId, | ||||||
|  |                         ["kgnr"] = p.KgNr, | ||||||
|  |                         ["rdnr"] = p.RdNr, | ||||||
|  |                         ["net_weight"] = p.IsNetWeight, | ||||||
|  |                         ["manual_weighing"] = p.IsManualWeighing, | ||||||
|  |                         ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()), | ||||||
|  |                         ["comment"] = p.Comment, | ||||||
|  |                     }; | ||||||
|  |                     if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck; | ||||||
|  |                     if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked; | ||||||
|  |                     if (p.IsLesewagen != null) obj["lesewagen"] = p.IsLesewagen; | ||||||
|  |                     if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden; | ||||||
|  |                     if (p.Temperature != null) obj["temperature"] = p.Temperature; | ||||||
|  |                     if (p.Acid != null) obj["acid"] = p.Acid; | ||||||
|  |                     if (p.ScaleId != null) obj["scale_id"] = p.ScaleId; | ||||||
|  |                     if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData); | ||||||
|  |                     if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason; | ||||||
|  |                     return obj; | ||||||
|  |                 }).ToArray()), | ||||||
|  |                 ["comment"] = d.Comment, | ||||||
|  |             }; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) { | ||||||
|  |             var year = json["year"]!.AsValue().GetValue<int>(); | ||||||
|  |             var lsnr = json["lsnr"]!.AsValue().GetValue<string>(); | ||||||
|  |             var did = currentLsNrs.GetValueOrDefault(lsnr, -1); | ||||||
|  |             if (did == -1) { | ||||||
|  |                 if (!currentDids.ContainsKey(year)) currentDids[year] = 0; | ||||||
|  |                 did = ++currentDids[year]; | ||||||
|  |             } | ||||||
|  |             currentLsNrs[lsnr] = did; | ||||||
|  |             return (new Delivery { | ||||||
|  |                 Year = year, | ||||||
|  |                 DId = did, | ||||||
|  |                 DateString = json["date"]!.AsValue().GetValue<string>(), | ||||||
|  |                 TimeString = json["time"]?.AsValue().GetValue<string>(), | ||||||
|  |                 ZwstId = json["zwstid"]!.AsValue().GetValue<string>(), | ||||||
|  |                 LNr = json["lnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 LsNr = lsnr, | ||||||
|  |                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 Comment = json["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart { | ||||||
|  |                 Year = year, | ||||||
|  |                 DId = did, | ||||||
|  |                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 SortId = p["sortid"]!.AsValue().GetValue<string>(), | ||||||
|  |                 AttrId = p["attrid"]?.AsValue().GetValue<string>(), | ||||||
|  |                 CultId = p["cultid"]?.AsValue().GetValue<string>(), | ||||||
|  |                 Weight = p["weight"]!.AsValue().GetValue<int>(), | ||||||
|  |                 Kmw = p["kmw"]!.AsValue().GetValue<double>(), | ||||||
|  |                 QualId = p["qualid"]!.AsValue().GetValue<string>(), | ||||||
|  |                 HkId = p["hkid"]!.AsValue().GetValue<string>(), | ||||||
|  |                 KgNr = p["kgnr"]?.AsValue().GetValue<int>(), | ||||||
|  |                 RdNr = p["rdnr"]?.AsValue().GetValue<int>(), | ||||||
|  |                 IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(), | ||||||
|  |                 IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(), | ||||||
|  |                 Comment = p["comment"]?.AsValue().GetValue<string>(), | ||||||
|  |                 IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false, | ||||||
|  |                 IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(), | ||||||
|  |                 IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(), | ||||||
|  |                 IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(), | ||||||
|  |                 Temperature = p["temperature"]?.AsValue().GetValue<double>(), | ||||||
|  |                 Acid = p["acid"]?.AsValue().GetValue<double>(), | ||||||
|  |                 ScaleId = p["scale_id"]?.AsValue().GetValue<string>(), | ||||||
|  |                 WeighingData = p["weighing_data"]?.AsObject().ToJsonString(JsonOpts), | ||||||
|  |                 WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(), | ||||||
|  |             }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier { | ||||||
|  |                 Year = year, | ||||||
|  |                 DId = did, | ||||||
|  |                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(), | ||||||
|  |                 ModId = m!.AsValue().GetValue<string>(), | ||||||
|  |             })).ToList()); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user